4 files changed, 11 insertions, 10 deletions
diff --git a/src/cppunit/TestAssert.cpp b/src/cppunit/TestAssert.cpp
index f93c19b..9d8a408 100644
--- a/src/cppunit/TestAssert.cpp
+++ b/src/cppunit/TestAssert.cpp
@@ -1,11 +1,12 @@
 #include <cmath>
 
-#include "cppunit/TestAssert.h"
-#include "estring.h"
+#include <cppunit/TestAssert.h>
 #include <cppunit/NotEqualException.h>
 
+
 namespace CppUnit {
 
+
 /// Check for a failed general assertion 
 void TestAssert::assertImplementation (bool          condition,
   std::string   conditionExpression,
@@ -44,4 +45,4 @@ void TestAssert::assertEquals (double        expected,
 }
 
 
-} // namespace TestAssert
+}
diff --git a/src/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp
index 7c7c8ae..f330044 100644
--- a/src/cppunit/TestCase.cpp
+++ b/src/cppunit/TestCase.cpp
@@ -122,12 +122,12 @@ std::string
 { 
   std::string className;
 
-#if CPPUNIT_USE_TYPEINFO
+#if CPPUNIT_USE_TYPEINFO_NAME
   const std::type_info& thisClass = typeid (*this);
   className = thisClass.name();
 #else
   className = "TestCase";
-#endif // CPPUNIT_USE_TYPEINFO
+#endif
 
   return className + "." + getName (); 
 }
diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp
index 0e7546b..aa6372a 100644
--- a/src/cppunit/TestFactoryRegistry.cpp
+++ b/src/cppunit/TestFactoryRegistry.cpp
@@ -1,10 +1,10 @@
 #include <cppunit/Portability.h>
 #include <sstream>
 #include <utility>
-#include "cppunit/TestSuite.h"
-#include "cppunit/extensions/TestFactoryRegistry.h"
+#include <cppunit/TestSuite.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
 
-#if CPPUNIT_USE_TYPEINFO
+#if CPPUNIT_USE_TYPEINFO_NAME
 #  include "cppunit/extensions/TypeInfoHelper.h"
 #endif
 
diff --git a/src/cppunit/TypeInfoHelper.cpp b/src/cppunit/TypeInfoHelper.cpp
index 7b8fdcf..cf0a8c1 100644
--- a/src/cppunit/TypeInfoHelper.cpp
+++ b/src/cppunit/TypeInfoHelper.cpp
@@ -1,6 +1,6 @@
 #include <cppunit/Portability.h>
 
-#if CPPUNIT_USE_TYPEINFO
+#if CPPUNIT_USE_TYPEINFO_NAME
 
 #include <string>
 #include <cppunit/extensions/TypeInfoHelper.h>
@@ -27,4 +27,4 @@ TypeInfoHelper::getClassName( const std::type_info &info )
 
 } //  namespace CppUnit
 
-#endif // CPPUNIT_USE_TYPEINFO
+#endif