diff --git a/update_manager/boxed_value.cc b/update_manager/boxed_value.cc
index 6648e99..a4aeede 100644
--- a/update_manager/boxed_value.cc
+++ b/update_manager/boxed_value.cc
@@ -24,9 +24,9 @@
 #include <base/strings/string_number_conversions.h>
 #include <base/time/time.h>
 
+#include "update_engine/common/utils.h"
 #include "update_engine/update_manager/shill_provider.h"
 #include "update_engine/update_manager/updater_provider.h"
-#include "update_engine/utils.h"
 
 using std::set;
 using std::string;
diff --git a/update_manager/chromeos_policy.cc b/update_manager/chromeos_policy.cc
index 3a81059..6ba6f82 100644
--- a/update_manager/chromeos_policy.cc
+++ b/update_manager/chromeos_policy.cc
@@ -24,11 +24,11 @@
 #include <base/strings/string_util.h>
 #include <base/time/time.h>
 
-#include "update_engine/error_code.h"
+#include "update_engine/common/error_code.h"
+#include "update_engine/common/utils.h"
 #include "update_engine/update_manager/device_policy_provider.h"
 #include "update_engine/update_manager/policy_utils.h"
 #include "update_engine/update_manager/shill_provider.h"
-#include "update_engine/utils.h"
 
 using base::Time;
 using base::TimeDelta;
@@ -533,7 +533,7 @@
 
 EvalStatus ChromeOSPolicy::P2PEnabled(EvaluationContext* ec,
                                       State* state,
-                                      std::string* error,
+                                      string* error,
                                       bool* result) const {
   bool enabled = false;
 
@@ -569,7 +569,7 @@
 
 EvalStatus ChromeOSPolicy::P2PEnabledChanged(EvaluationContext* ec,
                                              State* state,
-                                             std::string* error,
+                                             string* error,
                                              bool* result,
                                              bool prev_result) const {
   EvalStatus status = P2PEnabled(ec, state, error, result);
diff --git a/update_manager/chromeos_policy_unittest.cc b/update_manager/chromeos_policy_unittest.cc
index f74eb8b..a78257d 100644
--- a/update_manager/chromeos_policy_unittest.cc
+++ b/update_manager/chromeos_policy_unittest.cc
@@ -25,7 +25,7 @@
 #include <brillo/message_loops/fake_message_loop.h>
 #include <gtest/gtest.h>
 
-#include "update_engine/fake_clock.h"
+#include "update_engine/common/fake_clock.h"
 #include "update_engine/update_manager/evaluation_context.h"
 #include "update_engine/update_manager/fake_state.h"
 #include "update_engine/update_manager/umtest_utils.h"
diff --git a/update_manager/default_policy.h b/update_manager/default_policy.h
index c86521e..3f41178 100644
--- a/update_manager/default_policy.h
+++ b/update_manager/default_policy.h
@@ -22,7 +22,7 @@
 
 #include <base/time/time.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
 #include "update_engine/update_manager/policy.h"
 
 namespace chromeos_update_manager {
diff --git a/update_manager/evaluation_context.cc b/update_manager/evaluation_context.cc
index 0453eac..03ac0b7 100644
--- a/update_manager/evaluation_context.cc
+++ b/update_manager/evaluation_context.cc
@@ -26,7 +26,7 @@
 #include <base/strings/string_util.h>
 #include <base/values.h>
 
-#include "update_engine/utils.h"
+#include "update_engine/common/utils.h"
 
 using base::Callback;
 using base::Closure;
diff --git a/update_manager/evaluation_context.h b/update_manager/evaluation_context.h
index a57daa6..df5816a 100644
--- a/update_manager/evaluation_context.h
+++ b/update_manager/evaluation_context.h
@@ -28,7 +28,7 @@
 #include <base/time/time.h>
 #include <brillo/message_loops/message_loop.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
 #include "update_engine/update_manager/boxed_value.h"
 #include "update_engine/update_manager/variable.h"
 
diff --git a/update_manager/evaluation_context_unittest.cc b/update_manager/evaluation_context_unittest.cc
index 3f2ff5e..1e61db7 100644
--- a/update_manager/evaluation_context_unittest.cc
+++ b/update_manager/evaluation_context_unittest.cc
@@ -24,7 +24,7 @@
 #include <brillo/message_loops/message_loop_utils.h>
 #include <gtest/gtest.h>
 
-#include "update_engine/fake_clock.h"
+#include "update_engine/common/fake_clock.h"
 #include "update_engine/update_manager/fake_variable.h"
 #include "update_engine/update_manager/generic_variables.h"
 #include "update_engine/update_manager/mock_variable.h"
diff --git a/update_manager/policy.h b/update_manager/policy.h
index 7105c57..fae1494 100644
--- a/update_manager/policy.h
+++ b/update_manager/policy.h
@@ -21,7 +21,7 @@
 #include <tuple>
 #include <vector>
 
-#include "update_engine/error_code.h"
+#include "update_engine/common/error_code.h"
 #include "update_engine/update_manager/evaluation_context.h"
 #include "update_engine/update_manager/state.h"
 
diff --git a/update_manager/real_config_provider.cc b/update_manager/real_config_provider.cc
index ebaac75..2d17a7f 100644
--- a/update_manager/real_config_provider.cc
+++ b/update_manager/real_config_provider.cc
@@ -20,9 +20,9 @@
 #include <base/logging.h>
 #include <brillo/key_value_store.h>
 
-#include "update_engine/constants.h"
+#include "update_engine/common/constants.h"
+#include "update_engine/common/utils.h"
 #include "update_engine/update_manager/generic_variables.h"
-#include "update_engine/utils.h"
 
 using brillo::KeyValueStore;
 
diff --git a/update_manager/real_config_provider.h b/update_manager/real_config_provider.h
index 727bdb0..4de910c 100644
--- a/update_manager/real_config_provider.h
+++ b/update_manager/real_config_provider.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
 
-#include "update_engine/hardware_interface.h"
+#include "update_engine/common/hardware_interface.h"
 #include "update_engine/update_manager/config_provider.h"
 #include "update_engine/update_manager/generic_variables.h"
 
diff --git a/update_manager/real_config_provider_unittest.cc b/update_manager/real_config_provider_unittest.cc
index ffdbf7d..2d7dc0d 100644
--- a/update_manager/real_config_provider_unittest.cc
+++ b/update_manager/real_config_provider_unittest.cc
@@ -22,9 +22,9 @@
 #include <base/files/scoped_temp_dir.h>
 #include <gtest/gtest.h>
 
-#include "update_engine/constants.h"
-#include "update_engine/fake_hardware.h"
-#include "update_engine/test_utils.h"
+#include "update_engine/common/constants.h"
+#include "update_engine/common/fake_hardware.h"
+#include "update_engine/common/test_utils.h"
 #include "update_engine/update_manager/umtest_utils.h"
 
 using base::TimeDelta;
diff --git a/update_manager/real_device_policy_provider.cc b/update_manager/real_device_policy_provider.cc
index e7ddb13..0abd9f7 100644
--- a/update_manager/real_device_policy_provider.cc
+++ b/update_manager/real_device_policy_provider.cc
@@ -23,9 +23,9 @@
 #include <base/time/time.h>
 #include <policy/device_policy.h>
 
+#include "update_engine/common/utils.h"
 #include "update_engine/update_manager/generic_variables.h"
 #include "update_engine/update_manager/real_shill_provider.h"
-#include "update_engine/utils.h"
 
 using base::TimeDelta;
 using brillo::MessageLoop;
diff --git a/update_manager/real_device_policy_provider_unittest.cc b/update_manager/real_device_policy_provider_unittest.cc
index cd2829d..c480b60 100644
--- a/update_manager/real_device_policy_provider_unittest.cc
+++ b/update_manager/real_device_policy_provider_unittest.cc
@@ -28,8 +28,8 @@
 #include <session_manager/dbus-proxies.h>
 #include <session_manager/dbus-proxy-mocks.h>
 
+#include "update_engine/common/test_utils.h"
 #include "update_engine/dbus_test_utils.h"
-#include "update_engine/test_utils.h"
 #include "update_engine/update_manager/umtest_utils.h"
 
 using base::TimeDelta;
diff --git a/update_manager/real_shill_provider.h b/update_manager/real_shill_provider.h
index 5f3f6bf..dbd6fc5 100644
--- a/update_manager/real_shill_provider.h
+++ b/update_manager/real_shill_provider.h
@@ -26,7 +26,7 @@
 #include <base/time/time.h>
 #include <dbus/object_path.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
 #include "update_engine/shill_proxy_interface.h"
 #include "update_engine/update_manager/generic_variables.h"
 #include "update_engine/update_manager/shill_provider.h"
diff --git a/update_manager/real_shill_provider_unittest.cc b/update_manager/real_shill_provider_unittest.cc
index 7272019..2fa0628 100644
--- a/update_manager/real_shill_provider_unittest.cc
+++ b/update_manager/real_shill_provider_unittest.cc
@@ -27,10 +27,10 @@
 #include <shill/dbus-proxies.h>
 #include <shill/dbus-proxy-mocks.h>
 
+#include "update_engine/common/fake_clock.h"
+#include "update_engine/common/test_utils.h"
 #include "update_engine/dbus_test_utils.h"
-#include "update_engine/fake_clock.h"
 #include "update_engine/fake_shill_proxy.h"
-#include "update_engine/test_utils.h"
 #include "update_engine/update_manager/umtest_utils.h"
 
 using base::Time;
diff --git a/update_manager/real_system_provider.cc b/update_manager/real_system_provider.cc
index 90173a0..040f37c 100644
--- a/update_manager/real_system_provider.cc
+++ b/update_manager/real_system_provider.cc
@@ -28,8 +28,8 @@
 #include <base/strings/stringprintf.h>
 #include <base/time/time.h>
 
+#include "update_engine/common/utils.h"
 #include "update_engine/update_manager/generic_variables.h"
-#include "update_engine/utils.h"
 
 using std::string;
 
diff --git a/update_manager/real_system_provider.h b/update_manager/real_system_provider.h
index a46a698..0329d74 100644
--- a/update_manager/real_system_provider.h
+++ b/update_manager/real_system_provider.h
@@ -20,8 +20,8 @@
 #include <memory>
 #include <string>
 
-#include "update_engine/boot_control_interface.h"
-#include "update_engine/hardware_interface.h"
+#include "update_engine/common/boot_control_interface.h"
+#include "update_engine/common/hardware_interface.h"
 #include "update_engine/update_manager/system_provider.h"
 
 namespace chromeos_update_manager {
diff --git a/update_manager/real_system_provider_unittest.cc b/update_manager/real_system_provider_unittest.cc
index 35e9be1..5ee4137 100644
--- a/update_manager/real_system_provider_unittest.cc
+++ b/update_manager/real_system_provider_unittest.cc
@@ -21,8 +21,8 @@
 #include <base/time/time.h>
 #include <gtest/gtest.h>
 
-#include "update_engine/fake_boot_control.h"
-#include "update_engine/fake_hardware.h"
+#include "update_engine/common/fake_boot_control.h"
+#include "update_engine/common/fake_hardware.h"
 #include "update_engine/update_manager/umtest_utils.h"
 
 using std::unique_ptr;
diff --git a/update_manager/real_time_provider.cc b/update_manager/real_time_provider.cc
index 1f3f6f0..ca3acad 100644
--- a/update_manager/real_time_provider.cc
+++ b/update_manager/real_time_provider.cc
@@ -20,7 +20,7 @@
 
 #include <base/time/time.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/update_manager/real_time_provider.h b/update_manager/real_time_provider.h
index 11bdf06..e7cae94 100644
--- a/update_manager/real_time_provider.h
+++ b/update_manager/real_time_provider.h
@@ -21,7 +21,7 @@
 
 #include <base/time/time.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
 #include "update_engine/update_manager/time_provider.h"
 
 namespace chromeos_update_manager {
diff --git a/update_manager/real_time_provider_unittest.cc b/update_manager/real_time_provider_unittest.cc
index 15fbe4b..0e1ef34 100644
--- a/update_manager/real_time_provider_unittest.cc
+++ b/update_manager/real_time_provider_unittest.cc
@@ -22,7 +22,7 @@
 #include <base/time/time.h>
 #include <gtest/gtest.h>
 
-#include "update_engine/fake_clock.h"
+#include "update_engine/common/fake_clock.h"
 #include "update_engine/update_manager/umtest_utils.h"
 
 using base::Time;
diff --git a/update_manager/real_updater_provider.cc b/update_manager/real_updater_provider.cc
index 1c2868d..1a3e65a 100644
--- a/update_manager/real_updater_provider.cc
+++ b/update_manager/real_updater_provider.cc
@@ -25,9 +25,9 @@
 #include <base/time/time.h>
 #include <update_engine/dbus-constants.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
+#include "update_engine/common/prefs.h"
 #include "update_engine/omaha_request_params.h"
-#include "update_engine/prefs.h"
 #include "update_engine/update_attempter.h"
 
 using base::StringPrintf;
diff --git a/update_manager/real_updater_provider_unittest.cc b/update_manager/real_updater_provider_unittest.cc
index 2f0f9dd..14eb30b 100644
--- a/update_manager/real_updater_provider_unittest.cc
+++ b/update_manager/real_updater_provider_unittest.cc
@@ -23,8 +23,8 @@
 #include <gtest/gtest.h>
 #include <update_engine/dbus-constants.h>
 
-#include "update_engine/fake_clock.h"
-#include "update_engine/fake_prefs.h"
+#include "update_engine/common/fake_clock.h"
+#include "update_engine/common/fake_prefs.h"
 #include "update_engine/fake_system_state.h"
 #include "update_engine/mock_update_attempter.h"
 #include "update_engine/omaha_request_params.h"
diff --git a/update_manager/state_factory.cc b/update_manager/state_factory.cc
index f90bd6e..d4f4aa4 100644
--- a/update_manager/state_factory.cc
+++ b/update_manager/state_factory.cc
@@ -20,7 +20,7 @@
 
 #include <base/logging.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
 #include "update_engine/update_manager/real_config_provider.h"
 #include "update_engine/update_manager/real_device_policy_provider.h"
 #include "update_engine/update_manager/real_random_provider.h"
diff --git a/update_manager/update_manager.h b/update_manager/update_manager.h
index 1d1db2e..a2f35df 100644
--- a/update_manager/update_manager.h
+++ b/update_manager/update_manager.h
@@ -25,7 +25,7 @@
 #include <base/memory/ref_counted.h>
 #include <base/time/time.h>
 
-#include "update_engine/clock_interface.h"
+#include "update_engine/common/clock_interface.h"
 #include "update_engine/update_manager/default_policy.h"
 #include "update_engine/update_manager/evaluation_context.h"
 #include "update_engine/update_manager/policy.h"
diff --git a/update_manager/update_manager_unittest.cc b/update_manager/update_manager_unittest.cc
index 03f37c7..4cc738d 100644
--- a/update_manager/update_manager_unittest.cc
+++ b/update_manager/update_manager_unittest.cc
@@ -34,7 +34,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "update_engine/fake_clock.h"
+#include "update_engine/common/fake_clock.h"
 #include "update_engine/update_manager/default_policy.h"
 #include "update_engine/update_manager/fake_state.h"
 #include "update_engine/update_manager/mock_policy.h"