types: Move stuff for global types into src/base/types.hh

--HG--
rename : src/sim/host.hh => src/base/types.hh

130 files changed, 141 insertions, 141 deletions

diff --git a/src/arch/alpha/isa_traits.hh b/src/arch/alpha/isa_traits.hh
index ab3af0a1d..aae8271ce 100644
--- a/src/arch/alpha/isa_traits.hh
+++ b/src/arch/alpha/isa_traits.hh
@@ -38,7 +38,7 @@ namespace LittleEndianGuest {}
 #include "arch/alpha/max_inst_regs.hh"
 #include "arch/alpha/types.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class StaticInstPtr;
 
diff --git a/src/arch/alpha/miscregfile.hh b/src/arch/alpha/miscregfile.hh
index b194e00bb..1a215b8e4 100644
--- a/src/arch/alpha/miscregfile.hh
+++ b/src/arch/alpha/miscregfile.hh
@@ -36,7 +36,7 @@
 
 #include "arch/alpha/ipr.hh"
 #include "arch/alpha/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 class Checkpoint;
diff --git a/src/arch/alpha/predecoder.hh b/src/arch/alpha/predecoder.hh
index 5502342e1..d18bb2402 100644
--- a/src/arch/alpha/predecoder.hh
+++ b/src/arch/alpha/predecoder.hh
@@ -34,7 +34,7 @@
 #include "arch/alpha/types.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/alpha/types.hh b/src/arch/alpha/types.hh
index 7905114b8..d670784c4 100644
--- a/src/arch/alpha/types.hh
+++ b/src/arch/alpha/types.hh
@@ -32,7 +32,7 @@
 #ifndef __ARCH_ALPHA_TYPES_HH__
 #define __ARCH_ALPHA_TYPES_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace AlphaISA {
 
diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index cf07699ce..6f5e17497 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -34,7 +34,7 @@
 #define __ARCH_ARM_ISA_TRAITS_HH__
 
 #include "arch/arm/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace LittleEndianGuest {};
 
diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh
index 86d344b05..2c0b773a0 100644
--- a/src/arch/arm/predecoder.hh
+++ b/src/arch/arm/predecoder.hh
@@ -35,7 +35,7 @@
 
 #include "arch/arm/types.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index 0a8d5d696..a2f664f1b 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_ARM_TYPES_HH__
 #define __ARCH_ARM_TYPES_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace ArmISA
 {
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index fedf1fa05..e26a00706 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -37,7 +37,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/mips/dsp.hh b/src/arch/mips/dsp.hh
index fde4b332a..dbada893a 100755
--- a/src/arch/mips/dsp.hh
+++ b/src/arch/mips/dsp.hh
@@ -35,7 +35,7 @@
 #include "arch/mips/isa_traits.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index fb46890c1..b091adb5d 100644
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -37,7 +37,7 @@
 #include "arch/mips/types.hh"
 #include "arch/mips/mips_core_specific.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace LittleEndianGuest {};
 
diff --git a/src/arch/mips/predecoder.hh b/src/arch/mips/predecoder.hh
index a33082718..01e2ee768 100644
--- a/src/arch/mips/predecoder.hh
+++ b/src/arch/mips/predecoder.hh
@@ -34,7 +34,7 @@
 
 #include "arch/mips/types.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/mips/types.hh b/src/arch/mips/types.hh
index b459d9e14..4e0684e78 100644
--- a/src/arch/mips/types.hh
+++ b/src/arch/mips/types.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_MIPS_TYPES_HH__
 #define __ARCH_MIPS_TYPES_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace MipsISA
 {
diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh
index 12ce3af9e..95b7c875e 100644
--- a/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@ -40,7 +40,7 @@
 #include "config/full_system.hh"
 //XXX This is needed for size_t. We should use something other than size_t
 //#include "kern/linux/linux.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include "cpu/thread_context.hh"
 
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 9833057a2..1c783a9b9 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -36,7 +36,7 @@
 #include "arch/sparc/max_inst_regs.hh"
 #include "arch/sparc/sparc_traits.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class StaticInstPtr;
 
diff --git a/src/arch/sparc/predecoder.hh b/src/arch/sparc/predecoder.hh
index 13ce5c1b6..c7503b282 100644
--- a/src/arch/sparc/predecoder.hh
+++ b/src/arch/sparc/predecoder.hh
@@ -34,7 +34,7 @@
 #include "arch/sparc/types.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/sparc/regfile.hh b/src/arch/sparc/regfile.hh
index 505d7c8d7..f732c9625 100644
--- a/src/arch/sparc/regfile.hh
+++ b/src/arch/sparc/regfile.hh
@@ -37,7 +37,7 @@
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/miscregfile.hh"
 #include "arch/sparc/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <string>
 
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
 {
diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh
index 13ced82de..811f95f54 100644
--- a/src/base/cp_annotate.hh
+++ b/src/base/cp_annotate.hh
@@ -33,7 +33,7 @@
 
 #include "base/loader/symtab.hh"
 #include "config/cp_annotate.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 #include "sim/startup.hh"
 #include "sim/system.hh"
diff --git a/src/base/crc.cc b/src/base/crc.cc
index ce837a408..eb1f4b641 100644
--- a/src/base/crc.cc
+++ b/src/base/crc.cc
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/crc.hh"
 
 #define ETHER_CRC_POLY_LE 0xedb88320
diff --git a/src/base/crc.hh b/src/base/crc.hh
index 16dce79aa..212be4f8a 100644
--- a/src/base/crc.hh
+++ b/src/base/crc.hh
@@ -31,7 +31,7 @@
 #ifndef __BASE_CRC_HH__
 #define __BASE_CRC_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 uint32_t crc32be(const uint8_t *buf, size_t len);
 uint32_t crc32le(const uint8_t *buf, size_t len);
diff --git a/src/base/fast_alloc.hh b/src/base/fast_alloc.hh
index c6490174e..aa8fff130 100644
--- a/src/base/fast_alloc.hh
+++ b/src/base/fast_alloc.hh
@@ -75,7 +75,7 @@ class FastAlloc
 #else
 
 #if FAST_ALLOC_DEBUG
-#include "sim/host.hh"   // for Tick
+#include "base/types.hh"
 #endif
 
 class FastAlloc
diff --git a/src/base/hashmap.hh b/src/base/hashmap.hh
index ff2aa151f..e8f525e4d 100644
--- a/src/base/hashmap.hh
+++ b/src/base/hashmap.hh
@@ -39,7 +39,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #if defined(__GNUC__) && __GNUC__ >= 3
     #define __hash_namespace __gnu_cxx
diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc
index ef64feeb4..ffc2f93ff 100644
--- a/src/base/hostinfo.cc
+++ b/src/base/hostinfo.cc
@@ -39,7 +39,7 @@
 #include <string>
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 
diff --git a/src/base/hostinfo.hh b/src/base/hostinfo.hh
index 70cd19203..ac7d40f13 100644
--- a/src/base/hostinfo.hh
+++ b/src/base/hostinfo.hh
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 std::string &hostname();
 
diff --git a/src/base/inet.cc b/src/base/inet.cc
index 8c3240fa6..84379b135 100644
--- a/src/base/inet.cc
+++ b/src/base/inet.cc
@@ -32,7 +32,7 @@
 #include <string>
 
 #include "base/cprintf.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/inet.hh"
 
 using namespace std;
diff --git a/src/base/inet.hh b/src/base/inet.hh
index 59b05291d..61d432036 100644
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -39,7 +39,7 @@
 
 #include "base/range.hh"
 #include "dev/etherpkt.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include "dnet/os.h"
 #include "dnet/eth.h"
diff --git a/src/base/intmath.hh b/src/base/intmath.hh
index c536fda51..139f6bf15 100644
--- a/src/base/intmath.hh
+++ b/src/base/intmath.hh
@@ -33,7 +33,7 @@
 
 #include <assert.h>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // Returns the prime number one less than n.
 int prevPrime(int n);
diff --git a/src/base/loader/hex_file.hh b/src/base/loader/hex_file.hh
index 40483e684..87a7eb0f3 100755
--- a/src/base/loader/hex_file.hh
+++ b/src/base/loader/hex_file.hh
@@ -35,7 +35,7 @@
 #include <limits>
 #include <string>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 
 class Port;
 
diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh
index d363cde84..73df5caf6 100644
--- a/src/base/loader/object_file.hh
+++ b/src/base/loader/object_file.hh
@@ -35,7 +35,7 @@
 #include <limits>
 #include <string>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 
 class Port;
 class SymbolTable;
diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 3e73eb7a3..d137477f4 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -36,7 +36,7 @@
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/str.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 using namespace std;
diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index cc1dc368f..2a2fd068e 100644
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -36,7 +36,7 @@
 #include <map>
 #include <string>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 
 class Checkpoint;
 class SymbolTable
diff --git a/src/base/misc.cc b/src/base/misc.cc
index 035282baf..55c324aaa 100644
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -39,7 +39,7 @@
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "base/varargs.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 using namespace std;
diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc
index 331b5eac6..0f237566a 100644
--- a/src/base/pollevent.cc
+++ b/src/base/pollevent.cc
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #include "sim/async.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/misc.hh"
 #include "base/pollevent.hh"
 #include "sim/core.hh"
diff --git a/src/base/random.hh b/src/base/random.hh
index 401ba086f..b74a7c4a2 100644
--- a/src/base/random.hh
+++ b/src/base/random.hh
@@ -36,7 +36,7 @@
 #include <string>
 
 #include "base/range.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class Checkpoint;
 
diff --git a/src/base/socket.cc b/src/base/socket.cc
index bcc5236b0..4ad8f5c93 100644
--- a/src/base/socket.cc
+++ b/src/base/socket.cc
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/misc.hh"
 #include "base/socket.hh"
 
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 45cd5186c..243d56c3a 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -67,7 +67,7 @@
 #include "base/stats/info.hh"
 #include "base/stats/types.hh"
 #include "base/stats/visit.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class Callback;
 
diff --git a/src/base/stats/events.cc b/src/base/stats/events.cc
index dcf52e6d8..29117b1e2 100644
--- a/src/base/stats/events.cc
+++ b/src/base/stats/events.cc
@@ -32,7 +32,7 @@
 
 #include "base/stats/events.hh"
 #include "base/stats/output.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 
diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index d14904fb0..91bea4540 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -43,7 +43,7 @@
 #include "base/stats/types.hh"
 #include "base/str.hh"
 #include "base/userinfo.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 
diff --git a/src/base/stats/mysql_run.hh b/src/base/stats/mysql_run.hh
index 7c606370e..7207cd841 100644
--- a/src/base/stats/mysql_run.hh
+++ b/src/base/stats/mysql_run.hh
@@ -34,7 +34,7 @@
 #include <string>
 
 #include "base/mysql.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace Stats {
 
diff --git a/src/base/stats/output.cc b/src/base/stats/output.cc
index 31aa21c45..f3a549b44 100644
--- a/src/base/stats/output.cc
+++ b/src/base/stats/output.cc
@@ -33,7 +33,7 @@
 #include "base/statistics.hh"
 #include "base/stats/output.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 
diff --git a/src/base/stats/types.hh b/src/base/stats/types.hh
index e561f94ad..87cf91653 100644
--- a/src/base/stats/types.hh
+++ b/src/base/stats/types.hh
@@ -34,7 +34,7 @@
 #include <limits>
 #include <vector>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace Stats {
 
diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh
index 89dd57912..c9fab19a3 100644
--- a/src/base/stats/visit.hh
+++ b/src/base/stats/visit.hh
@@ -34,7 +34,7 @@
 #include <string>
 
 #include "base/time.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace Stats {
 
diff --git a/src/base/trace.hh b/src/base/trace.hh
index fa24e9c48..6f8c196b0 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -38,7 +38,7 @@
 #include "base/cprintf.hh"
 #include "base/match.hh"
 #include "base/traceflags.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 namespace Trace {
diff --git a/src/sim/host.hh b/src/base/types.hh
index dd29534fd..6d8d3095c 100644
--- a/src/sim/host.hh
+++ b/src/base/types.hh
@@ -30,12 +30,12 @@
 
 /**
  * @file
- * Defines host-dependent types:
+ * Defines global host-dependent types:
  * Counter, Tick, and (indirectly) {int,uint}{8,16,32,64}_t.
  */
 
-#ifndef __HOST_HH__
-#define __HOST_HH__
+#ifndef __BASE_TYPES_HH__
+#define __BASE_TYPES_HH__
 
 #include <inttypes.h>
 
@@ -68,4 +68,4 @@ typedef uint64_t Addr;
 
 const Addr MaxAddr = (Addr)-1;
 
-#endif // __HOST_H__
+#endif // __BASE_TYPES_HH__
diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh
index e49a2bb59..a1bbe3735 100644
--- a/src/cpu/exetrace.hh
+++ b/src/cpu/exetrace.hh
@@ -34,7 +34,7 @@
 
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 #include "params/ExeTracer.hh"
 
diff --git a/src/cpu/inorder/comm.hh b/src/cpu/inorder/comm.hh
index 18bb24169..1a7fc9050 100644
--- a/src/cpu/inorder/comm.hh
+++ b/src/cpu/inorder/comm.hh
@@ -39,7 +39,7 @@
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /** Struct that defines the information passed from in between stages */
 /** This information mainly goes forward through the pipeline. */
diff --git a/src/cpu/inorder/inorder_trace.hh b/src/cpu/inorder/inorder_trace.hh
index 4338b438c..eb1287370 100644
--- a/src/cpu/inorder/inorder_trace.hh
+++ b/src/cpu/inorder/inorder_trace.hh
@@ -34,7 +34,7 @@
 
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 #include "params/InOrderTrace.hh"
 #include "cpu/exetrace.hh"
diff --git a/src/cpu/inteltrace.hh b/src/cpu/inteltrace.hh
index e34658b58..56fafe93a 100644
--- a/src/cpu/inteltrace.hh
+++ b/src/cpu/inteltrace.hh
@@ -35,7 +35,7 @@
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
 #include "params/IntelTrace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 
 class ThreadContext;
diff --git a/src/cpu/legiontrace.hh b/src/cpu/legiontrace.hh
index 9962063e4..19a996ed3 100644
--- a/src/cpu/legiontrace.hh
+++ b/src/cpu/legiontrace.hh
@@ -35,7 +35,7 @@
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
 #include "params/LegionTrace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 
 class ThreadContext;
diff --git a/src/cpu/nativetrace.hh b/src/cpu/nativetrace.hh
index 9e912d92f..12d96e0ae 100644
--- a/src/cpu/nativetrace.hh
+++ b/src/cpu/nativetrace.hh
@@ -34,7 +34,7 @@
 
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 #include "arch/x86/intregs.hh"
 #include "arch/x86/floatregs.hh"
diff --git a/src/cpu/o3/2bit_local_pred.hh b/src/cpu/o3/2bit_local_pred.hh
index 954b86b4c..7669c6b97 100644
--- a/src/cpu/o3/2bit_local_pred.hh
+++ b/src/cpu/o3/2bit_local_pred.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_2BIT_LOCAL_PRED_HH__
 
 #include "cpu/o3/sat_counter.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <vector>
 
diff --git a/src/cpu/o3/bpred_unit.hh b/src/cpu/o3/bpred_unit.hh
index a11582ca7..15d34316e 100644
--- a/src/cpu/o3/bpred_unit.hh
+++ b/src/cpu/o3/bpred_unit.hh
@@ -39,7 +39,7 @@
 #include "cpu/o3/ras.hh"
 #include "cpu/o3/tournament_pred.hh"
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <list>
 
diff --git a/src/cpu/o3/btb.hh b/src/cpu/o3/btb.hh
index 3c4899e89..38ecabc46 100644
--- a/src/cpu/o3/btb.hh
+++ b/src/cpu/o3/btb.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_BTB_HH__
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class DefaultBTB
 {
diff --git a/src/cpu/o3/comm.hh b/src/cpu/o3/comm.hh
index fb772060b..a486f340d 100644
--- a/src/cpu/o3/comm.hh
+++ b/src/cpu/o3/comm.hh
@@ -35,7 +35,7 @@
 
 #include "sim/faults.hh"
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // Typedef for physical register index type. Although the Impl would be the
 // most likely location for this, there are a few classes that need this
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 279d3e56a..96a4aebef 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -42,7 +42,7 @@
 #include "mem/packet.hh"
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 #if FULL_SYSTEM
diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index 0c3f44436..5537a57e7 100644
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -42,7 +42,7 @@
 #include "cpu/o3/dep_graph.hh"
 #include "cpu/op_class.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class DerivO3CPUParams;
 class FUPool;
diff --git a/src/cpu/o3/ras.hh b/src/cpu/o3/ras.hh
index f0621c5b5..e9a52fd37 100644
--- a/src/cpu/o3/ras.hh
+++ b/src/cpu/o3/ras.hh
@@ -31,7 +31,7 @@
 #ifndef __CPU_O3_RAS_HH__
 #define __CPU_O3_RAS_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include <vector>
 
 /** Return address stack class, implements a simple RAS. */
diff --git a/src/cpu/o3/sat_counter.hh b/src/cpu/o3/sat_counter.hh
index 7e15119b0..7dd840f31 100644
--- a/src/cpu/o3/sat_counter.hh
+++ b/src/cpu/o3/sat_counter.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_SAT_COUNTER_HH__
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /**
  * Private counter class for the internal saturating counters.
diff --git a/src/cpu/o3/store_set.hh b/src/cpu/o3/store_set.hh
index f9f7637d0..88f5e0d07 100644
--- a/src/cpu/o3/store_set.hh
+++ b/src/cpu/o3/store_set.hh
@@ -37,7 +37,7 @@
 #include <vector>
 
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 struct ltseqnum {
     bool operator()(const InstSeqNum &lhs, const InstSeqNum &rhs) const
diff --git a/src/cpu/o3/tournament_pred.hh b/src/cpu/o3/tournament_pred.hh
index 472944910..31e539628 100644
--- a/src/cpu/o3/tournament_pred.hh
+++ b/src/cpu/o3/tournament_pred.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_TOURNAMENT_PRED_HH__
 
 #include "cpu/o3/sat_counter.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include <vector>
 
 /**
diff --git a/src/cpu/ozone/ea_list.hh b/src/cpu/ozone/ea_list.hh
index d9e9d701f..eadd577a4 100644
--- a/src/cpu/ozone/ea_list.hh
+++ b/src/cpu/ozone/ea_list.hh
@@ -36,7 +36,7 @@
 #include <utility>
 
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /**
  * Simple class to hold onto a list of pairs, each pair having a memory
diff --git a/src/cpu/ozone/inst_queue.hh b/src/cpu/ozone/inst_queue.hh
index e840d5c21..8235760b4 100644
--- a/src/cpu/ozone/inst_queue.hh
+++ b/src/cpu/ozone/inst_queue.hh
@@ -39,7 +39,7 @@
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class FUPool;
 class MemInterface;
diff --git a/src/cpu/ozone/null_predictor.hh b/src/cpu/ozone/null_predictor.hh
index 0751338b7..e930ca7d4 100644
--- a/src/cpu/ozone/null_predictor.hh
+++ b/src/cpu/ozone/null_predictor.hh
@@ -32,7 +32,7 @@
 #define __CPU_OZONE_NULL_PREDICTOR_HH__
 
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 template <class Impl>
 class NullPredictor
diff --git a/src/cpu/pc_event.hh b/src/cpu/pc_event.hh
index 3709dcd59..f26bbf3f2 100644
--- a/src/cpu/pc_event.hh
+++ b/src/cpu/pc_event.hh
@@ -35,7 +35,7 @@
 #include <vector>
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 class PCEventQueue;
diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index 27bb4efec..9606ed24d 100644
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -35,7 +35,7 @@
 
 #include "arch/stacktrace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 5058db0da..ef9f2e712 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -51,7 +51,7 @@
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
 #include "sim/debug.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index 3daa55791..7348a8576 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -41,7 +41,7 @@
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 class BaseCPU;
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index 1dc148ce6..58a6b7986 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -43,7 +43,7 @@
 #include "base/refcnt.hh"
 #include "cpu/op_class.hh"
 #include "sim/faults.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // forward declarations
 struct AlphaSimpleImpl;
diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh
index ca649b40e..08b9b6e0c 100644
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -36,7 +36,7 @@
 #include "config/full_system.hh"
 #include "mem/request.hh"
 #include "sim/faults.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 #include "sim/byteswap.hh"
 
diff --git a/src/dev/alpha/backdoor.hh b/src/dev/alpha/backdoor.hh
index ad3c79823..6fae27d31 100644
--- a/src/dev/alpha/backdoor.hh
+++ b/src/dev/alpha/backdoor.hh
@@ -39,7 +39,7 @@
 #include "dev/alpha/access.h"
 #include "dev/io_device.hh"
 #include "params/AlphaBackdoor.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class BaseCPU;
diff --git a/src/dev/etherlink.hh b/src/dev/etherlink.hh
index 8f38fcab8..519e37152 100644
--- a/src/dev/etherlink.hh
+++ b/src/dev/etherlink.hh
@@ -40,7 +40,7 @@
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 #include "params/EtherLink.hh"
 
diff --git a/src/dev/etherpkt.hh b/src/dev/etherpkt.hh
index 623895ba8..4193a7302 100644
--- a/src/dev/etherpkt.hh
+++ b/src/dev/etherpkt.hh
@@ -41,7 +41,7 @@
 #include <assert.h>
 
 #include "base/refcnt.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /*
  * Reference counted class containing ethernet packet data
diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh
index 1bc2ab87b..69d80d81a 100644
--- a/src/dev/intel_8254_timer.hh
+++ b/src/dev/intel_8254_timer.hh
@@ -38,7 +38,7 @@
 
 #include "base/bitunion.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 /** Programmable Interval Timer (Intel 8254) */
diff --git a/src/dev/mips/backdoor.hh b/src/dev/mips/backdoor.hh
index b8cc0ae46..f8995b72b 100755
--- a/src/dev/mips/backdoor.hh
+++ b/src/dev/mips/backdoor.hh
@@ -39,7 +39,7 @@
 #include "dev/mips/access.h"
 #include "dev/io_device.hh"
 #include "params/MipsBackdoor.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class BaseCPU;
diff --git a/src/dev/ns_gige.cc b/src/dev/ns_gige.cc
index fb3446299..ecaebb663 100644
--- a/src/dev/ns_gige.cc
+++ b/src/dev/ns_gige.cc
@@ -45,7 +45,7 @@
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/NSGigE.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/system.hh"
 
 const char *NsRxStateStrings[] =
diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc
index 37c6a8259..ce9ac5984 100644
--- a/src/dev/sinic.cc
+++ b/src/dev/sinic.cc
@@ -42,7 +42,7 @@
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/stats.hh"
 
 using namespace std;
diff --git a/src/kern/tru64/dump_mbuf.cc b/src/kern/tru64/dump_mbuf.cc
index e6bfc06d9..2cc0d15fd 100644
--- a/src/kern/tru64/dump_mbuf.cc
+++ b/src/kern/tru64/dump_mbuf.cc
@@ -36,7 +36,7 @@
 #include "base/loader/symtab.hh"
 #include "cpu/thread_context.hh"
 #include "kern/tru64/mbuf.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/system.hh"
 #include "sim/arguments.hh"
 #include "arch/isa_traits.hh"
diff --git a/src/kern/tru64/mbuf.hh b/src/kern/tru64/mbuf.hh
index 78b5ead7a..b1b86ef47 100644
--- a/src/kern/tru64/mbuf.hh
+++ b/src/kern/tru64/mbuf.hh
@@ -31,7 +31,7 @@
 #ifndef __MBUF_HH__
 #define __MBUF_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "arch/isa_traits.hh"
 
 namespace tru64 {
diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc
index 8b706c250..921b028a5 100644
--- a/src/kern/tru64/printf.cc
+++ b/src/kern/tru64/printf.cc
@@ -34,7 +34,7 @@
 #include "arch/vtophys.hh"
 #include "base/cprintf.hh"
 #include "base/trace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/arguments.hh"
 
 using namespace std;
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 82db7750c..cf738a340 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -37,7 +37,7 @@
  * Cache definitions.
  */
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/fast_alloc.hh"
 #include "base/misc.hh"
 #include "base/range.hh"
diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc
index 9ec9c090c..ee267feb8 100644
--- a/src/mem/cache/mshr.cc
+++ b/src/mem/cache/mshr.cc
@@ -41,7 +41,7 @@
 
 #include "mem/cache/mshr.hh"
 #include "sim/core.hh" // for curTick
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/misc.hh"
 #include "mem/cache/cache.hh"
 
diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc
index 487b227da..1c19420da 100644
--- a/src/mem/cache/tags/iic_repl/gen.cc
+++ b/src/mem/cache/tags/iic_repl/gen.cc
@@ -40,7 +40,7 @@
 #include "mem/cache/tags/iic.hh"
 #include "mem/cache/tags/iic_repl/gen.hh"
 #include "params/GenRepl.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 
diff --git a/src/mem/cache/tags/iic_repl/repl.hh b/src/mem/cache/tags/iic_repl/repl.hh
index cdb5ae4b8..91a4cc309 100644
--- a/src/mem/cache/tags/iic_repl/repl.hh
+++ b/src/mem/cache/tags/iic_repl/repl.hh
@@ -42,7 +42,7 @@
 #include <list>
 
 #include "cpu/smt.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 
diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index eaffd530e..14c6c40a4 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -49,7 +49,7 @@
 #include "base/misc.hh"
 #include "base/printable.hh"
 #include "mem/request.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 
diff --git a/src/mem/page_table.hh b/src/mem/page_table.hh
index d4101c6bf..461b07a69 100644
--- a/src/mem/page_table.hh
+++ b/src/mem/page_table.hh
@@ -43,7 +43,7 @@
 #include "arch/tlb.hh"
 #include "base/hashmap.hh"
 #include "mem/request.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 class Process;
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 4a521717e..56849b12d 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -46,7 +46,7 @@
 #include "mem/packet_access.hh"
 #include "mem/physical.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 using namespace TheISA;
diff --git a/src/mem/request.hh b/src/mem/request.hh
index 546774d13..3915fa683 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -44,7 +44,7 @@
 #include "base/fast_alloc.hh"
 #include "base/flags.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 class Request;
diff --git a/src/mem/rubymem.cc b/src/mem/rubymem.cc
index 6a22830ef..911d533a0 100644
--- a/src/mem/rubymem.cc
+++ b/src/mem/rubymem.cc
@@ -32,7 +32,7 @@
 #include "arch/isa_traits.hh"
 #include "mem/rubymem.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/output.hh"
 
 // Ruby includes
diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index 18eeac0d1..edd78fa28 100644
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -317,12 +317,12 @@ class CheckedIntType(MetaParamValue):
 
         if not cls.cxx_predecls:
             # most derived types require this, so we just do it here once
-            cls.cxx_predecls = ['#include "sim/host.hh"']
+            cls.cxx_predecls = ['#include "base/types.hh"']
 
         if not cls.swig_predecls:
             # most derived types require this, so we just do it here once
             cls.swig_predecls = ['%import "stdint.i"\n' +
-                                 '%import "sim/host.hh"']
+                                 '%import "base/types.hh"']
 
         if not (hasattr(cls, 'min') and hasattr(cls, 'max')):
             if not (hasattr(cls, 'size') and hasattr(cls, 'unsigned')):
@@ -766,9 +766,9 @@ frequency_tolerance = 0.001  # 0.1%
 
 class TickParamValue(NumericParamValue):
     cxx_type = 'Tick'
-    cxx_predecls = ['#include "sim/host.hh"']
+    cxx_predecls = ['#include "base/types.hh"']
     swig_predecls = ['%import "stdint.i"\n' +
-                     '%import "sim/host.hh"']
+                     '%import "base/types.hh"']
 
     def getValue(self):
         return long(self.value)
@@ -844,9 +844,9 @@ class Frequency(TickParamValue):
 # An explicit conversion to a Latency or Frequency must be made first.
 class Clock(ParamValue):
     cxx_type = 'Tick'
-    cxx_predecls = ['#include "sim/host.hh"']
+    cxx_predecls = ['#include "base/types.hh"']
     swig_predecls = ['%import "stdint.i"\n' +
-                     '%import "sim/host.hh"']
+                     '%import "base/types.hh"']
     def __init__(self, value):
         if isinstance(value, (Latency, Clock)):
             self.ticks = value.ticks
diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index c567bea4d..eefe106a4 100644
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -37,7 +37,7 @@
 #include "base/misc.hh"
 #include "base/socket.hh"
 #include "sim/core.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/startup.hh"
 
 extern const char *compileDate;
@@ -59,7 +59,7 @@ inline void disableAllListeners() { ListenSocket::disableAll(); }
 
 %include "stdint.i"
 %include "std_string.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 
 void setOutputDir(const std::string &dir);
 void SimStartup();
diff --git a/src/python/swig/debug.i b/src/python/swig/debug.i
index 1084d6936..b7fdb2171 100644
--- a/src/python/swig/debug.i
+++ b/src/python/swig/debug.i
@@ -31,12 +31,12 @@
 %module debug
 
 %{
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/debug.hh"
 %}
 
 %include "stdint.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 %include "sim/debug.hh"
 
 %wrapper %{
diff --git a/src/python/swig/event.i b/src/python/swig/event.i
index b40e59a4b..c09f12016 100644
--- a/src/python/swig/event.i
+++ b/src/python/swig/event.i
@@ -32,7 +32,7 @@
 
 %{
 #include "python/swig/pyevent.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
@@ -75,7 +75,7 @@
 
 %include "stdint.i"
 %include "std_string.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 %include "sim/eventq.hh"
 %include "python/swig/pyevent.hh"
 
diff --git a/src/python/swig/pyobject.hh b/src/python/swig/pyobject.hh
index e895be636..d11dc323c 100644
--- a/src/python/swig/pyobject.hh
+++ b/src/python/swig/pyobject.hh
@@ -31,7 +31,7 @@
 #include <Python.h>
 
 #include "cpu/base.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
diff --git a/src/python/swig/random.i b/src/python/swig/random.i
index 657a59780..d9ea2a404 100644
--- a/src/python/swig/random.i
+++ b/src/python/swig/random.i
@@ -35,7 +35,7 @@
 %{
 #include <cstdlib>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 inline void
 seed(uint64_t seed)
diff --git a/src/python/swig/range.i b/src/python/swig/range.i
index 309e6a8ba..659bde8d7 100644
--- a/src/python/swig/range.i
+++ b/src/python/swig/range.i
@@ -31,7 +31,7 @@
 %rename(assign) *::operator=;
 
 %include "base/range.hh"
-%include "sim/host.hh"
+%include "base/types.hh"
 
 %template(AddrRange) Range<Addr>;
 %template(TickRange) Range<Tick>;
diff --git a/src/python/swig/sim_object.i b/src/python/swig/sim_object.i
index 2280fc0e3..840aea998 100644
--- a/src/python/swig/sim_object.i
+++ b/src/python/swig/sim_object.i
@@ -37,7 +37,7 @@
 // import these files for SWIG to wrap
 %include "stdint.i"
 %include "std_string.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 
 class BaseCPU;
 
diff --git a/src/python/swig/trace.i b/src/python/swig/trace.i
index 69b44c025..57ab3d3ec 100644
--- a/src/python/swig/trace.i
+++ b/src/python/swig/trace.i
@@ -32,7 +32,7 @@
 
 %{
 #include "base/trace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 inline void
 output(const char *filename)
diff --git a/src/sim/arguments.hh b/src/sim/arguments.hh
index 14c9e1f8a..3cef49e5d 100644
--- a/src/sim/arguments.hh
+++ b/src/sim/arguments.hh
@@ -36,7 +36,7 @@
 #include "arch/vtophys.hh"
 #include "base/refcnt.hh"
 #include "mem/vport.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/sim/byteswap.hh b/src/sim/byteswap.hh
index 2519e552b..fc36bdf33 100644
--- a/src/sim/byteswap.hh
+++ b/src/sim/byteswap.hh
@@ -39,7 +39,7 @@
 
 #include "base/bigint.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // This lets us figure out what the byte order of the host system is
 #if defined(linux)
diff --git a/src/sim/core.hh b/src/sim/core.hh
index 50cb2ef59..c1a363689 100644
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /// The universal simulation clock.
 extern Tick curTick;
diff --git a/src/sim/debug.hh b/src/sim/debug.hh
index 7dafb8394..ca7a606c6 100644
--- a/src/sim/debug.hh
+++ b/src/sim/debug.hh
@@ -31,7 +31,7 @@
 #ifndef __SIM_DEBUG_HH__
 #define __SIM_DEBUG_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 void schedBreakCycle(Tick when);
 
diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index 33bb34252..219d306f0 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -48,7 +48,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "sim/serialize.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class EventQueue;       // forward declaration
 
diff --git a/src/sim/init.cc b/src/sim/init.cc
index 66eddfb6f..2e34740fb 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -41,7 +41,7 @@
 #include "base/misc.hh"
 #include "sim/async.hh"
 #include "sim/core.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/init.hh"
 
 using namespace std;
diff --git a/src/sim/insttracer.hh b/src/sim/insttracer.hh
index 9fb5f9f22..23a0a14a6 100644
--- a/src/sim/insttracer.hh
+++ b/src/sim/insttracer.hh
@@ -36,7 +36,7 @@
 #include "base/trace.hh"
 #include "cpu/inst_seq.hh"      // for InstSeqNum
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class ThreadContext;
diff --git a/src/sim/process.hh b/src/sim/process.hh
index 527209467..db52e1697 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -46,7 +46,7 @@
 
 #include "arch/types.hh"
 #include "base/statistics.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 #include "sim/syscallreturn.hh"
 
diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 30996fc3b..847dcede0 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -31,7 +31,7 @@
 class ThreadContext;
 
 //We need the "Tick" and "Addr" data types from here
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace PseudoInst {
 
diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index c33633065..0069f5614 100644
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -43,7 +43,7 @@
 #include <iostream>
 #include <map>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class IniFile;
 class Serializable;
diff --git a/src/sim/sim_exit.hh b/src/sim/sim_exit.hh
index 174b00024..117502932 100644
--- a/src/sim/sim_exit.hh
+++ b/src/sim/sim_exit.hh
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // forward declaration
 class Callback;
diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index dad8f6e8b..81ab00f9e 100644
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -37,7 +37,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "base/stats/events.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
 
diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc
index 1ac2c80df..2d3b84e09 100644
--- a/src/sim/simulate.cc
+++ b/src/sim/simulate.cc
@@ -34,7 +34,7 @@
 #include "sim/stat_control.hh"
 #include "sim/async.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
 #include "sim/simulate.hh"
diff --git a/src/sim/simulate.hh b/src/sim/simulate.hh
index 139bddb82..978082f82 100644
--- a/src/sim/simulate.hh
+++ b/src/sim/simulate.hh
@@ -29,7 +29,7 @@
  *          Steve Reinhardt
  */
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_events.hh"
 
 SimLoopExitEvent *simulate(Tick num_cycles = MaxTick);
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index e995bd487..4831419b0 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -50,7 +50,7 @@
 #include <fcntl.h>
 #include <sys/uio.h>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 #include "base/chunk_generator.hh"
 #include "base/intmath.hh"      // for RoundUp
 #include "base/misc.hh"
diff --git a/src/unittest/rangemaptest.cc b/src/unittest/rangemaptest.cc
index 36223ed9c..a6476624f 100644
--- a/src/unittest/rangemaptest.cc
+++ b/src/unittest/rangemaptest.cc
@@ -30,7 +30,7 @@
 
 #include <iostream>
 #include <cassert>
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/range_map.hh"
 
 using namespace std;
diff --git a/src/unittest/rangemultimaptest.cc b/src/unittest/rangemultimaptest.cc
index a110256c9..ec68ba35a 100644
--- a/src/unittest/rangemultimaptest.cc
+++ b/src/unittest/rangemultimaptest.cc
@@ -31,7 +31,7 @@
 #include <cassert>
 #include <iostream>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/range_map.hh"
 
 using namespace std;
diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc
index 3934786ec..9c10d078c 100644
--- a/src/unittest/stattest.cc
+++ b/src/unittest/stattest.cc
@@ -37,7 +37,7 @@
 #include "base/statistics.hh"
 #include "base/stats/text.hh"
 #include "base/stats/mysql.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 using namespace Stats;