diff --git a/hwc2_device/DrmHwcTwo.cpp b/hwc2_device/DrmHwcTwo.cpp
index 311c2fe..bc86988 100644
--- a/hwc2_device/DrmHwcTwo.cpp
+++ b/hwc2_device/DrmHwcTwo.cpp
@@ -20,8 +20,8 @@
 
 #include <cinttypes>
 
-#include "compositor/CompositionPlanner.h"
-#include "utils/log.h"
+#include "drm/DrmHwc.h"
+#include "hwc/HwcDisplay.h"
 
 namespace android::drm_hwcomposer {
 
diff --git a/hwc2_device/DrmHwcTwo.h b/hwc2_device/DrmHwcTwo.h
index deb9deb..2ed5ac9 100644
--- a/hwc2_device/DrmHwcTwo.h
+++ b/hwc2_device/DrmHwcTwo.h
@@ -19,6 +19,7 @@
 #include <hardware/hwcomposer2.h>
 
 #include "drm/DrmHwc.h"
+#include "hwc/HwcDisplay.h"
 
 namespace android::drm_hwcomposer {
 
diff --git a/hwc2_device/hwc2_device.cpp b/hwc2_device/hwc2_device.cpp
index dac8511..2f8b753 100644
--- a/hwc2_device/hwc2_device.cpp
+++ b/hwc2_device/hwc2_device.cpp
@@ -25,15 +25,17 @@
 #include <optional>
 
 #include <cutils/native_handle.h>
+#include <hardware/hwcomposer2.h>
+#include <system/graphics-base-v1.1.h>
 #include <ui/GraphicTypes.h>
 
-#include "DrmHwcTwo.h"
-#include "compositor/CompositionPlanner.h"
+#include "bufferinfo/BufferInfoGetter.h"
 #include "compositor/DisplayInfo.h"
-#include "hardware/hwcomposer2.h"
+#include "hwc/HwcDisplay.h"
 #include "hwc/HwcLayer.h"
-#include "system/graphics-base-v1.1.h"
+#include "hwc2_device/DrmHwcTwo.h"
 #include "utils/log.h"
+#include "utils/properties.h"
 
 namespace android::drm_hwcomposer {