diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/SConscript
--- a/src/arch/SConscript	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/SConscript	Sun Apr 22 23:18:47 2012 -0700
@@ -29,6 +29,7 @@
 # Authors: Steve Reinhardt
 
 import sys
+import os
 
 Import('*')
 
@@ -107,7 +108,7 @@
     # Add in the CPU models.
     source += [ Value(m) for m in cpu_models ]
 
-    return target, source
+    return [os.path.join("generated", t) for t in target], source
 
 ARCH_DIR = Dir('.')
 
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/alpha/registers.hh
--- a/src/arch/alpha/registers.hh	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/alpha/registers.hh	Sun Apr 22 23:18:47 2012 -0700
@@ -31,8 +31,8 @@
 #ifndef __ARCH_ALPHA_REGISTERS_HH__
 #define __ARCH_ALPHA_REGISTERS_HH__
 
+#include "arch/alpha/generated/max_inst_regs.hh"
 #include "arch/alpha/ipr.hh"
-#include "arch/alpha/max_inst_regs.hh"
 #include "base/types.hh"
 
 namespace AlphaISA {
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/arm/insts/macromem.cc
--- a/src/arch/arm/insts/macromem.cc	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/arm/insts/macromem.cc	Sun Apr 22 23:18:47 2012 -0700
@@ -43,7 +43,7 @@
 #include <sstream>
 
 #include "arch/arm/insts/macromem.hh"
-#include "arch/arm/decoder.hh"
+#include "arch/arm/generated/decoder.hh"
 
 using namespace std;
 using namespace ArmISAInst;
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/arm/registers.hh
--- a/src/arch/arm/registers.hh	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/arm/registers.hh	Sun Apr 22 23:18:47 2012 -0700
@@ -43,8 +43,8 @@
 #ifndef __ARCH_ARM_REGISTERS_HH__
 #define __ARCH_ARM_REGISTERS_HH__
 
+#include "arch/arm/generated/max_inst_regs.hh"
 #include "arch/arm/intregs.hh"
-#include "arch/arm/max_inst_regs.hh"
 #include "arch/arm/miscregs.hh"
 
 namespace ArmISA {
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/mips/registers.hh
--- a/src/arch/mips/registers.hh	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/mips/registers.hh	Sun Apr 22 23:18:47 2012 -0700
@@ -32,7 +32,7 @@
 #ifndef __ARCH_MIPS_REGISTERS_HH__
 #define __ARCH_MIPS_REGISTERS_HH__
 
-#include "arch/mips/max_inst_regs.hh"
+#include "arch/mips/generated/max_inst_regs.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/power/registers.hh
--- a/src/arch/power/registers.hh	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/power/registers.hh	Sun Apr 22 23:18:47 2012 -0700
@@ -31,7 +31,7 @@
 #ifndef __ARCH_POWER_REGISTERS_HH__
 #define __ARCH_POWER_REGISTERS_HH__
 
-#include "arch/power/max_inst_regs.hh"
+#include "arch/power/generated/max_inst_regs.hh"
 #include "arch/power/miscregs.hh"
 
 namespace PowerISA {
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/sparc/registers.hh
--- a/src/arch/sparc/registers.hh	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/sparc/registers.hh	Sun Apr 22 23:18:47 2012 -0700
@@ -32,7 +32,7 @@
 #ifndef __ARCH_SPARC_REGISTERS_HH__
 #define __ARCH_SPARC_REGISTERS_HH__
 
-#include "arch/sparc/max_inst_regs.hh"
+#include "arch/sparc/generated/max_inst_regs.hh"
 #include "arch/sparc/miscregs.hh"
 #include "arch/sparc/sparc_traits.hh"
 #include "base/types.hh"
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/x86/faults.cc
--- a/src/arch/x86/faults.cc	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/x86/faults.cc	Sun Apr 22 23:18:47 2012 -0700
@@ -40,7 +40,7 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/decoder.hh"
+#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/faults.hh"
 #include "arch/x86/isa_traits.hh"
 #include "base/trace.hh"
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/x86/insts/badmicroop.cc
--- a/src/arch/x86/insts/badmicroop.cc	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/x86/insts/badmicroop.cc	Sun Apr 22 23:18:47 2012 -0700
@@ -37,8 +37,8 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/insts/badmicroop.hh"
-#include "arch/x86/decoder.hh"
 #include "arch/x86/isa_traits.hh"
 
 namespace X86ISA
diff -r 24b06cbf2d67 -r 7a8f6ddfbedf src/arch/x86/registers.hh
--- a/src/arch/x86/registers.hh	Sun Apr 22 05:20:44 2012 -0700
+++ b/src/arch/x86/registers.hh	Sun Apr 22 23:18:47 2012 -0700
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_REGISTERS_HH__
 #define __ARCH_X86_REGISTERS_HH__
 
+#include "arch/x86/generated/max_inst_regs.hh"
 #include "arch/x86/regs/int.hh"
 #include "arch/x86/regs/misc.hh"
-#include "arch/x86/max_inst_regs.hh"
 #include "arch/x86/x86_traits.hh"
 
 namespace X86ISA