diff --git a/dbus_service.h b/dbus_service.h
index 47953cb..d61e3b5 100644
--- a/dbus_service.h
+++ b/dbus_service.h
@@ -6,6 +6,7 @@
 #define UPDATE_ENGINE_DBUS_SERVICE_H_
 
 #include <inttypes.h>
+
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <dbus/dbus-glib-lowlevel.h>
diff --git a/dbus_wrapper_interface.h b/dbus_wrapper_interface.h
index 35a76b6..d6915ff 100644
--- a/dbus_wrapper_interface.h
+++ b/dbus_wrapper_interface.h
@@ -7,8 +7,8 @@
 
 // A mockable interface for DBus.
 
-#include <dbus/dbus-glib.h>
 #include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
 
 #ifndef DBUS_TYPE_G_OBJECT_PATH_ARRAY
 #define DBUS_TYPE_G_OBJECT_PATH_ARRAY \
diff --git a/download_action.h b/download_action.h
index b4982e0..c99f14b 100644
--- a/download_action.h
+++ b/download_action.h
@@ -5,9 +5,9 @@
 #ifndef UPDATE_ENGINE_DOWNLOAD_ACTION_H_
 #define UPDATE_ENGINE_DOWNLOAD_ACTION_H_
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include <string>
 
diff --git a/file_writer.h b/file_writer.h
index 70d4778..7877ba5 100644
--- a/file_writer.h
+++ b/file_writer.h
@@ -5,9 +5,9 @@
 #ifndef UPDATE_ENGINE_FILE_WRITER_H_
 #define UPDATE_ENGINE_FILE_WRITER_H_
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <base/logging.h>
diff --git a/main.cc b/main.cc
index 83b9a4b..c7d724b 100644
--- a/main.cc
+++ b/main.cc
@@ -26,11 +26,10 @@
 #include "update_engine/terminator.h"
 #include "update_engine/update_attempter.h"
 #include "update_engine/update_check_scheduler.h"
-#include "update_engine/utils.h"
-
 extern "C" {
 #include "update_engine/update_engine.dbusserver.h"
 }
+#include "update_engine/utils.h"
 
 DEFINE_bool(logtostderr, false,
             "Write logs to stderr instead of to a file in log_dir.");
diff --git a/metrics.cc b/metrics.cc
index 2522159..deb445b 100644
--- a/metrics.cc
+++ b/metrics.cc
@@ -8,8 +8,8 @@
 
 #include <base/logging.h>
 
-#include "update_engine/constants.h"
 #include "update_engine/clock_interface.h"
+#include "update_engine/constants.h"
 #include "update_engine/prefs_interface.h"
 #include "update_engine/system_state.h"
 #include "update_engine/utils.h"
diff --git a/omaha_request_action.h b/omaha_request_action.h
index 8b6c41b..c289793 100644
--- a/omaha_request_action.h
+++ b/omaha_request_action.h
@@ -5,9 +5,9 @@
 #ifndef UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
 #define UPDATE_ENGINE_OMAHA_REQUEST_ACTION_H_
 
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 
 #include <string>
 #include <vector>
diff --git a/p2p_manager_unittest.cc b/p2p_manager_unittest.cc
index f76e47c..eaf66a1 100644
--- a/p2p_manager_unittest.cc
+++ b/p2p_manager_unittest.cc
@@ -4,11 +4,11 @@
 
 #include <glib.h>
 
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <dirent.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <attr/xattr.h>  // NOLINT - requires typed defined in unistd.h
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -19,8 +19,8 @@
 #include <policy/libpolicy.h>
 #include <policy/mock_device_policy.h>
 
-#include "update_engine/p2p_manager.h"
 #include "update_engine/fake_p2p_manager_configuration.h"
+#include "update_engine/p2p_manager.h"
 #include "update_engine/prefs.h"
 #include "update_engine/test_utils.h"
 #include "update_engine/utils.h"
diff --git a/payload_state_interface.h b/payload_state_interface.h
index 5c648cb..36b8130 100644
--- a/payload_state_interface.h
+++ b/payload_state_interface.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "update_engine/constants.h"
 #include "update_engine/action_processor.h"
+#include "update_engine/constants.h"
 #include "update_engine/omaha_response.h"
 
 namespace chromeos_update_engine {
diff --git a/postinstall_runner_action.cc b/postinstall_runner_action.cc
index 86b7501..562ba16 100644
--- a/postinstall_runner_action.cc
+++ b/postinstall_runner_action.cc
@@ -4,8 +4,8 @@
 
 #include "update_engine/postinstall_runner_action.h"
 
-#include <sys/mount.h>
 #include <stdlib.h>
+#include <sys/mount.h>
 #include <vector>
 
 #include "update_engine/action_processor.h"
diff --git a/real_dbus_wrapper.h b/real_dbus_wrapper.h
index 7e49f4e..002b486 100644
--- a/real_dbus_wrapper.h
+++ b/real_dbus_wrapper.h
@@ -8,8 +8,8 @@
 // A mockable interface for DBus.
 
 #include <base/macros.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 
 #include "update_engine/dbus_wrapper_interface.h"
 
diff --git a/update_attempter.h b/update_attempter.h
index 8ea348a..ec4cba2 100644
--- a/update_attempter.h
+++ b/update_attempter.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 
 #include <base/bind.h>
 #include <base/time/time.h>
diff --git a/utils_unittest.cc b/utils_unittest.cc
index fa97f55..a9ce287 100644
--- a/utils_unittest.cc
+++ b/utils_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
 
 #include <map>
 #include <string>