diff --git a/src/arch/power/remote_gdb.cc b/src/arch/power/remote_gdb.cc
index 702439d..5955253 100644
--- a/src/arch/power/remote_gdb.cc
+++ b/src/arch/power/remote_gdb.cc
@@ -142,6 +142,7 @@
 #include "arch/power/gdb-xml/gdb_xml_power_fpu.hh"
 #include "arch/power/gdb-xml/gdb_xml_powerpc_32.hh"
 #include "arch/power/gdb-xml/gdb_xml_powerpc_64.hh"
+#include "arch/power/pcstate.hh"
 #include "arch/power/regs/misc.hh"
 #include "cpu/thread_state.hh"
 #include "debug/GDBAcc.hh"
diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc
index 0179fe4..ff2b8f1 100644
--- a/src/arch/sparc/nativetrace.cc
+++ b/src/arch/sparc/nativetrace.cc
@@ -28,6 +28,7 @@
 
 #include "arch/sparc/nativetrace.hh"
 
+#include "arch/sparc/pcstate.hh"
 #include "arch/sparc/regs/int.hh"
 #include "cpu/thread_context.hh"
 #include "params/SparcNativeTrace.hh"
diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index abb1a32..697fb18 100644
--- a/src/arch/x86/nativetrace.cc
+++ b/src/arch/x86/nativetrace.cc
@@ -28,6 +28,7 @@
 
 #include "arch/x86/nativetrace.hh"
 
+#include "arch/x86/pcstate.hh"
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/int.hh"
 #include "cpu/thread_context.hh"
diff --git a/src/base/remote_gdb.hh b/src/base/remote_gdb.hh
index 2248d71..59bccc5 100644
--- a/src/base/remote_gdb.hh
+++ b/src/base/remote_gdb.hh
@@ -50,7 +50,7 @@
 #include <string>
 #include <vector>
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/cprintf.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index eb0978f..b76c034 100644
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -46,7 +46,7 @@
 #include <map>
 #include <queue>
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/statistics.hh"
 #include "cpu/base.hh"
 #include "cpu/exec_context.hh"
diff --git a/src/cpu/checker/thread_context.hh b/src/cpu/checker/thread_context.hh
index 115fd1d..9e6c812 100644
--- a/src/cpu/checker/thread_context.hh
+++ b/src/cpu/checker/thread_context.hh
@@ -42,7 +42,7 @@
 #ifndef __CPU_CHECKER_THREAD_CONTEXT_HH__
 #define __CPU_CHECKER_THREAD_CONTEXT_HH__
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "config/the_isa.hh"
 #include "cpu/checker/cpu.hh"
 #include "cpu/simple_thread.hh"
diff --git a/src/cpu/inst_pb_trace.hh b/src/cpu/inst_pb_trace.hh
index cfcd47e..ee0ed64 100644
--- a/src/cpu/inst_pb_trace.hh
+++ b/src/cpu/inst_pb_trace.hh
@@ -38,7 +38,7 @@
 #ifndef __CPU_INST_PB_TRACE_HH__
 #define __CPU_INST_PB_TRACE_HH__
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "cpu/static_inst_fwd.hh"
diff --git a/src/cpu/nop_static_inst.cc b/src/cpu/nop_static_inst.cc
index aa34481..4b73aa0 100644
--- a/src/cpu/nop_static_inst.cc
+++ b/src/cpu/nop_static_inst.cc
@@ -28,8 +28,7 @@
 
 #include "cpu/nop_static_inst.hh"
 
-#include "arch/pcstate.hh"
-#include "config/the_isa.hh"
+#include "arch/generic/pcstate.hh"
 #include "cpu/static_inst.hh"
 
 namespace gem5
diff --git a/src/cpu/o3/comm.hh b/src/cpu/o3/comm.hh
index b2da358..f2c6e60 100644
--- a/src/cpu/o3/comm.hh
+++ b/src/cpu/o3/comm.hh
@@ -44,7 +44,7 @@
 
 #include <vector>
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index ebbfd9a..670b92f 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -49,7 +49,7 @@
 #include <set>
 #include <vector>
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/statistics.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/comm.hh"
diff --git a/src/cpu/o3/decode.cc b/src/cpu/o3/decode.cc
index d10e19a..362daee 100644
--- a/src/cpu/o3/decode.cc
+++ b/src/cpu/o3/decode.cc
@@ -40,7 +40,7 @@
 
 #include "cpu/o3/decode.hh"
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
diff --git a/src/cpu/pred/bpred_unit.cc b/src/cpu/pred/bpred_unit.cc
index b1b4503..0940ae1 100644
--- a/src/cpu/pred/bpred_unit.cc
+++ b/src/cpu/pred/bpred_unit.cc
@@ -44,7 +44,7 @@
 
 #include <algorithm>
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/compiler.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
diff --git a/src/cpu/pred/btb.hh b/src/cpu/pred/btb.hh
index ce1cb21..206ee8d 100644
--- a/src/cpu/pred/btb.hh
+++ b/src/cpu/pred/btb.hh
@@ -29,7 +29,7 @@
 #ifndef __CPU_PRED_BTB_HH__
 #define __CPU_PRED_BTB_HH__
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "base/logging.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
diff --git a/src/cpu/pred/indirect.hh b/src/cpu/pred/indirect.hh
index ee17d2c..7bec64f 100644
--- a/src/cpu/pred/indirect.hh
+++ b/src/cpu/pred/indirect.hh
@@ -29,7 +29,7 @@
 #ifndef __CPU_PRED_INDIRECT_BASE_HH__
 #define __CPU_PRED_INDIRECT_BASE_HH__
 
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "params/IndirectPredictor.hh"
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index 797ef67..bddc1f5 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -48,9 +48,9 @@
 #include "arch/decoder.hh"
 #include "arch/generic/htm.hh"
 #include "arch/generic/mmu.hh"
+#include "arch/generic/pcstate.hh"
 #include "arch/generic/tlb.hh"
 #include "arch/isa.hh"
-#include "arch/pcstate.hh"
 #include "arch/vecregs.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh
index 985ffcd..3844d0c 100644
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -47,7 +47,7 @@
 
 #include "arch/generic/htm.hh"
 #include "arch/generic/isa.hh"
-#include "arch/pcstate.hh"
+#include "arch/generic/pcstate.hh"
 #include "arch/vecregs.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
diff --git a/src/dev/arm/css/scmi_platform.hh b/src/dev/arm/css/scmi_platform.hh
index ad53b83..581408d 100644
--- a/src/dev/arm/css/scmi_platform.hh
+++ b/src/dev/arm/css/scmi_platform.hh
@@ -38,6 +38,7 @@
 #ifndef __DEV_ARM_CSS_SCMI_PLATFORM_H__
 #define __DEV_ARM_CSS_SCMI_PLATFORM_H__
 
+#include "base/bitunion.hh"
 #include "dev/arm/css/scmi_protocols.hh"
 #include "dev/arm/css/scp.hh"
 #include "dev/dma_device.hh"