4 files changed, 6 insertions, 12 deletions
diff --git a/include/cppunit/BriefTestProgressListener.h b/include/cppunit/BriefTestProgressListener.h
index c3b4b9d..5d87e05 100644
--- a/include/cppunit/BriefTestProgressListener.h
+++ b/include/cppunit/BriefTestProgressListener.h
@@ -26,10 +26,6 @@ public:
 
   void endTest( Test *test );
 
-  /*! Call this method after running the tests.
-   */
-  void done();
-
 private:
   /// Prevents the use of the copy constructor.
   BriefTestProgressListener( const BriefTestProgressListener &copy );
diff --git a/include/cppunit/TextTestProgressListener.h b/include/cppunit/TextTestProgressListener.h
index 180633e..2aa230b 100644
--- a/include/cppunit/TextTestProgressListener.h
+++ b/include/cppunit/TextTestProgressListener.h
@@ -22,11 +22,11 @@ public:
   virtual ~TextTestProgressListener();
 
   void startTest( Test *test );
+
   void addFailure( const TestFailure &failure );
 
-  /*! Call this method after running the tests.
-   */
-  void done();
+  void endTestRun( Test *test, 
+                   TestResult *eventManager );
 
 private:
   /// Prevents the use of the copy constructor.
diff --git a/include/cppunit/extensions/TestSuiteBuilder.h b/include/cppunit/extensions/TestSuiteBuilder.h
index 1f3e028..709053b 100644
--- a/include/cppunit/extensions/TestSuiteBuilder.h
+++ b/include/cppunit/extensions/TestSuiteBuilder.h
@@ -5,10 +5,8 @@
 #include <memory>
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestCaller.h>
+#include <cppunit/extensions/TypeInfoHelper.h>
 
-#if CPPUNIT_USE_TYPEINFO_NAME
-#  include <cppunit/extensions/TypeInfoHelper.h>
-#endif
 
 namespace CppUnit {
 
diff --git a/include/cppunit/extensions/TypeInfoHelper.h b/include/cppunit/extensions/TypeInfoHelper.h
index 5199a70..e12d4c0 100644
--- a/include/cppunit/extensions/TypeInfoHelper.h
+++ b/include/cppunit/extensions/TypeInfoHelper.h
@@ -3,7 +3,7 @@
 
 #include <cppunit/Portability.h>
 
-#if CPPUNIT_USE_TYPEINFO_NAME
+#if CPPUNIT_HAVE_RTTI
 
 #include <typeinfo>
 
@@ -26,6 +26,6 @@ namespace CppUnit {
 
 }  // namespace CppUnit
 
-#endif
+#endif  // CPPUNIT_HAVE_RTTI
 
 #endif  // CPPUNIT_TYPEINFOHELPER_H