Include/cppunit/ui/text/TestRunner.

include/cppunit/ui/text/TestRunner.h:
* src/cppunit/TextTestRunner.cpp: Renamed TextUi::TestRunner
TextTestRunner and moved it to the CppUnit namespace. Added
a deprecated typedef for compatibility with previous version.

* include/cppunit/ui/text/TextTestRunner.h: added.

* include/cppunit/ui/mfc/TestRunner.h:
* src/cppunit/msvc6/testrunner/TestRunner.cpp: Renamed MfcUi::TestRunner
MfcTestRunner. Added deprecated typedef for compatibility. Renamed
TestRunner.cpp to MfcTestRunner.cpp.

* include/cppunit/ui/mfc/MfcTestRunner.h: added.

* include/cppunit/ui/qt/TestRunner.h:
* src/qttestrunner/TestRunner.cpp: renamed QtUi::TestRunner QtTestRunner
and moved it to CppUnit namespace. Added a deprecated typedef for
compatibility. Renamed TestRunner.cpp to QtTestRunner.cpp.

* include/cppunit/ui/qt/TestRunner.h:
* src/qttestrunner/TestRunner.h: Moved TestRunner to CppUnit namespace
and renamed it QtTestRunner. Added deprecated typedef for compatibility.

* include/cppunit/Asserter.h:
* src/cppunit/Asserter.cpp: changed namespace Asserter to a struct and
made all methods static.

* include/cppunit/extensions/HelperMacros.h:
* include/cppunit/extensions/SourceLine.h:
* include/cppunit/extensions/TestAssert.h:
* include/cppunit/extensions/TestPlugIn.h:
* include/cppunit/Portability.h: changed CPPUNIT_NS(symbol) to a
symbol macro that expand either to CppUnit or nothing. The symbol is
no longer a parameter.

* include/cppunit/portability/CppUnitVector.h:
* include/cppunit/portability/CppUnitDeque.h:
* include/cppunit/portability/CppUnitMap.h: added. STL Wrapper for
compilers that do not support template default argumenent and need
the allocator to be passed when instantiating STL container.

* examples/cppunittest/*.h:
* examples/cppunittest/*.cpp:
* src/msvc6/testrunner/*.h:
* src/msvc6/testrunner/*.cpp:
* src/msvc6/testpluginrunner/*.h:
* src/msvc6/testpluginrunner/*.cpp:
* src/qttestrunner/*.h:
* src/qttestrunner/*.cpp: replaced occurence of CppUnit:: by CPPUNIT_NS.

* src/cppunit/TestSuite.h:
replaced occurence of std::vector by CppUnitVector.

44 files changed, 397 insertions, 397 deletions

diff --git a/examples/cppunittest/BaseTestCase.h b/examples/cppunittest/BaseTestCase.h
index 86f069f..019ed66 100644
--- a/examples/cppunittest/BaseTestCase.h
+++ b/examples/cppunittest/BaseTestCase.h
@@ -4,7 +4,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
-class BaseTestCase : public CppUnit::TestCase
+class BaseTestCase : public CPPUNIT_NS::TestCase
 {
   CPPUNIT_TEST_SUITE( BaseTestCase );
   CPPUNIT_TEST( testUsingCheckIt );
diff --git a/examples/cppunittest/CppUnitTestMain.cpp b/examples/cppunittest/CppUnitTestMain.cpp
index 1e00009..ab626b2 100644
--- a/examples/cppunittest/CppUnitTestMain.cpp
+++ b/examples/cppunittest/CppUnitTestMain.cpp
@@ -18,23 +18,23 @@ main( int argc, char* argv[] )
   std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
 
   // Create the event manager and test controller
-  CppUnit::TestResult controller;
+  CPPUNIT_NS::TestResult controller;
 
   // Add a listener that colllects test result
-  CppUnit::TestResultCollector result;
+  CPPUNIT_NS::TestResultCollector result;
   controller.addListener( &result );        
 
   // Add a listener that print dots as test run.
 #ifdef WIN32
-  CppUnit::TextTestProgressListener progress;
+  CPPUNIT_NS::TextTestProgressListener progress;
 #else
-  CppUnit::BriefTestProgressListener progress;
+  CPPUNIT_NS::BriefTestProgressListener progress;
 #endif
   controller.addListener( &progress );      
 
   // Add the top suite to the test runner
-  CppUnit::TestRunner runner;
-  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );   
+  CPPUNIT_NS::TestRunner runner;
+  runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );   
   try
   {
     std::cout << "Running "  <<  testPath;
@@ -43,11 +43,11 @@ main( int argc, char* argv[] )
     std::cerr << std::endl;
 
     // Print test in a compiler compatible format.
-    CppUnit::CompilerOutputter outputter( &result, std::cerr );
+    CPPUNIT_NS::CompilerOutputter outputter( &result, std::cerr );
     outputter.write(); 
 
     std::ofstream file( "tests.xml" );
-    CppUnit::XmlOutputter xml( &result, file );
+    CPPUNIT_NS::XmlOutputter xml( &result, file );
     xml.setStyleSheet( "report.xsl" );
     xml.write();
     file.close();
diff --git a/examples/cppunittest/ExceptionTest.cpp b/examples/cppunittest/ExceptionTest.cpp
index c3d1876..c703c7d 100644
--- a/examples/cppunittest/ExceptionTest.cpp
+++ b/examples/cppunittest/ExceptionTest.cpp
@@ -33,10 +33,10 @@ ExceptionTest::tearDown()
 void 
 ExceptionTest::testConstructor()
 {
-  const CppUnit::Message message( "a message" );
-  const CppUnit::SourceLine sourceLine( "dir/afile.cpp", 17 );
+  const CPPUNIT_NS::Message message( "a message" );
+  const CPPUNIT_NS::SourceLine sourceLine( "dir/afile.cpp", 17 );
   
-  CppUnit::Exception e( message, sourceLine );
+  CPPUNIT_NS::Exception e( message, sourceLine );
 
   CPPUNIT_ASSERT_EQUAL( message.shortDescription(), e.message().shortDescription() );
   CPPUNIT_ASSERT( sourceLine == e.sourceLine() );
@@ -46,9 +46,9 @@ ExceptionTest::testConstructor()
 void 
 ExceptionTest::testDefaultConstructor()
 {
-  CppUnit::Exception e;
+  CPPUNIT_NS::Exception e;
 
-  CPPUNIT_ASSERT( CppUnit::Message() == e.message() );
+  CPPUNIT_ASSERT( CPPUNIT_NS::Message() == e.message() );
   CPPUNIT_ASSERT( !e.sourceLine().isValid() );
 }
 
@@ -56,9 +56,9 @@ ExceptionTest::testDefaultConstructor()
 void 
 ExceptionTest::testCopyConstructor()
 {
-  CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
-  CppUnit::Exception e( CppUnit::Message("message"), sourceLine  );
-  CppUnit::Exception other( e );
+  CPPUNIT_NS::SourceLine sourceLine( "fileName.cpp", 123 );
+  CPPUNIT_NS::Exception e( CPPUNIT_NS::Message("message"), sourceLine  );
+  CPPUNIT_NS::Exception other( e );
   checkIsSame( e, other );
 }
 
@@ -66,9 +66,9 @@ ExceptionTest::testCopyConstructor()
 void 
 ExceptionTest::testAssignment()
 {
-  CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
-  CppUnit::Exception e( CppUnit::Message("message"), sourceLine  );
-  CppUnit::Exception other;
+  CPPUNIT_NS::SourceLine sourceLine( "fileName.cpp", 123 );
+  CPPUNIT_NS::Exception e( CPPUNIT_NS::Message("message"), sourceLine  );
+  CPPUNIT_NS::Exception other;
   other = e;
   checkIsSame( e, other );
 }
@@ -77,16 +77,16 @@ ExceptionTest::testAssignment()
 void 
 ExceptionTest::testClone()
 {
-  CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
-  CppUnit::Exception e( CppUnit::Message("message"), sourceLine  );
-  std::auto_ptr<CppUnit::Exception> other( e.clone() );
+  CPPUNIT_NS::SourceLine sourceLine( "fileName.cpp", 123 );
+  CPPUNIT_NS::Exception e( CPPUNIT_NS::Message("message"), sourceLine  );
+  std::auto_ptr<CPPUNIT_NS::Exception> other( e.clone() );
   checkIsSame( e, *other.get() );
 }
 
 
 void 
-ExceptionTest::checkIsSame( CppUnit::Exception &e, 
-                            CppUnit::Exception &other )
+ExceptionTest::checkIsSame( CPPUNIT_NS::Exception &e, 
+                            CPPUNIT_NS::Exception &other )
 {
   std::string eWhat( e.what() );
   std::string otherWhat( other.what() );
diff --git a/examples/cppunittest/ExceptionTest.h b/examples/cppunittest/ExceptionTest.h
index 41bcda2..a3b4c91 100644
--- a/examples/cppunittest/ExceptionTest.h
+++ b/examples/cppunittest/ExceptionTest.h
@@ -4,7 +4,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
-class ExceptionTest : public CppUnit::TestFixture
+class ExceptionTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( ExceptionTest );
   CPPUNIT_TEST( testConstructor );
@@ -30,8 +30,8 @@ public:
 private:
   ExceptionTest( const ExceptionTest &copy );
   void operator =( const ExceptionTest &copy );
-  void checkIsSame( CppUnit::Exception &e, 
-                    CppUnit::Exception &other );
+  void checkIsSame( CPPUNIT_NS::Exception &e, 
+                    CPPUNIT_NS::Exception &other );
 
 private:
 };
diff --git a/examples/cppunittest/HelperMacrosTest.cpp b/examples/cppunittest/HelperMacrosTest.cpp
index 3674416..311b4a7 100644
--- a/examples/cppunittest/HelperMacrosTest.cpp
+++ b/examples/cppunittest/HelperMacrosTest.cpp
@@ -10,7 +10,7 @@
  - no unit test for CPPUNIT_TEST_SUITE_REGISTRATION...
  */
 
-class FailTestFixture : public CppUnit::TestFixture
+class FailTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( FailTestFixture );
   CPPUNIT_TEST_FAIL( testFail );
@@ -23,7 +23,7 @@ public:
 };
 
 
-class FailToFailTestFixture : public CppUnit::TestFixture
+class FailToFailTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( FailToFailTestFixture );
   CPPUNIT_TEST_FAIL( testFailToFail );
@@ -35,7 +35,7 @@ public:
 };
 
 
-class ExceptionTestFixture : public CppUnit::TestFixture
+class ExceptionTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( ExceptionTestFixture );
   CPPUNIT_TEST_EXCEPTION( testException, FailureException );
@@ -48,7 +48,7 @@ public:
 };
 
 
-class ExceptionNotCaughtTestFixture : public CppUnit::TestFixture
+class ExceptionNotCaughtTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( ExceptionNotCaughtTestFixture );
   CPPUNIT_TEST_EXCEPTION( testExceptionNotCaught, FailureException );
@@ -60,14 +60,14 @@ public:
 };
 
 
-class CustomTestTestFixture : public CppUnit::TestFixture
+class CustomTestTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( CustomTestTestFixture );
   CPPUNIT_TEST_CUSTOM( makeCustomTest );
   CPPUNIT_TEST_SUITE_END();
 public:
-  static CppUnit::Test *makeCustomTest( const ThisTestFixtureFactory &factory,
-                                        const CppUnit::TestNamer &namer )
+  static CPPUNIT_NS::Test *makeCustomTest( const ThisTestFixtureFactory &factory,
+                                           const CPPUNIT_NS::TestNamer &namer )
   {
     MockTestCase *test = new MockTestCase( namer.getTestNameFor( "myCustomTest" ) );
     test->makeRunTestThrow();
@@ -76,15 +76,15 @@ public:
 };
 
 
-class CustomsTestTestFixture : public CppUnit::TestFixture
+class CustomsTestTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( CustomsTestTestFixture );
   CPPUNIT_TEST_CUSTOMS( addCustomTests );
   CPPUNIT_TEST_SUITE_END();
 public:
-  static void addCustomTests( CppUnit::TestSuite *suite,
+  static void addCustomTests( CPPUNIT_NS::TestSuite *suite,
                               const ThisTestFixtureFactory &factory,
-                              const CppUnit::TestNamer &namer )
+                              const CPPUNIT_NS::TestNamer &namer )
   {
     MockTestCase *test1 = new MockTestCase( namer.getTestNameFor( "myCustomTest1" ) );
     test1->makeRunTestThrow();
@@ -104,7 +104,7 @@ public:
 
 
 
-class AddTestTestFixture : public CppUnit::TestFixture
+class AddTestTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( AddTestTestFixture );
   TEST_ADD_N_MOCK( 7 );
@@ -132,7 +132,7 @@ void
 HelperMacrosTest::setUp()
 {
   m_testListener = new MockTestListener( "mock-testlistener" );
-  m_result = new CppUnit::TestResult();
+  m_result = new CPPUNIT_NS::TestResult();
   m_result->addListener( m_testListener );
 }
 
@@ -148,7 +148,7 @@ HelperMacrosTest::tearDown()
 void 
 HelperMacrosTest::testNoSubclassing()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( BaseTestCase::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( BaseTestCase::suite() );
   CPPUNIT_ASSERT_EQUAL( 1, suite->countTestCases() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectNoFailure();
@@ -161,7 +161,7 @@ HelperMacrosTest::testNoSubclassing()
 void 
 HelperMacrosTest::testSubclassing()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( SubclassedTestCase::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( SubclassedTestCase::suite() );
   CPPUNIT_ASSERT_EQUAL( 2, suite->countTestCases() );
   m_testListener->setExpectedStartTestCall( 2 );
   m_testListener->setExpectedAddFailureCall( 1 );
@@ -174,7 +174,7 @@ HelperMacrosTest::testSubclassing()
 void 
 HelperMacrosTest::testFail()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( FailTestFixture::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( FailTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectNoFailure();
 
@@ -186,7 +186,7 @@ HelperMacrosTest::testFail()
 void 
 HelperMacrosTest::testFailToFail()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( FailToFailTestFixture::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( FailToFailTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectedAddFailureCall( 1 );
 
@@ -198,7 +198,7 @@ HelperMacrosTest::testFailToFail()
 void 
 HelperMacrosTest::testException()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( ExceptionTestFixture::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( ExceptionTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectNoFailure();
   
@@ -210,7 +210,7 @@ HelperMacrosTest::testException()
 void 
 HelperMacrosTest::testExceptionNotCaught()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( ExceptionNotCaughtTestFixture::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( ExceptionNotCaughtTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectedAddFailureCall( 1 );
 
@@ -222,7 +222,7 @@ HelperMacrosTest::testExceptionNotCaught()
 void 
 HelperMacrosTest::testCustomTest()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( CustomTestTestFixture::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( CustomTestTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 1 );
   m_testListener->setExpectedAddFailureCall( 1 );
 
@@ -234,7 +234,7 @@ HelperMacrosTest::testCustomTest()
 void 
 HelperMacrosTest::testCustomTests()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( CustomsTestTestFixture::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( CustomsTestTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 2 );
   m_testListener->setExpectedAddFailureCall( 1 );
 
@@ -246,7 +246,7 @@ HelperMacrosTest::testCustomTests()
 void 
 HelperMacrosTest::testAddTest()
 {
-  std::auto_ptr<CppUnit::TestSuite> suite( AddTestTestFixture::suite() );
+  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( AddTestTestFixture::suite() );
   m_testListener->setExpectedStartTestCall( 7 );
   m_testListener->setExpectedAddFailureCall( 0 );
 
diff --git a/examples/cppunittest/HelperMacrosTest.h b/examples/cppunittest/HelperMacrosTest.h
index bba8a22..1f3a32a 100644
--- a/examples/cppunittest/HelperMacrosTest.h
+++ b/examples/cppunittest/HelperMacrosTest.h
@@ -5,7 +5,7 @@
 #include "MockTestListener.h"
 
 
-class HelperMacrosTest : public CppUnit::TestFixture
+class HelperMacrosTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( HelperMacrosTest );
   CPPUNIT_TEST( testNoSubclassing );
@@ -45,7 +45,7 @@ private:
   void operator =( const HelperMacrosTest &copy );
 
 private:
-  CppUnit::TestResult *m_result;
+  CPPUNIT_NS::TestResult *m_result;
   MockTestListener *m_testListener;
 };
 
diff --git a/examples/cppunittest/MessageTest.cpp b/examples/cppunittest/MessageTest.cpp
index dd60200..47a34da 100644
--- a/examples/cppunittest/MessageTest.cpp
+++ b/examples/cppunittest/MessageTest.cpp
@@ -18,7 +18,7 @@ MessageTest::~MessageTest()
 void 
 MessageTest::setUp()
 {
-  m_message = new CppUnit::Message();
+  m_message = new CPPUNIT_NS::Message();
 }
 
 
@@ -92,7 +92,7 @@ MessageTest::testAddDetail3()
 void 
 MessageTest::testAddDetailEmptyMessage()
 {
-  m_message->addDetail( CppUnit::Message() );
+  m_message->addDetail( CPPUNIT_NS::Message() );
   CPPUNIT_ASSERT_EQUAL( 0, m_message->detailCount() );
 }
 
@@ -102,7 +102,7 @@ MessageTest::testAddDetailMessage()
 {
   std::string expected1( "first" );
   std::string expected2( "second" );
-  m_message->addDetail( CppUnit::Message( "shortDesc", expected1, expected2 ) );
+  m_message->addDetail( CPPUNIT_NS::Message( "shortDesc", expected1, expected2 ) );
   CPPUNIT_ASSERT_EQUAL( 2, m_message->detailCount() );
   CPPUNIT_ASSERT_EQUAL( expected1, m_message->detailAt(0) );
   CPPUNIT_ASSERT_EQUAL( expected2, m_message->detailAt(1) );
@@ -131,7 +131,7 @@ void
 MessageTest::testConstructor()
 {
   std::string expected( "short" );
-  CppUnit::Message message( expected );
+  CPPUNIT_NS::Message message( expected );
   
   CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
   CPPUNIT_ASSERT_EQUAL( 0, message.detailCount() );
@@ -143,7 +143,7 @@ MessageTest::testConstructorDetail1()
 {
   std::string expected( "short" );
   std::string expected1( "detail-1" );
-  CppUnit::Message message( expected, expected1 );
+  CPPUNIT_NS::Message message( expected, expected1 );
   
   CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
   CPPUNIT_ASSERT_EQUAL( 1, message.detailCount() );
@@ -157,7 +157,7 @@ MessageTest::testConstructorDetail2()
   std::string expected( "short" );
   std::string expected1( "detail-1" );
   std::string expected2( "detail-2" );
-  CppUnit::Message message( expected, expected1, expected2 );
+  CPPUNIT_NS::Message message( expected, expected1, expected2 );
   
   CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
   CPPUNIT_ASSERT_EQUAL( 2, message.detailCount() );
@@ -173,7 +173,7 @@ MessageTest::testConstructorDetail3()
   std::string expected1( "detail-1" );
   std::string expected2( "detail-2" );
   std::string expected3( "detail-3" );
-  CppUnit::Message message( expected, expected1, expected2, expected3 );
+  CPPUNIT_NS::Message message( expected, expected1, expected2, expected3 );
   
   CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
   CPPUNIT_ASSERT_EQUAL( 3, message.detailCount() );
@@ -205,21 +205,21 @@ MessageTest::testDetailsSome()
 void 
 MessageTest::testEqual()
 {
-  CPPUNIT_ASSERT( *m_message == CppUnit::Message() );
+  CPPUNIT_ASSERT( *m_message == CPPUNIT_NS::Message() );
   
-  CppUnit::Message message1( "short", "det1", "det2", "det3" );
-  CppUnit::Message message2( message1 );
+  CPPUNIT_NS::Message message1( "short", "det1", "det2", "det3" );
+  CPPUNIT_NS::Message message2( message1 );
   CPPUNIT_ASSERT( message1 == message2 );
 
   CPPUNIT_ASSERT( !(*m_message == message1) );
 
-  CppUnit::Message message3( "short" );
+  CPPUNIT_NS::Message message3( "short" );
   CPPUNIT_ASSERT( !(message3 == message1) );
 
-  CppUnit::Message message4( "long" );
+  CPPUNIT_NS::Message message4( "long" );
   CPPUNIT_ASSERT( !(message3 == message4) );
 
-  CppUnit::Message message5( "short", "det1", "det-2", "det3" );
+  CPPUNIT_NS::Message message5( "short", "det1", "det-2", "det3" );
   CPPUNIT_ASSERT( !(message1 == message5) );
 }
 
@@ -227,8 +227,8 @@ MessageTest::testEqual()
 void 
 MessageTest::testNotEqual()
 {
-  CppUnit::Message message1( "short", "det1", "det2", "det3" );
-  CppUnit::Message message2( "short", "det1", "det-2", "det3" );
+  CPPUNIT_NS::Message message1( "short", "det1", "det2", "det3" );
+  CPPUNIT_NS::Message message2( "short", "det1", "det-2", "det3" );
   CPPUNIT_ASSERT( message1 != message2 );
   CPPUNIT_ASSERT( !(message1 != message1) );
 }
diff --git a/examples/cppunittest/MessageTest.h b/examples/cppunittest/MessageTest.h
index b8bbf3a..4c757e8 100644
--- a/examples/cppunittest/MessageTest.h
+++ b/examples/cppunittest/MessageTest.h
@@ -7,7 +7,7 @@
 
 
 /// Unit tests for MessageTest
-class MessageTest : public CppUnit::TestFixture
+class MessageTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( MessageTest );
   CPPUNIT_TEST( testDefaultConstructor );
@@ -68,7 +68,7 @@ private:
   void operator =( const MessageTest &other );
 
 private:
-  CppUnit::Message *m_message;
+  CPPUNIT_NS::Message *m_message;
 };
 
 
diff --git a/examples/cppunittest/MockTestCase.cpp b/examples/cppunittest/MockTestCase.cpp
index e6bc335..9f7c2f6 100644
--- a/examples/cppunittest/MockTestCase.cpp
+++ b/examples/cppunittest/MockTestCase.cpp
@@ -4,7 +4,7 @@
 
 
 MockTestCase::MockTestCase( std::string name )
-    : CppUnit::TestCase( name )
+    : CPPUNIT_NS::TestCase( name )
     , m_hasSetUpExpectation( false )
     , m_expectedSetUpCall( 0 )
     , m_actualSetUpCall( 0 )
@@ -90,8 +90,8 @@ MockTestCase::runTest()
 
 /*
 bool 
-MockTestCase::findTestPath( const CppUnit::Test *test,
-                            CppUnit::TestPath &testPath )
+MockTestCase::findTestPath( const CPPUNIT_NS::Test *test,
+                            CPPUNIT_NS::TestPath &testPath )
 {
   if ( m_passingTest == test )
   {
diff --git a/examples/cppunittest/MockTestCase.h b/examples/cppunittest/MockTestCase.h
index 49739dc..8ff80e4 100644
--- a/examples/cppunittest/MockTestCase.h
+++ b/examples/cppunittest/MockTestCase.h
@@ -7,10 +7,10 @@
 /*! \class MockTestCase
  * \brief This class represents a mock test case.
  */
-class MockTestCase : public CppUnit::TestCase
+class MockTestCase : public CPPUNIT_NS::TestCase
 {
 public:
-  typedef CppUnit::TestCase SuperClass;   // work around VC++ call to super class method.
+  typedef CPPUNIT_NS::TestCase SuperClass;   // work around VC++ call to super class method.
 
   /*! Constructs a MockTestCase object.
    */
@@ -27,7 +27,7 @@ public:
   void makeSetUpThrow();
   void makeTearDownThrow();
   void makeRunTestThrow();
-  void makeFindTestPathPassFor( const CppUnit::Test *testFound );
+  void makeFindTestPathPassFor( const CPPUNIT_NS::Test *testFound );
   
   void verify();
 
@@ -36,8 +36,8 @@ protected:
   void setUp();
   void tearDown();
   void runTest();
-//  bool findTestPath( const CppUnit::Test *test,
-//                     CppUnit::TestPath &testPath );
+//  bool findTestPath( const CPPUNIT_NS::Test *test,
+//                     CPPUNIT_NS::TestPath &testPath );
 
 private:
   /// Prevents the use of the copy constructor.
@@ -65,7 +65,7 @@ private:
   bool m_setUpThrow;
   bool m_tearDownThrow;
   bool m_runTestThrow;
-  const CppUnit::Test *m_passingTest;
+  const CPPUNIT_NS::Test *m_passingTest;
 };
 
 
diff --git a/examples/cppunittest/MockTestListener.cpp b/examples/cppunittest/MockTestListener.cpp
index 5b8b506..0cacfd3 100644
--- a/examples/cppunittest/MockTestListener.cpp
+++ b/examples/cppunittest/MockTestListener.cpp
@@ -42,8 +42,8 @@ MockTestListener::MockTestListener( std::string name )
 
 
 void 
-MockTestListener::setExpectFailure( CppUnit::Test *failedTest,
-                                    CppUnit::Exception *thrownException,
+MockTestListener::setExpectFailure( CPPUNIT_NS::Test *failedTest,
+                                    CPPUNIT_NS::Exception *thrownException,
                                     bool isError )
 {
   m_hasExpectationForAddFailure = true;
@@ -79,7 +79,7 @@ MockTestListener::setExpectedAddFailureCall( int callCount )
 
 
 void 
-MockTestListener::setExpectStartTest( CppUnit::Test *test )
+MockTestListener::setExpectStartTest( CPPUNIT_NS::Test *test )
 {
   m_hasExpectationForStartTest = true;
   m_hasParametersExpectationForStartTest = true;
@@ -97,7 +97,7 @@ MockTestListener::setExpectedStartTestCall( int callCount )
 
 
 void 
-MockTestListener::setExpectEndTest( CppUnit::Test *test )
+MockTestListener::setExpectEndTest( CPPUNIT_NS::Test *test )
 {
   m_hasExpectationForEndTest = true;
   m_hasParametersExpectationForEndTest = true;
@@ -115,7 +115,7 @@ MockTestListener::setExpectedEndTestCall( int callCount )
 
 
 void 
-MockTestListener::setExpectStartSuite( CppUnit::Test *test )
+MockTestListener::setExpectStartSuite( CPPUNIT_NS::Test *test )
 {
   m_hasExpectationForStartSuite = true;
   m_hasParametersExpectationForStartSuite = true;
@@ -133,7 +133,7 @@ MockTestListener::setExpectedStartSuiteCall( int callCount )
 
 
 void 
-MockTestListener::setExpectEndSuite( CppUnit::Test *test )
+MockTestListener::setExpectEndSuite( CPPUNIT_NS::Test *test )
 {
   m_hasExpectationForEndSuite = true;
   m_hasParametersExpectationForEndSuite = true;
@@ -151,8 +151,8 @@ MockTestListener::setExpectedEndSuiteCall( int callCount )
 
 
 void 
-MockTestListener::setExpectStartTestRun( CppUnit::Test *test,
-                                         CppUnit::TestResult *eventManager )
+MockTestListener::setExpectStartTestRun( CPPUNIT_NS::Test *test,
+                                         CPPUNIT_NS::TestResult *eventManager )
 {
   m_hasExpectationForStartTestRun = true;
   m_hasParametersExpectationForStartTestRun = true;
@@ -171,8 +171,8 @@ MockTestListener::setExpectedStartTestRunCall( int callCount )
 
 
 void 
-MockTestListener::setExpectEndTestRun( CppUnit::Test *test,
-                                       CppUnit::TestResult *eventManager )
+MockTestListener::setExpectEndTestRun( CPPUNIT_NS::Test *test,
+                                       CPPUNIT_NS::TestResult *eventManager )
 {
   m_hasExpectationForEndTestRun = true;
   m_hasParametersExpectationForEndTestRun = true;
@@ -191,7 +191,7 @@ MockTestListener::setExpectedEndTestRunCall( int callCount )
 
 
 void 
-MockTestListener::addFailure( const CppUnit::TestFailure &failure )
+MockTestListener::addFailure( const CPPUNIT_NS::TestFailure &failure )
 {
   if ( m_hasExpectationForAddFailure  ||  m_hasExpectationForSomeFailure )
     ++m_addFailureCall;
@@ -215,7 +215,7 @@ MockTestListener::addFailure( const CppUnit::TestFailure &failure )
 
 
 void 
-MockTestListener::startTest( CppUnit::Test *test )
+MockTestListener::startTest( CPPUNIT_NS::Test *test )
 {
   if ( m_hasExpectationForStartTest )
   {
@@ -234,7 +234,7 @@ MockTestListener::startTest( CppUnit::Test *test )
 
 
 void 
-MockTestListener::endTest( CppUnit::Test *test )
+MockTestListener::endTest( CPPUNIT_NS::Test *test )
 {
   if ( m_hasExpectationForEndTest )
   {
@@ -252,7 +252,7 @@ MockTestListener::endTest( CppUnit::Test *test )
 
 
 void 
-MockTestListener::startSuite( CppUnit::Test *test )
+MockTestListener::startSuite( CPPUNIT_NS::Test *test )
 {
   if ( m_hasExpectationForStartSuite )
   {
@@ -270,7 +270,7 @@ MockTestListener::startSuite( CppUnit::Test *test )
 
 
 void 
-MockTestListener::endSuite( CppUnit::Test *test )
+MockTestListener::endSuite( CPPUNIT_NS::Test *test )
 {
   if ( m_hasExpectationForEndSuite )
   {
@@ -288,8 +288,8 @@ MockTestListener::endSuite( CppUnit::Test *test )
 
 
 void 
-MockTestListener::startTestRun( CppUnit::Test *test, 
-                                CppUnit::TestResult *eventManager )
+MockTestListener::startTestRun( CPPUNIT_NS::Test *test, 
+                                CPPUNIT_NS::TestResult *eventManager )
 {
   if ( m_hasExpectationForStartTestRun )
   {
@@ -309,8 +309,8 @@ MockTestListener::startTestRun( CppUnit::Test *test,
 
 
 void 
-MockTestListener::endTestRun( CppUnit::Test *test, 
-                              CppUnit::TestResult *eventManager )
+MockTestListener::endTestRun( CPPUNIT_NS::Test *test, 
+                              CPPUNIT_NS::TestResult *eventManager )
 {
   if ( m_hasExpectationForEndTestRun )
   {
diff --git a/examples/cppunittest/MockTestListener.h b/examples/cppunittest/MockTestListener.h
index cbcf7b6..17f2dfa 100644
--- a/examples/cppunittest/MockTestListener.h
+++ b/examples/cppunittest/MockTestListener.h
@@ -5,42 +5,42 @@
 #include <string>
 
 
-class MockTestListener : public CppUnit::TestListener
+class MockTestListener : public CPPUNIT_NS::TestListener
 {
 public:
   MockTestListener( std::string name );
   virtual ~MockTestListener() {}
 
-  void setExpectFailure( CppUnit::Test *failedTest,
-                         CppUnit::Exception *thrownException,
+  void setExpectFailure( CPPUNIT_NS::Test *failedTest,
+                         CPPUNIT_NS::Exception *thrownException,
                          bool isError );
   void setExpectNoFailure();
   void setExpectFailure();
   void setExpectedAddFailureCall( int callCount );
-  void setExpectStartTest( CppUnit::Test *test );
+  void setExpectStartTest( CPPUNIT_NS::Test *test );
   void setExpectedStartTestCall( int callCount );
-  void setExpectEndTest( CppUnit::Test *test );
+  void setExpectEndTest( CPPUNIT_NS::Test *test );
   void setExpectedEndTestCall( int callCount );
-  void setExpectStartSuite( CppUnit::Test *suite );
+  void setExpectStartSuite( CPPUNIT_NS::Test *suite );
   void setExpectedStartSuiteCall( int callCount );
-  void setExpectEndSuite( CppUnit::Test *suite );
+  void setExpectEndSuite( CPPUNIT_NS::Test *suite );
   void setExpectedEndSuiteCall( int callCount );
-  void setExpectStartTestRun( CppUnit::Test *test,
-                              CppUnit::TestResult *eventManager );
+  void setExpectStartTestRun( CPPUNIT_NS::Test *test,
+                              CPPUNIT_NS::TestResult *eventManager );
   void setExpectedStartTestRunCall( int callCount );
-  void setExpectEndTestRun( CppUnit::Test *test,
-                            CppUnit::TestResult *eventManager );
+  void setExpectEndTestRun( CPPUNIT_NS::Test *test,
+                            CPPUNIT_NS::TestResult *eventManager );
   void setExpectedEndTestRunCall( int callCount );
 
-  void addFailure( const CppUnit::TestFailure &failure );
-  void startTest( CppUnit::Test *test );
-  void endTest( CppUnit::Test *test );
-  void startSuite( CppUnit::Test *suite );
-  void endSuite( CppUnit::Test *suite );
-  void startTestRun( CppUnit::Test *test, 
-                     CppUnit::TestResult *eventManager );
-  void endTestRun( CppUnit::Test *test, 
-                   CppUnit::TestResult *eventManager );
+  void addFailure( const CPPUNIT_NS::TestFailure &failure );
+  void startTest( CPPUNIT_NS::Test *test );
+  void endTest( CPPUNIT_NS::Test *test );
+  void startSuite( CPPUNIT_NS::Test *suite );
+  void endSuite( CPPUNIT_NS::Test *suite );
+  void startTestRun( CPPUNIT_NS::Test *test, 
+                     CPPUNIT_NS::TestResult *eventManager );
+  void endTestRun( CPPUNIT_NS::Test *test, 
+                   CPPUNIT_NS::TestResult *eventManager );
 
   void verify();
 
@@ -51,38 +51,38 @@ private:
   bool m_hasParametersExpectationForStartTest;
   int m_expectedStartTestCallCount;
   int m_startTestCall;
-  CppUnit::Test *m_expectedStartTest;
+  CPPUNIT_NS::Test *m_expectedStartTest;
 
   bool m_hasExpectationForEndTest;
   bool m_hasParametersExpectationForEndTest;
   int m_expectedEndTestCallCount;
-  CppUnit::Test *m_expectedEndTest;
+  CPPUNIT_NS::Test *m_expectedEndTest;
   int m_endTestCall;
 
   bool m_hasExpectationForStartSuite;
   bool m_hasParametersExpectationForStartSuite;
   int m_expectedStartSuiteCallCount;
-  CppUnit::Test *m_expectedStartSuite;
+  CPPUNIT_NS::Test *m_expectedStartSuite;
   int m_startSuiteCall;
 
   bool m_hasExpectationForEndSuite;
   bool m_hasParametersExpectationForEndSuite;
   int m_expectedEndSuiteCallCount;
-  CppUnit::Test *m_expectedEndSuite;
+  CPPUNIT_NS::Test *m_expectedEndSuite;
   int m_endSuiteCall;
 
   bool m_hasExpectationForStartTestRun;
   bool m_hasParametersExpectationForStartTestRun;
   int m_expectedStartTestRunCallCount;
-  CppUnit::Test *m_expectedStartTestRun;
-  CppUnit::TestResult *m_expectedStartTestRun2;
+  CPPUNIT_NS::Test *m_expectedStartTestRun;
+  CPPUNIT_NS::TestResult *m_expectedStartTestRun2;
   int m_startTestRunCall;
 
   bool m_hasExpectationForEndTestRun;
   bool m_hasParametersExpectationForEndTestRun;
   int m_expectedEndTestRunCallCount;
-  CppUnit::Test *m_expectedEndTestRun;
-  CppUnit::TestResult *m_expectedEndTestRun2;
+  CPPUNIT_NS::Test *m_expectedEndTestRun;
+  CPPUNIT_NS::TestResult *m_expectedEndTestRun2;
   int m_endTestRunCall;
 
   bool m_hasExpectationForAddFailure;
@@ -90,8 +90,8 @@ private:
   bool m_hasParametersExpectationForAddFailure;
   int m_expectedAddFailureCallCount;
   int m_addFailureCall;
-  CppUnit::Test *m_expectedFailedTest;
-  CppUnit::Exception *m_expectedException;
+  CPPUNIT_NS::Test *m_expectedFailedTest;
+  CPPUNIT_NS::Exception *m_expectedException;
   bool m_expectedIsError;
 };
 
diff --git a/examples/cppunittest/OrthodoxTest.cpp b/examples/cppunittest/OrthodoxTest.cpp
index b20fbe3..0da7180 100644
--- a/examples/cppunittest/OrthodoxTest.cpp
+++ b/examples/cppunittest/OrthodoxTest.cpp
@@ -20,7 +20,7 @@ void
 OrthodoxTest::setUp()
 {
   m_testListener = new MockTestListener( "mock-listener" );
-  m_result = new CppUnit::TestResult();
+  m_result = new CPPUNIT_NS::TestResult();
   m_result->addListener( m_testListener );
 }
 
@@ -36,7 +36,7 @@ OrthodoxTest::tearDown()
 void 
 OrthodoxTest::testValue()
 {
-  CppUnit::Orthodox<Value> test;
+  CPPUNIT_NS::Orthodox<Value> test;
   m_testListener->setExpectNoFailure();
   test.run( m_result );
   m_testListener->verify();
@@ -46,7 +46,7 @@ OrthodoxTest::testValue()
 void 
 OrthodoxTest::testValueBadConstructor()
 {
-  CppUnit::Orthodox<ValueBadConstructor> test;
+  CPPUNIT_NS::Orthodox<ValueBadConstructor> test;
   m_testListener->setExpectFailure();
   test.run( m_result );
   m_testListener->verify();
@@ -56,7 +56,7 @@ OrthodoxTest::testValueBadConstructor()
 void 
 OrthodoxTest::testValueBadInvert()
 {
-  CppUnit::Orthodox<ValueBadInvert> test;
+  CPPUNIT_NS::Orthodox<ValueBadInvert> test;
   m_testListener->setExpectFailure();
   test.run( m_result );
   m_testListener->verify();
@@ -66,7 +66,7 @@ OrthodoxTest::testValueBadInvert()
 void 
 OrthodoxTest::testValueBadEqual()
 {
-  CppUnit::Orthodox<ValueBadEqual> test;
+  CPPUNIT_NS::Orthodox<ValueBadEqual> test;
   m_testListener->setExpectFailure();
   test.run( m_result );
   m_testListener->verify();
@@ -76,7 +76,7 @@ OrthodoxTest::testValueBadEqual()
 void 
 OrthodoxTest::testValueBadNotEqual()
 {
-  CppUnit::Orthodox<ValueBadNotEqual> test;
+  CPPUNIT_NS::Orthodox<ValueBadNotEqual> test;
   m_testListener->setExpectFailure();
   test.run( m_result );
   m_testListener->verify();
@@ -86,7 +86,7 @@ OrthodoxTest::testValueBadNotEqual()
 void 
 OrthodoxTest::testValueBadCall()
 {
-  CppUnit::Orthodox<ValueBadCall> test;
+  CPPUNIT_NS::Orthodox<ValueBadCall> test;
   m_testListener->setExpectFailure();
   test.run( m_result );
   m_testListener->verify();
@@ -96,7 +96,7 @@ OrthodoxTest::testValueBadCall()
 void 
 OrthodoxTest::testValueBadAssignment()
 {
-  CppUnit::Orthodox<ValueBadAssignment> test;
+  CPPUNIT_NS::Orthodox<ValueBadAssignment> test;
   m_testListener->setExpectFailure();
   test.run( m_result );
   m_testListener->verify();
diff --git a/examples/cppunittest/OrthodoxTest.h b/examples/cppunittest/OrthodoxTest.h
index b71db84..422c074 100644
--- a/examples/cppunittest/OrthodoxTest.h
+++ b/examples/cppunittest/OrthodoxTest.h
@@ -5,7 +5,7 @@
 #include "MockTestListener.h"
 
 
-class OrthodoxTest : public CppUnit::TestFixture
+class OrthodoxTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( OrthodoxTest );
   CPPUNIT_TEST( testValue );
@@ -169,7 +169,7 @@ private:
   void operator =( const OrthodoxTest &copy );
 
 private:
-  CppUnit::TestResult *m_result;
+  CPPUNIT_NS::TestResult *m_result;
   MockTestListener *m_testListener;
 };
 
diff --git a/examples/cppunittest/RepeatedTestTest.cpp b/examples/cppunittest/RepeatedTestTest.cpp
index 9dfdf6f..272a9a4 100644
--- a/examples/cppunittest/RepeatedTestTest.cpp
+++ b/examples/cppunittest/RepeatedTestTest.cpp
@@ -22,7 +22,7 @@ void
 RepeatedTestTest::setUp()
 {
   m_test = new RunCountTest();
-  m_repeatedTest = new CppUnit::RepeatedTest( m_test, m_repeatCount );
+  m_repeatedTest = new CPPUNIT_NS::RepeatedTest( m_test, m_repeatCount );
 }
 
 
@@ -37,7 +37,7 @@ RepeatedTestTest::tearDown()
 void 
 RepeatedTestTest::testRun()
 {
-  CppUnit::TestResult result;
+  CPPUNIT_NS::TestResult result;
   m_repeatedTest->run( &result );
 
   CPPUNIT_ASSERT_EQUAL( 17, m_test->m_runCount );
diff --git a/examples/cppunittest/StringToolsTest.cpp b/examples/cppunittest/StringToolsTest.cpp
index e2c95cc..7d876f1 100644
--- a/examples/cppunittest/StringToolsTest.cpp
+++ b/examples/cppunittest/StringToolsTest.cpp
@@ -29,7 +29,7 @@ void
 StringToolsTest::testToStringInt()
 {
   std::string expected = "123456789";
-  std::string actual = CppUnit::StringTools::toString( 123456789 );
+  std::string actual = CPPUNIT_NS::StringTools::toString( 123456789 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -38,7 +38,7 @@ void
 StringToolsTest::testToStringDouble()
 {
   std::string expected = "1234.56";
-  std::string actual = CppUnit::StringTools::toString( 1234.56 );
+  std::string actual = CPPUNIT_NS::StringTools::toString( 1234.56 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -47,8 +47,8 @@ void
 StringToolsTest::testSplitEmptyString()
 {
   std::string text;
-  CppUnit::StringTools::Strings expected;
-  CppUnit::StringTools::Strings actual = CppUnit::StringTools::split( text, ';' );
+  CPPUNIT_NS::StringTools::Strings expected;
+  CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' );
 
   CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() );
   CPPUNIT_ASSERT( expected == actual );
@@ -59,9 +59,9 @@ void
 StringToolsTest::testSplitOneItem()
 {
   std::string text = "1";
-  CppUnit::StringTools::Strings expected;
+  CPPUNIT_NS::StringTools::Strings expected;
   expected.push_back( "1" );
-  CppUnit::StringTools::Strings actual = CppUnit::StringTools::split( text, ';' );
+  CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' );
 
   CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() );
   CPPUNIT_ASSERT( expected == actual );
@@ -72,10 +72,10 @@ void
 StringToolsTest::testSplitItemEmpty()
 {
   std::string text = "1;";
-  CppUnit::StringTools::Strings expected;
+  CPPUNIT_NS::StringTools::Strings expected;
   expected.push_back( "1" );
   expected.push_back( "" );
-  CppUnit::StringTools::Strings actual = CppUnit::StringTools::split( text, ';' );
+  CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' );
 
   CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() );
   CPPUNIT_ASSERT( expected == actual );
@@ -86,10 +86,10 @@ void
 StringToolsTest::testSplitTwoItem()
 {
   std::string text = "2;1";
-  CppUnit::StringTools::Strings expected;
+  CPPUNIT_NS::StringTools::Strings expected;
   expected.push_back( "2" );
   expected.push_back( "1" );
-  CppUnit::StringTools::Strings actual = CppUnit::StringTools::split( text, ';' );
+  CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' );
 
   CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() );
   CPPUNIT_ASSERT( expected == actual );
@@ -100,11 +100,11 @@ void
 StringToolsTest::testSplitEmptyTwoItem()
 {
   std::string text = ";1;2";
-  CppUnit::StringTools::Strings expected;
+  CPPUNIT_NS::StringTools::Strings expected;
   expected.push_back( "" );
   expected.push_back( "1" );
   expected.push_back( "2" );
-  CppUnit::StringTools::Strings actual = CppUnit::StringTools::split( text, ';' );
+  CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' );
 
   CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() );
   CPPUNIT_ASSERT( expected == actual );
@@ -115,11 +115,11 @@ void
 StringToolsTest::testSplitEmptyItemEmpty()
 {
   std::string text = ";1;";
-  CppUnit::StringTools::Strings expected;
+  CPPUNIT_NS::StringTools::Strings expected;
   expected.push_back( "" );
   expected.push_back( "1" );
   expected.push_back( "" );
-  CppUnit::StringTools::Strings actual = CppUnit::StringTools::split( text, ';' );
+  CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' );
 
   CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() );
   CPPUNIT_ASSERT( expected == actual );
@@ -130,13 +130,13 @@ void
 StringToolsTest::testSplitEmptyItemEmptyEmptyItem()
 {
   std::string text = ";1;;;2";
-  CppUnit::StringTools::Strings expected;
+  CPPUNIT_NS::StringTools::Strings expected;
   expected.push_back( "" );
   expected.push_back( "1" );
   expected.push_back( "" );
   expected.push_back( "" );
   expected.push_back( "2" );
-  CppUnit::StringTools::Strings actual = CppUnit::StringTools::split( text, ';' );
+  CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' );
 
   CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() );
   CPPUNIT_ASSERT( expected == actual );
@@ -149,7 +149,7 @@ StringToolsTest::testWrapEmpty()
   std::string text = "";
   std::string expected = "";
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -160,7 +160,7 @@ StringToolsTest::testWrapNotNeeded()
   std::string text = "abcd";
   std::string expected = text;
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -171,7 +171,7 @@ StringToolsTest::testWrapLimitNotNeeded()
   std::string text = "abcdef";
   std::string expected = text;
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -182,7 +182,7 @@ StringToolsTest::testWrapOneNeeded()
   std::string text = "abcdefghi";
   std::string expected = "abcdef\nghi";
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -193,7 +193,7 @@ StringToolsTest::testWrapTwoNeeded()
   std::string text = "abcdefghijklmnop";
   std::string expected = "abcdef\nghijkl\nmnop";
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -204,7 +204,7 @@ StringToolsTest::testWrapLimitTwoNeeded()
   std::string text = "abcdefghijklmnopqr";
   std::string expected = "abcdef\nghijkl\nmnopqr";
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -215,7 +215,7 @@ StringToolsTest::testWrapOneNeededTwoNeeded()
   std::string text = "123456789\nabcdefghijklmno";
   std::string expected = "123456\n789\nabcdef\nghijkl\nmno";
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
@@ -226,7 +226,7 @@ StringToolsTest::testWrapNotNeededEmptyLinesOneNeeded()
   std::string text = "12345\n\n\n\nabcdefghi";
   std::string expected = "12345\n\n\n\nabcdef\nghi";
 
-  std::string actual = CppUnit::StringTools::wrap( text, 6 );
+  std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 );
   CPPUNIT_ASSERT_EQUAL( expected, actual );
 }
 
diff --git a/examples/cppunittest/SynchronizedTestResult.h b/examples/cppunittest/SynchronizedTestResult.h
index fca3d26..284a639 100644
--- a/examples/cppunittest/SynchronizedTestResult.h
+++ b/examples/cppunittest/SynchronizedTestResult.h
@@ -4,7 +4,7 @@
 #include <cppunit/TestResultCollector.h>
 
 
-class SynchronizedTestResult : public CppUnit::TestResultCollector
+class SynchronizedTestResult : public CPPUNIT_NS::TestResultCollector
 {
 public:
 
@@ -16,7 +16,7 @@ public:
     virtual void unlocked() {}
   };
 
-  class ObservedSynchronizationObject : public CppUnit::SynchronizedObject::SynchronizationObject
+  class ObservedSynchronizationObject : public CPPUNIT_NS::SynchronizedObject::SynchronizationObject
   {
   public:
     ObservedSynchronizationObject( SynchronizationObjectListener *listener ) :
diff --git a/examples/cppunittest/TestAssertTest.cpp b/examples/cppunittest/TestAssertTest.cpp
index 96eaa7f..da471ad 100644
--- a/examples/cppunittest/TestAssertTest.cpp
+++ b/examples/cppunittest/TestAssertTest.cpp
@@ -79,7 +79,7 @@ TestAssertTest::testAssertMessageFalse()
   {
     CPPUNIT_ASSERT_MESSAGE( message, 2==3 );
   }
-  catch( CppUnit::Exception &e )
+  catch( CPPUNIT_NS::Exception &e )
   {
     exceptionCaught = true; // ok, we were expecting an exception.
     checkMessageContains( &e, message );
@@ -134,7 +134,7 @@ TestAssertTest::testFail()
   {
     CPPUNIT_FAIL( failure );
   }
-  catch( CppUnit::Exception &e )
+  catch( CPPUNIT_NS::Exception &e )
   {
     exceptionCaught = true;
     checkMessageContains( &e, failure );
@@ -144,7 +144,7 @@ TestAssertTest::testFail()
 
 
 void 
-TestAssertTest::checkMessageContains( CppUnit::Exception *e,
+TestAssertTest::checkMessageContains( CPPUNIT_NS::Exception *e,
                                       std::string expected )
 {
   std::string actual = e->what();
diff --git a/examples/cppunittest/TestAssertTest.h b/examples/cppunittest/TestAssertTest.h
index 80c44a9..5195588 100644
--- a/examples/cppunittest/TestAssertTest.h
+++ b/examples/cppunittest/TestAssertTest.h
@@ -4,7 +4,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
-class TestAssertTest : public CppUnit::TestFixture
+class TestAssertTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestAssertTest );
   CPPUNIT_TEST( testAssertTrue );
@@ -53,7 +53,7 @@ private:
                              double actual, 
                              double delta );
 
-  void checkMessageContains( CppUnit::Exception *e,
+  void checkMessageContains( CPPUNIT_NS::Exception *e,
                              std::string expectedMessage );
 
 private:
diff --git a/examples/cppunittest/TestCallerTest.cpp b/examples/cppunittest/TestCallerTest.cpp
index 626368b..bdfb3d0 100644
--- a/examples/cppunittest/TestCallerTest.cpp
+++ b/examples/cppunittest/TestCallerTest.cpp
@@ -19,7 +19,7 @@ TestCallerTest::ExceptionThrower::testThrowFailureException()
 void 
 TestCallerTest::ExceptionThrower::testThrowException()
 {
-  throw CppUnit::Exception( CppUnit::Message( "expected Exception" ) );
+  throw CPPUNIT_NS::Exception( CPPUNIT_NS::Message( "expected Exception" ) );
 }
 
 
@@ -51,7 +51,7 @@ TestCallerTest::setUp()
   m_testCount = 0;
   TrackedTestCase::setTracker( this );
   m_testListener = new MockTestListener( "listener1" );
-  m_result = new CppUnit::TestResult();
+  m_result = new CPPUNIT_NS::TestResult();
   m_result->addListener( m_testListener );
 }
 
@@ -104,7 +104,7 @@ void
 TestCallerTest::testBasicConstructor()
 {
   {
-    CppUnit::TestCaller<TrackedTestCase> caller( m_testName, 
+    CPPUNIT_NS::TestCaller<TrackedTestCase> caller( m_testName, 
                                                  &TrackedTestCase::test );
     checkTestName( caller.getName() );
     checkNothingButConstructorCalled();
@@ -122,7 +122,7 @@ TestCallerTest::testReferenceConstructor()
 {
   TrackedTestCase testCase;
   {
-    CppUnit::TestCaller<TrackedTestCase> caller( "TrackedTestCaseCaller", 
+    CPPUNIT_NS::TestCaller<TrackedTestCase> caller( "TrackedTestCaseCaller", 
                                                  &TrackedTestCase::test, 
                                                  testCase );
     checkTestName( caller.getName() );
@@ -141,7 +141,7 @@ TestCallerTest::testPointerConstructor()
 {
   TrackedTestCase *testCase = new TrackedTestCase();
   {
-    CppUnit::TestCaller<TrackedTestCase> caller( m_testName, 
+    CPPUNIT_NS::TestCaller<TrackedTestCase> caller( m_testName, 
                                                  &TrackedTestCase::test, 
                                                  testCase );
     checkTestName( caller.getName() );
@@ -158,7 +158,7 @@ TestCallerTest::testPointerConstructor()
 void 
 TestCallerTest::testExpectFailureException()
 {
-  CppUnit::TestCaller<ExceptionThrower,FailureException> caller( 
+  CPPUNIT_NS::TestCaller<ExceptionThrower,FailureException> caller( 
       m_testName,
       &ExceptionThrower::testThrowFailureException );
   m_testListener->setExpectNoFailure();
@@ -170,7 +170,7 @@ TestCallerTest::testExpectFailureException()
 void 
 TestCallerTest::testExpectException()
 {
-  CppUnit::TestCaller<ExceptionThrower,CppUnit::Exception> caller( 
+  CPPUNIT_NS::TestCaller<ExceptionThrower,CPPUNIT_NS::Exception> caller( 
       m_testName,
       &ExceptionThrower::testThrowException );
   m_testListener->setExpectNoFailure();
@@ -182,7 +182,7 @@ TestCallerTest::testExpectException()
 void 
 TestCallerTest::testExpectedExceptionNotCaught()
 {
-  CppUnit::TestCaller<ExceptionThrower,FailureException> caller( 
+  CPPUNIT_NS::TestCaller<ExceptionThrower,FailureException> caller( 
       m_testName,
       &ExceptionThrower::testThrowNothing );
   m_testListener->setExpectedAddFailureCall( 1 );
diff --git a/examples/cppunittest/TestCallerTest.h b/examples/cppunittest/TestCallerTest.h
index d2bcc07..0d8b453 100644
--- a/examples/cppunittest/TestCallerTest.h
+++ b/examples/cppunittest/TestCallerTest.h
@@ -8,7 +8,7 @@
 #include "MockTestListener.h"
 #include "TrackedTestCase.h"
 
-class TestCallerTest : public CppUnit::TestFixture, 
+class TestCallerTest : public CPPUNIT_NS::TestFixture, 
                               Tracker
 {
   CPPUNIT_TEST_SUITE( TestCallerTest );
@@ -35,7 +35,7 @@ public:
   void testExpectedExceptionNotCaught();
 
 private:
-  class ExceptionThrower : public CppUnit::TestCase
+  class ExceptionThrower : public CPPUNIT_NS::TestCase
   {
   public:
     void testThrowFailureException();
@@ -64,7 +64,7 @@ private:
   int m_testCount;
   const std::string m_testName;
   MockTestListener *m_testListener;
-  CppUnit::TestResult *m_result;
+  CPPUNIT_NS::TestResult *m_result;
 };
 
 
diff --git a/examples/cppunittest/TestCaseTest.cpp b/examples/cppunittest/TestCaseTest.cpp
index 91a3f22..3a948d4 100644
--- a/examples/cppunittest/TestCaseTest.cpp
+++ b/examples/cppunittest/TestCaseTest.cpp
@@ -27,7 +27,7 @@ void
 TestCaseTest::setUp()
 {
   m_testListener = new MockTestListener( "mock-testlistener" );
-  m_result = new CppUnit::TestResult();
+  m_result = new CPPUNIT_NS::TestResult();
   m_result->addListener( m_testListener );
 }
 
@@ -107,7 +107,7 @@ TestCaseTest::checkFailure( bool failSetUp,
 void 
 TestCaseTest::testCountTestCases()
 {
-  CppUnit::TestCase test;
+  CPPUNIT_NS::TestCase test;
   CPPUNIT_ASSERT_EQUAL( 1, test.countTestCases() );
 }
 
@@ -115,7 +115,7 @@ TestCaseTest::testCountTestCases()
 void 
 TestCaseTest::testDefaultConstructor()
 {
-  CppUnit::TestCase test;
+  CPPUNIT_NS::TestCase test;
   CPPUNIT_ASSERT_EQUAL( std::string(""), test.getName() );
 }
 
@@ -124,7 +124,7 @@ void
 TestCaseTest::testConstructorWithName()
 {
   std::string testName( "TestName" );
-  CppUnit::TestCase test( testName );
+  CPPUNIT_NS::TestCase test( testName );
   CPPUNIT_ASSERT_EQUAL( testName, test.getName() );
 }
 
@@ -148,7 +148,7 @@ TestCaseTest::testTwoRun()
 void 
 TestCaseTest::testGetChildTestCount()
 {
-  CppUnit::TestCase test( "test" );
+  CPPUNIT_NS::TestCase test( "test" );
   CPPUNIT_ASSERT_EQUAL( 0, test.getChildTestCount() );
 }
 
@@ -156,6 +156,6 @@ TestCaseTest::testGetChildTestCount()
 void 
 TestCaseTest::testGetChildTestAtThrow()
 {
-  CppUnit::TestCase test( "test" );
+  CPPUNIT_NS::TestCase test( "test" );
   test.getChildTestAt( 0 );
 }
diff --git a/examples/cppunittest/TestCaseTest.h b/examples/cppunittest/TestCaseTest.h
index 8fb83cc..48c73ae 100644
--- a/examples/cppunittest/TestCaseTest.h
+++ b/examples/cppunittest/TestCaseTest.h
@@ -12,7 +12,7 @@
 #include <stdexcept>
 
 
-class TestCaseTest : public CppUnit::TestFixture
+class TestCaseTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestCaseTest );
   CPPUNIT_TEST( testSetUpFailure );
@@ -62,10 +62,10 @@ private:
   void checkResult( int failures,
                     int errors,
                     int testsRun,
-                    CppUnit::TestResult *result );
+                    CPPUNIT_NS::TestResult *result );
 */
 private:
-  CppUnit::TestResult *m_result;
+  CPPUNIT_NS::TestResult *m_result;
   MockTestListener *m_testListener;
 };
 
diff --git a/examples/cppunittest/TestDecoratorTest.cpp b/examples/cppunittest/TestDecoratorTest.cpp
index 8ff257d..48dd76d 100644
--- a/examples/cppunittest/TestDecoratorTest.cpp
+++ b/examples/cppunittest/TestDecoratorTest.cpp
@@ -21,7 +21,7 @@ void
 TestDecoratorTest::setUp()
 {
   m_test = new MockTestCase( "mocktest" );
-  m_decorator = new CppUnit::TestDecorator( m_test );
+  m_decorator = new CPPUNIT_NS::TestDecorator( m_test );
 }
 
 
@@ -48,7 +48,7 @@ TestDecoratorTest::testRun()
   m_test->setExpectedSetUpCall( 1 );
   m_test->setExpectedRunTestCall( 1 );
   m_test->setExpectedTearDownCall( 1 );
-  CppUnit::TestResult result;
+  CPPUNIT_NS::TestResult result;
 
   m_decorator->run( &result );
   m_test->verify();
diff --git a/examples/cppunittest/TestDecoratorTest.h b/examples/cppunittest/TestDecoratorTest.h
index 860d0b6..7a098c9 100644
--- a/examples/cppunittest/TestDecoratorTest.h
+++ b/examples/cppunittest/TestDecoratorTest.h
@@ -6,7 +6,7 @@
 #include "MockTestCase.h"
 
 
-class TestDecoratorTest : public CppUnit::TestFixture
+class TestDecoratorTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestDecoratorTest );
   CPPUNIT_TEST( testCountTestCases );
@@ -31,7 +31,7 @@ private:
 
 private:
   MockTestCase *m_test;
-  CppUnit::TestDecorator *m_decorator;
+  CPPUNIT_NS::TestDecorator *m_decorator;
 };
 
 
diff --git a/examples/cppunittest/TestFailureTest.cpp b/examples/cppunittest/TestFailureTest.cpp
index d48f286..6c76820 100644
--- a/examples/cppunittest/TestFailureTest.cpp
+++ b/examples/cppunittest/TestFailureTest.cpp
@@ -34,8 +34,8 @@ TestFailureTest::tearDown()
 void 
 TestFailureTest::testConstructorAndGetters()
 {
-  CppUnit::TestCase test;
-  CppUnit::Exception *error = new ObservedException( this );
+  CPPUNIT_NS::TestCase test;
+  CPPUNIT_NS::Exception *error = new ObservedException( this );
   checkTestFailure( &test, error, false );
   CPPUNIT_ASSERT( m_exceptionDestroyed );
 }
@@ -44,8 +44,8 @@ TestFailureTest::testConstructorAndGetters()
 void 
 TestFailureTest::testConstructorAndGettersForError()
 {
-  CppUnit::TestCase test;
-  CppUnit::Exception *error = new ObservedException( this );
+  CPPUNIT_NS::TestCase test;
+  CPPUNIT_NS::Exception *error = new ObservedException( this );
   checkTestFailure( &test, error, true );
   CPPUNIT_ASSERT( m_exceptionDestroyed );
 }
@@ -59,11 +59,11 @@ TestFailureTest::exceptionDestroyed()
 
 
 void 
-TestFailureTest::checkTestFailure( CppUnit::Test *test, 
-                                   CppUnit::Exception *error,
+TestFailureTest::checkTestFailure( CPPUNIT_NS::Test *test, 
+                                   CPPUNIT_NS::Exception *error,
                                    bool isError )
 {
-  CppUnit::TestFailure failure( test, error, isError );
+  CPPUNIT_NS::TestFailure failure( test, error, isError );
   CPPUNIT_ASSERT_EQUAL( test, failure.failedTest() );
   CPPUNIT_ASSERT_EQUAL( error, failure.thrownException() );
   CPPUNIT_ASSERT_EQUAL( isError, failure.isError() );
diff --git a/examples/cppunittest/TestFailureTest.h b/examples/cppunittest/TestFailureTest.h
index 8149a2e..84f41e9 100644
--- a/examples/cppunittest/TestFailureTest.h
+++ b/examples/cppunittest/TestFailureTest.h
@@ -4,7 +4,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
-class TestFailureTest : public CppUnit::TestFixture
+class TestFailureTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestFailureTest );
   CPPUNIT_TEST( testConstructorAndGetters );
@@ -24,11 +24,11 @@ public:
   void exceptionDestroyed();
 
 private:
-  class ObservedException : public CppUnit::Exception
+  class ObservedException : public CPPUNIT_NS::Exception
   {
   public:
     ObservedException( TestFailureTest *listener ) : 
-        CppUnit::Exception( CppUnit::Message("ObservedException" ) ),
+        CPPUNIT_NS::Exception( CPPUNIT_NS::Message("ObservedException" ) ),
         m_listener( listener )
     {
     }
@@ -44,8 +44,8 @@ private:
 
   TestFailureTest( const TestFailureTest &copy );
   void operator =( const TestFailureTest &copy );
-  void checkTestFailure( CppUnit::Test *test, 
-                         CppUnit::Exception *error,
+  void checkTestFailure( CPPUNIT_NS::Test *test, 
+                         CPPUNIT_NS::Exception *error,
                          bool isError );
 
 private:
diff --git a/examples/cppunittest/TestPathTest.cpp b/examples/cppunittest/TestPathTest.cpp
index bf89581..d664273 100644
--- a/examples/cppunittest/TestPathTest.cpp
+++ b/examples/cppunittest/TestPathTest.cpp
@@ -19,16 +19,16 @@ TestPathTest::~TestPathTest()
 void 
 TestPathTest::setUp()
 {
-  m_path = new CppUnit::TestPath();
-  m_test1 = new CppUnit::TestCase( "test1" );
-  m_test2 = new CppUnit::TestCase( "test2" );
-  m_test3 = new CppUnit::TestCase( "test3" );
-  m_test4 = new CppUnit::TestCase( "test4" );
-
-  m_suite1 = new CppUnit::TestSuite( "All Tests" );
-  m_suite2 = new CppUnit::TestSuite( "Custom" );
-  m_testSuite2a =  new CppUnit::TestCase( "MyTest::testDefaultConstructor" );
-  m_testSuite2b =  new CppUnit::TestCase( "MyTest::testConstructor" );
+  m_path = new CPPUNIT_NS::TestPath();
+  m_test1 = new CPPUNIT_NS::TestCase( "test1" );
+  m_test2 = new CPPUNIT_NS::TestCase( "test2" );
+  m_test3 = new CPPUNIT_NS::TestCase( "test3" );
+  m_test4 = new CPPUNIT_NS::TestCase( "test4" );
+
+  m_suite1 = new CPPUNIT_NS::TestSuite( "All Tests" );
+  m_suite2 = new CPPUNIT_NS::TestSuite( "Custom" );
+  m_testSuite2a =  new CPPUNIT_NS::TestCase( "MyTest::testDefaultConstructor" );
+  m_testSuite2b =  new CPPUNIT_NS::TestCase( "MyTest::testConstructor" );
   m_suite2->addTest( m_testSuite2a );
   m_suite2->addTest( m_testSuite2b );
   m_suite1->addTest( m_suite2 );
@@ -108,7 +108,7 @@ TestPathTest::testGetChildTestThrowIfNotValid()
 void 
 TestPathTest::testAddPath()
 {
-  CppUnit::TestPath path;
+  CPPUNIT_NS::TestPath path;
   path.add( m_test2 );
   path.add( m_test3 );
 
@@ -125,7 +125,7 @@ TestPathTest::testAddPath()
 void 
 TestPathTest::testAddInvalidPath()
 {
-  CppUnit::TestPath path;
+  CPPUNIT_NS::TestPath path;
   m_path->add( path );
 
   CPPUNIT_ASSERT( !m_path->isValid() );
@@ -236,7 +236,7 @@ TestPathTest::testInsertThrow2()
 void 
 TestPathTest::testInsertPath()
 {
-  CppUnit::TestPath path;
+  CPPUNIT_NS::TestPath path;
   path.add( m_test2 );
   path.add( m_test3 );
 
@@ -255,7 +255,7 @@ TestPathTest::testInsertPath()
 void 
 TestPathTest::testInsertPathThrow()
 {
-  CppUnit::TestPath path;
+  CPPUNIT_NS::TestPath path;
   path.add( m_test2 );
 
   m_path->insert( path, 1 );
@@ -265,7 +265,7 @@ TestPathTest::testInsertPathThrow()
 void 
 TestPathTest::testInsertPathDontThrowIfInvalid()
 {
-  CppUnit::TestPath path;
+  CPPUNIT_NS::TestPath path;
   m_path->insert( path, 1 );
 }
 
@@ -273,7 +273,7 @@ TestPathTest::testInsertPathDontThrowIfInvalid()
 void 
 TestPathTest::testRootConstructor()
 {
-  CppUnit::TestPath path( m_test1 );
+  CPPUNIT_NS::TestPath path( m_test1 );
   CPPUNIT_ASSERT( path.isValid() );
   CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() );
   CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) );
@@ -287,7 +287,7 @@ TestPathTest::testPathSliceConstructorCopyUntilEnd()
   m_path->add( m_test2 );
   m_path->add( m_test3 );
   
-  CppUnit::TestPath path( *m_path, 1 );
+  CPPUNIT_NS::TestPath path( *m_path, 1 );
 
   CPPUNIT_ASSERT_EQUAL( 2, path.getTestCount() );
   CPPUNIT_ASSERT( m_test2 == path.getTestAt(0) );
@@ -302,7 +302,7 @@ TestPathTest::testPathSliceConstructorCopySpecifiedCount()
   m_path->add( m_test2 );
   m_path->add( m_test3 );
   
-  CppUnit::TestPath path( *m_path, 0, 1 );
+  CPPUNIT_NS::TestPath path( *m_path, 0, 1 );
 
   CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() );
   CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) );
@@ -314,7 +314,7 @@ TestPathTest::testPathSliceConstructorCopyNone()
 {
   m_path->add( m_test1 );
   
-  CppUnit::TestPath path( *m_path, 0, 0 );
+  CPPUNIT_NS::TestPath path( *m_path, 0, 0 );
   CPPUNIT_ASSERT_EQUAL( 0, path.getTestCount() );
 }
 
@@ -325,7 +325,7 @@ TestPathTest::testPathSliceConstructorNegativeIndex()
   m_path->add( m_test1 );
   m_path->add( m_test2 );
 
-  CppUnit::TestPath path( *m_path, -1, 2 );
+  CPPUNIT_NS::TestPath path( *m_path, -1, 2 );
 
   CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() );
   CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) );
@@ -338,7 +338,7 @@ TestPathTest::testPathSliceConstructorAfterEndIndex()
   m_path->add( m_test1 );
   m_path->add( m_test2 );
 
-  CppUnit::TestPath path( *m_path, 2, 5 );
+  CPPUNIT_NS::TestPath path( *m_path, 2, 5 );
 
   CPPUNIT_ASSERT_EQUAL( 0, path.getTestCount() );
 }
@@ -350,7 +350,7 @@ TestPathTest::testPathSliceConstructorNegativeIndexUntilEnd()
   m_path->add( m_test1 );
   m_path->add( m_test2 );
 
-  CppUnit::TestPath path( *m_path, -1 );
+  CPPUNIT_NS::TestPath path( *m_path, -1 );
 
   CPPUNIT_ASSERT_EQUAL( 2, path.getTestCount() );
   CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) );
@@ -364,7 +364,7 @@ TestPathTest::testPathSliceConstructorNegativeIndexNone()
   m_path->add( m_test1 );
   m_path->add( m_test2 );
 
-  CppUnit::TestPath path( *m_path, -2, 1 );
+  CPPUNIT_NS::TestPath path( *m_path, -2, 1 );
 
   CPPUNIT_ASSERT_EQUAL( 0, path.getTestCount() );
 }
@@ -409,7 +409,7 @@ TestPathTest::testToStringHierarchy()
 void 
 TestPathTest::testPathStringConstructorRoot()
 {
-  CppUnit::TestPath path( m_suite1, "/All Tests" );
+  CPPUNIT_NS::TestPath path( m_suite1, "/All Tests" );
 
   CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() );
   CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) );
@@ -419,7 +419,7 @@ TestPathTest::testPathStringConstructorRoot()
 void 
 TestPathTest::testPathStringConstructorEmptyIsRoot()
 {
-  CppUnit::TestPath path( m_suite1, "" );
+  CPPUNIT_NS::TestPath path( m_suite1, "" );
 
   CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() );
   CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) );
@@ -429,7 +429,7 @@ TestPathTest::testPathStringConstructorEmptyIsRoot()
 void 
 TestPathTest::testPathStringConstructorHierarchy()
 {
-  CppUnit::TestPath path( m_suite1, "/All Tests/Custom/MyTest::testDefaultConstructor" );
+  CPPUNIT_NS::TestPath path( m_suite1, "/All Tests/Custom/MyTest::testDefaultConstructor" );
 
   CPPUNIT_ASSERT_EQUAL( 3, path.getTestCount() );
   CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) );
@@ -441,14 +441,14 @@ TestPathTest::testPathStringConstructorHierarchy()
 void 
 TestPathTest::testPathStringConstructorBadRootThrow()
 {
-  CppUnit::TestPath path( m_suite1, "/Custom" );
+  CPPUNIT_NS::TestPath path( m_suite1, "/Custom" );
 }
 
 
 void 
 TestPathTest::testPathStringConstructorRelativeRoot()
 {
-  CppUnit::TestPath path( m_suite1, "All Tests" );
+  CPPUNIT_NS::TestPath path( m_suite1, "All Tests" );
 
   CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() );
   CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) );
@@ -458,7 +458,7 @@ TestPathTest::testPathStringConstructorRelativeRoot()
 void 
 TestPathTest::testPathStringConstructorRelativeRoot2()
 {
-  CppUnit::TestPath path( m_suite1, "Custom" );
+  CPPUNIT_NS::TestPath path( m_suite1, "Custom" );
 
   CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() );
   CPPUNIT_ASSERT( m_suite2 == path.getTestAt(0) );
@@ -468,14 +468,14 @@ TestPathTest::testPathStringConstructorRelativeRoot2()
 void 
 TestPathTest::testPathStringConstructorThrow1()
 {
-  CppUnit::TestPath path( m_suite1, "/" );
+  CPPUNIT_NS::TestPath path( m_suite1, "/" );
 }
 
 
 void 
 TestPathTest::testPathStringConstructorRelativeHierarchy()
 {
-  CppUnit::TestPath path( m_suite1, "Custom/MyTest::testConstructor" );
+  CPPUNIT_NS::TestPath path( m_suite1, "Custom/MyTest::testConstructor" );
 
   CPPUNIT_ASSERT_EQUAL( 2, path.getTestCount() );
   CPPUNIT_ASSERT( m_suite2 == path.getTestAt(0) );
@@ -486,5 +486,5 @@ TestPathTest::testPathStringConstructorRelativeHierarchy()
 void 
 TestPathTest::testPathStringConstructorBadRelativeHierarchyThrow()
 {
-  CppUnit::TestPath path( m_suite1, "Custom/MyBadTest::testConstructor" );
+  CPPUNIT_NS::TestPath path( m_suite1, "Custom/MyBadTest::testConstructor" );
 }
diff --git a/examples/cppunittest/TestPathTest.h b/examples/cppunittest/TestPathTest.h
index 6ed4a98..655a807 100644
--- a/examples/cppunittest/TestPathTest.h
+++ b/examples/cppunittest/TestPathTest.h
@@ -10,7 +10,7 @@
 /*! \class TestPathTest
  * \brief Unit tests for class TestPath.
  */
-class TestPathTest : public CppUnit::TestFixture
+class TestPathTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestPathTest );
   CPPUNIT_TEST( testDefaultConstructor );
@@ -126,15 +126,15 @@ private:
   void operator =( const TestPathTest &copy );
 
 private:
-  CppUnit::TestPath *m_path;
-  CppUnit::TestCase *m_test1;
-  CppUnit::TestCase *m_test2;
-  CppUnit::TestCase *m_test3;
-  CppUnit::TestCase *m_test4;
-  CppUnit::TestSuite *m_suite1;
-  CppUnit::TestSuite *m_suite2;
-  CppUnit::TestCase *m_testSuite2a;
-  CppUnit::TestCase *m_testSuite2b;
+  CPPUNIT_NS::TestPath *m_path;
+  CPPUNIT_NS::TestCase *m_test1;
+  CPPUNIT_NS::TestCase *m_test2;
+  CPPUNIT_NS::TestCase *m_test3;
+  CPPUNIT_NS::TestCase *m_test4;
+  CPPUNIT_NS::TestSuite *m_suite1;
+  CPPUNIT_NS::TestSuite *m_suite2;
+  CPPUNIT_NS::TestCase *m_testSuite2a;
+  CPPUNIT_NS::TestCase *m_testSuite2b;
 };
 
 
diff --git a/examples/cppunittest/TestResultCollectorTest.cpp b/examples/cppunittest/TestResultCollectorTest.cpp
index bb60dd6..0d8fdd6 100644
--- a/examples/cppunittest/TestResultCollectorTest.cpp
+++ b/examples/cppunittest/TestResultCollectorTest.cpp
@@ -22,10 +22,10 @@ TestResultCollectorTest::setUp()
 {
   m_lockCount = 0;
   m_unlockCount = 0;
-  m_result = new CppUnit::TestResultCollector();
+  m_result = new CPPUNIT_NS::TestResultCollector();
   m_synchronizedResult = new SynchronizedTestResult( this );  
-  m_test = new CppUnit::TestCase();
-  m_test2 = new CppUnit::TestCase();
+  m_test = new CPPUNIT_NS::TestCase();
+  m_test2 = new CPPUNIT_NS::TestCase();
 }
 
 
@@ -49,16 +49,16 @@ TestResultCollectorTest::testConstructor()
 void 
 TestResultCollectorTest::testAddTwoErrors()
 {
-  CppUnit::Message errorMessage1( "First Error" );
-  CppUnit::Message errorMessage2( "Second Error" );
+  CPPUNIT_NS::Message errorMessage1( "First Error" );
+  CPPUNIT_NS::Message errorMessage2( "Second Error" );
   {
-    CppUnit::TestFailure failure1( m_test, 
-                                   new CppUnit::Exception( errorMessage1 ),
+    CPPUNIT_NS::TestFailure failure1( m_test, 
+                                   new CPPUNIT_NS::Exception( errorMessage1 ),
                                    true );
     m_result->addFailure( failure1 );
 
-    CppUnit::TestFailure failure2( m_test2, 
-                                   new CppUnit::Exception( errorMessage2 ),
+    CPPUNIT_NS::TestFailure failure2( m_test2, 
+                                   new CPPUNIT_NS::Exception( errorMessage2 ),
                                    true );
     m_result->addFailure( failure2 );
   } // ensure that the test result duplicate the failures.
@@ -78,16 +78,16 @@ TestResultCollectorTest::testAddTwoErrors()
 void 
 TestResultCollectorTest::testAddTwoFailures()
 {
-  CppUnit::Message errorMessage1( "First Failure" );
-  CppUnit::Message errorMessage2( "Second Failure" );
+  CPPUNIT_NS::Message errorMessage1( "First Failure" );
+  CPPUNIT_NS::Message errorMessage2( "Second Failure" );
   {
-    CppUnit::TestFailure failure1( m_test, 
-                                   new CppUnit::Exception( errorMessage1 ),
+    CPPUNIT_NS::TestFailure failure1( m_test, 
+                                   new CPPUNIT_NS::Exception( errorMessage1 ),
                                    false );
     m_result->addFailure( failure1 );
 
-    CppUnit::TestFailure failure2( m_test2, 
-                                   new CppUnit::Exception( errorMessage2 ),
+    CPPUNIT_NS::TestFailure failure2( m_test2, 
+                                   new CPPUNIT_NS::Exception( errorMessage2 ),
                                    false );
     m_result->addFailure( failure2 );
   } // ensure that the test result duplicate the failures.
@@ -227,12 +227,12 @@ TestResultCollectorTest::checkResult( int failures,
 
 
 void
-TestResultCollectorTest::checkFailure( CppUnit::TestFailure *failure,
-                                       CppUnit::Message expectedMessage,
-                                       CppUnit::Test *expectedTest,
+TestResultCollectorTest::checkFailure( CPPUNIT_NS::TestFailure *failure,
+                                       CPPUNIT_NS::Message expectedMessage,
+                                       CPPUNIT_NS::Test *expectedTest,
                                        bool expectedIsError )
 {
-  CppUnit::Message actualMessage( failure->thrownException()->message() );
+  CPPUNIT_NS::Message actualMessage( failure->thrownException()->message() );
   CPPUNIT_ASSERT( expectedMessage == actualMessage );
   CPPUNIT_ASSERT_EQUAL( expectedTest, failure->failedTest() );
   CPPUNIT_ASSERT_EQUAL( expectedIsError, failure->isError() );
@@ -286,12 +286,12 @@ TestResultCollectorTest::addError( std::string message )
 
 void 
 TestResultCollectorTest::addFailure( std::string message, 
-                                     CppUnit::Test *failedTest, 
+                                     CPPUNIT_NS::Test *failedTest, 
                                      bool isError,
-                                     CppUnit::TestResultCollector *result )
+                                     CPPUNIT_NS::TestResultCollector *result )
 {
-  CppUnit::TestFailure failure( failedTest, 
-                                new CppUnit::Exception( CppUnit::Message( message ) ), 
+  CPPUNIT_NS::TestFailure failure( failedTest, 
+                                new CPPUNIT_NS::Exception( CPPUNIT_NS::Message( message ) ), 
                                 isError );
   result->addFailure( failure );
 }
diff --git a/examples/cppunittest/TestResultCollectorTest.h b/examples/cppunittest/TestResultCollectorTest.h
index ad3f582..bf7e5ae 100644
--- a/examples/cppunittest/TestResultCollectorTest.h
+++ b/examples/cppunittest/TestResultCollectorTest.h
@@ -6,7 +6,7 @@
 #include "SynchronizedTestResult.h"
 
 
-class TestResultCollectorTest : public CppUnit::TestFixture,
+class TestResultCollectorTest : public CPPUNIT_NS::TestFixture,
                        public SynchronizedTestResult::SynchronizationObjectListener
 {
   CPPUNIT_TEST_SUITE( TestResultCollectorTest );
@@ -66,9 +66,9 @@ private:
                     int errors,
                     int testsRun );
 
-  void checkFailure( CppUnit::TestFailure *failure,
-                     CppUnit::Message expectedMessage,
-                     CppUnit::Test *expectedTest,
+  void checkFailure( CPPUNIT_NS::TestFailure *failure,
+                     CPPUNIT_NS::Message expectedMessage,
+                     CPPUNIT_NS::Test *expectedTest,
                      bool expectedIsError );
 
   void checkWasSuccessful( bool shouldBeSuccessful );
@@ -78,15 +78,15 @@ private:
   void addFailure( std::string message );
   void addError( std::string message );
   void addFailure( std::string message, 
-                   CppUnit::Test *failedTest, 
+                   CPPUNIT_NS::Test *failedTest, 
                    bool isError,
-                   CppUnit::TestResultCollector *result );
+                   CPPUNIT_NS::TestResultCollector *result );
 
 private:
-  CppUnit::TestResultCollector *m_result;
+  CPPUNIT_NS::TestResultCollector *m_result;
   SynchronizedTestResult *m_synchronizedResult;  
-  CppUnit::Test *m_test;
-  CppUnit::Test *m_test2;
+  CPPUNIT_NS::Test *m_test;
+  CPPUNIT_NS::Test *m_test2;
   int m_lockCount;
   int m_unlockCount;
 };
diff --git a/examples/cppunittest/TestResultTest.cpp b/examples/cppunittest/TestResultTest.cpp
index b43b1b0..f1987ac 100644
--- a/examples/cppunittest/TestResultTest.cpp
+++ b/examples/cppunittest/TestResultTest.cpp
@@ -19,10 +19,10 @@ TestResultTest::~TestResultTest()
 void 
 TestResultTest::setUp()
 {
-  m_result = new CppUnit::TestResult();
+  m_result = new CPPUNIT_NS::TestResult();
   m_listener1 = new MockTestListener( "listener1" );
   m_listener2 = new MockTestListener( "listener2" );
-  m_dummyTest = new CppUnit::TestCase();
+  m_dummyTest = new CPPUNIT_NS::TestCase();
 }
 
 
@@ -54,8 +54,8 @@ TestResultTest::testStop()
 void 
 TestResultTest::testAddError()
 {
-  CppUnit::Exception *dummyException = new CppUnit::Exception( 
-                                           CppUnit::Message( "some_error" ) );
+  CPPUNIT_NS::Exception *dummyException = new CPPUNIT_NS::Exception( 
+                                           CPPUNIT_NS::Message( "some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException, true );
   m_result->addListener( m_listener1 );
 
@@ -68,8 +68,8 @@ TestResultTest::testAddError()
 void 
 TestResultTest::testAddFailure()
 {
-  CppUnit::Exception *dummyException = new CppUnit::Exception( 
-                                            CppUnit::Message("some_error" ) );
+  CPPUNIT_NS::Exception *dummyException = new CPPUNIT_NS::Exception( 
+                                            CPPUNIT_NS::Message("some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException, false );
   m_result->addListener( m_listener1 );
 
@@ -145,8 +145,8 @@ TestResultTest::testTwoListener()
 {
   m_listener1->setExpectStartTest( m_dummyTest );
   m_listener2->setExpectStartTest( m_dummyTest );
-  CppUnit::Exception *dummyException1 = new CppUnit::Exception( 
-                                             CppUnit::Message( "some_error" ) );
+  CPPUNIT_NS::Exception *dummyException1 = new CPPUNIT_NS::Exception( 
+                                             CPPUNIT_NS::Message( "some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException1, true );
   m_listener2->setExpectFailure( m_dummyTest, dummyException1, true );
   m_listener1->setExpectEndTest( m_dummyTest );
diff --git a/examples/cppunittest/TestResultTest.h b/examples/cppunittest/TestResultTest.h
index 44a0f45..28b0369 100644
--- a/examples/cppunittest/TestResultTest.h
+++ b/examples/cppunittest/TestResultTest.h
@@ -6,7 +6,7 @@
 #include "MockTestListener.h"
 
 
-class TestResultTest : public CppUnit::TestFixture
+class TestResultTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestResultTest );
   CPPUNIT_TEST( testConstructor );
@@ -46,10 +46,10 @@ private:
   void operator =( const TestResultTest &copy );
 
 private:
-  CppUnit::TestResult *m_result;
+  CPPUNIT_NS::TestResult *m_result;
   MockTestListener *m_listener1;
   MockTestListener *m_listener2;
-  CppUnit::Test *m_dummyTest;
+  CPPUNIT_NS::Test *m_dummyTest;
 };
 
 
diff --git a/examples/cppunittest/TestSetUpTest.cpp b/examples/cppunittest/TestSetUpTest.cpp
index 5a4bad8..6622d41 100644
--- a/examples/cppunittest/TestSetUpTest.cpp
+++ b/examples/cppunittest/TestSetUpTest.cpp
@@ -31,8 +31,8 @@ TestSetUpTest::tearDown()
 void 
 TestSetUpTest::testRun()
 {
-  CppUnit::TestResult result;
-  CppUnit::TestCase test;
+  CPPUNIT_NS::TestResult result;
+  CPPUNIT_NS::TestCase test;
   MockSetUp setUpTest( &test );
   
   setUpTest.run( &result );
diff --git a/examples/cppunittest/TestSetUpTest.h b/examples/cppunittest/TestSetUpTest.h
index aa8fcdd..117473b 100644
--- a/examples/cppunittest/TestSetUpTest.h
+++ b/examples/cppunittest/TestSetUpTest.h
@@ -5,7 +5,7 @@
 #include <cppunit/extensions/TestSetUp.h>
 
 
-class TestSetUpTest : public CppUnit::TestFixture
+class TestSetUpTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestSetUpTest );
   CPPUNIT_TEST( testRun );
@@ -21,11 +21,11 @@ public:
   void testRun();
 
 private:
-  class MockSetUp : public CppUnit::TestSetUp
+  class MockSetUp : public CPPUNIT_NS::TestSetUp
   {
   public:
-    MockSetUp( CppUnit::Test *test )
-        : CppUnit::TestSetUp( test )
+    MockSetUp( CPPUNIT_NS::Test *test )
+        : CPPUNIT_NS::TestSetUp( test )
         , m_setUpCalled( false )
         , m_tearDownCalled( false )
     {
diff --git a/examples/cppunittest/TestSuiteTest.cpp b/examples/cppunittest/TestSuiteTest.cpp
index d63dc45..ae6e65a 100644
--- a/examples/cppunittest/TestSuiteTest.cpp
+++ b/examples/cppunittest/TestSuiteTest.cpp
@@ -21,7 +21,7 @@ TestSuiteTest::~TestSuiteTest()
 void 
 TestSuiteTest::setUp()
 {
-  m_suite = new CppUnit::TestSuite();
+  m_suite = new CPPUNIT_NS::TestSuite();
 }
 
 
@@ -36,7 +36,7 @@ void
 TestSuiteTest::testConstructor()
 {
   std::string name( "MySuite" );
-  CppUnit::TestSuite suite( name );
+  CPPUNIT_NS::TestSuite suite( name );
   CPPUNIT_ASSERT_EQUAL( name, suite.getName() );
 }
 
@@ -73,7 +73,7 @@ TestSuiteTest::testCountTestCasesWithSubSuite()
   case2->setExpectedCountTestCasesCall();
   MockTestCase *case3 = new MockTestCase( "test3" );
   case3->setExpectedCountTestCasesCall();
-  CppUnit::TestSuite *subSuite = new CppUnit::TestSuite( "SubSuite");
+  CPPUNIT_NS::TestSuite *subSuite = new CPPUNIT_NS::TestSuite( "SubSuite");
   subSuite->addTest( case1 );
   subSuite->addTest( case2 );
   m_suite->addTest( case3 );
@@ -93,7 +93,7 @@ TestSuiteTest::testRunWithOneTest()
   case1->setExpectedRunTestCall();
   m_suite->addTest( case1 );
 
-  CppUnit::TestResult result;
+  CPPUNIT_NS::TestResult result;
   m_suite->run( &result );
 
   case1->verify();
@@ -109,13 +109,13 @@ TestSuiteTest::testRunWithOneTestAndSubSuite()
   case2->setExpectedRunTestCall();
   MockTestCase *case3 = new MockTestCase( "test3" );
   case3->setExpectedRunTestCall();
-  CppUnit::TestSuite *subSuite = new CppUnit::TestSuite( "SubSuite");
+  CPPUNIT_NS::TestSuite *subSuite = new CPPUNIT_NS::TestSuite( "SubSuite");
   subSuite->addTest( case1 );
   subSuite->addTest( case2 );
   m_suite->addTest( case3 );
   m_suite->addTest( subSuite);
 
-  CppUnit::TestResult result;
+  CPPUNIT_NS::TestResult result;
   m_suite->run( &result );
 
   case1->verify();
@@ -127,8 +127,8 @@ TestSuiteTest::testRunWithOneTestAndSubSuite()
 void 
 TestSuiteTest::testGetTests()
 {
-  m_suite->addTest( new CppUnit::TestCase( "test1" ) );
-  m_suite->addTest( new CppUnit::TestCase( "test2" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test1" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) );
   CPPUNIT_ASSERT_EQUAL( 2, int(m_suite->getTests().size()) );
 }
 
@@ -136,7 +136,7 @@ TestSuiteTest::testGetTests()
 void 
 TestSuiteTest::testDeleteContents()
 {
-  m_suite->addTest( new CppUnit::TestCase( "test2" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) );
   m_suite->deleteContents();
   CPPUNIT_ASSERT_EQUAL( 0, int(m_suite->getTests().size()) );
 }
@@ -145,8 +145,8 @@ TestSuiteTest::testDeleteContents()
 void 
 TestSuiteTest::testGetChildTestCount()
 {
-  m_suite->addTest( new CppUnit::TestCase( "test1" ) );
-  m_suite->addTest( new CppUnit::TestCase( "test2" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test1" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) );
 
   CPPUNIT_ASSERT_EQUAL( 2, m_suite->getChildTestCount() );
 }
@@ -155,8 +155,8 @@ TestSuiteTest::testGetChildTestCount()
 void 
 TestSuiteTest::testGetChildTestAt()
 {
-  CppUnit::TestCase *test1 = new CppUnit::TestCase( "test1" );
-  CppUnit::TestCase *test2 = new CppUnit::TestCase( "test2" );
+  CPPUNIT_NS::TestCase *test1 = new CPPUNIT_NS::TestCase( "test1" );
+  CPPUNIT_NS::TestCase *test2 = new CPPUNIT_NS::TestCase( "test2" );
   m_suite->addTest( test1 );
   m_suite->addTest( test2 );
 
diff --git a/examples/cppunittest/TestTest.cpp b/examples/cppunittest/TestTest.cpp
index c551a95..a98cc08 100644
--- a/examples/cppunittest/TestTest.cpp
+++ b/examples/cppunittest/TestTest.cpp
@@ -7,7 +7,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestTest,
 
 
 TestTest::TestTest() : 
-    CppUnit::TestFixture()
+    CPPUNIT_NS::TestFixture()
 {
 }
 
@@ -20,13 +20,13 @@ TestTest::~TestTest()
 void 
 TestTest::setUp()
 {
-  m_suite = new CppUnit::TestSuite( "suite" );
+  m_suite = new CPPUNIT_NS::TestSuite( "suite" );
   m_test1 = new MockTestCase( "test1" );
   m_test2 = new MockTestCase( "test2" );
   m_suite->addTest( m_test1 );
   m_suite->addTest( m_test2 );
   
-  m_path = new CppUnit::TestPath();
+  m_path = new CPPUNIT_NS::TestPath();
 }
 
 
@@ -122,11 +122,11 @@ TestTest::testFindTestThrow()
 void 
 TestTest::testResolveTestPath()
 {
-  CppUnit::TestPath path1 = m_suite->resolveTestPath( "suite");
+  CPPUNIT_NS::TestPath path1 = m_suite->resolveTestPath( "suite");
   CPPUNIT_ASSERT_EQUAL( 1, path1.getTestCount() );
   CPPUNIT_ASSERT( m_suite == path1.getTestAt(0) );
 
-  CppUnit::TestPath path2 = m_suite->resolveTestPath( "suite/test2");
+  CPPUNIT_NS::TestPath path2 = m_suite->resolveTestPath( "suite/test2");
   CPPUNIT_ASSERT_EQUAL( 2, path2.getTestCount() );
   CPPUNIT_ASSERT( m_suite == path2.getTestAt(0) );
   CPPUNIT_ASSERT( m_test2 == path2.getTestAt(1) );
diff --git a/examples/cppunittest/TestTest.h b/examples/cppunittest/TestTest.h
index fa0cef2..d556ace 100644
--- a/examples/cppunittest/TestTest.h
+++ b/examples/cppunittest/TestTest.h
@@ -11,7 +11,7 @@
 /*! \class TestTest
  * \brief Unit test for class Test.
  */
-class TestTest : public CppUnit::TestFixture
+class TestTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestTest );
   CPPUNIT_TEST( testFindTestPathPointerThis );
@@ -57,10 +57,10 @@ private:
   void operator =( const TestTest &copy );
 
 private:
-  CppUnit::TestSuite *m_suite;
+  CPPUNIT_NS::TestSuite *m_suite;
   MockTestCase *m_test1;
   MockTestCase *m_test2;
-  CppUnit::TestPath *m_path;
+  CPPUNIT_NS::TestPath *m_path;
 };
 
 
diff --git a/examples/cppunittest/TrackedTestCase.h b/examples/cppunittest/TrackedTestCase.h
index b437033..f665c50 100644
--- a/examples/cppunittest/TrackedTestCase.h
+++ b/examples/cppunittest/TrackedTestCase.h
@@ -17,7 +17,7 @@ public:
 };
 
 
-class TrackedTestCase : public CppUnit::TestCase
+class TrackedTestCase : public CPPUNIT_NS::TestCase
 {
 public:
   TrackedTestCase();
diff --git a/examples/cppunittest/XmlElementTest.cpp b/examples/cppunittest/XmlElementTest.cpp
index 585b0ba..02ffee7 100644
--- a/examples/cppunittest/XmlElementTest.cpp
+++ b/examples/cppunittest/XmlElementTest.cpp
@@ -33,7 +33,7 @@ XmlElementTest::tearDown()
 void 
 XmlElementTest::testStringContentConstructor()
 {
-  CppUnit::XmlElement element( "aName", "someContent" );
+  CPPUNIT_NS::XmlElement element( "aName", "someContent" );
   CPPUNIT_ASSERT_EQUAL( std::string("aName"), element.name() );
   CPPUNIT_ASSERT_EQUAL( std::string("someContent"), element.content() );
 }
@@ -42,7 +42,7 @@ XmlElementTest::testStringContentConstructor()
 void 
 XmlElementTest::testNumericContentConstructor()
 {
-  CppUnit::XmlElement element( "numericName", 123456789 );
+  CPPUNIT_NS::XmlElement element( "numericName", 123456789 );
   CPPUNIT_ASSERT_EQUAL( std::string("numericName"), element.name() );
   CPPUNIT_ASSERT_EQUAL( std::string("123456789"), element.content() );
 }
@@ -51,7 +51,7 @@ XmlElementTest::testNumericContentConstructor()
 void 
 XmlElementTest::testSetName()
 {
-  CppUnit::XmlElement element( "aName" );
+  CPPUNIT_NS::XmlElement element( "aName" );
   element.setName( "anotherName" );
   CPPUNIT_ASSERT_EQUAL( std::string("anotherName"), element.name() );
 }
@@ -60,7 +60,7 @@ XmlElementTest::testSetName()
 void 
 XmlElementTest::testSetStringContent()
 {
-  CppUnit::XmlElement element( "aName", "someContent" );
+  CPPUNIT_NS::XmlElement element( "aName", "someContent" );
   element.setContent( "other" );
   CPPUNIT_ASSERT_EQUAL( std::string("other"), element.content() );
 }
@@ -69,7 +69,7 @@ XmlElementTest::testSetStringContent()
 void 
 XmlElementTest::testSetNumericContent()
 {
-  CppUnit::XmlElement element( "aName", "someContent" );
+  CPPUNIT_NS::XmlElement element( "aName", "someContent" );
   element.setContent( 87654321 );
   CPPUNIT_ASSERT_EQUAL( std::string("87654321"), element.content() );
 }
@@ -78,11 +78,11 @@ XmlElementTest::testSetNumericContent()
 void 
 XmlElementTest::testElementCount()
 {
-  CppUnit::XmlElement node( "element", "content" );
+  CPPUNIT_NS::XmlElement node( "element", "content" );
   CPPUNIT_ASSERT_EQUAL( 0, node.elementCount() );
 
-  node.addElement( new CppUnit::XmlElement( "child1" ) );
-  node.addElement( new CppUnit::XmlElement( "child2" ) );
+  node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) );
+  node.addElement( new CPPUNIT_NS::XmlElement( "child2" ) );
   CPPUNIT_ASSERT_EQUAL( 2, node.elementCount() );
 }
 
@@ -90,7 +90,7 @@ XmlElementTest::testElementCount()
 void 
 XmlElementTest::testElementAtNegativeIndexThrow()
 {
-  CppUnit::XmlElement node( "element" );
+  CPPUNIT_NS::XmlElement node( "element" );
   node.elementAt( -1 );
 }
 
@@ -98,7 +98,7 @@ XmlElementTest::testElementAtNegativeIndexThrow()
 void 
 XmlElementTest::testElementAtTooLargeIndexThrow()
 {
-  CppUnit::XmlElement node( "element" );
+  CPPUNIT_NS::XmlElement node( "element" );
   node.elementAt( 0 );
 }
 
@@ -106,9 +106,9 @@ XmlElementTest::testElementAtTooLargeIndexThrow()
 void 
 XmlElementTest::testElementAt()
 {
-  CppUnit::XmlElement node( "element" );
-  CppUnit::XmlElement *element1 = new CppUnit::XmlElement( "element1" );
-  CppUnit::XmlElement *element2 = new CppUnit::XmlElement( "element2" );
+  CPPUNIT_NS::XmlElement node( "element" );
+  CPPUNIT_NS::XmlElement *element1 = new CPPUNIT_NS::XmlElement( "element1" );
+  CPPUNIT_NS::XmlElement *element2 = new CPPUNIT_NS::XmlElement( "element2" );
   node.addElement( element1 );
   node.addElement( element2 );
 
@@ -120,8 +120,8 @@ XmlElementTest::testElementAt()
 void 
 XmlElementTest::testElementForThrow()
 {
-  CppUnit::XmlElement node( "element" );
-  node.addElement( new CppUnit::XmlElement( "element1" ) );
+  CPPUNIT_NS::XmlElement node( "element" );
+  node.addElement( new CPPUNIT_NS::XmlElement( "element1" ) );
   node.elementFor( "name2" );
 }
 
@@ -129,9 +129,9 @@ XmlElementTest::testElementForThrow()
 void 
 XmlElementTest::testElementFor()
 {
-  CppUnit::XmlElement node( "element" );
-  CppUnit::XmlElement *element1 = new CppUnit::XmlElement( "element1" );
-  CppUnit::XmlElement *element2 = new CppUnit::XmlElement( "element2" );
+  CPPUNIT_NS::XmlElement node( "element" );
+  CPPUNIT_NS::XmlElement *element1 = new CPPUNIT_NS::XmlElement( "element1" );
+  CPPUNIT_NS::XmlElement *element2 = new CPPUNIT_NS::XmlElement( "element2" );
   node.addElement( element1 );
   node.addElement( element2 );
 
@@ -143,7 +143,7 @@ XmlElementTest::testElementFor()
 void 
 XmlElementTest::testEmptyNodeToString()
 {
-  CppUnit::XmlElement node( "element" );
+  CPPUNIT_NS::XmlElement node( "element" );
   std::string expectedXml = "<element></element>";
   CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() );
 }
@@ -152,7 +152,7 @@ XmlElementTest::testEmptyNodeToString()
 void 
 XmlElementTest::testElementWithAttributesToString()
 {
-  CppUnit::XmlElement node( "element" );
+  CPPUNIT_NS::XmlElement node( "element" );
   node.addAttribute( "id", 17 );
   node.addAttribute( "date-format", "iso-8901" );
   std::string expectedXml = "<element id=\"17\" "
@@ -165,7 +165,7 @@ XmlElementTest::testElementWithAttributesToString()
 void 
 XmlElementTest::testEscapedAttributeValueToString()
 {
-  CppUnit::XmlElement node( "element" );
+  CPPUNIT_NS::XmlElement node( "element" );
   node.addAttribute( "escaped", "&<>\"'" );
   std::string expectedXml = "<element escaped=\""
                             "&amp;&lt;&gt;&quot;&apos;"
@@ -177,7 +177,7 @@ XmlElementTest::testEscapedAttributeValueToString()
 void 
 XmlElementTest::testElementToStringEscapeContent()
 {
-  CppUnit::XmlElement node( "element", "ChessTest<class Chess>" );
+  CPPUNIT_NS::XmlElement node( "element", "ChessTest<class Chess>" );
   std::string expectedXml = "<element>"
                             "ChessTest&lt;class Chess&gt;"
                             "</element>";
@@ -188,9 +188,9 @@ XmlElementTest::testElementToStringEscapeContent()
 void 
 XmlElementTest::testElementWithChildrenToString()
 {
-  CppUnit::XmlElement node( "element" );
-  node.addElement( new CppUnit::XmlElement( "child1" ) );
-  node.addElement( new CppUnit::XmlElement( "child2" ) );
+  CPPUNIT_NS::XmlElement node( "element" );
+  node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) );
+  node.addElement( new CPPUNIT_NS::XmlElement( "child2" ) );
   std::string expectedXml = "<element><child1></child1>"
                             "<child2></child2></element>";
   CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() );
@@ -200,7 +200,7 @@ XmlElementTest::testElementWithChildrenToString()
 void 
 XmlElementTest::testElementWithContentToString()
 {
-  CppUnit::XmlElement node( "element", "content\nline2" );
+  CPPUNIT_NS::XmlElement node( "element", "content\nline2" );
   std::string expectedXml = "<element>content\nline2</element>";
   CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() );
 }
@@ -209,7 +209,7 @@ XmlElementTest::testElementWithContentToString()
 void 
 XmlElementTest::testElementWithNumericContentToString()
 {
-  CppUnit::XmlElement node( "element", 123456789 );
+  CPPUNIT_NS::XmlElement node( "element", 123456789 );
   std::string expectedXml = "<element>123456789</element>";
   CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() );
 }
@@ -218,8 +218,8 @@ XmlElementTest::testElementWithNumericContentToString()
 void 
 XmlElementTest::testElementWithContentAndChildToString()
 {
-  CppUnit::XmlElement node( "element", "content" );
-  node.addElement( new CppUnit::XmlElement( "child1" ) );
+  CPPUNIT_NS::XmlElement node( "element", "content" );
+  node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) );
   std::string expectedXml = "<element><child1></child1>content</element>";
   CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() );
 }
diff --git a/examples/cppunittest/XmlOutputterTest.cpp b/examples/cppunittest/XmlOutputterTest.cpp
index 7e85191..486f00c 100644
--- a/examples/cppunittest/XmlOutputterTest.cpp
+++ b/examples/cppunittest/XmlOutputterTest.cpp
@@ -25,7 +25,7 @@ void
 XmlOutputterTest::setUp()
 {
   m_dummyTests.clear();
-  m_result = new CppUnit::TestResultCollector();
+  m_result = new CPPUNIT_NS::TestResultCollector();
 }
 
 
@@ -42,8 +42,8 @@ XmlOutputterTest::tearDown()
 void 
 XmlOutputterTest::testWriteXmlResultWithNoTest()
 {
-  CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( m_result, stream );
+  CPPUNIT_NS::OStringStream stream;
+  CPPUNIT_NS::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -65,10 +65,10 @@ XmlOutputterTest::testWriteXmlResultWithNoTest()
 void 
 XmlOutputterTest::testWriteXmlResultWithOneFailure()
 {
-  addTestFailure( "test1", "message failure1", CppUnit::SourceLine( "test.cpp", 3 ) );
+  addTestFailure( "test1", "message failure1", CPPUNIT_NS::SourceLine( "test.cpp", 3 ) );
 
-  CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( m_result, stream );
+  CPPUNIT_NS::OStringStream stream;
+  CPPUNIT_NS::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -102,8 +102,8 @@ XmlOutputterTest::testWriteXmlResultWithOneError()
 {
   addTestError( "test1", "message error1" );
 
-  CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( m_result, stream );
+  CPPUNIT_NS::OStringStream stream;
+  CPPUNIT_NS::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -133,8 +133,8 @@ XmlOutputterTest::testWriteXmlResultWithOneSuccess()
 {
   addTest( "test1" );
 
-  CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( m_result, stream );
+  CPPUNIT_NS::OStringStream stream;
+  CPPUNIT_NS::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -168,8 +168,8 @@ XmlOutputterTest::testWriteXmlResultWithThreeFailureTwoErrorsAndTwoSuccess()
   addTestError( "test6", "error2" );
   addTest( "test7" );
 
-  CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( m_result, stream );
+  CPPUNIT_NS::OStringStream stream;
+  CPPUNIT_NS::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -221,7 +221,7 @@ XmlOutputterTest::testWriteXmlResultWithThreeFailureTwoErrorsAndTwoSuccess()
 }
 
 
-class XmlOutputterTest::MockHook : public CppUnit::XmlOutputterHook
+class XmlOutputterTest::MockHook : public CPPUNIT_NS::XmlOutputterHook
 {
 public:
   MockHook( int &beginCalls,
@@ -237,33 +237,33 @@ public:
   {
   }
 
-  void beginDocument( CppUnit::XmlDocument *document )
+  void beginDocument( CPPUNIT_NS::XmlDocument *document )
   {
     ++m_beginCalls;
   }
 
-  void endDocument( CppUnit::XmlDocument *document )
+  void endDocument( CPPUNIT_NS::XmlDocument *document )
   {
     ++m_endCalls;
   }
 
-  void failTestAdded( CppUnit::XmlDocument *document,
-                      CppUnit::XmlElement *testElement,
-                      CppUnit::Test *test,
-                      CppUnit::TestFailure *failure )
+  void failTestAdded( CPPUNIT_NS::XmlDocument *document,
+                      CPPUNIT_NS::XmlElement *testElement,
+                      CPPUNIT_NS::Test *test,
+                      CPPUNIT_NS::TestFailure *failure )
   {
     ++m_failedTestCalls;
   }
 
-  void successfulTestAdded( CppUnit::XmlDocument *document,
-                            CppUnit::XmlElement *testElement,
-                            CppUnit::Test *test )
+  void successfulTestAdded( CPPUNIT_NS::XmlDocument *document,
+                            CPPUNIT_NS::XmlElement *testElement,
+                            CPPUNIT_NS::Test *test )
   {
     ++m_successfulTestCalls;
   }
 
-  void statisticsAdded( CppUnit::XmlDocument *document,
-                        CppUnit::XmlElement *statisticsElement )
+  void statisticsAdded( CPPUNIT_NS::XmlDocument *document,
+                        CPPUNIT_NS::XmlElement *statisticsElement )
   {
     ++m_statisticsCalls;
   }
@@ -289,8 +289,8 @@ XmlOutputterTest::testHook()
   addTestFailure( "testfail1", "assertion failed" );
   addTestError( "testerror1", "exception" );
 
-  CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( m_result, stream );
+  CPPUNIT_NS::OStringStream stream;
+  CPPUNIT_NS::XmlOutputter outputter( m_result, stream );
   outputter.addHook( &hook );
   outputter.write();
 
@@ -305,7 +305,7 @@ XmlOutputterTest::testHook()
 void 
 XmlOutputterTest::addTest( std::string testName )
 {
-  CppUnit::Test *test = makeDummyTest( testName );
+  CPPUNIT_NS::Test *test = makeDummyTest( testName );
   m_result->startTest( test );
   m_result->endTest( test );
 }
@@ -314,41 +314,41 @@ XmlOutputterTest::addTest( std::string testName )
 void 
 XmlOutputterTest::addTestFailure( std::string testName,
                                   std::string message,
-                                  CppUnit::SourceLine sourceLine )
+                                  CPPUNIT_NS::SourceLine sourceLine )
 {
-  addGenericTestFailure( testName, CppUnit::Message(message), sourceLine, false );
+  addGenericTestFailure( testName, CPPUNIT_NS::Message(message), sourceLine, false );
 }
 
 
 void 
 XmlOutputterTest::addTestError( std::string testName,
                                 std::string message,
-                                CppUnit::SourceLine sourceLine )
+                                CPPUNIT_NS::SourceLine sourceLine )
 {
-  addGenericTestFailure( testName, CppUnit::Message(message), sourceLine, true );
+  addGenericTestFailure( testName, CPPUNIT_NS::Message(message), sourceLine, true );
 }
 
 
 void 
 XmlOutputterTest::addGenericTestFailure(  std::string testName,
-                                          CppUnit::Message message,
-                                          CppUnit::SourceLine sourceLine,
+                                          CPPUNIT_NS::Message message,
+                                          CPPUNIT_NS::SourceLine sourceLine,
                                           bool isError )
 {
-  CppUnit::Test *test = makeDummyTest( testName );
+  CPPUNIT_NS::Test *test = makeDummyTest( testName );
   m_result->startTest( test );
-  CppUnit::TestFailure failure( test, 
-                                new CppUnit::Exception( message, sourceLine ),
+  CPPUNIT_NS::TestFailure failure( test, 
+                                new CPPUNIT_NS::Exception( message, sourceLine ),
                                 isError );
   m_result->addFailure( failure );
   m_result->endTest( test );
 }
 
 
-CppUnit::Test *
+CPPUNIT_NS::Test *
 XmlOutputterTest::makeDummyTest( std::string testName )
 {
-  CppUnit::Test *test = new CppUnit::TestCase( testName );
+  CPPUNIT_NS::Test *test = new CPPUNIT_NS::TestCase( testName );
   m_dummyTests.push_back( test );
   return test;
 }
diff --git a/examples/cppunittest/XmlOutputterTest.h b/examples/cppunittest/XmlOutputterTest.h
index a1600ee..c451a2b 100644
--- a/examples/cppunittest/XmlOutputterTest.h
+++ b/examples/cppunittest/XmlOutputterTest.h
@@ -11,7 +11,7 @@
 /*! \class XmlOutputterTest
  * \brief Unit tests for XmlOutputter.
  */
-class XmlOutputterTest : public CppUnit::TestFixture
+class XmlOutputterTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( XmlOutputterTest );
   CPPUNIT_TEST( testWriteXmlResultWithNoTest );
@@ -57,20 +57,20 @@ private:
   void addTest( std::string testName );
   void addTestFailure( std::string testName,
                        std::string message,
-                       CppUnit::SourceLine sourceLine = CppUnit::SourceLine() );
+                       CPPUNIT_NS::SourceLine sourceLine = CPPUNIT_NS::SourceLine() );
   void addTestError( std::string testName,
                      std::string message,
-                     CppUnit::SourceLine sourceLine = CppUnit::SourceLine() );
+                     CPPUNIT_NS::SourceLine sourceLine = CPPUNIT_NS::SourceLine() );
   void addGenericTestFailure( std::string testName,
-                              CppUnit::Message message,
-                              CppUnit::SourceLine sourceLine,
+                              CPPUNIT_NS::Message message,
+                              CPPUNIT_NS::SourceLine sourceLine,
                               bool isError );
 
-  CppUnit::Test *makeDummyTest( std::string testName );
+  CPPUNIT_NS::Test *makeDummyTest( std::string testName );
 
 private:
-  CppUnit::TestResultCollector *m_result;
-  std::deque<CppUnit::Test *> m_dummyTests;
+  CPPUNIT_NS::TestResultCollector *m_result;
+  std::deque<CPPUNIT_NS::Test *> m_dummyTests;
 };
 
 
diff --git a/examples/cppunittest/XmlUniformiser.cpp b/examples/cppunittest/XmlUniformiser.cpp
index 109a843..e884e20 100644
--- a/examples/cppunittest/XmlUniformiser.cpp
+++ b/examples/cppunittest/XmlUniformiser.cpp
@@ -23,7 +23,7 @@ notEqualIndex( std::string expectedXml,
 void 
 checkXmlEqual( std::string expectedXml,
                std::string actualXml,
-               CppUnit::SourceLine sourceLine )
+               CPPUNIT_NS::SourceLine sourceLine )
 {
   std::string expected = XmlUniformiser( expectedXml ).stripped();
   std::string actual = XmlUniformiser( actualXml ).stripped();
@@ -32,11 +32,11 @@ checkXmlEqual( std::string expectedXml,
     return;
 
   int index = notEqualIndex( expected, actual );
-  CppUnit::OStringStream message;
+  CPPUNIT_NS::OStringStream message;
   message  <<  "differ at index: "  <<  index  << "\n"
            <<  "expected: "  <<  expected.substr(index) << "\n"
            <<  "but was : "  <<  actual.substr( index );
-  ::CppUnit::Asserter::failNotEqual( expected,
+  ::CPPUNIT_NS::Asserter::failNotEqual( expected,
                                      actual,
                                      sourceLine,
                                      message.str() );
diff --git a/examples/cppunittest/XmlUniformiserTest.h b/examples/cppunittest/XmlUniformiserTest.h
index d590505..a7edf8c 100644
--- a/examples/cppunittest/XmlUniformiserTest.h
+++ b/examples/cppunittest/XmlUniformiserTest.h
@@ -7,7 +7,7 @@
 /*! \class XmlUniformiserTest
  * \brief Unit test for XmlUniformiser.
  */
-class XmlUniformiserTest : public CppUnit::TestFixture
+class XmlUniformiserTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( XmlUniformiserTest );
   CPPUNIT_TEST( testEmpty );