diff --git a/Source/cmCableWrapTclCommand.cxx b/Source/cmCableWrapTclCommand.cxx
index 634e69013..b7d5f4aa4 100644
--- a/Source/cmCableWrapTclCommand.cxx
+++ b/Source/cmCableWrapTclCommand.cxx
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "cmCacheManager.h"
 #include "cmTarget.h"
 #include "cmGeneratedFileStream.h"
-#include <strstream>
+
 
 cmCableWrapTclCommand::cmCableWrapTclCommand():
   m_CableClassSet(NULL)
diff --git a/Source/cmConfigure.h.in b/Source/cmConfigure.h.in
index bcdd68297..0c3844168 100644
--- a/Source/cmConfigure.h.in
+++ b/Source/cmConfigure.h.in
@@ -1,2 +1,2 @@
-#undef CMAKE_NO_STD_NAMESPACE
-#undef CMAKE_NO_ANSI_STREAM_HEADERS
+#undef CMAKE_NO_STD_NAMESPACE
+#undef CMAKE_NO_ANSI_STREAM_HEADERS
diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h
index 276a829c2..dca7488cd 100644
--- a/Source/cmGeneratedFileStream.h
+++ b/Source/cmGeneratedFileStream.h
@@ -80,7 +80,7 @@ public:
   /**
    * Allow a test for whether the file is open.
    */
-  operator bool() { return m_Stream.is_open(); }
+  operator bool() { return static_cast<bool>(m_Stream); }
   
   /**
    * Close the file stream.  This will cause the copy-if-different to the
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index fa2afd208..9c84215fb 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -64,9 +64,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef CMAKE_NO_ANSI_STREAM_HEADERS
 #include <fstream>
 #include <iostream>
+#include <strstream>
 #else
 #include <fstream.h>
 #include <iostream.h>
+#include <strstream.h>
 #endif
 
 #include <vector>