diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp
index ffc45ef..c771022 100644
--- a/drmhwctwo.cpp
+++ b/drmhwctwo.cpp
@@ -18,20 +18,18 @@
 #define LOG_TAG "hwc-drm-two"
 
 #include "drmhwctwo.h"
-#include "backendmanager.h"
-#include "drmdisplaycomposition.h"
-#include "drmhwcomposer.h"
-#include "platform.h"
-#include "vsyncworker.h"
-
-#include <inttypes.h>
-#include <string>
 
 #include <cutils/properties.h>
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer2.h>
+#include <inttypes.h>
 #include <log/log.h>
 
+#include <string>
+
+#include "backend/backendmanager.h"
+#include "compositor/drmdisplaycomposition.h"
+
 namespace android {
 
 class DrmVsyncCallback : public VsyncCallback {