7 files changed, 15 insertions, 9 deletions
diff --git a/src/base/loader/aout_object.cc b/src/base/loader/aout_object.cc
index 468b1b1f0..b731c9a83 100644
--- a/src/base/loader/aout_object.cc
+++ b/src/base/loader/aout_object.cc
@@ -28,9 +28,10 @@
  * Authors: Steve Reinhardt
  */
 
+#include "base/loader/aout_object.hh"
+
 #include <string>
 
-#include "base/loader/aout_object.hh"
 #include "base/loader/exec_aout.h"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
diff --git a/src/base/loader/dtb_object.cc b/src/base/loader/dtb_object.cc
index 986f6455d..fab6a762d 100644
--- a/src/base/loader/dtb_object.cc
+++ b/src/base/loader/dtb_object.cc
@@ -35,9 +35,9 @@
 
 #include <cassert>
 
-#include "sim/byteswap.hh"
 #include "fdt.h"
 #include "libfdt.h"
+#include "sim/byteswap.hh"
 
 ObjectFile *
 DtbObject::tryFile(const std::string &fname, size_t len, uint8_t *data)
diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc
index 1869efa13..4e94ecd1e 100644
--- a/src/base/loader/ecoff_object.cc
+++ b/src/base/loader/ecoff_object.cc
@@ -28,9 +28,10 @@
  * Authors: Steve Reinhardt
  */
 
+#include "base/loader/ecoff_object.hh"
+
 #include <string>
 
-#include "base/loader/ecoff_object.hh"
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
diff --git a/src/base/loader/hex_file.cc b/src/base/loader/hex_file.cc
index dac013d40..c80343961 100755
--- a/src/base/loader/hex_file.cc
+++ b/src/base/loader/hex_file.cc
@@ -28,14 +28,15 @@
  * Authors: Jaidev Patwardhan
  */
 
+#include "base/loader/hex_file.hh"
+
 #include <cctype>
 #include <cstdio>
 #include <list>
 #include <string>
 
-#include "base/loader/hex_file.hh"
-#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
 #include "mem/port_proxy.hh"
 
 using namespace std;
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 8bafd3c56..a82314e68 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -29,9 +29,11 @@
  *          Steve Reinhardt
  */
 
+#include "base/loader/object_file.hh"
+
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <zlib.h>
 
@@ -39,14 +41,13 @@
 #include <list>
 #include <string>
 
+#include "base/cprintf.hh"
 #include "base/loader/aout_object.hh"
 #include "base/loader/dtb_object.hh"
 #include "base/loader/ecoff_object.hh"
 #include "base/loader/elf_object.hh"
-#include "base/loader/object_file.hh"
 #include "base/loader/raw_object.hh"
 #include "base/loader/symtab.hh"
-#include "base/cprintf.hh"
 #include "mem/port_proxy.hh"
 
 using namespace std;
diff --git a/src/base/loader/raw_object.cc b/src/base/loader/raw_object.cc
index 35a952741..4a04f7dfc 100644
--- a/src/base/loader/raw_object.cc
+++ b/src/base/loader/raw_object.cc
@@ -29,6 +29,7 @@
  */
 
 #include "base/loader/raw_object.hh"
+
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "debug/Loader.hh"
diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 853d98cc4..ea7332114 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -28,12 +28,13 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/loader/symtab.hh"
+
 #include <fstream>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/str.hh"
 #include "base/types.hh"