diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b6638b..aeecc7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,6 @@
 include(XercesVolatile)
 include(XercesLString)
 include(XercesMFC)
-include(XercesStdLibs)
 include(XercesSSE2)
 include(XercesPathMax)
 include(XercesWChar)
diff --git a/cmake/XercesStdLibs.cmake b/cmake/XercesStdLibs.cmake
deleted file mode 100644
index 23afe06..0000000
--- a/cmake/XercesStdLibs.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# CMake build for xerces-c
-#
-# Written by Roger Leigh <rleigh@codelibre.net>
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# C++ standard library includes
-
-include(CheckCXXSourceCompiles)
-
-check_cxx_source_compiles("
-#include <map>
-#include <iomanip>
-#include <cmath>
-using namespace std;
-
-int main() {
-  return 0;
-}"
-  HAVE_STD_LIBS)
-
-set(XERCES_NEW_IOSTREAMS ${HAVE_STD_LIBS})
diff --git a/config.h.cmake.in b/config.h.cmake.in
index d48f38a..456aa35 100644
--- a/config.h.cmake.in
+++ b/config.h.cmake.in
@@ -186,9 +186,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #cmakedefine HAVE_STDLIB_H 1
 
-/* define if the compiler supports ISO C++ standard library */
-#cmakedefine HAVE_STD_LIBS 1
-
 /* Define to 1 if you have the `strcasecmp' function. */
 #cmakedefine HAVE_STRCASECMP 1
 
@@ -363,9 +360,6 @@
 /* Define if there is support for L"widestring" */
 #cmakedefine XERCES_LSTRSUPPORT 1
 
-/* Define if the isstream library can be included as <iostream> */
-#cmakedefine XERCES_NEW_IOSTREAMS 1
-
 /* Define to have XMemory.hpp avoid declaring a matching operator delete for
    the placement operator new */
 #cmakedefine XERCES_NO_MATCHING_DELETE_OPERATOR 1
diff --git a/configure.ac b/configure.ac
index 7679aff..ac30636 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,6 @@
 
 XERCES_INT_TYPES
 
-AC_CXX_HAVE_STD_LIBS
 AC_CXX_HAVE_LSTRING
 
 ACX_PTHREAD
@@ -517,10 +516,6 @@
 	AC_DEFINE([XERCES_SSIZE_T], [long], [Define as the appropriate ssize_t type])
 	AC_DEFINE([XERCES_SSIZE_MAX], [LONG_MAX], [Define as the appropriate SSIZE_MAX macro]))
 
-AS_IF([test x$ac_cv_cxx_have_std_libs = xyes],
-	AC_DEFINE([XERCES_NEW_IOSTREAMS], 1, [Define if the isstream library can be included as <iostream>]))
-
-
 AC_OUTPUT
 
 AC_MSG_NOTICE
diff --git a/m4/cxx_have_std_libs.m4 b/m4/cxx_have_std_libs.m4
deleted file mode 100644
index 0175217..0000000
--- a/m4/cxx_have_std_libs.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl @synopsis AC_CXX_HAVE_STD_LIBS
-dnl
-dnl If the compiler supports ISO C++ standard library (i.e., can
-dnl include the files iostream, map, iomanip and cmath}), define
-dnl HAVE_STD_LIBS.
-dnl
-dnl @category Cxx
-dnl @author Todd Veldhuizen
-dnl @author Luc Maisonobe <luc@spaceroots.org>
-dnl @version 2004-02-04
-dnl @license AllPermissive
-
-AC_DEFUN([AC_CXX_HAVE_STD_LIBS],
-[AC_CACHE_CHECK(whether the compiler supports ISO C++ standard library,
-ac_cv_cxx_have_std_libs,
-[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([#include <iostream>
-#include <map>
-#include <iomanip>
-#include <cmath>
-using namespace std;],[return 0;],
- ac_cv_cxx_have_std_libs=yes, ac_cv_cxx_have_std_libs=no)
- AC_LANG_RESTORE
-])
-if test "$ac_cv_cxx_have_std_libs" = yes; then
-  AC_DEFINE(HAVE_STD_LIBS,,[define if the compiler supports ISO C++ standard library])
-fi
-])
diff --git a/samples/src/CreateDOMDocument/CreateDOMDocument.cpp b/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
index 8acace7..0d53600 100644
--- a/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
+++ b/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
@@ -33,11 +33,7 @@
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/OutOfMemoryException.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 
 XERCES_CPP_NAMESPACE_USE
diff --git a/samples/src/DOMCount/DOMCount.cpp b/samples/src/DOMCount/DOMCount.cpp
index d8c9a01..8be6483 100644
--- a/samples/src/DOMCount/DOMCount.cpp
+++ b/samples/src/DOMCount/DOMCount.cpp
@@ -39,11 +39,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
 
 
 // ---------------------------------------------------------------------------
diff --git a/samples/src/DOMCount/DOMCount.hpp b/samples/src/DOMCount/DOMCount.hpp
index 2d9c8c1..b338fd4 100644
--- a/samples/src/DOMCount/DOMCount.hpp
+++ b/samples/src/DOMCount/DOMCount.hpp
@@ -24,11 +24,7 @@
 // ---------------------------------------------------------------------------
 #include <xercesc/dom/DOMErrorHandler.hpp>
 #include <xercesc/util/XMLString.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 XERCES_CPP_NAMESPACE_USE
 
diff --git a/samples/src/DOMPrint/DOMPrintErrorHandler.cpp b/samples/src/DOMPrint/DOMPrintErrorHandler.cpp
index dd7391e..b02a7e9 100644
--- a/samples/src/DOMPrint/DOMPrintErrorHandler.cpp
+++ b/samples/src/DOMPrint/DOMPrintErrorHandler.cpp
@@ -21,11 +21,7 @@
 
 #include <xercesc/util/XMLString.hpp>
 #include <xercesc/dom/DOMError.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 #include "DOMPrintErrorHandler.hpp"
 
diff --git a/samples/src/DOMPrint/DOMTreeErrorReporter.cpp b/samples/src/DOMPrint/DOMTreeErrorReporter.cpp
index 9a24fac..0be35b9 100644
--- a/samples/src/DOMPrint/DOMTreeErrorReporter.cpp
+++ b/samples/src/DOMPrint/DOMTreeErrorReporter.cpp
@@ -24,11 +24,7 @@
 // ---------------------------------------------------------------------------
 #include <xercesc/sax/SAXParseException.hpp>
 #include "DOMTreeErrorReporter.hpp"
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/samples/src/DOMPrint/DOMTreeErrorReporter.hpp b/samples/src/DOMPrint/DOMTreeErrorReporter.hpp
index 5807c2b..cd09f68 100644
--- a/samples/src/DOMPrint/DOMTreeErrorReporter.hpp
+++ b/samples/src/DOMPrint/DOMTreeErrorReporter.hpp
@@ -21,11 +21,7 @@
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/sax/ErrorHandler.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 
 XERCES_CPP_NAMESPACE_USE
diff --git a/samples/src/EnumVal/EnumVal.cpp b/samples/src/EnumVal/EnumVal.cpp
index 6cc4c17..e8da368 100644
--- a/samples/src/EnumVal/EnumVal.cpp
+++ b/samples/src/EnumVal/EnumVal.cpp
@@ -28,11 +28,7 @@
 #include <xercesc/parsers/SAXParser.hpp>
 #include <xercesc/validators/DTD/DTDValidator.hpp>
 #include <xercesc/util/OutOfMemoryException.hpp>    
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/samples/src/MemParse/MemParse.hpp b/samples/src/MemParse/MemParse.hpp
index db44bde..525a841 100644
--- a/samples/src/MemParse/MemParse.hpp
+++ b/samples/src/MemParse/MemParse.hpp
@@ -28,11 +28,7 @@
 #include <xercesc/util/PlatformUtils.hpp>
 #include "MemParseHandlers.hpp"
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 
 
diff --git a/samples/src/PParse/PParse.hpp b/samples/src/PParse/PParse.hpp
index 0283a32..b209b6f 100644
--- a/samples/src/PParse/PParse.hpp
+++ b/samples/src/PParse/PParse.hpp
@@ -22,11 +22,7 @@
 // ---------------------------------------------------------------------------
 //  Includes for all the program files to see
 // ---------------------------------------------------------------------------
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <string.h>
 #include <stdlib.h>
 #include "PParseHandlers.hpp"
diff --git a/samples/src/PSVIWriter/PSVIWriter.cpp b/samples/src/PSVIWriter/PSVIWriter.cpp
index d7de612..430a87e 100644
--- a/samples/src/PSVIWriter/PSVIWriter.cpp
+++ b/samples/src/PSVIWriter/PSVIWriter.cpp
@@ -34,11 +34,9 @@
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 #include <xercesc/util/OutOfMemoryException.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
+
+
 // ---------------------------------------------------------------------------
 //  Local helper methods
 // ---------------------------------------------------------------------------
diff --git a/samples/src/PSVIWriter/PSVIWriter.hpp b/samples/src/PSVIWriter/PSVIWriter.hpp
index 70bb9c2..3aa8117 100644
--- a/samples/src/PSVIWriter/PSVIWriter.hpp
+++ b/samples/src/PSVIWriter/PSVIWriter.hpp
@@ -30,11 +30,7 @@
 #include <xercesc/util/XMLUni.hpp>
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 #include <xercesc/sax2/SAX2XMLReader.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 
 // ---------------------------------------------------------------------------
diff --git a/samples/src/Redirect/Redirect.hpp b/samples/src/Redirect/Redirect.hpp
index ab7ba64..5a33afb 100644
--- a/samples/src/Redirect/Redirect.hpp
+++ b/samples/src/Redirect/Redirect.hpp
@@ -25,11 +25,7 @@
 // ---------------------------------------------------------------------------
 #include <stdlib.h>
 #include <string.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <xercesc/util/PlatformUtils.hpp>
 #include "RedirectHandlers.hpp"
 
diff --git a/samples/src/SAX2Count/SAX2Count.cpp b/samples/src/SAX2Count/SAX2Count.cpp
index 93714bf..be48e29 100644
--- a/samples/src/SAX2Count/SAX2Count.cpp
+++ b/samples/src/SAX2Count/SAX2Count.cpp
@@ -27,11 +27,7 @@
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/sax2/SAX2XMLReader.hpp>
 #include <xercesc/sax2/XMLReaderFactory.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
 #include <xercesc/util/OutOfMemoryException.hpp>
 
 // ---------------------------------------------------------------------------
diff --git a/samples/src/SAX2Count/SAX2Count.hpp b/samples/src/SAX2Count/SAX2Count.hpp
index b2cff19..a5e29bf 100644
--- a/samples/src/SAX2Count/SAX2Count.hpp
+++ b/samples/src/SAX2Count/SAX2Count.hpp
@@ -27,11 +27,7 @@
 #include <xercesc/util/PlatformUtils.hpp>
 #include <stdlib.h>
 #include <string.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include "SAX2CountHandlers.hpp"
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 #include <xercesc/sax2/SAX2XMLReader.hpp>
diff --git a/samples/src/SAX2Print/SAX2Print.hpp b/samples/src/SAX2Print/SAX2Print.hpp
index 65e4845..a84d6cd 100644
--- a/samples/src/SAX2Print/SAX2Print.hpp
+++ b/samples/src/SAX2Print/SAX2Print.hpp
@@ -23,11 +23,7 @@
 //  Includes for all the program files to see
 // ---------------------------------------------------------------------------
 #include <string.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <stdlib.h>
 #include "SAX2PrintHandlers.hpp"
 
diff --git a/samples/src/SAXCount/SAXCount.cpp b/samples/src/SAXCount/SAXCount.cpp
index 331d09c..12e249e 100644
--- a/samples/src/SAXCount/SAXCount.cpp
+++ b/samples/src/SAXCount/SAXCount.cpp
@@ -24,11 +24,7 @@
 //  Includes
 // ---------------------------------------------------------------------------
 #include "SAXCount.hpp"
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
 #include <xercesc/util/OutOfMemoryException.hpp>
 
 // ---------------------------------------------------------------------------
diff --git a/samples/src/SAXCount/SAXCount.hpp b/samples/src/SAXCount/SAXCount.hpp
index 51d1e4c..216cffe 100644
--- a/samples/src/SAXCount/SAXCount.hpp
+++ b/samples/src/SAXCount/SAXCount.hpp
@@ -26,11 +26,7 @@
 #include <xercesc/util/PlatformUtils.hpp>
 #include <stdlib.h>
 #include <string.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <xercesc/parsers/SAXParser.hpp>
 #include "SAXCountHandlers.hpp"
 
diff --git a/samples/src/SAXPrint/SAXPrint.hpp b/samples/src/SAXPrint/SAXPrint.hpp
index 50a117c..fd10775 100644
--- a/samples/src/SAXPrint/SAXPrint.hpp
+++ b/samples/src/SAXPrint/SAXPrint.hpp
@@ -23,11 +23,7 @@
 //  Includes for all the program files to see
 // ---------------------------------------------------------------------------
 #include <string.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <stdlib.h>
 #include "SAXPrintHandlers.hpp"
 
diff --git a/samples/src/SCMPrint/SCMPrint.cpp b/samples/src/SCMPrint/SCMPrint.cpp
index 4e13e99..a812a5c 100644
--- a/samples/src/SCMPrint/SCMPrint.cpp
+++ b/samples/src/SCMPrint/SCMPrint.cpp
@@ -33,13 +33,8 @@
 #include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
 #include <xercesc/framework/psvi/XSParticle.hpp>
 #include <xercesc/framework/psvi/XSModelGroup.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
 #include <fstream>
-#else
-#include <iostream.h>
-#include <fstream.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <xercesc/util/OutOfMemoryException.hpp>
diff --git a/samples/src/SEnumVal/SEnumVal.cpp b/samples/src/SEnumVal/SEnumVal.cpp
index 3ce46f9..a335efb 100644
--- a/samples/src/SEnumVal/SEnumVal.cpp
+++ b/samples/src/SEnumVal/SEnumVal.cpp
@@ -30,11 +30,7 @@
 #include <xercesc/validators/schema/SchemaSymbols.hpp>
 #include <xercesc/validators/common/ContentSpecNode.hpp>
 #include <xercesc/util/OutOfMemoryException.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/samples/src/StdInParse/StdInParse.hpp b/samples/src/StdInParse/StdInParse.hpp
index 671807f..26757f8 100644
--- a/samples/src/StdInParse/StdInParse.hpp
+++ b/samples/src/StdInParse/StdInParse.hpp
@@ -25,11 +25,7 @@
 // ---------------------------------------------------------------------------
 #include <string.h>
 #include <stdlib.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <xercesc/util/PlatformUtils.hpp>
 #include "StdInParseHandlers.hpp"
 
diff --git a/samples/src/XInclude/XInclude.hpp b/samples/src/XInclude/XInclude.hpp
index 7791367..5c62591 100644
--- a/samples/src/XInclude/XInclude.hpp
+++ b/samples/src/XInclude/XInclude.hpp
@@ -25,11 +25,7 @@
 #include <xercesc/dom/DOMErrorHandler.hpp>
 #include <xercesc/util/XMLString.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 XERCES_CPP_NAMESPACE_USE
 
diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
index a7df0eb..d76657f 100644
--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
+++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
@@ -67,7 +67,6 @@
 #define XERCES_SIZE_T @XERCES_SIZE_T@
 #define XERCES_SSIZE_T @XERCES_SSIZE_T@
 
-#cmakedefine XERCES_NEW_IOSTREAMS 1
 #cmakedefine XERCES_LSTRSUPPORT 1
 #cmakedefine XERCES_MFC_SUPPORT 1
 
diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.in b/src/xercesc/util/Xerces_autoconf_config.hpp.in
index 69f8ed7..d361485 100644
--- a/src/xercesc/util/Xerces_autoconf_config.hpp.in
+++ b/src/xercesc/util/Xerces_autoconf_config.hpp.in
@@ -68,7 +68,6 @@
 #undef XERCES_SIZE_T
 #undef XERCES_SSIZE_T
 
-#undef XERCES_NEW_IOSTREAMS
 #undef XERCES_LSTRSUPPORT
 
 #undef XERCES_HAVE_CPUID_INTRINSIC
diff --git a/tests/src/DOM/Normalizer/Normalizer.cpp b/tests/src/DOM/Normalizer/Normalizer.cpp
index 204f28e..2e8b532 100644
--- a/tests/src/DOM/Normalizer/Normalizer.cpp
+++ b/tests/src/DOM/Normalizer/Normalizer.cpp
@@ -21,11 +21,7 @@
 #include <xercesc/framework/XMLBuffer.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 #include <xercesc/util/XMLUni.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
diff --git a/tests/src/DOM/TypeInfo/TypeInfo.cpp b/tests/src/DOM/TypeInfo/TypeInfo.cpp
index a56bbee..af9a917 100644
--- a/tests/src/DOM/TypeInfo/TypeInfo.cpp
+++ b/tests/src/DOM/TypeInfo/TypeInfo.cpp
@@ -25,11 +25,7 @@
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/validators/schema/SchemaSymbols.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 #define UNUSED(x) { if(x!=0){} }
 
diff --git a/tests/src/InitTermTest/InitTermTest.cpp b/tests/src/InitTermTest/InitTermTest.cpp
index 80a83a5..872aefd 100644
--- a/tests/src/InitTermTest/InitTermTest.cpp
+++ b/tests/src/InitTermTest/InitTermTest.cpp
@@ -42,11 +42,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
 #include <limits.h>
 
 
diff --git a/tests/src/InitTermTest/InitTermTest.hpp b/tests/src/InitTermTest/InitTermTest.hpp
index bc480c3..0c5f9f8 100644
--- a/tests/src/InitTermTest/InitTermTest.hpp
+++ b/tests/src/InitTermTest/InitTermTest.hpp
@@ -25,11 +25,7 @@
 #include <xercesc/sax/ErrorHandler.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 XERCES_CPP_NAMESPACE_USE
 
diff --git a/tests/src/MemHandlerTest/MemoryMonitor.cpp b/tests/src/MemHandlerTest/MemoryMonitor.cpp
index 551af7b..45b2ca6 100644
--- a/tests/src/MemHandlerTest/MemoryMonitor.cpp
+++ b/tests/src/MemHandlerTest/MemoryMonitor.cpp
@@ -24,13 +24,8 @@
 //  Includes
 // ---------------------------------------------------------------------------
 #include "MemoryMonitor.hpp"
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
 #include <fstream>
-#else
-#include <iostream.h>
-#include <fstream.h>
-#endif
 #include <assert.h>
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/util/OutOfMemoryException.hpp>
diff --git a/tests/src/NetAccessorTest/NetAccessorTest.cpp b/tests/src/NetAccessorTest/NetAccessorTest.cpp
index 3bb735b..faa0a9f 100644
--- a/tests/src/NetAccessorTest/NetAccessorTest.cpp
+++ b/tests/src/NetAccessorTest/NetAccessorTest.cpp
@@ -30,11 +30,7 @@
 #include    <xercesc/util/XMLNetAccessor.hpp>
 #include    <xercesc/util/BinInputStream.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include	<iostream>
-#else
-#include	<iostream.h>
-#endif
 
 XERCES_CPP_NAMESPACE_USE
 
diff --git a/tests/src/ParserTest/ParserTest.hpp b/tests/src/ParserTest/ParserTest.hpp
index 46e6be1..8afd42b 100644
--- a/tests/src/ParserTest/ParserTest.hpp
+++ b/tests/src/ParserTest/ParserTest.hpp
@@ -40,11 +40,7 @@
 #include <stdlib.h>
 #include <xercesc/util/PlatformUtils.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 
 // ---------------------------------------------------------------------------
diff --git a/tests/src/UtilTests/CoreTests.hpp b/tests/src/UtilTests/CoreTests.hpp
index 307176d..c2325be 100644
--- a/tests/src/UtilTests/CoreTests.hpp
+++ b/tests/src/UtilTests/CoreTests.hpp
@@ -24,11 +24,7 @@
 #include <xercesc/util/XMLUni.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 XERCES_CPP_NAMESPACE_USE
 
diff --git a/tests/src/XSTSHarness/XSTSHarness.cpp b/tests/src/XSTSHarness/XSTSHarness.cpp
index ce3f564..9a448ab 100644
--- a/tests/src/XSTSHarness/XSTSHarness.cpp
+++ b/tests/src/XSTSHarness/XSTSHarness.cpp
@@ -31,11 +31,7 @@
 #include <xercesc/util/BinInputStream.hpp>
 #include <xercesc/sax2/SAX2XMLReader.hpp>
 #include <xercesc/sax2/XMLReaderFactory.hpp>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
 #include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/framework/MemBufInputSource.hpp>
 
diff --git a/tests/src/XSTSHarness/XSTSHarness.hpp b/tests/src/XSTSHarness/XSTSHarness.hpp
index f6ee05a..a71bd7d 100644
--- a/tests/src/XSTSHarness/XSTSHarness.hpp
+++ b/tests/src/XSTSHarness/XSTSHarness.hpp
@@ -29,11 +29,7 @@
 #include <xercesc/util/PlatformUtils.hpp>
 #include <stdlib.h>
 #include <string.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 #include <xercesc/sax2/SAX2XMLReader.hpp>
 #include <xercesc/sax2/DefaultHandler.hpp>
diff --git a/tests/src/XSValueTest/XSValueTest.cpp b/tests/src/XSValueTest/XSValueTest.cpp
index 14bc6c4..420d044 100644
--- a/tests/src/XSValueTest/XSValueTest.cpp
+++ b/tests/src/XSValueTest/XSValueTest.cpp
@@ -31,11 +31,7 @@
 #	include <config.h>
 #endif
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
 
 #include <stdio.h>
 #include <math.h>
diff --git a/tests/src/XSValueTest/XSValueTest.hpp b/tests/src/XSValueTest/XSValueTest.hpp
index cdf46b5..2477662 100644
--- a/tests/src/XSValueTest/XSValueTest.hpp
+++ b/tests/src/XSValueTest/XSValueTest.hpp
@@ -27,11 +27,7 @@
 // ---------------------------------------------------------------------------
 #include <xercesc/util/XercesDefs.hpp>
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 
 #include <xercesc/util/XMLString.hpp>
 
diff --git a/tests/src/XSerializerTest/XSerializerTest.cpp b/tests/src/XSerializerTest/XSerializerTest.cpp
index 0219550..c19626c 100644
--- a/tests/src/XSerializerTest/XSerializerTest.cpp
+++ b/tests/src/XSerializerTest/XSerializerTest.cpp
@@ -32,11 +32,7 @@
 
 #include "XSerializerTest.hpp"
 
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <fstream>
-#else
-#include <fstream.h>
-#endif
 
 // ---------------------------------------------------------------------------
 //  command line option variables
diff --git a/tests/src/XSerializerTest/XSerializerTest.hpp b/tests/src/XSerializerTest/XSerializerTest.hpp
index db33938..0455284 100644
--- a/tests/src/XSerializerTest/XSerializerTest.hpp
+++ b/tests/src/XSerializerTest/XSerializerTest.hpp
@@ -28,11 +28,7 @@
 #include <xercesc/util/PlatformUtils.hpp>
 #include <stdlib.h>
 #include <string.h>
-#if defined(XERCES_NEW_IOSTREAMS)
 #include <iostream>
-#else
-#include <iostream.h>
-#endif
 #include "XSerializerHandlers.hpp"
 #include <xercesc/sax2/SAX2XMLReader.hpp>
 #include <xercesc/sax2/XMLReaderFactory.hpp>