diff --git a/backend/BackendManager.cpp b/backend/BackendManager.cpp
index 46d9536..6c1dd27 100644
--- a/backend/BackendManager.cpp
+++ b/backend/BackendManager.cpp
@@ -18,7 +18,9 @@
 
 #include "BackendManager.h"
 
-#include "hwc/HwcDisplay.h"
+#include "drm/DrmConnector.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmDisplayPipeline.h"
 #include "utils/log.h"
 #include "utils/properties.h"
 
diff --git a/backend/BackendManager.h b/backend/BackendManager.h
index f76d71e..12ec5b8 100644
--- a/backend/BackendManager.h
+++ b/backend/BackendManager.h
@@ -21,10 +21,11 @@
 #include <string>
 #include <vector>
 
-#include "compositor/CompositionPlanner.h"
-
 namespace android::drm_hwcomposer {
 
+class DrmConnector;
+struct DrmDisplayPipeline;
+
 // BackendManager is a singleton that manages the registration of Backends and
 // finding a Backend which can be used to create a DrmDisplayPipeline for a
 // DrmConnector.
diff --git a/backend/ClientBackend.cpp b/backend/ClientBackend.cpp
index 7eaf769..ad98ebf 100644
--- a/backend/ClientBackend.cpp
+++ b/backend/ClientBackend.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "backend/GenericBackend.h"
-#include "compositor/GenericCompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 #include "hwc/HwcDisplay.h"
 
 namespace android::drm_hwcomposer {
diff --git a/backend/GenericBackend.cpp b/backend/GenericBackend.cpp
index 090d201..038c7cc 100644
--- a/backend/GenericBackend.cpp
+++ b/backend/GenericBackend.cpp
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-#include "backend/GenericBackend.h"
+#include "GenericBackend.h"
 
+#include "backend/BackendManager.h"
+#include "compositor/CompositionPlanner.h"
 #include "compositor/GenericCompositionPlanner.h"
+#include "drm/DrmConnector.h"
 #include "drm/DrmDisplayPipeline.h"
 
 namespace android::drm_hwcomposer {
diff --git a/backend/GenericBackend.h b/backend/GenericBackend.h
index dd61a06..4126e54 100644
--- a/backend/GenericBackend.h
+++ b/backend/GenericBackend.h
@@ -21,6 +21,9 @@
 
 namespace android::drm_hwcomposer {
 
+class DrmConnector;
+struct DrmDisplayPipeline;
+
 // Implement the Backend interface on top of upstream drm uAPI.
 class GenericBackend : public BackendManager::Backend {
  public: