compile: don't #include unnecessary stuff

Time from base/time.hh has a name clash with Time from Ruby's
TypeDefines.hh.  Eventually Ruby's Time should go away, so instead of
fixing this properly just try to avoid the clash.

diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh
index c9fab19a3e9da35c1a5be51d4bc4668c0dd826c6..f5c2fc34ca9a1b30bc8767d0af55571e86894540 100644 (file)
--- a/src/base/stats/visit.hh
+++ b/src/base/stats/visit.hh
@@ -31,11 +31,6 @@
 #ifndef __BASE_STATS_VISIT_HH__
 #define __BASE_STATS_VISIT_HH__
 
-#include <string>
-
-#include "base/time.hh"
-#include "base/types.hh"
-
 namespace Stats {
 
 class Info;

diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 6016ccfd93e5352940af603aa7ef3576cfc71bef..703bbd1e0e1a194e54f7030521343dc09b7ed517 100644 (file)
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -41,14 +41,16 @@
 /// This file defines objects used to emulate syscalls from the target
 /// application on the host machine.
 
-#include <errno.h>
-#include <string>
 #ifdef __CYGWIN32__
 #include <sys/fcntl.h>  // for O_BINARY
 #endif
 #include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/uio.h>
+#include <sys/time.h>
+
+#include <string>
 
 #include "base/chunk_generator.hh"
 #include "base/intmath.hh"      // for RoundUp