diff --git a/buffet/states/state_change_queue.cc b/buffet/states/state_change_queue.cc
index 663d799..f7775ba 100644
--- a/buffet/states/state_change_queue.cc
+++ b/buffet/states/state_change_queue.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <base/logging.h>
-
 #include "buffet/states/state_change_queue.h"
 
+#include <base/logging.h>
+
 namespace buffet {
 
 StateChangeQueue::StateChangeQueue(size_t max_queue_size)
diff --git a/buffet/states/state_change_queue_unittest.cc b/buffet/states/state_change_queue_unittest.cc
index 7aa6c9f..01f5f9f 100644
--- a/buffet/states/state_change_queue_unittest.cc
+++ b/buffet/states/state_change_queue_unittest.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 
-#include <gtest/gtest.h>
-
 #include "buffet/states/state_change_queue.h"
 
+#include <gtest/gtest.h>
+
 namespace buffet {
 
 class StateChangeQueueTest : public ::testing::Test {
diff --git a/buffet/states/state_manager_unittest.cc b/buffet/states/state_manager_unittest.cc
index df2260a..bdfad8c 100644
--- a/buffet/states/state_manager_unittest.cc
+++ b/buffet/states/state_manager_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "buffet/states/state_manager.h"
+
 #include <cstdlib>  // for abs().
 #include <vector>
 
@@ -13,7 +15,6 @@
 #include "buffet/commands/unittest_utils.h"
 #include "buffet/states/error_codes.h"
 #include "buffet/states/mock_state_change_queue_interface.h"
-#include "buffet/states/state_manager.h"
 
 using buffet::unittests::CreateDictionaryValue;
 using buffet::unittests::ValueToString;
diff --git a/buffet/states/state_package_unittest.cc b/buffet/states/state_package_unittest.cc
index d8dc907..9d5b0d6 100644
--- a/buffet/states/state_package_unittest.cc
+++ b/buffet/states/state_package_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "buffet/states/state_package.h"
+
 #include <memory>
 #include <string>
 
@@ -12,7 +14,6 @@
 #include "buffet/commands/schema_constants.h"
 #include "buffet/commands/unittest_utils.h"
 #include "buffet/states/error_codes.h"
-#include "buffet/states/state_package.h"
 
 using buffet::unittests::CreateDictionaryValue;
 using buffet::unittests::ValueToString;