diff --git a/headers/tools/cppunit/TestShell.h b/headers/tools/cppunit/TestShell.h
index 9ceb8a29d1..2704e13364 100644
--- a/headers/tools/cppunit/TestShell.h
+++ b/headers/tools/cppunit/TestShell.h
@@ -17,9 +17,7 @@ class BDirectory;
 class BLocker;
 class BPath;
 
-#ifndef NO_ELF_SYMBOL_PATCHING
-#include <tools/elfsymbolpatcher/ElfSymbolPatcher.h>
-#endif
+class ElfSymbolPatchGroup;
 
 // Defines SuiteFunction to be a pointer to a function that
 // takes no arguments and returns a pointer to a CppUnit::Test
diff --git a/src/tools/cppunit/Jamfile b/src/tools/cppunit/Jamfile
index 0dea61cc87..ffb20ade3a 100644
--- a/src/tools/cppunit/Jamfile
+++ b/src/tools/cppunit/Jamfile
@@ -11,7 +11,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) cppunit ] ;
 {
 	DEFINES += BUILDING_CPPUNIT ;
 
-	if ( $(OS) != BEOS && $(OS) != HAIKU ) || $(OSPLAT) = PPC {
+	if $(OS) != BEOS || $(OSPLAT) = PPC {
 		DEFINES += NO_ELF_SYMBOL_PATCHING ;
 	}
 }
@@ -52,8 +52,8 @@ SharedLibrary libcppunit.so :
 	: be [ TargetLibstdc++ ]
 ;
 
-if  ( $(OS) = BEOS || $(OS) = HAIKU ) && $(OSPLAT) != PPC {
-	LinkAgainst libcppunit.so : libelfsymbolpatcher.a debug ;
+if  $(OS) = BEOS && $(OSPLAT) != PPC {
+	LinkAgainst libcppunit.so : libelfsymbolpatcher.a ;
 }
 
 # To run the tests we need the cppunit library.
diff --git a/src/tools/cppunit/TestShell.cpp b/src/tools/cppunit/TestShell.cpp
index 1cbf482dc3..61abf51f61 100644
--- a/src/tools/cppunit/TestShell.cpp
+++ b/src/tools/cppunit/TestShell.cpp
@@ -22,6 +22,10 @@
 #include <TestShell.h>
 #include <TestListener.h>
 
+#ifndef NO_ELF_SYMBOL_PATCHING
+#	include <ElfSymbolPatcher.h>
+#endif
+
 using std::cout;
 using std::endl;
 using std::set;