--- a/src/core/object.cc	Sun Aug 12 22:44:21 2007 +0200
+++ b/src/core/object.cc	Sun Aug 12 22:45:24 2007 +0200
@@ -22,9 +22,7 @@
 #include "assert.h"
 #include "singleton.h"
 #include "uid-manager.h"
-#include "sv-trace-source.h"
 #include "trace-resolver.h"
-#include "composite-trace-resolver.h"
 #include <vector>
 
 namespace {
@@ -292,6 +290,8 @@
 #ifdef RUN_SELF_TESTS
 
 #include "test.h"
+#include "sv-trace-source.h"
+#include "composite-trace-resolver.h"
 
 namespace {