style: [patch 1/22] use /r/3648/ to reorganize includes

51 files changed, 99 insertions, 55 deletions

diff --git a/src/dev/alpha/backdoor.cc b/src/dev/alpha/backdoor.cc
index 93bfedf9d..5c627ca34 100644
--- a/src/dev/alpha/backdoor.cc
+++ b/src/dev/alpha/backdoor.cc
@@ -35,6 +35,8 @@
  * Alpha Console Backdoor Definition
  */
 
+#include "dev/alpha/backdoor.hh"
+
 #include <cstddef>
 #include <string>
 
@@ -45,7 +47,6 @@
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "debug/AlphaBackdoor.hh"
-#include "dev/alpha/backdoor.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunami_io.hh"
diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc
index 300b481de..82a38129b 100644
--- a/src/dev/alpha/tsunami.cc
+++ b/src/dev/alpha/tsunami.cc
@@ -32,6 +32,8 @@
  * Implementation of Tsunami platform.
  */
 
+#include "dev/alpha/tsunami.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -39,7 +41,6 @@
 #include "arch/alpha/system.hh"
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
-#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunami_io.hh"
 #include "dev/alpha/tsunami_pchip.hh"
diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc
index b9a3eb46f..7429d8ca9 100644
--- a/src/dev/alpha/tsunami_cchip.cc
+++ b/src/dev/alpha/tsunami_cchip.cc
@@ -33,6 +33,8 @@
  * Emulation of the Tsunami CChip CSRs
  */
 
+#include "dev/alpha/tsunami_cchip.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -45,7 +47,6 @@
 #include "debug/IPI.hh"
 #include "debug/Tsunami.hh"
 #include "dev/alpha/tsunami.hh"
-#include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunamireg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index 8015ec2fe..7112a02a7 100644
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -34,6 +34,8 @@
  * Tsunami I/O including PIC, PIT, RTC, DMA
  */
 
+#include "dev/alpha/tsunami_io.hh"
+
 #include <sys/time.h>
 
 #include <deque>
@@ -46,7 +48,6 @@
 #include "debug/Tsunami.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
-#include "dev/alpha/tsunami_io.hh"
 #include "dev/alpha/tsunamireg.h"
 #include "dev/rtcreg.h"
 #include "mem/packet.hh"
diff --git a/src/dev/arm/a9scu.cc b/src/dev/arm/a9scu.cc
index 26b2a4522..32dc3f7df 100644
--- a/src/dev/arm/a9scu.cc
+++ b/src/dev/arm/a9scu.cc
@@ -37,9 +37,10 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/a9scu.hh"
+
 #include "base/intmath.hh"
 #include "base/trace.hh"
-#include "dev/arm/a9scu.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"
diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index 540d09615..d9acc9a00 100644
--- a/src/dev/arm/amba_device.cc
+++ b/src/dev/arm/amba_device.cc
@@ -40,9 +40,10 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/amba_device.hh"
+
 #include "base/trace.hh"
 #include "debug/AMBA.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_fake.cc b/src/dev/arm/amba_fake.cc
index d415ab2fa..3f8fcd6ee 100644
--- a/src/dev/arm/amba_fake.cc
+++ b/src/dev/arm/amba_fake.cc
@@ -40,9 +40,10 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/amba_fake.hh"
+
 #include "base/trace.hh"
 #include "debug/AMBA.hh"
-#include "dev/arm/amba_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc
index 0e6925852..9efdeb129 100644
--- a/src/dev/arm/energy_ctrl.cc
+++ b/src/dev/arm/energy_ctrl.cc
@@ -39,8 +39,9 @@
  *          Stephan Diestelhorst
  */
 
-#include "debug/EnergyCtrl.hh"
 #include "dev/arm/energy_ctrl.hh"
+
+#include "debug/EnergyCtrl.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/EnergyCtrl.hh"
diff --git a/src/dev/arm/gic_pl390.cc b/src/dev/arm/gic_pl390.cc
index 5a73c3100..3c6fed712 100644
--- a/src/dev/arm/gic_pl390.cc
+++ b/src/dev/arm/gic_pl390.cc
@@ -41,12 +41,13 @@
  *          Prakash Ramrakhyani
  */
 
+#include "dev/arm/gic_pl390.hh"
+
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/GIC.hh"
 #include "debug/IPI.hh"
 #include "debug/Interrupt.hh"
-#include "dev/arm/gic_pl390.hh"
 #include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/arm/hdlcd.cc b/src/dev/arm/hdlcd.cc
index 0f63f23fc..363aeba94 100644
--- a/src/dev/arm/hdlcd.cc
+++ b/src/dev/arm/hdlcd.cc
@@ -40,9 +40,9 @@
 
 #include "dev/arm/hdlcd.hh"
 
-#include "base/vnc/vncinput.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/HDLcd.hh"
 #include "dev/arm/amba_device.hh"
diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index d96810351..941546743 100644
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -41,11 +41,12 @@
  *          William Wang
  */
 
-#include "base/vnc/vncinput.hh"
+#include "dev/arm/kmi.hh"
+
 #include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
 #include "debug/Pl050.hh"
 #include "dev/arm/amba_device.hh"
-#include "dev/arm/kmi.hh"
 #include "dev/ps2.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/arm/pl011.cc b/src/dev/arm/pl011.cc
index 40f34e1fd..f7f5d2d0a 100644
--- a/src/dev/arm/pl011.cc
+++ b/src/dev/arm/pl011.cc
@@ -51,8 +51,8 @@
 #include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
-#include "sim/sim_exit.hh"
 #include "params/Pl011.hh"
+#include "sim/sim_exit.hh"
 
 Pl011::Pl011(const Pl011Params *p)
     : Uart(p, 0xfff),
diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc
index 23ffe58c9..b12e7a352 100644
--- a/src/dev/arm/pl111.cc
+++ b/src/dev/arm/pl111.cc
@@ -38,14 +38,15 @@
  *          Ali Saidi
  */
 
-#include "base/vnc/vncinput.hh"
+#include "dev/arm/pl111.hh"
+
 #include "base/output.hh"
 #include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
 #include "debug/PL111.hh"
 #include "debug/Uart.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/pl111.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"
diff --git a/src/dev/arm/realview.cc b/src/dev/arm/realview.cc
index 2a6bc63f3..e5e7afdc0 100644
--- a/src/dev/arm/realview.cc
+++ b/src/dev/arm/realview.cc
@@ -44,6 +44,8 @@
  * Implementation of RealView platform.
  */
 
+#include "dev/arm/realview.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -51,7 +53,6 @@
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/realview.hh"
 #include "dev/terminal.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/arm/rtc_pl031.cc b/src/dev/arm/rtc_pl031.cc
index d5661877c..46c5d28e7 100644
--- a/src/dev/arm/rtc_pl031.cc
+++ b/src/dev/arm/rtc_pl031.cc
@@ -37,13 +37,14 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/rtc_pl031.hh"
+
 #include "base/intmath.hh"
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"
 #include "dev/arm/amba_device.hh"
-#include "dev/arm/rtc_pl031.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/arm/timer_cpulocal.cc b/src/dev/arm/timer_cpulocal.cc
index 11ae3b3d2..448ac2189 100644
--- a/src/dev/arm/timer_cpulocal.cc
+++ b/src/dev/arm/timer_cpulocal.cc
@@ -38,12 +38,13 @@
  *          Geoffrey Blake
  */
 
+#include "dev/arm/timer_cpulocal.hh"
+
 #include "base/intmath.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/timer_cpulocal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc
index 54a5a2516..99c722d79 100644
--- a/src/dev/arm/timer_sp804.cc
+++ b/src/dev/arm/timer_sp804.cc
@@ -37,12 +37,13 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/timer_sp804.hh"
+
 #include "base/intmath.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/timer_sp804.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/arm/vgic.cc b/src/dev/arm/vgic.cc
index 71d1d3bb6..60866f1f4 100644
--- a/src/dev/arm/vgic.cc
+++ b/src/dev/arm/vgic.cc
@@ -37,11 +37,12 @@
  * Authors: Matt Evans
  */
 
+#include "dev/arm/vgic.hh"
+
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/VGIC.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/vgic.hh"
 #include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc
index 918c754d5..b933853f8 100644
--- a/src/dev/baddev.cc
+++ b/src/dev/baddev.cc
@@ -32,10 +32,11 @@
  * BadDevice implemenation
  */
 
+#include "dev/baddev.hh"
+
 #include <string>
 
 #include "base/trace.hh"
-#include "dev/baddev.hh"
 #include "params/BadDevice.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/intel_8254_timer.cc b/src/dev/intel_8254_timer.cc
index e83280853..3831f21b8 100644
--- a/src/dev/intel_8254_timer.cc
+++ b/src/dev/intel_8254_timer.cc
@@ -30,9 +30,10 @@
  *          Miguel J. Serrano
  */
 
+#include "dev/intel_8254_timer.hh"
+
 #include "base/misc.hh"
 #include "debug/Intel8254Timer.hh"
-#include "dev/intel_8254_timer.hh"
 
 using namespace std;
 
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index daa939d8f..28ea52aad 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -41,9 +41,10 @@
  *          Nathan Binkert
  */
 
+#include "dev/io_device.hh"
+
 #include "base/trace.hh"
 #include "debug/AddrRanges.hh"
-#include "dev/io_device.hh"
 #include "sim/system.hh"
 
 PioPort::PioPort(PioDevice *dev)
diff --git a/src/dev/isa_fake.cc b/src/dev/isa_fake.cc
index 0871fecbb..92ee19a97 100644
--- a/src/dev/isa_fake.cc
+++ b/src/dev/isa_fake.cc
@@ -32,9 +32,10 @@
  * Isa Fake Device implementation
  */
 
+#include "dev/isa_fake.hh"
+
 #include "base/trace.hh"
 #include "debug/IsaFake.hh"
-#include "dev/isa_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"
diff --git a/src/dev/mc146818.cc b/src/dev/mc146818.cc
index 1eaaf96a2..4f5793543 100644
--- a/src/dev/mc146818.cc
+++ b/src/dev/mc146818.cc
@@ -30,6 +30,8 @@
  *          Miguel Serrano
  */
 
+#include "dev/mc146818.hh"
+
 #include <sys/time.h>
 
 #include <ctime>
@@ -39,7 +41,6 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "debug/MC146818.hh"
-#include "dev/mc146818.hh"
 #include "dev/rtcreg.h"
 
 using namespace std;
diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc
index 21dfd40bd..8843d4bf2 100755
--- a/src/dev/mips/malta.cc
+++ b/src/dev/mips/malta.cc
@@ -33,6 +33,8 @@
  * Implementation of Malta platform.
  */
 
+#include "dev/mips/malta.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -40,7 +42,6 @@
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
 #include "debug/Malta.hh"
-#include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
 #include "dev/mips/malta_io.hh"
 #include "dev/terminal.hh"
diff --git a/src/dev/mips/malta_cchip.cc b/src/dev/mips/malta_cchip.cc
index d607acb08..929702f77 100755
--- a/src/dev/mips/malta_cchip.cc
+++ b/src/dev/mips/malta_cchip.cc
@@ -33,6 +33,8 @@
  * Emulation of the Malta CChip CSRs
  */
 
+#include "dev/mips/malta_cchip.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -43,7 +45,6 @@
 #include "cpu/thread_context.hh"
 #include "debug/Malta.hh"
 #include "dev/mips/malta.hh"
-#include "dev/mips/malta_cchip.hh"
 #include "dev/mips/maltareg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc
index bd3791163..96de7f977 100755
--- a/src/dev/mips/malta_io.cc
+++ b/src/dev/mips/malta_io.cc
@@ -34,6 +34,8 @@
  * Malta I/O including PIC, PIT, RTC, DMA
  */
 
+#include "dev/mips/malta_io.hh"
+
 #include <sys/time.h>
 
 #include <deque>
@@ -46,7 +48,6 @@
 #include "debug/Malta.hh"
 #include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
-#include "dev/mips/malta_io.hh"
 #include "dev/mips/maltareg.h"
 #include "dev/rtcreg.h"
 #include "mem/packet.hh"
diff --git a/src/dev/pci/device.cc b/src/dev/pci/device.cc
index 916cd8422..192d824d8 100644
--- a/src/dev/pci/device.cc
+++ b/src/dev/pci/device.cc
@@ -63,7 +63,6 @@
 #include "sim/byteswap.hh"
 #include "sim/core.hh"
 
-
 PciDevice::PciDevice(const PciDeviceParams *p)
     : DmaDevice(p),
       _busAddr(p->pci_bus, p->pci_dev, p->pci_func),
diff --git a/src/dev/pci/host.cc b/src/dev/pci/host.cc
index 3b572f7f4..dfb197ba9 100644
--- a/src/dev/pci/host.cc
+++ b/src/dev/pci/host.cc
@@ -47,7 +47,6 @@
 #include "params/GenericPciHost.hh"
 #include "params/PciHost.hh"
 
-
 PciHost::PciHost(const PciHostParams *p)
     : PioDevice(p)
 {
diff --git a/src/dev/platform.cc b/src/dev/platform.cc
index 8c7706b48..63df9bc0d 100644
--- a/src/dev/platform.cc
+++ b/src/dev/platform.cc
@@ -29,9 +29,10 @@
  *          Nathan Binkert
  */
 
+#include "dev/platform.hh"
+
 #include "base/misc.hh"
 #include "config/the_isa.hh"
-#include "dev/platform.hh"
 #include "sim/sim_exit.hh"
 
 using namespace std;
diff --git a/src/dev/ps2.cc b/src/dev/ps2.cc
index 0d973ad70..2c13e5caf 100644
--- a/src/dev/ps2.cc
+++ b/src/dev/ps2.cc
@@ -37,10 +37,11 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/ps2.hh"
+
 #include <list>
 
 #include "base/misc.hh"
-#include "dev/ps2.hh"
 #include "x11keysym/keysym.h"
 
 namespace Ps2 {
diff --git a/src/dev/ps2.hh b/src/dev/ps2.hh
index f1ddb522e..9e9986735 100644
--- a/src/dev/ps2.hh
+++ b/src/dev/ps2.hh
@@ -41,6 +41,7 @@
 #define __DEV_PS2_HH__
 
 #include <stdint.h>
+#include <list>
 
 #include "base/bitunion.hh"
 
diff --git a/src/dev/sparc/dtod.cc b/src/dev/sparc/dtod.cc
index 5b74bbcb7..3d47ff660 100644
--- a/src/dev/sparc/dtod.cc
+++ b/src/dev/sparc/dtod.cc
@@ -31,6 +31,8 @@
 /** @file
  * Time of date device implementation
  */
+#include "dev/sparc/dtod.hh"
+
 #include <sys/time.h>
 
 #include <deque>
@@ -40,7 +42,6 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/sparc/dtod.hh"
 #include "dev/platform.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc
index 55cb93f37..28d384212 100644
--- a/src/dev/sparc/iob.cc
+++ b/src/dev/sparc/iob.cc
@@ -35,6 +35,8 @@
  * well as facilities to send IPIs to other cpus.
  */
 
+#include "dev/sparc/iob.hh"
+
 #include <cstring>
 
 #include "arch/sparc/faults.hh"
@@ -44,7 +46,6 @@
 #include "cpu/intr_control.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Iob.hh"
-#include "dev/sparc/iob.hh"
 #include "dev/platform.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc
index 5fe9157bc..a6ce1d09f 100644
--- a/src/dev/sparc/mm_disk.cc
+++ b/src/dev/sparc/mm_disk.cc
@@ -33,11 +33,12 @@
  * in legion. Any access is translated to an offset in the disk image.
  */
 
+#include "dev/sparc/mm_disk.hh"
+
 #include <cstring>
 
 #include "base/trace.hh"
 #include "debug/IdeDisk.hh"
-#include "dev/sparc/mm_disk.hh"
 #include "dev/platform.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
diff --git a/src/dev/sparc/t1000.cc b/src/dev/sparc/t1000.cc
index 12f43ab23..f65846297 100644
--- a/src/dev/sparc/t1000.cc
+++ b/src/dev/sparc/t1000.cc
@@ -32,13 +32,14 @@
  * Implementation of T1000 platform.
  */
 
+#include "dev/sparc/t1000.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
-#include "dev/sparc/t1000.hh"
 #include "dev/terminal.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/uart.cc b/src/dev/uart.cc
index f232f0f28..01900445f 100644
--- a/src/dev/uart.cc
+++ b/src/dev/uart.cc
@@ -32,9 +32,10 @@
  * Implements a base class for UARTs
  */
 
+#include "dev/uart.hh"
+
 #include "dev/platform.hh"
 #include "dev/terminal.hh"
-#include "dev/uart.hh"
 
 using namespace std;
 
diff --git a/src/dev/uart8250.cc b/src/dev/uart8250.cc
index a9446e6d5..3c97604fd 100644
--- a/src/dev/uart8250.cc
+++ b/src/dev/uart8250.cc
@@ -32,6 +32,8 @@
  * Implements a 8250 UART
  */
 
+#include "dev/uart8250.hh"
+
 #include <string>
 #include <vector>
 
@@ -41,7 +43,6 @@
 #include "debug/Uart.hh"
 #include "dev/platform.hh"
 #include "dev/terminal.hh"
-#include "dev/uart8250.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc
index 05c1edd62..f098784d0 100644
--- a/src/dev/virtio/base.cc
+++ b/src/dev/virtio/base.cc
@@ -37,8 +37,9 @@
  * Authors: Andreas Sandberg
  */
 
-#include "debug/VIO.hh"
 #include "dev/virtio/base.hh"
+
+#include "debug/VIO.hh"
 #include "params/VirtIODeviceBase.hh"
 
 VirtDescriptor::VirtDescriptor(PortProxy &_memProxy, VirtQueue &_queue,
diff --git a/src/dev/virtio/block.cc b/src/dev/virtio/block.cc
index 2b511e2f3..a602c3e29 100644
--- a/src/dev/virtio/block.cc
+++ b/src/dev/virtio/block.cc
@@ -37,8 +37,9 @@
  * Authors: Andreas Sandberg
  */
 
-#include "debug/VIOBlock.hh"
 #include "dev/virtio/block.hh"
+
+#include "debug/VIOBlock.hh"
 #include "params/VirtIOBlock.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/virtio/console.cc b/src/dev/virtio/console.cc
index 70b53c185..e3428e951 100644
--- a/src/dev/virtio/console.cc
+++ b/src/dev/virtio/console.cc
@@ -37,12 +37,12 @@
  * Authors: Andreas Sandberg
  */
 
-#include "debug/VIOConsole.hh"
 #include "dev/virtio/console.hh"
+
+#include "debug/VIOConsole.hh"
 #include "params/VirtIOConsole.hh"
 #include "sim/system.hh"
 
-
 VirtIOConsole::VirtIOConsole(Params *params)
     : VirtIODeviceBase(params, ID_CONSOLE, sizeof(Config), F_SIZE),
       qRecv(params->system->physProxy, params->qRecvSize, *this),
diff --git a/src/dev/virtio/fs9p.cc b/src/dev/virtio/fs9p.cc
index 2006006db..a8d1ee779 100644
--- a/src/dev/virtio/fs9p.cc
+++ b/src/dev/virtio/fs9p.cc
@@ -37,16 +37,17 @@
  * Authors: Andreas Sandberg
  */
 
+#include "dev/virtio/fs9p.hh"
+
+#include <fcntl.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <fcntl.h>
-#include <netdb.h>
 #include <unistd.h>
 
 #include "debug/VIO9P.hh"
 #include "debug/VIO9PData.hh"
-#include "dev/virtio/fs9p.hh"
 #include "params/VirtIO9PBase.hh"
 #include "params/VirtIO9PDiod.hh"
 #include "params/VirtIO9PProxy.hh"
diff --git a/src/dev/virtio/pci.cc b/src/dev/virtio/pci.cc
index fb0735eba..29b92948d 100644
--- a/src/dev/virtio/pci.cc
+++ b/src/dev/virtio/pci.cc
@@ -37,8 +37,9 @@
  * Authors: Andreas Sandberg
  */
 
-#include "debug/VIOPci.hh"
 #include "dev/virtio/pci.hh"
+
+#include "debug/VIOPci.hh"
 #include "mem/packet_access.hh"
 #include "params/PciVirtIO.hh"
 
diff --git a/src/dev/x86/cmos.cc b/src/dev/x86/cmos.cc
index 73cfe853e..16286f07e 100644
--- a/src/dev/x86/cmos.cc
+++ b/src/dev/x86/cmos.cc
@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "debug/CMOS.hh"
 #include "dev/x86/cmos.hh"
+
+#include "debug/CMOS.hh"
 #include "dev/x86/intdev.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/i8042.cc b/src/dev/x86/i8042.cc
index 8aef93223..39b02055b 100644
--- a/src/dev/x86/i8042.cc
+++ b/src/dev/x86/i8042.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/i8042.hh"
+
 #include "base/bitunion.hh"
 #include "debug/I8042.hh"
-#include "dev/x86/i8042.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc
index 7388036fb..a4b05b007 100644
--- a/src/dev/x86/i82094aa.cc
+++ b/src/dev/x86/i82094aa.cc
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/i82094aa.hh"
+
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/intmessage.hh"
 #include "cpu/base.hh"
 #include "debug/I82094AA.hh"
-#include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8259.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8237.cc b/src/dev/x86/i8237.cc
index b16f78883..a9ef53c2c 100644
--- a/src/dev/x86/i8237.cc
+++ b/src/dev/x86/i8237.cc
@@ -29,6 +29,7 @@
  */
 
 #include "dev/x86/i8237.hh"
+
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/i8254.cc b/src/dev/x86/i8254.cc
index f784a0107..457db13f7 100644
--- a/src/dev/x86/i8254.cc
+++ b/src/dev/x86/i8254.cc
@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "debug/I8254.hh"
 #include "dev/x86/i8254.hh"
+
+#include "debug/I8254.hh"
 #include "dev/x86/intdev.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8259.cc b/src/dev/x86/i8259.cc
index 84f2d1321..03c5cb948 100644
--- a/src/dev/x86/i8259.cc
+++ b/src/dev/x86/i8259.cc
@@ -28,10 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/i8259.hh"
+
 #include "base/bitfield.hh"
 #include "debug/I8259.hh"
 #include "dev/x86/i82094aa.hh"
-#include "dev/x86/i8259.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc
index fe3119803..6d182c078 100644
--- a/src/dev/x86/pc.cc
+++ b/src/dev/x86/pc.cc
@@ -32,6 +32,8 @@
  * Implementation of PC platform.
  */
 
+#include "dev/x86/pc.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -40,12 +42,11 @@
 #include "arch/x86/x86_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
+#include "dev/terminal.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8254.hh"
 #include "dev/x86/i8259.hh"
-#include "dev/x86/pc.hh"
 #include "dev/x86/south_bridge.hh"
-#include "dev/terminal.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff --git a/src/dev/x86/south_bridge.cc b/src/dev/x86/south_bridge.cc
index dbb1ef1be..e426c7049 100644
--- a/src/dev/x86/south_bridge.cc
+++ b/src/dev/x86/south_bridge.cc
@@ -28,10 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/south_bridge.hh"
+
 #include <cassert>
 
 #include "dev/x86/pc.hh"
-#include "dev/x86/south_bridge.hh"
 
 using namespace X86ISA;
 
diff --git a/src/dev/x86/speaker.cc b/src/dev/x86/speaker.cc
index 235860815..61a296719 100644
--- a/src/dev/x86/speaker.cc
+++ b/src/dev/x86/speaker.cc
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/speaker.hh"
+
 #include "base/bitunion.hh"
 #include "base/trace.hh"
 #include "debug/PcSpeaker.hh"
 #include "dev/x86/i8254.hh"
-#include "dev/x86/speaker.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"