diff --git a/headers/tools/cppunit/cppunit/Portability.h b/headers/tools/cppunit/cppunit/Portability.h
index 610098aebe..0cd88c8545 100644
--- a/headers/tools/cppunit/cppunit/Portability.h
+++ b/headers/tools/cppunit/cppunit/Portability.h
@@ -64,7 +64,7 @@
 #if CPPUNIT_HAVE_SSTREAM
 #   include <sstream>
     namespace CppUnit {
-      class OStringStream : public ostringstream
+      class OStringStream : public std::ostringstream
       {
       };
     }
diff --git a/headers/tools/cppunit/cppunit/config-auto.h b/headers/tools/cppunit/cppunit/config-auto.h
index e38066b3d3..2bc50c5c1f 100644
--- a/headers/tools/cppunit/cppunit/config-auto.h
+++ b/headers/tools/cppunit/cppunit/config-auto.h
@@ -34,7 +34,13 @@
 #endif
 
 /* define if the compiler has stringstream */
+#ifndef CPPUNIT_HAVE_SSTREAM
+#if __GNUC__ >= 4
+#define CPPUNIT_HAVE_SSTREAM 1
+#else
 /* #undef CPPUNIT_HAVE_SSTREAM */
+#endif
+#endif
 
 /* Define if you have the <strstream> header file. */
 #ifndef CPPUNIT_HAVE_STRSTREAM