includes: use base/types.hh not inttypes.h or stdint.h
diff --git a/src/arch/sparc/types.hh b/src/arch/sparc/types.hh
index dd369cc..501e2e8 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 5cb4c79..d8b013b 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 2942035..c06d664 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 664093f..28093a5 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 8ba28f3..c61d1cc 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 8d1f8d6..d80660a 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 ad35fa7..7c16228 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 @@
#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 712b97c..47e64ff 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 a55ce2c..00eee99 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 @@
#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 40f0338..0583b29 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 74901d6..a55e37e 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 d33c655..b77427c 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 1d9135a..e738cfc 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 d1c43f5..385ff55 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
{
