style: [patch 3/22] reduce include dependencies in some headers

Used cppclean to help identify useless includes and removed them. This
involved erroneously included headers, but also cases where forward
declarations could have been used rather than a full include.

4 files changed, 4 insertions, 3 deletions

diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh
index 5a98b13c7..64f192f6d 100644
--- a/src/base/bitfield.hh
+++ b/src/base/bitfield.hh
@@ -32,7 +32,7 @@
 #ifndef __BASE_BITFIELD_HH__
 #define __BASE_BITFIELD_HH__
 
-#include "base/types.hh"
+#include <inttypes.h>
 
 /**
  * Generate a 64-bit mask of 'nbits' 1s, right justified.
diff --git a/src/base/bitunion.hh b/src/base/bitunion.hh
index 35448ed24..306899563 100644
--- a/src/base/bitunion.hh
+++ b/src/base/bitunion.hh
@@ -32,7 +32,6 @@
 #define __BASE_BITUNION_HH__
 
 #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/time.cc b/src/base/time.cc
index 5ee286b9c..5509bccaf 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <sstream>
 
+#include "base/misc.hh"
 #include "config/use_posix_clock.hh"
 #include "sim/core.hh"
 #include "sim/serialize.hh"
diff --git a/src/base/vnc/vncinput.cc b/src/base/vnc/vncinput.cc
index 5021d407a..541b77143 100644
--- a/src/base/vnc/vncinput.cc
+++ b/src/base/vnc/vncinput.cc
@@ -46,7 +46,8 @@
 
 #include <sys/types.h>
 
-#include "base/output.hh" //simout
+#include "base/misc.hh"
+#include "base/output.hh"
 #include "base/trace.hh"
 #include "debug/VNC.hh"