diff --git a/buffet/buffet_client.cc b/buffet/buffet_client.cc
index 11f4ffc..1b61a83 100644
--- a/buffet/buffet_client.cc
+++ b/buffet/buffet_client.cc
@@ -17,8 +17,8 @@
 #include <dbus/object_manager.h>
 #include <dbus/values_util.h>
 
-#include "buffet/dbus_constants.h"
 #include "buffet/data_encoding.h"
+#include "buffet/dbus_constants.h"
 
 using namespace buffet::dbus_constants;  // NOLINT(build/namespaces)
 
diff --git a/buffet/commands/command_manager.cc b/buffet/commands/command_manager.cc
index 48a323f..26c0b9f 100644
--- a/buffet/commands/command_manager.cc
+++ b/buffet/commands/command_manager.cc
@@ -6,10 +6,10 @@
 
 #include <base/at_exit.h>
 #include <base/bind.h>
-#include <base/files/file_enumerator.h>
 #include <base/file_util.h>
-#include <base/values.h>
+#include <base/files/file_enumerator.h>
 #include <base/json/json_reader.h>
+#include <base/values.h>
 
 #include "buffet/commands/schema_constants.h"
 #include "buffet/error_codes.h"
diff --git a/buffet/commands/prop_types.cc b/buffet/commands/prop_types.cc
index 0df5bd1..f32ff2c 100644
--- a/buffet/commands/prop_types.cc
+++ b/buffet/commands/prop_types.cc
@@ -12,8 +12,8 @@
 #include <base/logging.h>
 #include <base/values.h>
 
-#include "buffet/commands/prop_values.h"
 #include "buffet/commands/object_schema.h"
+#include "buffet/commands/prop_values.h"
 #include "buffet/commands/schema_constants.h"
 #include "buffet/string_utils.h"
 
diff --git a/buffet/dbus_utils.cc b/buffet/dbus_utils.cc
index 58f0b26..5c02fb3 100644
--- a/buffet/dbus_utils.cc
+++ b/buffet/dbus_utils.cc
@@ -4,8 +4,8 @@
 
 #include "buffet/dbus_utils.h"
 
-#include <base/logging.h>
 #include <base/bind.h>
+#include <base/logging.h>
 
 namespace buffet {
 
diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index 5447726..0225a5b 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -13,10 +13,10 @@
 
 #include "buffet/data_encoding.h"
 #include "buffet/device_registration_storage_keys.h"
-#include "buffet/storage_impls.h"
 #include "buffet/http_transport_curl.h"
 #include "buffet/http_utils.h"
 #include "buffet/mime_utils.h"
+#include "buffet/storage_impls.h"
 #include "buffet/string_utils.h"
 #include "buffet/url_utils.h"
 
diff --git a/buffet/device_registration_info.h b/buffet/device_registration_info.h
index da0d409..d1c0e6e 100644
--- a/buffet/device_registration_info.h
+++ b/buffet/device_registration_info.h
@@ -5,9 +5,9 @@
 #ifndef BUFFET_DEVICE_REGISTRATION_INFO_H_
 #define BUFFET_DEVICE_REGISTRATION_INFO_H_
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include <base/basictypes.h>
diff --git a/buffet/error_unittest.cc b/buffet/error_unittest.cc
index cf943ad..5db0012 100644
--- a/buffet/error_unittest.cc
+++ b/buffet/error_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
 #include <base/files/file_path.h>
+#include <gtest/gtest.h>
 
 #include "buffet/error.h"
 
diff --git a/buffet/http_request.h b/buffet/http_request.h
index e5b9710..9bb436e 100644
--- a/buffet/http_request.h
+++ b/buffet/http_request.h
@@ -14,9 +14,9 @@
 
 #include <base/basictypes.h>
 
+#include "buffet/error.h"
 #include "buffet/http_connection.h"
 #include "buffet/http_transport.h"
-#include "buffet/error.h"
 
 namespace buffet {
 namespace http {
diff --git a/buffet/http_utils_unittest.cc b/buffet/http_utils_unittest.cc
index 882752b..190b566 100644
--- a/buffet/http_utils_unittest.cc
+++ b/buffet/http_utils_unittest.cc
@@ -9,8 +9,8 @@
 #include <gtest/gtest.h>
 
 #include "buffet/bind_lambda.h"
-#include "buffet/http_utils.h"
 #include "buffet/http_transport_fake.h"
+#include "buffet/http_utils.h"
 #include "buffet/mime_utils.h"
 #include "buffet/string_utils.h"
 #include "buffet/url_utils.h"
diff --git a/buffet/manager.h b/buffet/manager.h
index 4498c50..2041160 100644
--- a/buffet/manager.h
+++ b/buffet/manager.h
@@ -16,8 +16,8 @@
 #include <dbus/object_path.h>
 
 #include "buffet/dbus_constants.h"
-#include "buffet/exported_property_set.h"
 #include "buffet/device_registration_info.h"
+#include "buffet/exported_property_set.h"
 
 namespace buffet {