diff --git a/compositor/CompositionPlanner.cpp b/compositor/CompositionPlanner.cpp
index 3e00e27..83af852 100644
--- a/compositor/CompositionPlanner.cpp
+++ b/compositor/CompositionPlanner.cpp
@@ -16,6 +16,7 @@
 
 #include "CompositionPlanner.h"
 
+#include "compositor/LayerData.h"
 #include "hwc/HwcLayer.h"
 
 namespace android::drm_hwcomposer {
diff --git a/compositor/CompositionPlanner.h b/compositor/CompositionPlanner.h
index 021c9dc..0fb7cb6 100644
--- a/compositor/CompositionPlanner.h
+++ b/compositor/CompositionPlanner.h
@@ -21,13 +21,12 @@
 #include <optional>
 #include <vector>
 
-#include "compositor/LayerData.h"
-
 namespace android::drm_hwcomposer {
 
-struct LayerToPlaneJoiningPlan;
+enum class CompositionType;
 class HwcDisplay;
 class HwcLayer;
+struct LayerToPlaneJoiningPlan;
 
 // CompositionPlanner is responsible for determining the mapping between
 // HwcLayer and drm planes. This includes deciding which HwcLayers should be
diff --git a/compositor/DisplayInfo.h b/compositor/DisplayInfo.h
index a22a634..22d07d9 100644
--- a/compositor/DisplayInfo.h
+++ b/compositor/DisplayInfo.h
@@ -82,7 +82,7 @@ enum class Colorspace : int32_t {
 /**
  * Display panel orientation property values.
  */
-enum PanelOrientation {
+enum class PanelOrientation {
   kModePanelOrientationNormal = 0,
   kModePanelOrientationBottomUp,
   kModePanelOrientationLeftUp,
diff --git a/compositor/GenericCompositionPlanner.cpp b/compositor/GenericCompositionPlanner.cpp
index 392e80b..eb6100a 100644
--- a/compositor/GenericCompositionPlanner.cpp
+++ b/compositor/GenericCompositionPlanner.cpp
@@ -20,11 +20,12 @@
 #include <tuple>
 #include <vector>
 
-#include "backend/BackendManager.h"
 #include "compositor/FlatteningController.h"
 #include "compositor/LayerData.h"
+#include "drm/DrmPlane.h"
 #include "hwc/HwcDisplay.h"
 #include "hwc/HwcLayer.h"
+#include "utils/log.h"
 
 namespace android::drm_hwcomposer {
 
diff --git a/compositor/GenericCompositionPlanner.h b/compositor/GenericCompositionPlanner.h
index d520e66..999a14f 100644
--- a/compositor/GenericCompositionPlanner.h
+++ b/compositor/GenericCompositionPlanner.h
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 
 namespace android::drm_hwcomposer {
 
-struct LayerToPlaneJoiningPlan;
+enum class CompositionType;
 class HwcDisplay;
 class HwcLayer;
 
diff --git a/compositor/LayerData.h b/compositor/LayerData.h
index 05c898d..26cdcb1 100644
--- a/compositor/LayerData.h
+++ b/compositor/LayerData.h
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "bufferinfo/BufferInfo.h"
-#include "drm/DrmFbImporter.h"
 #include "utils/fd.h"
 
 namespace android::drm_hwcomposer {
diff --git a/compositor/LayerToPlaneJoiningPlan.cpp b/compositor/LayerToPlaneJoiningPlan.cpp
index 63f572d..e4f3473 100644
--- a/compositor/LayerToPlaneJoiningPlan.cpp
+++ b/compositor/LayerToPlaneJoiningPlan.cpp
@@ -18,9 +18,9 @@
 
 #include "LayerToPlaneJoiningPlan.h"
 
-#include "drm/DrmDevice.h"
+#include "compositor/LayerData.h"
+#include "drm/DrmDisplayPipeline.h"
 #include "drm/DrmPlane.h"
-#include "utils/log.h"
 
 namespace android::drm_hwcomposer {
 
diff --git a/compositor/LayerToPlaneJoiningPlan.h b/compositor/LayerToPlaneJoiningPlan.h
index dd3d8b7..20058b1 100644
--- a/compositor/LayerToPlaneJoiningPlan.h
+++ b/compositor/LayerToPlaneJoiningPlan.h
@@ -23,7 +23,10 @@
 
 namespace android::drm_hwcomposer {
 
-class DrmDevice;
+class DrmPlane;
+struct DrmDisplayPipeline;
+template <typename T>
+class BindingOwner;
 
 struct LayerToPlaneJoiningPlan {
   struct LayerToPlaneJoining {
diff --git a/drm/DrmPlane.cpp b/drm/DrmPlane.cpp
index 5e4696b..a147827 100644
--- a/drm/DrmPlane.cpp
+++ b/drm/DrmPlane.cpp
@@ -26,6 +26,7 @@
 #include "DrmDevice.h"
 #include "bufferinfo/BufferInfoGetter.h"
 #include "compositor/LayerData.h"
+#include "drm/DrmFbImporter.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {
diff --git a/hwc/HwcLayer.h b/hwc/HwcLayer.h
index 3ac6134..574b3fe 100644
--- a/hwc/HwcLayer.h
+++ b/hwc/HwcLayer.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <map>
 #include <memory>
 
 #include "bufferinfo/BufferInfo.h"
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 0051e54..5e6614f 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -1091,7 +1091,8 @@ ndk::ScopedAStatus ComposerClient::getDisplayPhysicalOrientation(
       *orientation = common::Transform::ROT_90;
       break;
     default:
-      ALOGE("Unknown panel orientation value: %d", drm_orientation);
+      ALOGE("Unknown panel orientation value: %d",
+            static_cast<int>(drm_orientation));
       return ToBinderStatus(hwc3::Error::kBadDisplay);
   }