diff --git a/fake_hardware.h b/fake_hardware.h
index e5d2e75..f043f6c 100644
--- a/fake_hardware.h
+++ b/fake_hardware.h
@@ -6,6 +6,8 @@
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_HARDWARE_H_
 
 #include <map>
+#include <string>
+#include <vector>
 
 #include <base/time/time.h>
 
diff --git a/hardware.cc b/hardware.cc
index 441e066..3a11129 100644
--- a/hardware.cc
+++ b/hardware.cc
@@ -90,15 +90,15 @@
   LOG(INFO) << "GetAllKernelDevices";
 
   std::string disk_name = utils::GetDiskName(Hardware::BootKernelDevice());
-  if(disk_name.empty()) {
+  if (disk_name.empty()) {
     LOG(ERROR) << "Failed to get the cuurent kernel boot disk name";
     return std::vector<std::string>();
   }
 
   std::vector<std::string> devices;
-  for (int partition_num : {2, 4}) { // for now, only #2, #4 for slot A & B
+  for (int partition_num : {2, 4}) {  // for now, only #2, #4 for slot A & B
     std::string device = utils::MakePartitionName(disk_name, partition_num);
-    if(!device.empty()) {
+    if (!device.empty()) {
       devices.push_back(std::move(device));
     } else {
       LOG(ERROR) << "Cannot make a partition name for disk: "
diff --git a/hardware.h b/hardware.h
index 99c0803..8183c51 100644
--- a/hardware.h
+++ b/hardware.h
@@ -5,9 +5,12 @@
 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_H_
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_HARDWARE_H_
 
-#include "update_engine/hardware_interface.h"
+#include <string>
+#include <vector>
 
-#include "base/basictypes.h"
+#include <base/basictypes.h>
+
+#include "update_engine/hardware_interface.h"
 
 namespace chromeos_update_engine {
 
diff --git a/mock_hardware.h b/mock_hardware.h
index 574f1f7..8b6f4c0 100644
--- a/mock_hardware.h
+++ b/mock_hardware.h
@@ -5,6 +5,9 @@
 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HARDWARE_H_
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_HARDWARE_H_
 
+#include <string>
+#include <vector>
+
 #include "update_engine/fake_hardware.h"
 
 #include <gmock/gmock.h>
@@ -13,7 +16,7 @@
 
 // A mocked, fake implementation of HardwareInterface.
 class MockHardware : public HardwareInterface {
-public:
+ public:
   MockHardware() {
     // Delegate all calls to the fake instance
     ON_CALL(*this, BootKernelDevice())
@@ -77,7 +80,7 @@
     return fake_;
   }
 
-private:
+ private:
   // The underlying FakeHardware.
   FakeHardware fake_;