diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 65599e0ad..20807c8ea 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -27,8 +27,6 @@
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/Glob.hxx>
-#include <cmsys/stl/iterator>
-#include <cmsys/stl/algorithm>
 #include <cmsys/FStream.hxx>
 
 #include <stdlib.h>
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 8ba8847af..59590fd16 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -18,8 +18,6 @@
 #include "cmake.h"
 #include "cmAlgorithms.h"
 
-#include <cmsys/stl/algorithm>
-
 #include <assert.h>
 
 /*
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 0a66732b3..e8d158ebb 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -11,7 +11,6 @@
 ============================================================================*/
 #include "cmFindLibraryCommand.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/stl/algorithm>
 
 cmFindLibraryCommand::cmFindLibraryCommand()
 {
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index ab3c1ee41..c6c9f5360 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -30,7 +30,6 @@
 # include "cmLocale.h"
 # include <cm_libarchive.h>
 #endif
-#include <cmsys/stl/algorithm>
 #include <cmsys/FStream.hxx>
 #include <cmsys/Terminal.h>
 
diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h
index 42333fa40..ead2e014c 100644
--- a/Source/cmXMLSafe.h
+++ b/Source/cmXMLSafe.h
@@ -12,7 +12,8 @@
 #ifndef cmXMLSafe_h
 #define cmXMLSafe_h
 
-#include <cmsys/stl/string>
+#include <cmsys/Configure.hxx>
+#include <string>
 #include <iosfwd>
 
 /** \class cmXMLSafe