diff --git a/cxxtest/ErrorFormatter.h b/cxxtest/ErrorFormatter.h
index b1d054f..ce0cec1 100644
--- a/cxxtest/ErrorFormatter.h
+++ b/cxxtest/ErrorFormatter.h
@@ -84,12 +84,10 @@ class ErrorFormatter : public TestListener {
         if (tracker().testSkipped()) {
             (*_o) << "s";
             _o->flush();
-            fflush(stdout);
             _dotting = true;
         } else if (!tracker().testFailed()) {
             (*_o) << ".";
             _o->flush();
-            fflush(stdout);
             _dotting = true;
         }
     }
diff --git a/cxxtest/TestMain.h b/cxxtest/TestMain.h
index 33c87d7..6544a58 100644
--- a/cxxtest/TestMain.h
+++ b/cxxtest/TestMain.h
@@ -15,12 +15,11 @@
 #include <cxxtest/TestTracker.h>
 #include <cxxtest/Flags.h>
 
-#ifndef _CXXTEST_HAVE_STD
-#   define _CXXTEST_HAVE_STD
-#endif // _CXXTEST_HAVE_STD
 
 #include <cxxtest/StdValueTraits.h>
 
+
+    
 #if defined(_CXXTEST_HAVE_STD)
 #ifdef _CXXTEST_OLD_STD
 #   include <iostream.h>
@@ -30,6 +29,7 @@
 #   include <cstring>
 #endif // _CXXTEST_OLD_STD
 
+
 namespace CxxTest {
 
 inline void print_help(const char* name) {
@@ -40,6 +40,8 @@ inline void print_help(const char* name) {
     CXXTEST_STD(cerr) << name << " --help-tests" << CXXTEST_STD(endl);
     CXXTEST_STD(cerr) << name << " -v             Enable tracing output." << CXXTEST_STD(endl);
 }
+#else
+namespace CxxTest {
 #endif