diff -r 0e0cf51add93 -r 48db8feb6224 src/arch/alpha/SConscript
--- a/src/arch/alpha/SConscript	Wed Apr 23 13:08:28 2014 +0100
+++ b/src/arch/alpha/SConscript	Wed Apr 23 13:08:35 2014 +0100
@@ -63,10 +63,5 @@
     SimObject('AlphaSystem.py')
     SimObject('AlphaTLB.py')
 
-
     # Add in files generated by the ISA description.
-    isa_desc_files = env.ISADesc('isa/main.isa')
-    # Only non-header files need to be compiled.
-    for f in isa_desc_files:
-        if not f.path.endswith('.hh'):
-            Source(f)
+    env.ISADesc('isa/main.isa')
diff -r 0e0cf51add93 -r 48db8feb6224 src/arch/arm/SConscript
--- a/src/arch/arm/SConscript	Wed Apr 23 13:08:28 2014 +0100
+++ b/src/arch/arm/SConscript	Wed Apr 23 13:08:35 2014 +0100
@@ -89,10 +89,5 @@
     DebugFlag('Faults', "Trace Exceptions, interrupts, svc/swi")
     DebugFlag('TLBVerbose')
 
-    # Add in files generated by the ISA description.
-    isa_desc_files = env.ISADesc('isa/main.isa')
-    # Only non-header files need to be compiled.
-    for f in isa_desc_files:
-        if not f.path.endswith('.hh'):
-            Source(f)
-
+    # Add files generated by the ISA description.
+    env.ISADesc('isa/main.isa')
diff -r 0e0cf51add93 -r 48db8feb6224 src/arch/mips/SConscript
--- a/src/arch/mips/SConscript	Wed Apr 23 13:08:28 2014 +0100
+++ b/src/arch/mips/SConscript	Wed Apr 23 13:08:35 2014 +0100
@@ -59,9 +59,4 @@
 
     DebugFlag('MipsPRA')
 
-    # Add in files generated by the ISA description.
-    isa_desc_files = env.ISADesc('isa/main.isa')
-    # Only non-header files need to be compiled.
-    for f in isa_desc_files:
-        if not f.path.endswith('.hh'):
-            Source(f)
+    env.ISADesc('isa/main.isa')
diff -r 0e0cf51add93 -r 48db8feb6224 src/arch/power/SConscript
--- a/src/arch/power/SConscript	Wed Apr 23 13:08:28 2014 +0100
+++ b/src/arch/power/SConscript	Wed Apr 23 13:08:35 2014 +0100
@@ -58,11 +58,4 @@
 
     DebugFlag('Power')
 
-    # Add in files generated by the ISA description.
-    isa_desc_files = env.ISADesc('isa/main.isa')
-
-    # Only non-header files need to be compiled.
-    for f in isa_desc_files:
-        if not f.path.endswith('.hh'):
-            Source(f)
-
+    env.ISADesc('isa/main.isa')
diff -r 0e0cf51add93 -r 48db8feb6224 src/arch/sparc/SConscript
--- a/src/arch/sparc/SConscript	Wed Apr 23 13:08:28 2014 +0100
+++ b/src/arch/sparc/SConscript	Wed Apr 23 13:08:35 2014 +0100
@@ -61,9 +61,4 @@
     DebugFlag('Sparc', "Generic SPARC ISA stuff")
     DebugFlag('RegisterWindows', "Register window manipulation")
 
-    # Add in files generated by the ISA description.
-    isa_desc_files = env.ISADesc('isa/main.isa')
-    # Only non-header files need to be compiled.
-    for f in isa_desc_files:
-        if not f.path.endswith('.hh'):
-            Source(f)
+    env.ISADesc('isa/main.isa')
diff -r 0e0cf51add93 -r 48db8feb6224 src/arch/x86/SConscript
--- a/src/arch/x86/SConscript	Wed Apr 23 13:08:28 2014 +0100
+++ b/src/arch/x86/SConscript	Wed Apr 23 13:08:35 2014 +0100
@@ -312,6 +312,3 @@
         # Add in python file dependencies that won't be caught otherwise
         for pyfile in python_files:
             env.Depends(f, "isa/insts/%s" % pyfile)
-        # Only non-header files need to be compiled.
-        if not f.path.endswith('.hh'):
-            Source(f)