diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 2bc335bce6..f646109137 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -37,6 +37,7 @@
 
 #include "arch/arm/isa.hh"
 
+#include "arch/arm/decoder.hh"
 #include "arch/arm/faults.hh"
 #include "arch/arm/htm.hh"
 #include "arch/arm/interrupts.hh"
@@ -47,6 +48,7 @@
 #include "arch/arm/system.hh"
 #include "arch/arm/tlbi_op.hh"
 #include "arch/arm/utility.hh"
+#include "arch/generic/decoder.hh"
 #include "base/cprintf.hh"
 #include "cpu/base.hh"
 #include "cpu/checker/cpu.hh"
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index 3a5b31074d..482933995c 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -41,6 +41,7 @@
 #include <iomanip>
 #include <sstream>
 
+#include "arch/generic/decoder.hh"
 #include "base/cast.hh"
 #include "base/compiler.hh"
 #include "base/logging.hh"
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index c625a61e2f..392e7cbe4b 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -41,7 +41,7 @@
 #ifndef __CPU_O3_FETCH_HH__
 #define __CPU_O3_FETCH_HH__
 
-#include "arch/decoder.hh"
+#include "arch/generic/decoder.hh"
 #include "arch/generic/mmu.hh"
 #include "base/statistics.hh"
 #include "config/the_isa.hh"
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index eee0564080..d9738d22b0 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -41,6 +41,7 @@
 
 #include "cpu/simple/atomic.hh"
 
+#include "arch/generic/decoder.hh"
 #include "base/output.hh"
 #include "config/the_isa.hh"
 #include "cpu/exetrace.hh"
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index ad98ed9ca0..4cc8e1fb80 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -41,6 +41,7 @@
 
 #include "cpu/simple/base.hh"
 
+#include "arch/generic/decoder.hh"
 #include "base/cprintf.hh"
 #include "base/inifile.hh"
 #include "base/loader/symtab.hh"
diff --git a/src/cpu/simple/noncaching.cc b/src/cpu/simple/noncaching.cc
index f6ef53067a..6458beeb28 100644
--- a/src/cpu/simple/noncaching.cc
+++ b/src/cpu/simple/noncaching.cc
@@ -39,6 +39,8 @@
 
 #include <cassert>
 
+#include "arch/generic/decoder.hh"
+
 namespace gem5
 {
 
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index 0ae1a61413..da3e0c0113 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -41,6 +41,7 @@
 
 #include "cpu/simple/timing.hh"
 
+#include "arch/generic/decoder.hh"
 #include "base/compiler.hh"
 #include "config/the_isa.hh"
 #include "cpu/exetrace.hh"
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 3c4eae76ce..7b572ef767 100644
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -42,6 +42,7 @@
 
 #include <string>
 
+#include "arch/generic/decoder.hh"
 #include "base/callback.hh"
 #include "base/compiler.hh"
 #include "base/cprintf.hh"
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index 50e9f30420..0f25e17dff 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -45,7 +45,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "arch/decoder.hh"
 #include "arch/generic/htm.hh"
 #include "arch/generic/mmu.hh"
 #include "arch/generic/pcstate.hh"