diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index ff6de8d03..3264fc8b2 100644
--- a/src/arch/alpha/faults.cc
+++ b/src/arch/alpha/faults.cc
@@ -35,6 +35,7 @@
 #include "cpu/thread_context.hh"
 #include "cpu/base.hh"
 #include "base/trace.hh"
+
 #if !FULL_SYSTEM
 #include "sim/process.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index a653d7845..0e3c4ea37 100644
--- a/src/arch/alpha/linux/process.cc
+++ b/src/arch/alpha/linux/process.cc
@@ -32,11 +32,9 @@
 #include "arch/alpha/linux/linux.hh"
 #include "arch/alpha/linux/process.hh"
 #include "arch/alpha/isa_traits.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 
diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc
index 815784388..68ee86455 100644
--- a/src/arch/mips/faults.cc
+++ b/src/arch/mips/faults.cc
@@ -32,13 +32,14 @@
  */
 
 #include "arch/mips/faults.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/base.hh"
-#include "base/trace.hh"
 #include "arch/mips/pra_constants.hh"
+#include "base/trace.hh"
+#include "cpu/base.hh"
+#include "cpu/thread_context.hh"
+
 #if !FULL_SYSTEM
-#include "sim/process.hh"
 #include "mem/page_table.hh"
+#include "sim/process.hh"
 #endif
 
 namespace MipsISA
diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index 4c3581ecb..f3cac84e8 100644
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -33,11 +33,9 @@
 #include "arch/mips/linux/linux.hh"
 #include "arch/mips/linux/process.hh"
 #include "arch/mips/isa_traits.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/system.hh"
 #include "sim/syscall_emul.hh"
diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh
index 8cf94df98..21777e440 100644
--- a/src/arch/mips/locked_mem.hh
+++ b/src/arch/mips/locked_mem.hh
@@ -42,7 +42,6 @@
 #include "base/trace.hh"
 #include "mem/request.hh"
 
-
 namespace MipsISA
 {
 
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 7f1e94709..fa3e3bff9 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -32,14 +32,11 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/process.hh"
-
 #include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
-
 #include "mem/page_table.hh"
-
 #include "sim/process.hh"
 #include "sim/process_impl.hh"
 #include "sim/system.hh"
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index cf1230745..e104b0bd2 100644
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -47,7 +47,6 @@
 #include "mem/page_table.hh"
 #include "params/MipsTLB.hh"
 
-
 using namespace std;
 using namespace MipsISA;
 
diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index a0ff69391..aa47b83c0 100644
--- a/src/arch/power/tlb.cc
+++ b/src/arch/power/tlb.cc
@@ -50,7 +50,6 @@
 #include "params/PowerTLB.hh"
 #include "sim/process.hh"
 
-
 using namespace std;
 using namespace PowerISA;
 
diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index 56ac4e946..6aee87449 100644
--- a/src/arch/x86/insts/microregop.cc
+++ b/src/arch/x86/insts/microregop.cc
@@ -37,10 +37,11 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/microregop.hh"
 #include "arch/x86/regs/misc.hh"
 #include "base/condcodes.hh"
-#include <string>
 
 namespace X86ISA
 {
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/misc.hh"
+#include "base/trace.hh"
+#include "base/types.hh"
 
-#include "base/trace.hh"        // for DPRINTF
-
-#include "base/loader/exec_ecoff.h"
+// 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 */
diff --git a/src/cpu/o3/mem_dep_unit_impl.hh b/src/cpu/o3/mem_dep_unit_impl.hh
index 59344d9f7..5f5e71624 100644
--- a/src/cpu/o3/mem_dep_unit_impl.hh
+++ b/src/cpu/o3/mem_dep_unit_impl.hh
@@ -32,7 +32,6 @@
 
 #include "cpu/o3/inst_queue.hh"
 #include "cpu/o3/mem_dep_unit.hh"
-
 #include "params/DerivO3CPU.hh"
 
 template <class MemDepPred, class Impl>
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc
index b311ed8cf..26286c208 100644
--- a/src/dev/pcidev.cc
+++ b/src/dev/pcidev.cc
@@ -39,13 +39,13 @@
 #include <vector>
 
 #include "base/inifile.hh"
-#include "base/intmath.hh" // for isPowerOf2(
+#include "base/intmath.hh"
 #include "base/misc.hh"
-#include "base/str.hh"  // for to_number
+#include "base/str.hh"
 #include "base/trace.hh"
+#include "dev/alpha/tsunamireg.h"
 #include "dev/pciconfigall.hh"
 #include "dev/pcidev.hh"
-#include "dev/alpha/tsunamireg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/byteswap.hh"
diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index bfff816ca..f619dd11b 100644
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -29,16 +29,16 @@
  *          Ali Saidi
  */
 
-#include "sim/arguments.hh"
+#include <sstream>
+
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/events.hh"
 #include "kern/linux/printk.hh"
 #include "kern/system_events.hh"
+#include "sim/arguments.hh"
 #include "sim/system.hh"
 
-#include <sstream>
-
 namespace Linux {
 
 void
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 94cdc959c..867d77121 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -38,10 +38,10 @@
 #ifndef __BASE_CACHE_HH__
 #define __BASE_CACHE_HH__
 
-#include <vector>
-#include <string>
-#include <list>
 #include <algorithm>
+#include <list>
+#include <string>
+#include <vector>
 
 #include "base/misc.hh"
 #include "base/statistics.hh"
diff --git a/src/mem/cache/tags/iic.cc b/src/mem/cache/tags/iic.cc
index b5bd66366..1315a17ee 100644
--- a/src/mem/cache/tags/iic.cc
+++ b/src/mem/cache/tags/iic.cc
@@ -34,18 +34,15 @@
  */
 
 #include <algorithm>
+#include <cmath>
 #include <string>
 #include <vector>
 
-#include <math.h>
-
+#include "base/intmath.hh"
+#include "base/trace.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/tags/iic.hh"
-#include "base/intmath.hh"
-#include "sim/core.hh" // for curTick
-
-#include "base/trace.hh" // for DPRINTF
-
+#include "sim/core.hh"
 
 using namespace std;
 
diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index a99936abf..8a8b0d0d6 100644
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -35,11 +35,11 @@
 
 #include <string>
 
-#include "mem/cache/base.hh"
 #include "base/intmath.hh"
+#include "mem/cache/base.hh"
+#include "mem/cache/tags/cacheset.hh"
 #include "mem/cache/tags/lru.hh"
 #include "sim/core.hh"
-#include "cacheset.hh"
 
 using namespace std;