diff --git a/src/base/debug.hh b/src/base/debug.hh
index 527af6a705..7c9834ce7a 100644
--- a/src/base/debug.hh
+++ b/src/base/debug.hh
@@ -137,4 +137,10 @@ void clearDebugFlag(const char *string);
 
 void dumpDebugFlags();
 
+#if TRACING_ON
+#   define DTRACE(x) (Debug::x)
+#else // !TRACING_ON
+#   define DTRACE(x) (false)
+#endif  // TRACING_ON
+
 #endif // __BASE_DEBUG_HH__
diff --git a/src/base/trace.hh b/src/base/trace.hh
index c3372e7090..c3a499b9df 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -168,8 +168,6 @@ class Named
 
 #if TRACING_ON
 
-#define DTRACE(x) (Debug::x)
-
 #define DDUMP(x, data, count) do {               \
     using namespace Debug;                       \
     if (DTRACE(x))                               \
@@ -220,7 +218,6 @@ class Named
 
 #else // !TRACING_ON
 
-#define DTRACE(x) (false)
 #define DDUMP(x, data, count) do {} while (0)
 #define DPRINTF(x, ...) do {} while (0)
 #define DPRINTFS(x, ...) do {} while (0)
diff --git a/src/sim/eventq_impl.hh b/src/sim/eventq_impl.hh
index 39bf00b44d..0e4f408139 100644
--- a/src/sim/eventq_impl.hh
+++ b/src/sim/eventq_impl.hh
@@ -31,7 +31,7 @@
 #ifndef __SIM_EVENTQ_IMPL_HH__
 #define __SIM_EVENTQ_IMPL_HH__
 
-#include "base/trace.hh"
+#include "base/debug.hh"
 #include "sim/eventq.hh"
 
 inline void