includes: sort all includes

46 files changed, 64 insertions, 71 deletions

diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc
index b36b5977d..34aab6ed0 100644
--- a/src/dev/alpha/tsunami.cc
+++ b/src/dev/alpha/tsunami.cc
@@ -38,10 +38,10 @@
 
 #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_pchip.hh"
 #include "dev/alpha/tsunami_io.hh"
-#include "dev/alpha/tsunami.hh"
+#include "dev/alpha/tsunami_pchip.hh"
 #include "dev/terminal.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index c90f06b5a..37456ada2 100644
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -43,11 +43,11 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/rtcreg.h"
-#include "dev/alpha/tsunami_cchip.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"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
diff --git a/src/dev/alpha/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh
index b6d63322b..f88cf5a6c 100644
--- a/src/dev/alpha/tsunami_io.hh
+++ b/src/dev/alpha/tsunami_io.hh
@@ -40,8 +40,8 @@
 #include "base/range.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/intel_8254_timer.hh"
-#include "dev/mc146818.hh"
 #include "dev/io_device.hh"
+#include "dev/mc146818.hh"
 #include "params/TsunamiIO.hh"
 #include "sim/eventq.hh"
 
diff --git a/src/dev/alpha/tsunami_pchip.cc b/src/dev/alpha/tsunami_pchip.cc
index df980cf79..e293f6333 100644
--- a/src/dev/alpha/tsunami_pchip.cc
+++ b/src/dev/alpha/tsunami_pchip.cc
@@ -39,9 +39,9 @@
 
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_pchip.hh"
 #include "dev/alpha/tsunamireg.h"
-#include "dev/alpha/tsunami.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 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"
diff --git a/src/dev/disk_image.cc b/src/dev/disk_image.cc
index aa8c98732..6a06e74f6 100644
--- a/src/dev/disk_image.cc
+++ b/src/dev/disk_image.cc
@@ -34,9 +34,9 @@
 
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <cstring>
 #include <fstream>
 #include <string>
@@ -45,8 +45,8 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "dev/disk_image.hh"
-#include "sim/sim_exit.hh"
 #include "sim/byteswap.hh"
+#include "sim/sim_exit.hh"
 
 using namespace std;
 
diff --git a/src/dev/disk_image.hh b/src/dev/disk_image.hh
index a5c70ec82..3865562a0 100644
--- a/src/dev/disk_image.hh
+++ b/src/dev/disk_image.hh
@@ -38,10 +38,10 @@
 #include <fstream>
 
 #include "base/hashmap.hh"
-#include "sim/sim_object.hh"
-#include "params/DiskImage.hh"
 #include "params/CowDiskImage.hh"
+#include "params/DiskImage.hh"
 #include "params/RawDiskImage.hh"
+#include "sim/sim_object.hh"
 
 #define SectorSize (512)
 
diff --git a/src/dev/etherbus.hh b/src/dev/etherbus.hh
index 6408f7f1f..43978b9c2 100644
--- a/src/dev/etherbus.hh
+++ b/src/dev/etherbus.hh
@@ -35,12 +35,11 @@
 #ifndef __ETHERBUS_H__
 #define __ETHERBUS_H__
 
-#include "sim/eventq.hh"
-#include "dev/etherpkt.hh"
 #include "dev/etherobject.hh"
+#include "dev/etherpkt.hh"
 #include "params/EtherBus.hh"
+#include "sim/eventq.hh"
 #include "sim/sim_object.hh"
-#include "params/EtherBus.hh"
 
 class EtherDump;
 class EtherInt;
diff --git a/src/dev/etherdump.hh b/src/dev/etherdump.hh
index cf4213b27..cc8fa9151 100644
--- a/src/dev/etherdump.hh
+++ b/src/dev/etherdump.hh
@@ -36,9 +36,10 @@
 #define __ETHERDUMP_H__
 
 #include <fstream>
+
 #include "dev/etherpkt.hh"
-#include "sim/sim_object.hh"
 #include "params/EtherDump.hh"
+#include "sim/sim_object.hh"
 
 /*
  * Simple object for creating a simple pcap style packet trace
diff --git a/src/dev/etherint.cc b/src/dev/etherint.cc
index e9f830702..fce7b28c6 100644
--- a/src/dev/etherint.cc
+++ b/src/dev/etherint.cc
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
-#include "dev/etherint.hh"
 #include "base/misc.hh"
+#include "dev/etherint.hh"
 #include "sim/sim_object.hh"
 
 void
diff --git a/src/dev/etherlink.cc b/src/dev/etherlink.cc
index 9d8d8cfa8..dcecfd933 100644
--- a/src/dev/etherlink.cc
+++ b/src/dev/etherlink.cc
@@ -45,9 +45,9 @@
 #include "dev/etherlink.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
+#include "sim/core.hh"
 #include "sim/serialize.hh"
 #include "sim/system.hh"
-#include "sim/core.hh"
 
 using namespace std;
 
diff --git a/src/dev/etherlink.hh b/src/dev/etherlink.hh
index c47948f58..ca17b837d 100644
--- a/src/dev/etherlink.hh
+++ b/src/dev/etherlink.hh
@@ -40,7 +40,6 @@
 #include "dev/etherobject.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
-#include "params/EtherLink.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/dev/ethertap.cc b/src/dev/ethertap.cc
index 76952e5c0..401ea8a83 100644
--- a/src/dev/ethertap.cc
+++ b/src/dev/ethertap.cc
@@ -36,7 +36,6 @@
 #include <sys/param.h>
 #endif
 #include <netinet/in.h>
-
 #include <unistd.h>
 
 #include <deque>
diff --git a/src/dev/ethertap.hh b/src/dev/ethertap.hh
index 94957b2ce..2f38d57b4 100644
--- a/src/dev/ethertap.hh
+++ b/src/dev/ethertap.hh
@@ -39,8 +39,8 @@
 #include <string>
 
 #include "base/pollevent.hh"
-#include "dev/etherobject.hh"
 #include "dev/etherint.hh"
+#include "dev/etherobject.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherTap.hh"
 #include "sim/eventq.hh"
diff --git a/src/dev/ide_ctrl.hh b/src/dev/ide_ctrl.hh
index 430b3fc1b..93291ad66 100644
--- a/src/dev/ide_ctrl.hh
+++ b/src/dev/ide_ctrl.hh
@@ -38,9 +38,9 @@
 #define __IDE_CTRL_HH__
 
 #include "base/bitunion.hh"
+#include "dev/io_device.hh"
 #include "dev/pcidev.hh"
 #include "dev/pcireg.h"
-#include "dev/io_device.hh"
 #include "params/IdeController.hh"
 
 class IdeDisk;
diff --git a/src/dev/ide_disk.cc b/src/dev/ide_disk.cc
index a30811d4e..c6c020e5c 100644
--- a/src/dev/ide_disk.cc
+++ b/src/dev/ide_disk.cc
@@ -39,10 +39,10 @@
 #include <string>
 
 #include "arch/isa_traits.hh"
-#include "config/the_isa.hh"
 #include "base/chunk_generator.hh"
 #include "base/cprintf.hh" // csprintf
 #include "base/trace.hh"
+#include "config/the_isa.hh"
 #include "dev/disk_image.hh"
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_disk.hh"
diff --git a/src/dev/ide_disk.hh b/src/dev/ide_disk.hh
index 78a9e1fe7..0595e18cf 100644
--- a/src/dev/ide_disk.hh
+++ b/src/dev/ide_disk.hh
@@ -41,9 +41,8 @@
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_wdcreg.h"
 #include "dev/io_device.hh"
-#include "sim/eventq.hh"
 #include "params/IdeDisk.hh"
-
+#include "sim/eventq.hh"
 
 class ChunkGenerator;
 
diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh
index 30ddc7bca..bdfdf36cc 100644
--- a/src/dev/intel_8254_timer.hh
+++ b/src/dev/intel_8254_timer.hh
@@ -33,8 +33,8 @@
 #ifndef __DEV_8254_HH__
 #define __DEV_8254_HH__
 
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "base/bitunion.hh"
 #include "base/types.hh"
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index ffe8fdf06..b9c47adc6 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -34,7 +34,6 @@
 #include "dev/io_device.hh"
 #include "sim/system.hh"
 
-
 PioPort::PioPort(PioDevice *dev, System *s, std::string pname)
     : SimpleTimingPort(dev->name() + pname, dev), device(dev)
 { }
diff --git a/src/dev/isa_fake.hh b/src/dev/isa_fake.hh
index 1fd2415cb..07657ad7d 100644
--- a/src/dev/isa_fake.hh
+++ b/src/dev/isa_fake.hh
@@ -40,8 +40,8 @@
 #include "base/range.hh"
 #include "dev/io_device.hh"
 // #include "dev/alpha/tsunami.hh"
-#include "params/IsaFake.hh"
 #include "mem/packet.hh"
+#include "params/IsaFake.hh"
 
 /**
  * IsaFake is a device that returns, BadAddr, 1 or 0 on all reads and
diff --git a/src/dev/mc146818.cc b/src/dev/mc146818.cc
index 987b1bcd3..c29bb94b4 100644
--- a/src/dev/mc146818.cc
+++ b/src/dev/mc146818.cc
@@ -31,8 +31,8 @@
  */
 
 #include <sys/time.h>
-#include <time.h>
 
+#include <ctime>
 #include <string>
 
 #include "base/bitfield.hh"
diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc
index 73dc9f116..bcf970745 100755
--- a/src/dev/mips/malta.cc
+++ b/src/dev/mips/malta.cc
@@ -39,10 +39,10 @@
 
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
+#include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
-#include "dev/mips/malta_pchip.hh"
 #include "dev/mips/malta_io.hh"
-#include "dev/mips/malta.hh"
+#include "dev/mips/malta_pchip.hh"
 #include "dev/terminal.hh"
 #include "params/Malta.hh"
 #include "sim/system.hh"
diff --git a/src/dev/mips/malta_cchip.hh b/src/dev/mips/malta_cchip.hh
index 667b06b3f..4841551c4 100755
--- a/src/dev/mips/malta_cchip.hh
+++ b/src/dev/mips/malta_cchip.hh
@@ -36,8 +36,8 @@
 #ifndef __MALTA_CCHIP_HH__
 #define __MALTA_CCHIP_HH__
 
-#include "dev/mips/malta.hh"
 #include "base/range.hh"
+#include "dev/mips/malta.hh"
 #include "dev/io_device.hh"
 #include "params/MaltaCChip.hh"
 
diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc
index a7c68a3bc..bd9288487 100755
--- a/src/dev/mips/malta_io.cc
+++ b/src/dev/mips/malta_io.cc
@@ -43,11 +43,11 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/rtcreg.h"
-#include "dev/mips/malta_cchip.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"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
diff --git a/src/dev/mips/malta_pchip.cc b/src/dev/mips/malta_pchip.cc
index 035433021..7832a31bd 100755
--- a/src/dev/mips/malta_pchip.cc
+++ b/src/dev/mips/malta_pchip.cc
@@ -39,9 +39,9 @@
 
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "dev/mips/malta.hh"
 #include "dev/mips/malta_pchip.hh"
 #include "dev/mips/maltareg.h"
-#include "dev/mips/malta.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"
diff --git a/src/dev/mips/malta_pchip.hh b/src/dev/mips/malta_pchip.hh
index 62cdc886e..a554e253e 100755
--- a/src/dev/mips/malta_pchip.hh
+++ b/src/dev/mips/malta_pchip.hh
@@ -35,8 +35,8 @@
 #ifndef __MALTA_PCHIP_HH__
 #define __MALTA_PCHIP_HH__
 
-#include "dev/mips/malta.hh"
 #include "base/range.hh"
+#include "dev/mips/malta.hh"
 #include "dev/io_device.hh"
 #include "params/MaltaPChip.hh"
 
diff --git a/src/dev/pciconfigall.hh b/src/dev/pciconfigall.hh
index fbd022340..b3f6d1472 100644
--- a/src/dev/pciconfigall.hh
+++ b/src/dev/pciconfigall.hh
@@ -37,12 +37,11 @@
 #ifndef __PCICONFIGALL_HH__
 #define __PCICONFIGALL_HH__
 
-#include "dev/pcireg.h"
 #include "base/range.hh"
 #include "dev/io_device.hh"
+#include "dev/pcireg.h"
 #include "params/PciConfigAll.hh"
 
-
 /**
  * PCI Config Space
  * All of PCI config space needs to return -1 on Tsunami, except
diff --git a/src/dev/platform.hh b/src/dev/platform.hh
index 00d90a286..a3f239865 100644
--- a/src/dev/platform.hh
+++ b/src/dev/platform.hh
@@ -40,8 +40,8 @@
 #include <bitset>
 #include <set>
 
-#include "sim/sim_object.hh"
 #include "params/Platform.hh"
+#include "sim/sim_object.hh"
 
 class PciConfigAll;
 class IntrControl;
diff --git a/src/dev/ps2.cc b/src/dev/ps2.cc
index fe90ce6bc..dbcdfcaec 100644
--- a/src/dev/ps2.cc
+++ b/src/dev/ps2.cc
@@ -38,11 +38,10 @@
  */
 
 #include <list>
-#include "x11keysym/keysym.h"
 
 #include "base/misc.hh"
 #include "dev/ps2.hh"
-
+#include "x11keysym/keysym.h"
 
 namespace Ps2 {
 
diff --git a/src/dev/simple_disk.hh b/src/dev/simple_disk.hh
index 83ba622e6..1a95bd59f 100644
--- a/src/dev/simple_disk.hh
+++ b/src/dev/simple_disk.hh
@@ -35,8 +35,8 @@
 #ifndef __DEV_SIMPLE_DISK_HH__
 #define __DEV_SIMPLE_DISK_HH__
 
-#include "sim/sim_object.hh"
 #include "params/SimpleDisk.hh"
+#include "sim/sim_object.hh"
 
 class DiskImage;
 class System;
diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc
index 0b03aceb6..9bf8eca15 100644
--- a/src/dev/sparc/iob.cc
+++ b/src/dev/sparc/iob.cc
@@ -37,15 +37,15 @@
 
 #include <cstring>
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/faults.hh"
+#include "arch/sparc/isa_traits.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/intr_control.hh"
 #include "dev/sparc/iob.hh"
 #include "dev/platform.hh"
-#include "mem/port.hh"
 #include "mem/packet_access.hh"
+#include "mem/port.hh"
 #include "sim/faults.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/sparc/iob.hh b/src/dev/sparc/iob.hh
index b2fd6cbf6..7391b1ccd 100644
--- a/src/dev/sparc/iob.hh
+++ b/src/dev/sparc/iob.hh
@@ -37,8 +37,8 @@
 #define __DEV_SPARC_IOB_HH__
 
 #include "base/range.hh"
-#include "dev/io_device.hh"
 #include "dev/disk_image.hh"
+#include "dev/io_device.hh"
 #include "params/Iob.hh"
 
 class IntrControl;
diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc
index f0d51eef4..f9a91eded 100644
--- a/src/dev/sparc/mm_disk.cc
+++ b/src/dev/sparc/mm_disk.cc
@@ -38,8 +38,8 @@
 #include "base/trace.hh"
 #include "dev/sparc/mm_disk.hh"
 #include "dev/platform.hh"
-#include "mem/port.hh"
 #include "mem/packet_access.hh"
+#include "mem/port.hh"
 #include "sim/byteswap.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/sparc/mm_disk.hh b/src/dev/sparc/mm_disk.hh
index 41ec0cc59..0e43449a1 100644
--- a/src/dev/sparc/mm_disk.hh
+++ b/src/dev/sparc/mm_disk.hh
@@ -37,8 +37,8 @@
 #define __DEV_SPARC_MM_DISK_HH__
 
 #include "base/range.hh"
-#include "dev/io_device.hh"
 #include "dev/disk_image.hh"
+#include "dev/io_device.hh"
 #include "params/MmDisk.hh"
 
 class MmDisk : public BasicPioDevice
diff --git a/src/dev/terminal.cc b/src/dev/terminal.cc
index fba0c6130..637061082 100644
--- a/src/dev/terminal.cc
+++ b/src/dev/terminal.cc
@@ -35,13 +35,13 @@
 
 #include <sys/ioctl.h>
 #include <sys/termios.h>
-#include <errno.h>
 #include <poll.h>
 #include <unistd.h>
 
 #include <cctype>
-#include <iostream>
+#include <cerrno>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #include <string>
 
diff --git a/src/dev/terminal.hh b/src/dev/terminal.hh
index d2499b6b2..e2322d7c2 100644
--- a/src/dev/terminal.hh
+++ b/src/dev/terminal.hh
@@ -39,11 +39,11 @@
 #include <iostream>
 
 #include "base/circlebuf.hh"
-#include "cpu/intr_control.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
-#include "sim/sim_object.hh"
+#include "cpu/intr_control.hh"
 #include "params/Terminal.hh"
+#include "sim/sim_object.hh"
 
 class TerminalListener;
 class Uart;
diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh
index b14d254ca..be12c4e96 100644
--- a/src/dev/x86/i8042.hh
+++ b/src/dev/x86/i8042.hh
@@ -31,12 +31,12 @@
 #ifndef __DEV_X86_I8042_HH__
 #define __DEV_X86_I8042_HH__
 
-#include "dev/io_device.hh"
+#include <queue>
+
 #include "dev/x86/intdev.hh"
+#include "dev/io_device.hh"
 #include "params/I8042.hh"
 
-#include <queue>
-
 namespace X86ISA
 {
 
diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh
index 8be23d2c9..ae0322d94 100644
--- a/src/dev/x86/i82094aa.hh
+++ b/src/dev/x86/i82094aa.hh
@@ -31,14 +31,14 @@
 #ifndef __DEV_X86_I82094AA_HH__
 #define __DEV_X86_I82094AA_HH__
 
+#include <map>
+
 #include "base/bitunion.hh"
 #include "base/range_map.hh"
-#include "dev/io_device.hh"
 #include "dev/x86/intdev.hh"
+#include "dev/io_device.hh"
 #include "params/I82094AA.hh"
 
-#include <map>
-
 namespace X86ISA
 {
 
diff --git a/src/dev/x86/i8259.hh b/src/dev/x86/i8259.hh
index 2a5d5f6aa..eee5ec171 100644
--- a/src/dev/x86/i8259.hh
+++ b/src/dev/x86/i8259.hh
@@ -31,10 +31,10 @@
 #ifndef __DEV_X86_I8259_HH__
 #define __DEV_X86_I8259_HH__
 
-#include "dev/io_device.hh"
 #include "dev/x86/intdev.hh"
-#include "params/I8259.hh"
+#include "dev/io_device.hh"
 #include "enums/X86I8259CascadeMode.hh"
+#include "params/I8259.hh"
 
 namespace X86ISA
 {
diff --git a/src/dev/x86/intdev.hh b/src/dev/x86/intdev.hh
index b26b081bf..1b3efdbb5 100644
--- a/src/dev/x86/intdev.hh
+++ b/src/dev/x86/intdev.hh
@@ -32,18 +32,17 @@
 #define __DEV_X86_INTDEV_HH__
 
 #include <cassert>
+#include <list>
 #include <string>
 
-#include "arch/x86/x86_traits.hh"
 #include "arch/x86/intmessage.hh"
+#include "arch/x86/x86_traits.hh"
 #include "mem/mem_object.hh"
 #include "mem/mport.hh"
-#include "sim/sim_object.hh"
-#include "params/X86IntSourcePin.hh"
-#include "params/X86IntSinkPin.hh"
 #include "params/X86IntLine.hh"
-
-#include <list>
+#include "params/X86IntSinkPin.hh"
+#include "params/X86IntSourcePin.hh"
+#include "sim/sim_object.hh"
 
 namespace X86ISA {
 
diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc
index e3449abf6..7912a45e1 100644
--- a/src/dev/x86/pc.cc
+++ b/src/dev/x86/pc.cc
@@ -40,12 +40,12 @@
 #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.hh b/src/dev/x86/south_bridge.hh
index 61d6d387a..b9ef17d28 100644
--- a/src/dev/x86/south_bridge.hh
+++ b/src/dev/x86/south_bridge.hh
@@ -31,8 +31,8 @@
 #ifndef __DEV_X86_SOUTH_BRIDGE_HH__
 #define __DEV_X86_SOUTH_BRIDGE_HH__
 
-#include "sim/sim_object.hh"
 #include "params/SouthBridge.hh"
+#include "sim/sim_object.hh"
 
 namespace X86ISA
 {