5 files changed, 6 insertions, 6 deletions
diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index 37eb77ae1..b2948b803 100644
--- a/src/dev/arm/amba_device.cc
+++ b/src/dev/arm/amba_device.cc
@@ -41,8 +41,8 @@
  */
 
 #include "base/trace.hh"
-#include "dev/arm/amba_fake.hh"
 #include "dev/arm/amba_device.hh"
+#include "dev/arm/amba_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/arm/amba_device.hh b/src/dev/arm/amba_device.hh
index 297a78f82..f3db8b0ab 100644
--- a/src/dev/arm/amba_device.hh
+++ b/src/dev/arm/amba_device.hh
@@ -50,13 +50,13 @@
 #define __DEV_ARM_AMBA_DEVICE_HH__
 
 #include "base/range.hh"
-#include "dev/io_device.hh"
 #include "dev/arm/gic.hh"
+#include "dev/io_device.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/AmbaDevice.hh"
-#include "params/AmbaIntDevice.hh"
 #include "params/AmbaDmaDevice.hh"
+#include "params/AmbaIntDevice.hh"
 
 namespace AmbaDev {
 
diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index adf1439b3..1b8c15b83 100644
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -41,8 +41,8 @@
  *          William Wang
  */
 
-#include "base/trace.hh"
 #include "base/vnc/vncserver.hh"
+#include "base/trace.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/kmi.hh"
 #include "dev/ps2.hh"
diff --git a/src/dev/arm/kmi.hh b/src/dev/arm/kmi.hh
index 1e25f8974..dc488ccce 100644
--- a/src/dev/arm/kmi.hh
+++ b/src/dev/arm/kmi.hh
@@ -50,8 +50,8 @@
 
 #include <list>
 
-#include "base/range.hh"
 #include "base/vnc/vncserver.hh"
+#include "base/range.hh"
 #include "dev/arm/amba_device.hh"
 #include "params/Pl050.hh"
 
diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc
index e5da82e73..410c8d361 100644
--- a/src/dev/arm/pl111.cc
+++ b/src/dev/arm/pl111.cc
@@ -38,10 +38,10 @@
  *          Ali Saidi
  */
 
+#include "base/vnc/vncserver.hh"
 #include "base/bitmap.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
-#include "base/vnc/vncserver.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/gic.hh"
 #include "dev/arm/pl111.hh"