diff --git a/action.h b/action.h
index ce59158..27f1af9 100644
--- a/action.h
+++ b/action.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_H_
+#ifndef UPDATE_ENGINE_ACTION_H_
+#define UPDATE_ENGINE_ACTION_H_
 
 #include <stdio.h>
 
@@ -206,4 +206,4 @@
 
 };  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_H_
+#endif  // UPDATE_ENGINE_ACTION_H_
diff --git a/action_mock.h b/action_mock.h
index 505fbf5..16199f9 100644
--- a/action_mock.h
+++ b/action_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_MOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_MOCK_H_
+#ifndef UPDATE_ENGINE_ACTION_MOCK_H_
+#define UPDATE_ENGINE_ACTION_MOCK_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_MOCK_H_
+#endif  // UPDATE_ENGINE_ACTION_MOCK_H_
diff --git a/action_pipe.h b/action_pipe.h
index 3361ccd..f6d9434 100644
--- a/action_pipe.h
+++ b/action_pipe.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PIPE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PIPE_H_
+#ifndef UPDATE_ENGINE_ACTION_PIPE_H_
+#define UPDATE_ENGINE_ACTION_PIPE_H_
 
 #include <stdio.h>
 
@@ -87,4 +87,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PIPE_H_
+#endif  // UPDATE_ENGINE_ACTION_PIPE_H_
diff --git a/action_processor.h b/action_processor.h
index 32457a8..61fd29f 100644
--- a/action_processor.h
+++ b/action_processor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PROCESSOR_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PROCESSOR_H_
+#ifndef UPDATE_ENGINE_ACTION_PROCESSOR_H_
+#define UPDATE_ENGINE_ACTION_PROCESSOR_H_
 
 #include <deque>
 
@@ -99,4 +99,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PROCESSOR_H_
+#endif  // UPDATE_ENGINE_ACTION_PROCESSOR_H_
diff --git a/action_processor_mock.h b/action_processor_mock.h
index 696a0b6..bb91107 100644
--- a/action_processor_mock.h
+++ b/action_processor_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PROCESSOR_MOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PROCESSOR_MOCK_H_
+#ifndef UPDATE_ENGINE_ACTION_PROCESSOR_MOCK_H_
+#define UPDATE_ENGINE_ACTION_PROCESSOR_MOCK_H_
 
 #include <gmock/gmock.h>
 
@@ -19,4 +19,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_PROCESSOR_MOCK_H_
+#endif  // UPDATE_ENGINE_ACTION_PROCESSOR_MOCK_H_
diff --git a/bzip.h b/bzip.h
index 4f70d74..e78708b 100644
--- a/bzip.h
+++ b/bzip.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_BZIP_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_BZIP_H_
+#ifndef UPDATE_ENGINE_BZIP_H_
+#define UPDATE_ENGINE_BZIP_H_
 
 #include <string>
 #include <vector>
@@ -18,4 +18,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_BZIP_H_
+#endif  // UPDATE_ENGINE_BZIP_H_
diff --git a/bzip_extent_writer.h b/bzip_extent_writer.h
index f3121a9..9726253 100644
--- a/bzip_extent_writer.h
+++ b/bzip_extent_writer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_BZIP_EXTENT_WRITER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_BZIP_EXTENT_WRITER_H_
+#ifndef UPDATE_ENGINE_BZIP_EXTENT_WRITER_H_
+#define UPDATE_ENGINE_BZIP_EXTENT_WRITER_H_
 
 #include <vector>
 #include <bzlib.h>
@@ -35,4 +35,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_BZIP_EXTENT_WRITER_H_
+#endif  // UPDATE_ENGINE_BZIP_EXTENT_WRITER_H_
diff --git a/certificate_checker.h b/certificate_checker.h
index 7925937..eb49911 100644
--- a/certificate_checker.h
+++ b/certificate_checker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CERTIFICATE_CHECKER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CERTIFICATE_CHECKER_H_
+#ifndef UPDATE_ENGINE_CERTIFICATE_CHECKER_H_
+#define UPDATE_ENGINE_CERTIFICATE_CHECKER_H_
 
 #include <string>
 
@@ -119,4 +119,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_CERTIFICATE_CHECKER_H_
+#endif  // UPDATE_ENGINE_CERTIFICATE_CHECKER_H_
diff --git a/certificate_checker_mock.h b/certificate_checker_mock.h
index 78c44b7..f00dc85 100644
--- a/certificate_checker_mock.h
+++ b/certificate_checker_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CERTIFICATE_CHECKER_MOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CERTIFICATE_CHECKER_MOCK_H_
+#ifndef UPDATE_ENGINE_CERTIFICATE_CHECKER_MOCK_H_
+#define UPDATE_ENGINE_CERTIFICATE_CHECKER_MOCK_H_
 
 #include <gmock/gmock.h>
 #include <openssl/ssl.h>
@@ -23,4 +23,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_CERTIFICATE_CHECKER_MOCK_H_
+#endif  // UPDATE_ENGINE_CERTIFICATE_CHECKER_MOCK_H_
diff --git a/chrome_browser_proxy_resolver.h b/chrome_browser_proxy_resolver.h
index 48a1049..3b8e266 100644
--- a/chrome_browser_proxy_resolver.h
+++ b/chrome_browser_proxy_resolver.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_BROWSER_PROXY_RESOLVER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_BROWSER_PROXY_RESOLVER_H_
+#ifndef UPDATE_ENGINE_CHROME_BROWSER_PROXY_RESOLVER_H_
+#define UPDATE_ENGINE_CHROME_BROWSER_PROXY_RESOLVER_H_
 
 #include <deque>
 #include <map>
@@ -88,4 +88,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_BROWSER_PROXY_RESOLVER_H_
+#endif  // UPDATE_ENGINE_CHROME_BROWSER_PROXY_RESOLVER_H_
diff --git a/clock.h b/clock.h
index 95eeda9..f61fe00 100644
--- a/clock.h
+++ b/clock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CLOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CLOCK_H_
+#ifndef UPDATE_ENGINE_CLOCK_H_
+#define UPDATE_ENGINE_CLOCK_H_
 
 #include "update_engine/clock_interface.h"
 
@@ -26,4 +26,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_CLOCK_H_
+#endif  // UPDATE_ENGINE_CLOCK_H_
diff --git a/clock_interface.h b/clock_interface.h
index 5ee8161..bafb7fc 100644
--- a/clock_interface.h
+++ b/clock_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CLOCK_INTERFACE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CLOCK_INTERFACE_H_
+#ifndef UPDATE_ENGINE_CLOCK_INTERFACE_H_
+#define UPDATE_ENGINE_CLOCK_INTERFACE_H_
 
 #include <string>
 
@@ -39,4 +39,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_CLOCK_INTERFACE_H_
+#endif  // UPDATE_ENGINE_CLOCK_INTERFACE_H_
diff --git a/connection_manager.h b/connection_manager.h
index b50782b..0a2aabd 100644
--- a/connection_manager.h
+++ b/connection_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CONNECTION_MANAGER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CONNECTION_MANAGER_H_
+#ifndef UPDATE_ENGINE_CONNECTION_MANAGER_H_
+#define UPDATE_ENGINE_CONNECTION_MANAGER_H_
 
 #include <base/basictypes.h>
 
@@ -69,4 +69,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_CONNECTION_MANAGER_H_
+#endif  // UPDATE_ENGINE_CONNECTION_MANAGER_H_
diff --git a/constants.h b/constants.h
index 826c5ff..6eac886 100644
--- a/constants.h
+++ b/constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CONSTANTS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CONSTANTS_H_
+#ifndef UPDATE_ENGINE_CONSTANTS_H_
+#define UPDATE_ENGINE_CONSTANTS_H_
 
 namespace chromeos_update_engine {
 
@@ -160,4 +160,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_CONSTANTS_H_
+#endif  // UPDATE_ENGINE_CONSTANTS_H_
diff --git a/dbus_constants.h b/dbus_constants.h
index 849ba0b..d51e6fd 100644
--- a/dbus_constants.h
+++ b/dbus_constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_CONSTANTS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_CONSTANTS_H_
+#ifndef UPDATE_ENGINE_DBUS_CONSTANTS_H_
+#define UPDATE_ENGINE_DBUS_CONSTANTS_H_
 
 namespace chromeos_update_engine {
 
@@ -20,4 +20,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_CONSTANTS_H_
+#endif  // UPDATE_ENGINE_DBUS_CONSTANTS_H_
diff --git a/dbus_service.h b/dbus_service.h
index 3507918..c546316 100644
--- a/dbus_service.h
+++ b/dbus_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_SERVICE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_SERVICE_H_
+#ifndef UPDATE_ENGINE_DBUS_SERVICE_H_
+#define UPDATE_ENGINE_DBUS_SERVICE_H_
 
 #include <inttypes.h>
 #include <dbus/dbus-glib.h>
@@ -173,4 +173,4 @@
 
 G_END_DECLS
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_SERVICE_H_
+#endif  // UPDATE_ENGINE_DBUS_SERVICE_H_
diff --git a/dbus_wrapper_interface.h b/dbus_wrapper_interface.h
index 7bed2e6..35a76b6 100644
--- a/dbus_wrapper_interface.h
+++ b/dbus_wrapper_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_WRAPPER_INTERFACE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_WRAPPER_INTERFACE_H_
+#ifndef UPDATE_ENGINE_DBUS_WRAPPER_INTERFACE_H_
+#define UPDATE_ENGINE_DBUS_WRAPPER_INTERFACE_H_
 
 // A mockable interface for DBus.
 
@@ -111,4 +111,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_WRAPPER_INTERFACE_H_
+#endif  // UPDATE_ENGINE_DBUS_WRAPPER_INTERFACE_H_
diff --git a/delta_performer.h b/delta_performer.h
index 15c8af3..189fe3a 100644
--- a/delta_performer.h
+++ b/delta_performer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_DELTA_PERFORMER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_DELTA_PERFORMER_H_
+#ifndef UPDATE_ENGINE_DELTA_PERFORMER_H_
+#define UPDATE_ENGINE_DELTA_PERFORMER_H_
 
 #include <inttypes.h>
 
@@ -362,4 +362,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_DELTA_PERFORMER_H_
+#endif  // UPDATE_ENGINE_DELTA_PERFORMER_H_
diff --git a/download_action.h b/download_action.h
index d2f2004..b4982e0 100644
--- a/download_action.h
+++ b/download_action.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_DOWNLOAD_ACTION_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_DOWNLOAD_ACTION_H_
+#ifndef UPDATE_ENGINE_DOWNLOAD_ACTION_H_
+#define UPDATE_ENGINE_DOWNLOAD_ACTION_H_
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -150,4 +150,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_DOWNLOAD_ACTION_H_
+#endif  // UPDATE_ENGINE_DOWNLOAD_ACTION_H_
diff --git a/error_code.h b/error_code.h
index a9bfc2d..567534a 100644
--- a/error_code.h
+++ b/error_code.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_ERROR_CODE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_ERROR_CODE_H_
+#ifndef UPDATE_ENGINE_ERROR_CODE_H_
+#define UPDATE_ENGINE_ERROR_CODE_H_
 
 #include <ostream>  // NOLINT(readability/streams)
 
@@ -118,4 +118,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_ERROR_CODE_H_
+#endif  // UPDATE_ENGINE_ERROR_CODE_H_
diff --git a/extent_ranges.h b/extent_ranges.h
index 2b5748f..b85ecbd 100644
--- a/extent_ranges.h
+++ b/extent_ranges.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_EXTENT_RANGES_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_EXTENT_RANGES_H_
+#ifndef UPDATE_ENGINE_EXTENT_RANGES_H_
+#define UPDATE_ENGINE_EXTENT_RANGES_H_
 
 #include <map>
 #include <set>
@@ -70,4 +70,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_EXTENT_RANGES_H_
+#endif  // UPDATE_ENGINE_EXTENT_RANGES_H_
diff --git a/extent_writer.h b/extent_writer.h
index 7f31979..db24b4b 100644
--- a/extent_writer.h
+++ b/extent_writer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_EXTENT_WRITER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_EXTENT_WRITER_H_
+#ifndef UPDATE_ENGINE_EXTENT_WRITER_H_
+#define UPDATE_ENGINE_EXTENT_WRITER_H_
 
 #include <vector>
 #include "base/logging.h"
@@ -118,4 +118,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_EXTENT_WRITER_H_
+#endif  // UPDATE_ENGINE_EXTENT_WRITER_H_
diff --git a/fake_clock.h b/fake_clock.h
index 567e265..54c7c02 100644
--- a/fake_clock.h
+++ b/fake_clock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_CLOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_CLOCK_H_
+#ifndef UPDATE_ENGINE_FAKE_CLOCK_H_
+#define UPDATE_ENGINE_FAKE_CLOCK_H_
 
 #include "update_engine/clock_interface.h"
 
@@ -48,4 +48,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_CLOCK_H_
+#endif  // UPDATE_ENGINE_FAKE_CLOCK_H_
diff --git a/fake_hardware.h b/fake_hardware.h
index f043f6c..5b48ce2 100644
--- a/fake_hardware.h
+++ b/fake_hardware.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_HARDWARE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_HARDWARE_H_
+#ifndef UPDATE_ENGINE_FAKE_HARDWARE_H_
+#define UPDATE_ENGINE_FAKE_HARDWARE_H_
 
 #include <map>
 #include <string>
@@ -138,4 +138,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_HARDWARE_H_
+#endif  // UPDATE_ENGINE_FAKE_HARDWARE_H_
diff --git a/fake_p2p_manager.h b/fake_p2p_manager.h
index cbc063e..a00b91f 100644
--- a/fake_p2p_manager.h
+++ b/fake_p2p_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_P2P_MANAGER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_P2P_MANAGER_H_
+#ifndef UPDATE_ENGINE_FAKE_P2P_MANAGER_H_
+#define UPDATE_ENGINE_FAKE_P2P_MANAGER_H_
 
 #include <string>
 
@@ -117,4 +117,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_P2P_MANAGER_H_
+#endif  // UPDATE_ENGINE_FAKE_P2P_MANAGER_H_
diff --git a/fake_p2p_manager_configuration.h b/fake_p2p_manager_configuration.h
index 58a740e..e71baae 100644
--- a/fake_p2p_manager_configuration.h
+++ b/fake_p2p_manager_configuration.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_P2P_MANAGER_CONFIGURATION_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_P2P_MANAGER_CONFIGURATION_H_
+#ifndef UPDATE_ENGINE_FAKE_P2P_MANAGER_CONFIGURATION_H_
+#define UPDATE_ENGINE_FAKE_P2P_MANAGER_CONFIGURATION_H_
 
 #include "update_engine/p2p_manager.h"
 #include "update_engine/utils.h"
@@ -120,4 +120,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_P2P_MANAGER_CONFIGURATION_H_
+#endif  // UPDATE_ENGINE_FAKE_P2P_MANAGER_CONFIGURATION_H_
diff --git a/fake_prefs.h b/fake_prefs.h
index 30c3486..62cf738 100644
--- a/fake_prefs.h
+++ b/fake_prefs.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_PREFS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_PREFS_H_
+#ifndef UPDATE_ENGINE_FAKE_PREFS_H_
+#define UPDATE_ENGINE_FAKE_PREFS_H_
 
 #include <map>
 #include <string>
@@ -88,4 +88,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_PREFS_H_
+#endif  // UPDATE_ENGINE_FAKE_PREFS_H_
diff --git a/fake_system_state.h b/fake_system_state.h
index 0e853c9..062cbbb 100644
--- a/fake_system_state.h
+++ b/fake_system_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
+#ifndef UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
+#define UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
 
 #include <base/logging.h>
 #include <gmock/gmock.h>
@@ -246,4 +246,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
+#endif  // UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
diff --git a/file_descriptor.h b/file_descriptor.h
index 391a650..21c2758 100644
--- a/file_descriptor.h
+++ b/file_descriptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_DESCRIPTOR_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_DESCRIPTOR_H_
+#ifndef UPDATE_ENGINE_FILE_DESCRIPTOR_H_
+#define UPDATE_ENGINE_FILE_DESCRIPTOR_H_
 
 #include <errno.h>
 #include <sys/types.h>
@@ -119,4 +119,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_DESCRIPTOR_H_
+#endif  // UPDATE_ENGINE_FILE_DESCRIPTOR_H_
diff --git a/file_writer.h b/file_writer.h
index 155fe74..e2083c3 100644
--- a/file_writer.h
+++ b/file_writer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_WRITER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_WRITER_H_
+#ifndef UPDATE_ENGINE_FILE_WRITER_H_
+#define UPDATE_ENGINE_FILE_WRITER_H_
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -89,4 +89,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_WRITER_H_
+#endif  // UPDATE_ENGINE_FILE_WRITER_H_
diff --git a/file_writer_mock.h b/file_writer_mock.h
index 02c8d97..a2c5251 100644
--- a/file_writer_mock.h
+++ b/file_writer_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_WRITER_MOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_WRITER_MOCK_H_
+#ifndef UPDATE_ENGINE_FILE_WRITER_MOCK_H_
+#define UPDATE_ENGINE_FILE_WRITER_MOCK_H_
 
 #include "gmock/gmock.h"
 #include "update_engine/file_writer.h"
@@ -19,4 +19,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FILE_WRITER_MOCK_H_
+#endif  // UPDATE_ENGINE_FILE_WRITER_MOCK_H_
diff --git a/filesystem_copier_action.h b/filesystem_copier_action.h
index fce8e09..cdb3d8b 100644
--- a/filesystem_copier_action.h
+++ b/filesystem_copier_action.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FILESYSTEM_COPIER_ACTION_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FILESYSTEM_COPIER_ACTION_H_
+#ifndef UPDATE_ENGINE_FILESYSTEM_COPIER_ACTION_H_
+#define UPDATE_ENGINE_FILESYSTEM_COPIER_ACTION_H_
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -141,4 +141,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_FILESYSTEM_COPIER_ACTION_H_
+#endif  // UPDATE_ENGINE_FILESYSTEM_COPIER_ACTION_H_
diff --git a/hardware.h b/hardware.h
index 8183c51..7ab879a 100644
--- a/hardware.h
+++ b/hardware.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_H_
+#ifndef UPDATE_ENGINE_HARDWARE_H_
+#define UPDATE_ENGINE_HARDWARE_H_
 
 #include <string>
 #include <vector>
@@ -41,4 +41,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_H_
+#endif  // UPDATE_ENGINE_HARDWARE_H_
diff --git a/hardware_interface.h b/hardware_interface.h
index 83db8a2..8248553 100644
--- a/hardware_interface.h
+++ b/hardware_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_INTERFACE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_INTERFACE_H_
+#ifndef UPDATE_ENGINE_HARDWARE_INTERFACE_H_
+#define UPDATE_ENGINE_HARDWARE_INTERFACE_H_
 
 #include <string>
 #include <vector>
@@ -71,4 +71,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_INTERFACE_H_
+#endif  // UPDATE_ENGINE_HARDWARE_INTERFACE_H_
diff --git a/http_common.h b/http_common.h
index 51e9e7a..a4f7bdc 100644
--- a/http_common.h
+++ b/http_common.h
@@ -5,8 +5,8 @@
 // This file contains general definitions used in implementing, testing and
 // emulating communication over HTTP.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_COMMON_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_COMMON_H_
+#ifndef UPDATE_ENGINE_HTTP_COMMON_H_
+#define UPDATE_ENGINE_HTTP_COMMON_H_
 
 #include <cstdlib>
 
@@ -59,4 +59,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_COMMON_H_
+#endif  // UPDATE_ENGINE_HTTP_COMMON_H_
diff --git a/http_fetcher.h b/http_fetcher.h
index 07cebc9..fa26133 100644
--- a/http_fetcher.h
+++ b/http_fetcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_FETCHER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_FETCHER_H_
+#ifndef UPDATE_ENGINE_HTTP_FETCHER_H_
+#define UPDATE_ENGINE_HTTP_FETCHER_H_
 
 #include <deque>
 #include <string>
@@ -187,4 +187,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_FETCHER_H_
+#endif  // UPDATE_ENGINE_HTTP_FETCHER_H_
diff --git a/hwid_override.h b/hwid_override.h
index 04981ec..86cb53a 100644
--- a/hwid_override.h
+++ b/hwid_override.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_HWID_OVERRIDE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_HWID_OVERRIDE_H_
+#ifndef UPDATE_ENGINE_HWID_OVERRIDE_H_
+#define UPDATE_ENGINE_HWID_OVERRIDE_H_
 
 #include <map>
 #include <string>
@@ -30,4 +30,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_HWID_OVERRIDE_H_
+#endif  // UPDATE_ENGINE_HWID_OVERRIDE_H_
diff --git a/install_plan.h b/install_plan.h
index b30170e..6b91d10 100644
--- a/install_plan.h
+++ b/install_plan.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_INSTALL_PLAN_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_INSTALL_PLAN_H_
+#ifndef UPDATE_ENGINE_INSTALL_PLAN_H_
+#define UPDATE_ENGINE_INSTALL_PLAN_H_
 
 #include <string>
 #include <vector>
@@ -121,4 +121,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_INSTALL_PLAN_H_
+#endif  // UPDATE_ENGINE_INSTALL_PLAN_H_
diff --git a/libcurl_http_fetcher.h b/libcurl_http_fetcher.h
index d835b9c..495a2a9 100644
--- a/libcurl_http_fetcher.h
+++ b/libcurl_http_fetcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H_
+#ifndef UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H_
+#define UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H_
 
 #include <map>
 #include <string>
@@ -280,4 +280,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H_
+#endif  // UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H_
diff --git a/metrics.h b/metrics.h
index ba5e6c3..7dfd918 100644
--- a/metrics.h
+++ b/metrics.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_METRICS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_METRICS_H_
+#ifndef UPDATE_ENGINE_METRICS_H_
+#define UPDATE_ENGINE_METRICS_H_
 
 #include <base/time/time.h>
 
@@ -295,4 +295,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_METRICS_H_
+#endif  // UPDATE_ENGINE_METRICS_H_
diff --git a/mock_connection_manager.h b/mock_connection_manager.h
index ffb695a..9530865 100644
--- a/mock_connection_manager.h
+++ b/mock_connection_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_CONNECTION_MANAGER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_CONNECTION_MANAGER_H_
+#ifndef UPDATE_ENGINE_MOCK_CONNECTION_MANAGER_H_
+#define UPDATE_ENGINE_MOCK_CONNECTION_MANAGER_H_
 
 #include <gmock/gmock.h>
 
@@ -36,4 +36,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_CONNECTION_MANAGER_H_
+#endif  // UPDATE_ENGINE_MOCK_CONNECTION_MANAGER_H_
diff --git a/mock_dbus_wrapper.h b/mock_dbus_wrapper.h
index 444d0d8..a9dd0d8 100644
--- a/mock_dbus_wrapper.h
+++ b/mock_dbus_wrapper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_DBUS_WRAPPER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_DBUS_WRAPPER_H_
+#ifndef UPDATE_ENGINE_MOCK_DBUS_WRAPPER_H_
+#define UPDATE_ENGINE_MOCK_DBUS_WRAPPER_H_
 
 #include <gmock/gmock.h>
 
@@ -83,4 +83,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_DBUS_WRAPPER_H_
+#endif  // UPDATE_ENGINE_MOCK_DBUS_WRAPPER_H_
diff --git a/mock_file_writer.h b/mock_file_writer.h
index 46e57f4..f14b6ff 100644
--- a/mock_file_writer.h
+++ b/mock_file_writer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_FILE_WRITER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_FILE_WRITER_H_
+#ifndef UPDATE_ENGINE_MOCK_FILE_WRITER_H_
+#define UPDATE_ENGINE_MOCK_FILE_WRITER_H_
 
 #include <vector>
 
@@ -59,4 +59,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_FILE_WRITER_H_
+#endif  // UPDATE_ENGINE_MOCK_FILE_WRITER_H_
diff --git a/mock_hardware.h b/mock_hardware.h
index 8b6f4c0..1c2d4a7 100644
--- a/mock_hardware.h
+++ b/mock_hardware.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HARDWARE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HARDWARE_H_
+#ifndef UPDATE_ENGINE_MOCK_HARDWARE_H_
+#define UPDATE_ENGINE_MOCK_HARDWARE_H_
 
 #include <string>
 #include <vector>
@@ -90,4 +90,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HARDWARE_H_
+#endif  // UPDATE_ENGINE_MOCK_HARDWARE_H_
diff --git a/mock_http_fetcher.h b/mock_http_fetcher.h
index 99c47a5..d5879f5 100644
--- a/mock_http_fetcher.h
+++ b/mock_http_fetcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HTTP_FETCHER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HTTP_FETCHER_H_
+#ifndef UPDATE_ENGINE_MOCK_HTTP_FETCHER_H_
+#define UPDATE_ENGINE_MOCK_HTTP_FETCHER_H_
 
 #include <string>
 #include <vector>
@@ -140,4 +140,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HTTP_FETCHER_H_
+#endif  // UPDATE_ENGINE_MOCK_HTTP_FETCHER_H_
diff --git a/mock_p2p_manager.h b/mock_p2p_manager.h
index b0b6ac8..a0ed920 100644
--- a/mock_p2p_manager.h
+++ b/mock_p2p_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_P2P_MANAGER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_P2P_MANAGER_H_
+#ifndef UPDATE_ENGINE_MOCK_P2P_MANAGER_H_
+#define UPDATE_ENGINE_MOCK_P2P_MANAGER_H_
 
 #include <string>
 
@@ -94,4 +94,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_P2P_MANAGER_H_
+#endif  // UPDATE_ENGINE_MOCK_P2P_MANAGER_H_
diff --git a/mock_payload_state.h b/mock_payload_state.h
index 2db1d1b..bef2997 100644
--- a/mock_payload_state.h
+++ b/mock_payload_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_PAYLOAD_STATE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_PAYLOAD_STATE_H_
+#ifndef UPDATE_ENGINE_MOCK_PAYLOAD_STATE_H_
+#define UPDATE_ENGINE_MOCK_PAYLOAD_STATE_H_
 
 #include <string>
 
@@ -35,7 +35,7 @@
                void(const std::string& target_version_uid));
   MOCK_METHOD0(P2PNewAttempt, void());
   MOCK_METHOD0(P2PAttemptAllowed, bool());
-  MOCK_METHOD1(SetUsingP2PForDownloading, void(bool));
+  MOCK_METHOD1(SetUsingP2PForDownloading, void(bool value));
 
   // Getters.
   MOCK_METHOD0(GetResponseSignature, std::string());
@@ -59,4 +59,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_PAYLOAD_STATE_H_
+#endif  // UPDATE_ENGINE_MOCK_PAYLOAD_STATE_H_
diff --git a/multi_range_http_fetcher.h b/multi_range_http_fetcher.h
index 800c7fd..52f0b6f 100644
--- a/multi_range_http_fetcher.h
+++ b/multi_range_http_fetcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MULTI_RANGE_HTTP_FETCHER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MULTI_RANGE_HTTP_FETCHER_H_
+#ifndef UPDATE_ENGINE_MULTI_RANGE_HTTP_FETCHER_H_
+#define UPDATE_ENGINE_MULTI_RANGE_HTTP_FETCHER_H_
 
 #include <deque>
 #include <string>
@@ -162,4 +162,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_MULTI_RANGE_HTTP_FETCHER_H_
+#endif  // UPDATE_ENGINE_MULTI_RANGE_HTTP_FETCHER_H_
diff --git a/omaha_hash_calculator.h b/omaha_hash_calculator.h
index a45b14a..b7d681d 100644
--- a/omaha_hash_calculator.h
+++ b/omaha_hash_calculator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_HASH_CALCULATOR_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_HASH_CALCULATOR_H_
+#ifndef UPDATE_ENGINE_OMAHA_HASH_CALCULATOR_H_
+#define UPDATE_ENGINE_OMAHA_HASH_CALCULATOR_H_
 
 #include <string>
 #include <unistd.h>
@@ -99,4 +99,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_HASH_CALCULATOR_H_
+#endif  // UPDATE_ENGINE_OMAHA_HASH_CALCULATOR_H_
diff --git a/omaha_request_action.h b/omaha_request_action.h
index 6fef8e5..8b6c41b 100644
--- a/omaha_request_action.h
+++ b/omaha_request_action.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
+#ifndef UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
+#define UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -285,4 +285,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
+#endif  // UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
diff --git a/omaha_request_params.h b/omaha_request_params.h
index 86a18a6..f8bc13e 100644
--- a/omaha_request_params.h
+++ b/omaha_request_params.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_REQUEST_PARAMS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_REQUEST_PARAMS_H_
+#ifndef UPDATE_ENGINE_OMAHA_REQUEST_PARAMS_H_
+#define UPDATE_ENGINE_OMAHA_REQUEST_PARAMS_H_
 
 #include <string>
 
@@ -263,7 +263,8 @@
 
   // Use a validator that is a non-static member of this class so that its
   // inputs can be mocked in unit tests (e.g., build type for IsValidChannel).
-  typedef bool(OmahaRequestParams::*ValueValidator)(
+  typedef bool(
+      OmahaRequestParams::*ValueValidator)(  // NOLINT(readability/casting)
       const std::string&) const;
 
   // Returns true if parameter values should be locked down for security
@@ -403,4 +404,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_REQUEST_PARAMS_H_
+#endif  // UPDATE_ENGINE_OMAHA_REQUEST_PARAMS_H_
diff --git a/omaha_response.h b/omaha_response.h
index e704ee0..2320840 100644
--- a/omaha_response.h
+++ b/omaha_response.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_RESPONSE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_RESPONSE_H_
+#ifndef UPDATE_ENGINE_OMAHA_RESPONSE_H_
+#define UPDATE_ENGINE_OMAHA_RESPONSE_H_
 
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -84,4 +84,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_RESPONSE_H_
+#endif  // UPDATE_ENGINE_OMAHA_RESPONSE_H_
diff --git a/omaha_response_handler_action.h b/omaha_response_handler_action.h
index 6179ba7..da9550d 100644
--- a/omaha_response_handler_action.h
+++ b/omaha_response_handler_action.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_RESPONSE_HANDLER_ACTION_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_RESPONSE_HANDLER_ACTION_H_
+#ifndef UPDATE_ENGINE_OMAHA_RESPONSE_HANDLER_ACTION_H_
+#define UPDATE_ENGINE_OMAHA_RESPONSE_HANDLER_ACTION_H_
 
 #include <string>
 
@@ -93,4 +93,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_OMAHA_RESPONSE_HANDLER_ACTION_H_
+#endif  // UPDATE_ENGINE_OMAHA_RESPONSE_HANDLER_ACTION_H_
diff --git a/p2p_manager.h b/p2p_manager.h
index 25526bf..0e6e1b4 100644
--- a/p2p_manager.h
+++ b/p2p_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_P2P_MANAGER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_P2P_MANAGER_H_
+#ifndef UPDATE_ENGINE_P2P_MANAGER_H_
+#define UPDATE_ENGINE_P2P_MANAGER_H_
 
 #include <string>
 #include <vector>
@@ -167,4 +167,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_P2P_MANAGER_H_
+#endif  // UPDATE_ENGINE_P2P_MANAGER_H_
diff --git a/payload_constants.h b/payload_constants.h
index 4a4ec6f..58e7572 100644
--- a/payload_constants.h
+++ b/payload_constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_CONSTANTS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_CONSTANTS_H_
+#ifndef UPDATE_ENGINE_PAYLOAD_CONSTANTS_H_
+#define UPDATE_ENGINE_PAYLOAD_CONSTANTS_H_
 
 #include <base/basictypes.h>
 
@@ -18,4 +18,4 @@
 
 };  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_CONSTANTS_H_
+#endif  // UPDATE_ENGINE_PAYLOAD_CONSTANTS_H_
diff --git a/payload_signer.h b/payload_signer.h
index 8b34f10..d4215f5 100644
--- a/payload_signer.h
+++ b/payload_signer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_SIGNER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_SIGNER_H_
+#ifndef UPDATE_ENGINE_PAYLOAD_SIGNER_H_
+#define UPDATE_ENGINE_PAYLOAD_SIGNER_H_
 
 #include <string>
 #include <vector>
@@ -154,4 +154,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_SIGNER_H_
+#endif  // UPDATE_ENGINE_PAYLOAD_SIGNER_H_
diff --git a/payload_state.h b/payload_state.h
index b732c4c..34f2e53 100644
--- a/payload_state.h
+++ b/payload_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_STATE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_STATE_H_
+#ifndef UPDATE_ENGINE_PAYLOAD_STATE_H_
+#define UPDATE_ENGINE_PAYLOAD_STATE_H_
 
 #include <string>
 #include <vector>
@@ -534,4 +534,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_STATE_H_
+#endif  // UPDATE_ENGINE_PAYLOAD_STATE_H_
diff --git a/payload_state_interface.h b/payload_state_interface.h
index 8742f23..5c648cb 100644
--- a/payload_state_interface.h
+++ b/payload_state_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_STATE_INTERFACE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_STATE_INTERFACE_H_
+#ifndef UPDATE_ENGINE_PAYLOAD_STATE_INTERFACE_H_
+#define UPDATE_ENGINE_PAYLOAD_STATE_INTERFACE_H_
 
 #include <string>
 
@@ -167,4 +167,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PAYLOAD_STATE_INTERFACE_H_
+#endif  // UPDATE_ENGINE_PAYLOAD_STATE_INTERFACE_H_
diff --git a/postinstall_runner_action.h b/postinstall_runner_action.h
index 4e3e6e5..ee7c0b8 100644
--- a/postinstall_runner_action.h
+++ b/postinstall_runner_action.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_POSTINSTALL_RUNNER_ACTION_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_POSTINSTALL_RUNNER_ACTION_H_
+#ifndef UPDATE_ENGINE_POSTINSTALL_RUNNER_ACTION_H_
+#define UPDATE_ENGINE_POSTINSTALL_RUNNER_ACTION_H_
 
 #include <string>
 
@@ -60,4 +60,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_POSTINSTALL_RUNNER_ACTION_H_
+#endif  // UPDATE_ENGINE_POSTINSTALL_RUNNER_ACTION_H_
diff --git a/prefs.h b/prefs.h
index 0ca221b..fd86dde 100644
--- a/prefs.h
+++ b/prefs.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_H_
+#ifndef UPDATE_ENGINE_PREFS_H_
+#define UPDATE_ENGINE_PREFS_H_
 
 #include <string>
 
@@ -54,4 +54,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_H_
+#endif  // UPDATE_ENGINE_PREFS_H_
diff --git a/prefs_interface.h b/prefs_interface.h
index a3676e4..daf9196 100644
--- a/prefs_interface.h
+++ b/prefs_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_INTERFACE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_INTERFACE_H_
+#ifndef UPDATE_ENGINE_PREFS_INTERFACE_H_
+#define UPDATE_ENGINE_PREFS_INTERFACE_H_
 
 #include <string>
 
@@ -56,4 +56,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_INTERFACE_H_
+#endif  // UPDATE_ENGINE_PREFS_INTERFACE_H_
diff --git a/prefs_mock.h b/prefs_mock.h
index 36efd40..9ba4a52 100644
--- a/prefs_mock.h
+++ b/prefs_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_MOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_MOCK_H_
+#ifndef UPDATE_ENGINE_PREFS_MOCK_H_
+#define UPDATE_ENGINE_PREFS_MOCK_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PREFS_MOCK_H_
+#endif  // UPDATE_ENGINE_PREFS_MOCK_H_
diff --git a/proxy_resolver.h b/proxy_resolver.h
index 98cb53b..03bf731 100644
--- a/proxy_resolver.h
+++ b/proxy_resolver.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_PROXY_RESOLVER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_PROXY_RESOLVER_H_
+#ifndef UPDATE_ENGINE_PROXY_RESOLVER_H_
+#define UPDATE_ENGINE_PROXY_RESOLVER_H_
 
 
 #include <deque>
@@ -73,4 +73,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_PROXY_RESOLVER_H_
+#endif  // UPDATE_ENGINE_PROXY_RESOLVER_H_
diff --git a/real_dbus_wrapper.h b/real_dbus_wrapper.h
index 22dddde..7e49f4e 100644
--- a/real_dbus_wrapper.h
+++ b/real_dbus_wrapper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_REAL_DBUS_WRAPPER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_REAL_DBUS_WRAPPER_H_
+#ifndef UPDATE_ENGINE_REAL_DBUS_WRAPPER_H_
+#define UPDATE_ENGINE_REAL_DBUS_WRAPPER_H_
 
 // A mockable interface for DBus.
 
@@ -138,4 +138,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_REAL_DBUS_WRAPPER_H_
+#endif  // UPDATE_ENGINE_REAL_DBUS_WRAPPER_H_
diff --git a/real_system_state.h b/real_system_state.h
index acbcab9..81e1674 100644
--- a/real_system_state.h
+++ b/real_system_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_REAL_SYSTEM_STATE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_REAL_SYSTEM_STATE_H_
+#ifndef UPDATE_ENGINE_REAL_SYSTEM_STATE_H_
+#define UPDATE_ENGINE_REAL_SYSTEM_STATE_H_
 
 #include "update_engine/system_state.h"
 
@@ -142,4 +142,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_REAL_SYSTEM_STATE_H_
+#endif  // UPDATE_ENGINE_REAL_SYSTEM_STATE_H_
diff --git a/simple_key_value_store.h b/simple_key_value_store.h
index eb5a4e2..a648cd4 100644
--- a/simple_key_value_store.h
+++ b/simple_key_value_store.h
@@ -6,8 +6,8 @@
 // key value store. Each key/value pair is stored on its own line and
 // separated by the first '=' on the line.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_SIMPLE_KEY_VALUE_STORE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_SIMPLE_KEY_VALUE_STORE_H_
+#ifndef UPDATE_ENGINE_SIMPLE_KEY_VALUE_STORE_H_
+#define UPDATE_ENGINE_SIMPLE_KEY_VALUE_STORE_H_
 
 #include <map>
 #include <string>
@@ -50,4 +50,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_SIMPLE_KEY_VALUE_STORE_H_
+#endif  // UPDATE_ENGINE_SIMPLE_KEY_VALUE_STORE_H_
diff --git a/subprocess.h b/subprocess.h
index 3a8424c..4311595 100644
--- a/subprocess.h
+++ b/subprocess.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_SUBPROCESS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_SUBPROCESS_H_
+#ifndef UPDATE_ENGINE_SUBPROCESS_H_
+#define UPDATE_ENGINE_SUBPROCESS_H_
 
 #include <map>
 #include <memory>
@@ -104,4 +104,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_SUBPROCESS_H_
+#endif  // UPDATE_ENGINE_SUBPROCESS_H_
diff --git a/system_state.h b/system_state.h
index b008095..21aeabd 100644
--- a/system_state.h
+++ b/system_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_SYSTEM_STATE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_SYSTEM_STATE_H_
+#ifndef UPDATE_ENGINE_SYSTEM_STATE_H_
+#define UPDATE_ENGINE_SYSTEM_STATE_H_
 
 class MetricsLibraryInterface;
 
@@ -95,4 +95,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_SYSTEM_STATE_H_
+#endif  // UPDATE_ENGINE_SYSTEM_STATE_H_
diff --git a/terminator.h b/terminator.h
index e536d38..f8a261e 100644
--- a/terminator.h
+++ b/terminator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_TERMINATOR_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_TERMINATOR_H_
+#ifndef UPDATE_ENGINE_TERMINATOR_H_
+#define UPDATE_ENGINE_TERMINATOR_H_
 
 #include <signal.h>
 
@@ -50,4 +50,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_TERMINATOR_H_
+#endif  // UPDATE_ENGINE_TERMINATOR_H_
diff --git a/test_utils.h b/test_utils.h
index ec191f8..e81eabd 100644
--- a/test_utils.h
+++ b/test_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_TEST_UTILS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_TEST_UTILS_H_
+#ifndef UPDATE_ENGINE_TEST_UTILS_H_
+#define UPDATE_ENGINE_TEST_UTILS_H_
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -297,4 +297,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_TEST_UTILS_H_
+#endif  // UPDATE_ENGINE_TEST_UTILS_H_
diff --git a/update_attempter.cc b/update_attempter.cc
index 24f727b..6ee9f4d 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -982,11 +982,11 @@
   const string type = action->Type();
   if (type == DownloadAction::StaticType()) {
     download_progress_ = 0.0;
-    DownloadAction* download_action = dynamic_cast<DownloadAction*>(action);
+    DownloadAction* download_action = static_cast<DownloadAction*>(action);
     http_response_code_ = download_action->GetHTTPResponseCode();
   } else if (type == OmahaRequestAction::StaticType()) {
     OmahaRequestAction* omaha_request_action =
-        dynamic_cast<OmahaRequestAction*>(action);
+        static_cast<OmahaRequestAction*>(action);
     // If the request is not an event, then it's the update-check.
     if (!omaha_request_action->IsEvent()) {
       http_response_code_ = omaha_request_action->GetHTTPResponseCode();
@@ -1365,7 +1365,7 @@
 
 void UpdateAttempter::SetupDownload() {
   MultiRangeHttpFetcher* fetcher =
-      dynamic_cast<MultiRangeHttpFetcher*>(download_action_->http_fetcher());
+      static_cast<MultiRangeHttpFetcher*>(download_action_->http_fetcher());
   fetcher->ClearRanges();
   if (response_handler_action_->install_plan().is_resume) {
     // Resuming an update so fetch the update manifest metadata first.
diff --git a/update_attempter.h b/update_attempter.h
index 420b876..3d08347 100644
--- a/update_attempter.h
+++ b/update_attempter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H_
+#ifndef UPDATE_ENGINE_UPDATE_ATTEMPTER_H_
+#define UPDATE_ENGINE_UPDATE_ATTEMPTER_H_
 
 #include <time.h>
 
@@ -463,4 +463,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H_
+#endif  // UPDATE_ENGINE_UPDATE_ATTEMPTER_H_
diff --git a/update_attempter_mock.h b/update_attempter_mock.h
index 7655c42..e9c6946 100644
--- a/update_attempter_mock.h
+++ b/update_attempter_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
+#ifndef UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
+#define UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
+#endif  // UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
diff --git a/update_check_scheduler.h b/update_check_scheduler.h
index ec9e1a6..57613f9 100644
--- a/update_check_scheduler.h
+++ b/update_check_scheduler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_CHECK_SCHEDULER_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_CHECK_SCHEDULER_H_
+#ifndef UPDATE_ENGINE_UPDATE_CHECK_SCHEDULER_H_
+#define UPDATE_ENGINE_UPDATE_CHECK_SCHEDULER_H_
 
 #include <base/basictypes.h>
 #include <glib.h>
@@ -124,4 +124,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_CHECK_SCHEDULER_H_
+#endif  // UPDATE_ENGINE_UPDATE_CHECK_SCHEDULER_H_
diff --git a/update_manager/fake_updater_provider.h b/update_manager/fake_updater_provider.h
index 0105801..52b64a0 100644
--- a/update_manager/fake_updater_provider.h
+++ b/update_manager/fake_updater_provider.h
@@ -67,24 +67,33 @@
   }
 
  private:
-  FakeVariable<base::Time> var_updater_started_time_{
-      "updater_started_time", kVariableModePoll};
-  FakeVariable<base::Time> var_last_checked_time_{
-      "last_checked_time", kVariableModePoll};
-  FakeVariable<base::Time> var_update_completed_time_{
-      "update_completed_time", kVariableModePoll};
-  FakeVariable<double> var_progress_{"progress", kVariableModePoll};
-  FakeVariable<Stage> var_stage_{"stage", kVariableModePoll};
-  FakeVariable<std::string> var_new_version_{"new_version", kVariableModePoll};
-  FakeVariable<int64_t> var_payload_size_{"payload_size", kVariableModePoll};
-  FakeVariable<std::string> var_curr_channel_{
-      "curr_channel", kVariableModePoll};
-  FakeVariable<std::string> var_new_channel_{"new_channel", kVariableModePoll};
-  FakeVariable<bool> var_p2p_enabled_{"p2p_enabled", kVariableModePoll};
-  FakeVariable<bool> var_cellular_enabled_{
-      "cellular_enabled", kVariableModePoll};
-  FakeVariable<unsigned int> var_consecutive_failed_update_checks_{
-      "consecutive_failed_update_checks", kVariableModePoll};
+  FakeVariable<base::Time>
+      var_updater_started_time_{  // NOLINT(whitespace/braces)
+    "updater_started_time", kVariableModePoll};
+  FakeVariable<base::Time> var_last_checked_time_{  // NOLINT(whitespace/braces)
+    "last_checked_time", kVariableModePoll};
+  FakeVariable<base::Time>
+      var_update_completed_time_{  // NOLINT(whitespace/braces)
+    "update_completed_time", kVariableModePoll};
+  FakeVariable<double> var_progress_{  // NOLINT(whitespace/braces)
+    "progress", kVariableModePoll};
+  FakeVariable<Stage> var_stage_{  // NOLINT(whitespace/braces)
+    "stage", kVariableModePoll};
+  FakeVariable<std::string> var_new_version_{  // NOLINT(whitespace/braces)
+    "new_version", kVariableModePoll};
+  FakeVariable<int64_t> var_payload_size_{  // NOLINT(whitespace/braces)
+    "payload_size", kVariableModePoll};
+  FakeVariable<std::string> var_curr_channel_{  // NOLINT(whitespace/braces)
+    "curr_channel", kVariableModePoll};
+  FakeVariable<std::string> var_new_channel_{  // NOLINT(whitespace/braces)
+    "new_channel", kVariableModePoll};
+  FakeVariable<bool> var_p2p_enabled_{  // NOLINT(whitespace/braces)
+    "p2p_enabled", kVariableModePoll};
+  FakeVariable<bool> var_cellular_enabled_{  // NOLINT(whitespace/braces)
+    "cellular_enabled", kVariableModePoll};
+  FakeVariable<unsigned int>
+      var_consecutive_failed_update_checks_{  // NOLINT(whitespace/braces)
+    "consecutive_failed_update_checks", kVariableModePoll};
 
   DISALLOW_COPY_AND_ASSIGN(FakeUpdaterProvider);
 };
diff --git a/update_manager/real_updater_provider.cc b/update_manager/real_updater_provider.cc
index 7863019..6445972 100644
--- a/update_manager/real_updater_provider.cc
+++ b/update_manager/real_updater_provider.cc
@@ -141,8 +141,10 @@
   {update_engine::kUpdateStatusVerifying, Stage::kVerifying},
   {update_engine::kUpdateStatusFinalizing, Stage::kFinalizing},
   {update_engine::kUpdateStatusUpdatedNeedReboot, Stage::kUpdatedNeedReboot},
-  {update_engine::kUpdateStatusReportingErrorEvent,
-   Stage::kReportingErrorEvent},
+  {  // NOLINT(whitespace/braces)
+    update_engine::kUpdateStatusReportingErrorEvent,
+    Stage::kReportingErrorEvent
+  },
   {update_engine::kUpdateStatusAttemptingRollback, Stage::kAttemptingRollback},
 };
 
@@ -310,8 +312,8 @@
 };
 
 // A variable returning the number of consecutive failed update checks.
-class ConsecutiveFailedUpdateChecksVariable :
-    public UpdaterVariableBase<unsigned int> {
+class ConsecutiveFailedUpdateChecksVariable
+    : public UpdaterVariableBase<unsigned int> {
  public:
   using UpdaterVariableBase<unsigned int>::UpdaterVariableBase;
 
diff --git a/utils.h b/utils.h
index b35bf30..b99d808 100644
--- a/utils.h
+++ b/utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UTILS_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_UTILS_H_
+#ifndef UPDATE_ENGINE_UTILS_H_
+#define UPDATE_ENGINE_UTILS_H_
 
 #include <errno.h>
 #include <unistd.h>
@@ -654,4 +654,4 @@
 
 
 
-#endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_UTILS_H_
+#endif  // UPDATE_ENGINE_UTILS_H_