diff --git a/src/arch/riscv/pagetable.hh b/src/arch/riscv/pagetable.hh
index bb658055cf..d3c123e25f 100644
--- a/src/arch/riscv/pagetable.hh
+++ b/src/arch/riscv/pagetable.hh
@@ -31,6 +31,7 @@
 #ifndef __ARCH_RISCV_PAGETABLE_H__
 #define __ARCH_RISCV_PAGETABLE_H__
 
+#include "base/bitunion.hh"
 #include "base/logging.hh"
 #include "base/trie.hh"
 #include "base/types.hh"
diff --git a/src/arch/riscv/registers.hh b/src/arch/riscv/registers.hh
index 7ce59e32c4..ed8b9163a7 100644
--- a/src/arch/riscv/registers.hh
+++ b/src/arch/riscv/registers.hh
@@ -53,6 +53,7 @@
 #include "arch/generic/vec_pred_reg.hh"
 #include "arch/generic/vec_reg.hh"
 #include "arch/riscv/generated/max_inst_regs.hh"
+#include "base/bitunion.hh"
 #include "base/types.hh"
 
 namespace RiscvISA {
diff --git a/src/dev/arm/timer_a9global.hh b/src/dev/arm/timer_a9global.hh
index aea02cb57d..7a8cf85c83 100644
--- a/src/dev/arm/timer_a9global.hh
+++ b/src/dev/arm/timer_a9global.hh
@@ -39,6 +39,7 @@
 #ifndef __DEV_ARM_GLOBAL_TIMER_HH__
 #define __DEV_ARM_GLOBAL_TIMER_HH__
 
+#include "base/bitunion.hh"
 #include "dev/io_device.hh"
 #include "params/A9GlobalTimer.hh"
 
diff --git a/src/dev/ps2/mouse.hh b/src/dev/ps2/mouse.hh
index 7a1ef21c90..0a526dba7b 100644
--- a/src/dev/ps2/mouse.hh
+++ b/src/dev/ps2/mouse.hh
@@ -41,6 +41,7 @@
 #ifndef __DEV_PS2_MOUSE_HH__
 #define __DEV_PS2_MOUSE_HH__
 
+#include "base/bitunion.hh"
 #include "dev/ps2/device.hh"
 
 struct PS2MouseParams;
diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh
index 10681da92d..4fc6311697 100644
--- a/src/dev/x86/i8042.hh
+++ b/src/dev/x86/i8042.hh
@@ -31,6 +31,7 @@
 
 #include <deque>
 
+#include "base/bitunion.hh"
 #include "dev/intpin.hh"
 #include "dev/io_device.hh"
 #include "dev/ps2/device.hh"
diff --git a/src/mem/cache/compressors/dictionary_compressor.hh b/src/mem/cache/compressors/dictionary_compressor.hh
index bc9f49a1b5..5b8ca239c1 100644
--- a/src/mem/cache/compressors/dictionary_compressor.hh
+++ b/src/mem/cache/compressors/dictionary_compressor.hh
@@ -51,6 +51,7 @@
 #include <type_traits>
 #include <vector>
 
+#include "base/bitfield.hh"
 #include "base/statistics.hh"
 #include "base/types.hh"
 #include "mem/cache/compressors/base.hh"
diff --git a/src/mem/page_table.hh b/src/mem/page_table.hh
index 8b664f8e62..18ee18ac5d 100644
--- a/src/mem/page_table.hh
+++ b/src/mem/page_table.hh
@@ -38,6 +38,7 @@
 #include <string>
 #include <unordered_map>
 
+#include "base/bitfield.hh"
 #include "base/intmath.hh"
 #include "base/types.hh"
 #include "mem/request.hh"
diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 8135ee0fcb..c32243ae2f 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -47,6 +47,7 @@ class ThreadContext;
 
 #include "arch/pseudo_inst.hh"
 #include "arch/utility.hh"
+#include "base/bitfield.hh"
 #include "base/types.hh" // For Tick and Addr data types.
 #include "debug/PseudoInst.hh"
 #include "sim/guest_abi.hh"