diff --git a/boot_control_android.h b/boot_control_android.h
index c81f86d..4393ae8 100644
--- a/boot_control_android.h
+++ b/boot_control_android.h
@@ -25,8 +25,8 @@
 #include <liblp/builder.h>
 
 #include "update_engine/common/boot_control.h"
+#include "update_engine/common/dynamic_partition_control_interface.h"
 #include "update_engine/dynamic_partition_control_android.h"
-#include "update_engine/dynamic_partition_control_interface.h"
 
 namespace chromeos_update_engine {
 
diff --git a/dynamic_partition_control_interface.h b/common/dynamic_partition_control_interface.h
similarity index 91%
rename from dynamic_partition_control_interface.h
rename to common/dynamic_partition_control_interface.h
index b5be2be..b092f7a 100644
--- a/dynamic_partition_control_interface.h
+++ b/common/dynamic_partition_control_interface.h
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef UPDATE_ENGINE_DYNAMIC_PARTITION_CONTROL_INTERFACE_H_
-#define UPDATE_ENGINE_DYNAMIC_PARTITION_CONTROL_INTERFACE_H_
+#ifndef UPDATE_ENGINE_COMMON_DYNAMIC_PARTITION_CONTROL_INTERFACE_H_
+#define UPDATE_ENGINE_COMMON_DYNAMIC_PARTITION_CONTROL_INTERFACE_H_
 
 #include <stdint.h>
 
@@ -67,4 +67,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // UPDATE_ENGINE_DYNAMIC_PARTITION_CONTROL_INTERFACE_H_
+#endif  // UPDATE_ENGINE_COMMON_DYNAMIC_PARTITION_CONTROL_INTERFACE_H_
diff --git a/dynamic_partition_control_android.h b/dynamic_partition_control_android.h
index af37398..c1837e0 100644
--- a/dynamic_partition_control_android.h
+++ b/dynamic_partition_control_android.h
@@ -17,8 +17,6 @@
 #ifndef UPDATE_ENGINE_DYNAMIC_PARTITION_CONTROL_ANDROID_H_
 #define UPDATE_ENGINE_DYNAMIC_PARTITION_CONTROL_ANDROID_H_
 
-#include "update_engine/dynamic_partition_control_interface.h"
-
 #include <memory>
 #include <set>
 #include <string>
@@ -27,6 +25,8 @@
 #include <libsnapshot/auto_device.h>
 #include <libsnapshot/snapshot.h>
 
+#include "update_engine/common/dynamic_partition_control_interface.h"
+
 namespace chromeos_update_engine {
 
 class DynamicPartitionControlAndroid : public DynamicPartitionControlInterface {
diff --git a/mock_dynamic_partition_control.h b/mock_dynamic_partition_control.h
index 67b3998..db8e834 100644
--- a/mock_dynamic_partition_control.h
+++ b/mock_dynamic_partition_control.h
@@ -22,8 +22,8 @@
 #include <gmock/gmock.h>
 
 #include "update_engine/common/boot_control_interface.h"
+#include "update_engine/common/dynamic_partition_control_interface.h"
 #include "update_engine/dynamic_partition_control_android.h"
-#include "update_engine/dynamic_partition_control_interface.h"
 
 namespace chromeos_update_engine {