16 files changed, 16 insertions, 16 deletions

diff --git a/src/arch/x86/bios/acpi.hh b/src/arch/x86/bios/acpi.hh
index 7bca17790..bcc4e1962 100644
--- a/src/arch/x86/bios/acpi.hh
+++ b/src/arch/x86/bios/acpi.hh
@@ -58,7 +58,7 @@
 #ifndef __ARCH_X86_BIOS_ACPI_HH__
 #define __ARCH_X86_BIOS_ACPI_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 #include <vector>
diff --git a/src/arch/x86/bios/e820.hh b/src/arch/x86/bios/e820.hh
index da738343b..0cff6cc16 100644
--- a/src/arch/x86/bios/e820.hh
+++ b/src/arch/x86/bios/e820.hh
@@ -60,7 +60,7 @@
 
 #include "params/X86E820Entry.hh"
 #include "params/X86E820Table.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 #include <vector>
diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index 2332e7a5c..e526f9658 100644
--- a/src/arch/x86/bios/intelmp.cc
+++ b/src/arch/x86/bios/intelmp.cc
@@ -60,7 +60,7 @@
 #include "base/misc.hh"
 #include "mem/port.hh"
 #include "sim/byteswap.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // Config entry types
 #include "params/X86IntelMPBaseConfigEntry.hh"
diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc
index 95ade1e4d..1e49a875a 100644
--- a/src/arch/x86/bios/smbios.cc
+++ b/src/arch/x86/bios/smbios.cc
@@ -92,7 +92,7 @@
 #include "params/X86SMBiosSMBiosStructure.hh"
 #include "params/X86SMBiosSMBiosTable.hh"
 #include "sim/byteswap.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 
diff --git a/src/arch/x86/bios/smbios.hh b/src/arch/x86/bios/smbios.hh
index 1c50d0b48..688b0a6c5 100644
--- a/src/arch/x86/bios/smbios.hh
+++ b/src/arch/x86/bios/smbios.hh
@@ -93,7 +93,7 @@
 
 #include "enums/Characteristic.hh"
 #include "enums/ExtCharacteristic.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class FunctionalPort;
diff --git a/src/arch/x86/intmessage.hh b/src/arch/x86/intmessage.hh
index 467085da2..48f6c671b 100644
--- a/src/arch/x86/intmessage.hh
+++ b/src/arch/x86/intmessage.hh
@@ -36,7 +36,7 @@
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index 09241c310..2b549bb4a 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -62,7 +62,7 @@
 #include "arch/x86/max_inst_regs.hh"
 #include "arch/x86/types.hh"
 #include "arch/x86/x86_traits.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class StaticInstPtr;
 
diff --git a/src/arch/x86/miscregfile.hh b/src/arch/x86/miscregfile.hh
index babc65b44..fad70bf78 100644
--- a/src/arch/x86/miscregfile.hh
+++ b/src/arch/x86/miscregfile.hh
@@ -91,7 +91,7 @@
 #include "arch/x86/faults.hh"
 #include "arch/x86/miscregs.hh"
 #include "arch/x86/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <string>
 
diff --git a/src/arch/x86/pagetable.hh b/src/arch/x86/pagetable.hh
index 1a7a945e4..2c359c2cf 100644
--- a/src/arch/x86/pagetable.hh
+++ b/src/arch/x86/pagetable.hh
@@ -61,7 +61,7 @@
 #include <iostream>
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/bitunion.hh"
 #include "base/misc.hh"
 
diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh
index 0f9d24923..613832cb9 100644
--- a/src/arch/x86/pagetable_walker.hh
+++ b/src/arch/x86/pagetable_walker.hh
@@ -65,7 +65,7 @@
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "params/X86PagetableWalker.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/x86/predecoder.cc b/src/arch/x86/predecoder.cc
index 5bac8e711..0ae0fd328 100644
--- a/src/arch/x86/predecoder.cc
+++ b/src/arch/x86/predecoder.cc
@@ -60,7 +60,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {
diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh
index 4893f1de9..baef64d43 100644
--- a/src/arch/x86/predecoder.hh
+++ b/src/arch/x86/predecoder.hh
@@ -65,7 +65,7 @@
 #include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/x86/regfile.hh b/src/arch/x86/regfile.hh
index 8938ab0bc..07561fe8a 100644
--- a/src/arch/x86/regfile.hh
+++ b/src/arch/x86/regfile.hh
@@ -63,7 +63,7 @@
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/miscregfile.hh"
 #include "arch/x86/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <string>
 
diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh
index 6f0812a6a..c34411a2f 100644
--- a/src/arch/x86/utility.hh
+++ b/src/arch/x86/utility.hh
@@ -63,7 +63,7 @@
 #include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/thread_context.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/x86/vtophys.hh b/src/arch/x86/vtophys.hh
index be5e2700f..b36c24a1a 100644
--- a/src/arch/x86/vtophys.hh
+++ b/src/arch/x86/vtophys.hh
@@ -60,7 +60,7 @@
 
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/pagetable.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 class FunctionalPort;
diff --git a/src/arch/x86/x86_traits.hh b/src/arch/x86/x86_traits.hh
index 0347a7099..381695c40 100644
--- a/src/arch/x86/x86_traits.hh
+++ b/src/arch/x86/x86_traits.hh
@@ -60,7 +60,7 @@
 
 #include <assert.h>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {