diff --git a/src/arch/sparc/types.hh b/src/arch/sparc/types.hh
index dd369cc26..501e2e8cb 100644
--- a/src/arch/sparc/types.hh
+++ b/src/arch/sparc/types.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_SPARC_TYPES_HH__
 #define __ARCH_SPARC_TYPES_HH__
 
-#include <inttypes.h>
 #include "base/bigint.hh"
+#include "base/types.hh"
 
 namespace SparcISA
 {
diff --git a/src/arch/x86/cpuid.hh b/src/arch/x86/cpuid.hh
index 5cb4c7972..d8b013ba1 100644
--- a/src/arch/x86/cpuid.hh
+++ b/src/arch/x86/cpuid.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_X86_CPUID_HH__
 #define __ARCH_X86_CPUID_HH__
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/x86/types.hh b/src/arch/x86/types.hh
index 29420352b..c06d664eb 100644
--- a/src/arch/x86/types.hh
+++ b/src/arch/x86/types.hh
@@ -58,11 +58,11 @@
 #ifndef __ARCH_X86_TYPES_HH__
 #define __ARCH_X86_TYPES_HH__
 
-#include <inttypes.h>
 #include <iostream>
 
 #include "base/bitunion.hh"
 #include "base/cprintf.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {
diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh
index 664093fa2..28093a5d4 100644
--- a/src/base/bitfield.hh
+++ b/src/base/bitfield.hh
@@ -32,7 +32,7 @@
 #ifndef __BASE_BITFIELD_HH__
 #define __BASE_BITFIELD_HH__
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 /**
  * Generate a 64-bit mask of 'nbits' 1s, right justified.
diff --git a/src/base/bitunion.hh b/src/base/bitunion.hh
index 8ba28f3ba..c61d1cc7c 100644
--- a/src/base/bitunion.hh
+++ b/src/base/bitunion.hh
@@ -31,8 +31,8 @@
 #ifndef __BASE_BITUNION_HH__
 #define __BASE_BITUNION_HH__
 
-#include <inttypes.h>
 #include "base/bitfield.hh"
+#include "base/types.hh"
 
 //      The following implements the BitUnion system of defining bitfields
 //on top of an underlying class. This is done through the pervasive use of
diff --git a/src/base/compression/base.hh b/src/base/compression/base.hh
index 8d1f8d6b5..d80660ac3 100644
--- a/src/base/compression/base.hh
+++ b/src/base/compression/base.hh
@@ -37,7 +37,7 @@
  * This file defines a base (abstract virtual) compression algorithm object.
  */
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 /**
  * Abstract virtual compression algorithm object.
diff --git a/src/kern/linux/linux.hh b/src/kern/linux/linux.hh
index ad35fa726..7c16228ea 100644
--- a/src/kern/linux/linux.hh
+++ b/src/kern/linux/linux.hh
@@ -30,6 +30,8 @@
 
 #ifndef __LINUX_HH__
 #define __LINUX_HH__
+
+#include "base/types.hh"
 #include "config/full_system.hh"
 
 #if FULL_SYSTEM
@@ -38,7 +40,6 @@ class Linux {};
 
 #else //!FULL_SYSTEM
 
-#include <inttypes.h>
 #include <string>
 
 #include "kern/operatingsystem.hh"
diff --git a/src/kern/operatingsystem.hh b/src/kern/operatingsystem.hh
index 712b97c35..47e64ffd9 100644
--- a/src/kern/operatingsystem.hh
+++ b/src/kern/operatingsystem.hh
@@ -31,10 +31,9 @@
 #ifndef __KERN_OPERATINGSYSTEM_HH__
 #define __KERN_OPERATINGSYSTEM_HH__
 
+#include "base/types.hh"
 #include "config/full_system.hh"
 
-#include <inttypes.h>
-
 #if FULL_SYSTEM
 
 class OperatingSystem {};
diff --git a/src/kern/solaris/solaris.hh b/src/kern/solaris/solaris.hh
index a55ce2c80..00eee994b 100644
--- a/src/kern/solaris/solaris.hh
+++ b/src/kern/solaris/solaris.hh
@@ -30,6 +30,8 @@
 
 #ifndef __SOLARIS_HH__
 #define __SOLARIS_HH__
+
+#include "base/types.hh"
 #include "config/full_system.hh"
 
 #if FULL_SYSTEM
@@ -38,8 +40,6 @@ class Solaris {};
 
 #else //!FULL_SYSTEM
 
-#include <inttypes.h>
-
 #include "kern/operatingsystem.hh"
 
 class TranslatingPort;
diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh
index 40f033811..0583b29a6 100644
--- a/src/mem/bridge.hh
+++ b/src/mem/bridge.hh
@@ -39,10 +39,10 @@
 
 #include <string>
 #include <list>
-#include <inttypes.h>
 #include <queue>
 
 #include "base/fast_alloc.hh"
+#include "base/types.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 74901d626..a55e37e59 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -40,11 +40,11 @@
 #include <string>
 #include <set>
 #include <list>
-#include <inttypes.h>
 
 #include "base/range.hh"
 #include "base/hashmap.hh"
 #include "base/range_map.hh"
+#include "base/types.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index d33c655d7..b77427c90 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -42,11 +42,11 @@
 #include <string>
 #include <list>
 #include <algorithm>
-#include <inttypes.h>
 
 #include "base/misc.hh"
 #include "base/statistics.hh"
 #include "base/trace.hh"
+#include "base/types.hh"
 #include "mem/cache/mshr_queue.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
diff --git a/src/mem/port.hh b/src/mem/port.hh
index 1d9135ae6..e738cfc63 100644
--- a/src/mem/port.hh
+++ b/src/mem/port.hh
@@ -41,10 +41,10 @@
 #define __MEM_PORT_HH__
 
 #include <list>
-#include <inttypes.h>
 
 #include "base/misc.hh"
 #include "base/range.hh"
+#include "base/types.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
diff --git a/src/sim/syscallreturn.hh b/src/sim/syscallreturn.hh
index d1c43f584..385ff55db 100644
--- a/src/sim/syscallreturn.hh
+++ b/src/sim/syscallreturn.hh
@@ -31,7 +31,7 @@
 #ifndef __SIM_SYSCALLRETURN_HH__
 #define __SIM_SYSCALLRETURN_HH__
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 class SyscallReturn
 {