style: fix sorting of includes and whitespace in some files

4 files changed, 12 insertions, 13 deletions

diff --git a/src/base/loader/aout_object.cc b/src/base/loader/aout_object.cc
index 1412adfc3..fe435a599 100644
--- a/src/base/loader/aout_object.cc
+++ b/src/base/loader/aout_object.cc
@@ -31,11 +31,8 @@
 #include <string>
 
 #include "base/loader/aout_object.hh"
-
 #include "base/loader/symtab.hh"
-
-#include "base/trace.hh"        // for DPRINTF
-
+#include "base/trace.hh"
 #include "base/loader/exec_aout.h"
 
 using namespace std;
diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc
index d1719f1c6..2027a2e1e 100644
--- a/src/base/loader/ecoff_object.cc
+++ b/src/base/loader/ecoff_object.cc
@@ -31,14 +31,19 @@
 #include <string>
 
 #include "base/loader/ecoff_object.hh"
-#include "base/misc.hh"
 #include "base/loader/symtab.hh"
-
-#include "base/trace.hh"        // for DPRINTF
-
-#include "base/loader/exec_ecoff.h"
+#include "base/misc.hh"
+#include "base/trace.hh"
+#include "base/types.hh"
+
+// Only alpha will be able to load ecoff files for now.
+// base/types.hh and ecoff_machdep.h must be before the other .h files
+// because they are are gathered from other code bases and require some 
+// typedefs from those files.
+#include "arch/alpha/ecoff_machdep.h"
 #include "base/loader/coff_sym.h"
 #include "base/loader/coff_symconst.h"
+#include "base/loader/exec_ecoff.h"
 
 using namespace std;
 
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index 2db206a3c..a550d9765 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -38,7 +38,7 @@
 #include "base/loader/elf_object.hh"
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
-#include "base/trace.hh"        // for DPRINTF
+#include "base/trace.hh"
 #include "sim/byteswap.hh"
 
 using namespace std;
diff --git a/src/base/loader/exec_ecoff.h b/src/base/loader/exec_ecoff.h
index 555589806..a076afbab 100644
--- a/src/base/loader/exec_ecoff.h
+++ b/src/base/loader/exec_ecoff.h
@@ -37,9 +37,6 @@
 #ifndef	_SYS_EXEC_ECOFF_H_
 #define	_SYS_EXEC_ECOFF_H_
 
-//Only alpha will be able to load ecoff files for now
-#include "arch/alpha/ecoff_machdep.h"
-
 struct ecoff_filehdr {
         coff_ushort f_magic;	/* magic number */
         coff_ushort f_nscns;	/* # of sections */