diff --git a/Common/Core/Testing/Cxx/TestArrayAPI.cxx b/Common/Core/Testing/Cxx/TestArrayAPI.cxx
index 0816de7256ecdaa05a7186b09d7bf418b3b9d369..ccb14d6c41453c0725e9bb44cf9a011d80127646 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPI.cxx
@@ -23,9 +23,9 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx b/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
index 553ec5a50ae0de55cfc5878242dad22861aa6ad7..4f4d24393fd4fc9838950ab13201a7f08207db58 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
@@ -22,9 +22,9 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx b/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
index c69000edf9676c16910d85339457a2038369262a..cb92728f0eacaea124a170037e5046fcd43411a8 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
@@ -22,9 +22,9 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayBool.cxx b/Common/Core/Testing/Cxx/TestArrayBool.cxx
index bbea6f9da8a8c09767e5c746e8d3fc6a0600ddf8..19298316a88b8f0f7498ba9d407efff49cab2b10 100644
--- a/Common/Core/Testing/Cxx/TestArrayBool.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayBool.cxx
@@ -23,9 +23,9 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayCasting.cxx b/Common/Core/Testing/Cxx/TestArrayCasting.cxx
index 3654960205c59db455452ccf563088354232a040..5713ed30e8aec616e6e7e1ff5a8b4d5c79ff0743 100644
--- a/Common/Core/Testing/Cxx/TestArrayCasting.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayCasting.cxx
@@ -24,9 +24,9 @@
#include <vtkSparseArray.h>
#include <vtkTryDowncast.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#include <boost/algorithm/string.hpp>
diff --git a/Common/Core/Testing/Cxx/TestArrayExtents.cxx b/Common/Core/Testing/Cxx/TestArrayExtents.cxx
index 3cd4d51fe80c2fdf19a81e5105641f0f22a8bb12..c8a7bd1dbc1d3c057d2a51702781a0f6ce1ebae6 100644
--- a/Common/Core/Testing/Cxx/TestArrayExtents.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayExtents.cxx
@@ -22,9 +22,9 @@
#include <vtkArrayCoordinates.h>
#include <vtkArrayExtents.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#include "vtkSetGet.h"
#define test_expression(expression) \
diff --git a/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx b/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx
index 40164a6ef854dc1c065ffa24e415ddfa7bb2fb16..49e9c494a41de12d14d77fae96d6ccaa46ed7a3f 100644
--- a/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx
@@ -23,8 +23,8 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
void test_expression(const bool expression, const std::string& message)
{
diff --git a/Common/Core/Testing/Cxx/TestArrayNullValues.cxx b/Common/Core/Testing/Cxx/TestArrayNullValues.cxx
index 876af1c637974920bf76fdd24fb73654c717892c..8f53aae74fb0449d916bfbb305dda6f56383e732 100644
--- a/Common/Core/Testing/Cxx/TestArrayNullValues.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayNullValues.cxx
@@ -22,8 +22,8 @@
#include <vtkSparseArray.h>
#include <vtkSmartPointer.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
template<typename T>
void VerifyType(const T& DefaultNull, const T& AlternateNull)
diff --git a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
index 8b5538bf0bedc9f66277c3b16ac46a89971c4296..c99fd2a368a55a2ec821f6beeaded9ffa85d0257 100644
--- a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
@@ -23,9 +23,9 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayVariants.cxx b/Common/Core/Testing/Cxx/TestArrayVariants.cxx
index 50d0e407b19ac238d835d9d99c6959be18699aa5..5daae36fc04d71a7f5c5c0477648e0b1303831a9 100644
--- a/Common/Core/Testing/Cxx/TestArrayVariants.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayVariants.cxx
@@ -22,9 +22,9 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx b/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx
index 70be17c40d0f9c5e1f93017435f45d4e956d02d1..de8d97dc8f971736c607c8737934f3c0ece31595 100644
--- a/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx
+++ b/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx
@@ -23,8 +23,8 @@
#include <vtkSparseArray.h>
#include <vtkSmartPointer.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
index 36662ec3ddd6178e10c0e44552fb64d941196428..6ca8db09f656b8e043d230986e4e04099a77c1d3 100644
--- a/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
@@ -21,10 +21,10 @@
#include <vtkUnicodeString.h>
-#include <vtksys/stl/iterator>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iterator>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
index 33eb08ac19526e8fe1110c91b162cf663aef0842..ec823c012ed74c8d7c244ab4e4473a83cb3aa33b 100644
--- a/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
@@ -26,10 +26,10 @@
#include <vtkVariant.h>
#include <vtkTestErrorObserver.h>
-#include <vtksys/stl/iterator>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iterator>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
static int TestErrorsAndWarnings();
diff --git a/Common/Core/vtkAndroidOutputWindow.cxx b/Common/Core/vtkAndroidOutputWindow.cxx
index c43f27d1b716d0b5389090ee81dbdfa52b0d67a1..010a0949f4801e6ed0db3e88ff6d9ca438c96ab7 100644
--- a/Common/Core/vtkAndroidOutputWindow.cxx
+++ b/Common/Core/vtkAndroidOutputWindow.cxx
@@ -16,7 +16,7 @@
#include "vtkObjectFactory.h"
#include "vtkCommand.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
#include <android/log.h>
diff --git a/Common/Core/vtkArrayExtentsList.h b/Common/Core/vtkArrayExtentsList.h
index 4fef84a4ad7ad4ed43967ced70cef0d71e6d9160..582fe529b78fca8b154c607894230bf119b804be 100644
--- a/Common/Core/vtkArrayExtentsList.h
+++ b/Common/Core/vtkArrayExtentsList.h
@@ -43,7 +43,7 @@
#include "vtkCommonCoreModule.h" // For export macro
#include "vtkArrayExtents.h"
-#include <vtksys/stl/vector> // STL Header
+#include <vector> // STL Header
class VTKCOMMONCORE_EXPORT vtkArrayExtentsList
{
diff --git a/Common/Core/vtkArrayWeights.cxx b/Common/Core/vtkArrayWeights.cxx
index 60639c87fb0f006a828952049f1b53cc1d623622..0b82d76c961c149f82102d71a50601b0d48ef98d 100644
--- a/Common/Core/vtkArrayWeights.cxx
+++ b/Common/Core/vtkArrayWeights.cxx
@@ -20,7 +20,7 @@
=========================================================================*/
#include "vtkArrayWeights.h"
-#include <vtksys/stl/vector>
+#include <vector>
class vtkArrayWeightsStorage
{
diff --git a/Common/Core/vtkGarbageCollector.cxx b/Common/Core/vtkGarbageCollector.cxx
index a5be8a7c9e679c19fa3effd2db50e31ed8a64397..53957f658714b20cb88a1ca837a0ce4445ed7b47 100644
--- a/Common/Core/vtkGarbageCollector.cxx
+++ b/Common/Core/vtkGarbageCollector.cxx
@@ -18,7 +18,7 @@
#include "vtkObjectFactory.h"
#include "vtkSmartPointerBase.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <queue>
#include <stack>
#include <vector>
diff --git a/Common/Core/vtkObjectBase.cxx b/Common/Core/vtkObjectBase.cxx
index 3754ec1bbe19d5845bd83d9342ca8c033e653d96..70d713bfd91a5fbb591e3cd5cc6cc4292a8e328f 100644
--- a/Common/Core/vtkObjectBase.cxx
+++ b/Common/Core/vtkObjectBase.cxx
@@ -18,7 +18,7 @@
#include "vtkGarbageCollector.h"
#include "vtkWeakPointerBase.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define vtkBaseDebugMacro(x)
diff --git a/Common/Core/vtkTimePointUtility.cxx b/Common/Core/vtkTimePointUtility.cxx
index 6e43f9a7bd68c9b7021f060414f8c0c6e8b11f72..97edce2bbbed44669be02d4a9ddbb4b2ee844819 100644
--- a/Common/Core/vtkTimePointUtility.cxx
+++ b/Common/Core/vtkTimePointUtility.cxx
@@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkStdString.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
#if defined (__BORLANDC__)
#include <ctype.h> // for isdigit
diff --git a/Common/Core/vtkVariant.cxx b/Common/Core/vtkVariant.cxx
index 461f37c0ad93722330546713f786d52c1e455f3c..739bb7c13ac5282db651efe3c963500e939329e1 100644
--- a/Common/Core/vtkVariant.cxx
+++ b/Common/Core/vtkVariant.cxx
@@ -49,7 +49,7 @@ really building the vtkVariant.o object.
#include "vtkStringArray.h"
#include "vtkMath.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
#include "vtksys/SystemTools.hxx"
#include <locale> // C++ locale
diff --git a/Common/DataModel/Testing/Cxx/otherCellArray.cxx b/Common/DataModel/Testing/Cxx/otherCellArray.cxx
index 857eb4a1bf396bb71f1f3adb443417bd48f73527..dddea7e46987e0b1f75e4261370bef57d5b8be6f 100644
--- a/Common/DataModel/Testing/Cxx/otherCellArray.cxx
+++ b/Common/DataModel/Testing/Cxx/otherCellArray.cxx
@@ -24,7 +24,7 @@
#include "vtkIdTypeArray.h"
#include "vtkQuad.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestCellArray(ostream& strm)
{
diff --git a/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx b/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx
index 077165f8ffe4749ff1adf69a38884a9c5159e5ec..bfe4487af4c21f2b5519db96459741ef72f3bdb7 100644
--- a/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx
+++ b/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx
@@ -36,7 +36,7 @@
#include "vtkPentagonalPrism.h"
#include "vtkHexagonalPrism.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestOCB(ostream& strm)
{
diff --git a/Common/DataModel/Testing/Cxx/otherCellPosition.cxx b/Common/DataModel/Testing/Cxx/otherCellPosition.cxx
index ab71edc4ade23354b7f6aadcb8103790318591ae..f340b001b714ca9cc5e2227a2837110611531da5 100644
--- a/Common/DataModel/Testing/Cxx/otherCellPosition.cxx
+++ b/Common/DataModel/Testing/Cxx/otherCellPosition.cxx
@@ -36,7 +36,7 @@
#include "vtkPentagonalPrism.h"
#include "vtkHexagonalPrism.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestOCP(ostream& strm)
{
diff --git a/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx b/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx
index 9af80c4d9062f0fbbb4af08b6632f9d4307036ae..4d39f508721635d76ad88016f9faded824b4f86d 100644
--- a/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx
+++ b/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx
@@ -20,7 +20,7 @@
#include "vtkColorTransferFunction.h"
#include "vtkDebugLeaks.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int Test(ostream& strm)
{
diff --git a/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx b/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx
index 364d091cf4729d4f6cb56b5d251853bca6f3536e..cf39ffeef261943e6a7d8c04c339e3ac39fe3119 100644
--- a/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx
+++ b/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx
@@ -22,7 +22,7 @@
#include "vtkPointData.h"
#include "vtkCellData.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkDebugLeaks.h"
diff --git a/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx b/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx
index 882b99f111f7a3e3f2ef84d1a00df021c9d37ec4..2d073021efc17c811582630b8884a315f845f811 100644
--- a/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx
+++ b/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx
@@ -28,7 +28,7 @@
#include "vtkRectilinearGrid.h"
#include "vtkShortArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestORG(ostream& strm)
{
diff --git a/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx b/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx
index 970966178245db37f9a2c50906e8a72165d3bde5..d2b98fc667a38bf4e8a75dd5730dc9c53e9d96e0 100644
--- a/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx
+++ b/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx
@@ -28,7 +28,7 @@
#include "vtkShortArray.h"
#include "vtkStructuredGrid.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestOSG(ostream& strm)
{
diff --git a/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx b/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx
index 52c09474c34f0bd0ac0245533f93c6270dec914b..6aaf3988eb77739b551e356062ee405232fdd518 100644
--- a/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx
+++ b/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx
@@ -29,7 +29,7 @@
#include "vtkQuadraticPyramid.h"
#include "vtkPoints.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// New quadratic cells
#include "vtkBiQuadraticQuad.h"
diff --git a/Common/DataModel/vtkArrayData.cxx b/Common/DataModel/vtkArrayData.cxx
index 3d6e40c5c60ce905ceedf0d8e5bcd4bb77afddf6..8ad5149ae7a253799d9db67065fb61dc301977bd 100644
--- a/Common/DataModel/vtkArrayData.cxx
+++ b/Common/DataModel/vtkArrayData.cxx
@@ -25,8 +25,8 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <vector>
//
// Standard functions
diff --git a/Common/DataModel/vtkQuadratureSchemeDefinition.cxx b/Common/DataModel/vtkQuadratureSchemeDefinition.cxx
index be60c7818b888bd180facae0b102708f4b646669..dc1a9511d6ec4ec72fb00c59ecf10d9cfa8090f5 100644
--- a/Common/DataModel/vtkQuadratureSchemeDefinition.cxx
+++ b/Common/DataModel/vtkQuadratureSchemeDefinition.cxx
@@ -20,7 +20,7 @@
#include "vtkInformationStringKey.h"
#include "vtkCellType.h"
#include "vtkXMLDataElement.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
using std::ostringstream;
using std::istringstream;
#include <string>
diff --git a/Common/DataModel/vtkXMLDataElement.cxx b/Common/DataModel/vtkXMLDataElement.cxx
index 54c6877f813195db20c3ab663dbdee1e12a2f97b..3004445ccec53dd7c411b0b2a0cbe12547f05bd7 100644
--- a/Common/DataModel/vtkXMLDataElement.cxx
+++ b/Common/DataModel/vtkXMLDataElement.cxx
@@ -17,7 +17,7 @@
#include "vtkObjectFactory.h"
#include <ctype.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
using std::ostringstream;
using std::istringstream;
#include <vtksys/SystemTools.hxx>
diff --git a/Common/ExecutionModel/vtkExecutive.cxx b/Common/ExecutionModel/vtkExecutive.cxx
index 1669a1fa4d79fdc8126c9b4e547bb6309fa6e930..d9735bd56bb866fcbe72a17f38a796d0adac57d6 100644
--- a/Common/ExecutionModel/vtkExecutive.cxx
+++ b/Common/ExecutionModel/vtkExecutive.cxx
@@ -29,7 +29,7 @@
#include "vtkSmartPointer.h"
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkCompositeDataPipeline.h"
diff --git a/Common/System/Testing/Cxx/otherTimerLog.cxx b/Common/System/Testing/Cxx/otherTimerLog.cxx
index c9cdd3d9305c86532d5a1fd3f6eb237406a5add4..fc81994a098d4c4ddb8fdd369f0b0a2811881ec5 100644
--- a/Common/System/Testing/Cxx/otherTimerLog.cxx
+++ b/Common/System/Testing/Cxx/otherTimerLog.cxx
@@ -20,7 +20,7 @@
#include "vtkTimerLog.h"
#include "vtkDebugLeaks.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// this is needed for the unlink call
#if defined(__CYGWIN__)
diff --git a/Domains/Chemistry/vtkCMLMoleculeReader.cxx b/Domains/Chemistry/vtkCMLMoleculeReader.cxx
index 2be83c2f6f45fde83c183089f6dea3b2269b9b3d..2116a24b48037e95229ea8a4a4d775b2273c9a27 100644
--- a/Domains/Chemistry/vtkCMLMoleculeReader.cxx
+++ b/Domains/Chemistry/vtkCMLMoleculeReader.cxx
@@ -25,8 +25,8 @@
#include "vtkPeriodicTable.h"
#include "vtkXMLParser.h"
-#include <vtksys/stl/string>
-#include <vtksys/stl/vector>
+#include <string>
+#include <vector>
// Subclass of vtkXMLParser -- definitions at end of file
class vtkCMLParser : public vtkXMLParser
diff --git a/Examples/Array/Cxx/IdentityMatrix.cxx b/Examples/Array/Cxx/IdentityMatrix.cxx
index ca5d1d180290594ac3924bd567d20a2c3a714207..6b9120d8c62e3177cfd4c647c64701acc7a733a5 100644
--- a/Examples/Array/Cxx/IdentityMatrix.cxx
+++ b/Examples/Array/Cxx/IdentityMatrix.cxx
@@ -1,7 +1,7 @@
#include <vtkArrayPrint.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
int main(int argc, char* argv[])
{
diff --git a/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx b/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx
index 2ad5dd80d91bdb36fd109483f2b3c315a4d0ca41..56cba38b662bbb6c0bdc36b3aeb27f372051e4e9 100644
--- a/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx
+++ b/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx
@@ -48,7 +48,7 @@ All rights reserved.
#include "vtksys/CommandLineArguments.hxx"
-#include <vtksys/ios/sstream>
+#include <sstream>
void SetInputParameters( int& dim,
int& branch,
diff --git a/Examples/MultiBlock/Cxx/MultiBlock.cxx b/Examples/MultiBlock/Cxx/MultiBlock.cxx
index fb944c75db4ebddc60373f75a27637f7e229f89d..cd2ceeacf931745ffd89a71a42efbace71049265 100644
--- a/Examples/MultiBlock/Cxx/MultiBlock.cxx
+++ b/Examples/MultiBlock/Cxx/MultiBlock.cxx
@@ -37,7 +37,7 @@
#include "vtkStructuredGridOutlineFilter.h"
#include "vtkTestUtilities.h"
#include "vtkXMLStructuredGridReader.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int main(int argc, char* argv[])
{
diff --git a/Examples/Statistics/ExampleKMeansStatistics.cxx b/Examples/Statistics/ExampleKMeansStatistics.cxx
index 42e21feefa52bc04bff9225c98a55f23f38e79de..0ec2620ece48f0d58aa5c36e434bc8a1d883001d 100644
--- a/Examples/Statistics/ExampleKMeansStatistics.cxx
+++ b/Examples/Statistics/ExampleKMeansStatistics.cxx
@@ -20,7 +20,7 @@
#include "vtkStdString.h"
#include "vtkTimerLog.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
//=============================================================================
diff --git a/Filters/Extraction/vtkExtractArraysOverTime.cxx b/Filters/Extraction/vtkExtractArraysOverTime.cxx
index a9badaf162b6d26d7e6a2cadea7851addf30baac..d102784c27a35b02899a7eedcb7eaed4eb3a26e3 100644
--- a/Filters/Extraction/vtkExtractArraysOverTime.cxx
+++ b/Filters/Extraction/vtkExtractArraysOverTime.cxx
@@ -43,7 +43,7 @@
#include <cassert>
#include <map>
#include <string>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <vector>
class vtkExtractArraysOverTime::vtkInternal
diff --git a/Filters/Extraction/vtkExtractSelectedRows.cxx b/Filters/Extraction/vtkExtractSelectedRows.cxx
index 6e0566cd3fa3be2e68e9d7588c5e919b991c042f..51254279621133c233eabc5f2f73f5005ad56764 100644
--- a/Filters/Extraction/vtkExtractSelectedRows.cxx
+++ b/Filters/Extraction/vtkExtractSelectedRows.cxx
@@ -45,7 +45,7 @@
#include "vtkTree.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/map>
+#include <map>
#include <vector>
vtkStandardNewMacro(vtkExtractSelectedRows);
diff --git a/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx b/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx
index 05d7db9a8b498b75c464ddd3ac19beda5bbdc4cc..64fca113d256fe11f3068a3db9a91fb129cb699d 100644
--- a/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx
+++ b/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx
@@ -25,8 +25,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx b/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx
index b6bb62d2f4eaa2809e8e47cc98fb63b280e19bdc..823884d4f3501ea75c807905a226c2c51aff4b94 100644
--- a/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx
+++ b/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx
@@ -25,8 +25,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx b/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx
index 688f5b6072aff926a9f46ab8808db0ca4de732f7..d3c4179491ccf1eef439bc1ca020cb7751517e9f 100644
--- a/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx
+++ b/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx
@@ -26,8 +26,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/General/vtkMatricizeArray.cxx b/Filters/General/vtkMatricizeArray.cxx
index d56698e904515788b4d2a8d7e03f4f83cbccd5b6..28540884cead63f1a5ed7f7ada2026fbcba558dc 100644
--- a/Filters/General/vtkMatricizeArray.cxx
+++ b/Filters/General/vtkMatricizeArray.cxx
@@ -27,7 +27,7 @@
#include "vtkSmartPointer.h"
#include "vtkSparseArray.h"
-#include <vtksys/stl/numeric>
+#include <numeric>
///////////////////////////////////////////////////////////////////////////////
// vtkMatricizeArray
diff --git a/Filters/General/vtkQuadraturePointInterpolator.cxx b/Filters/General/vtkQuadraturePointInterpolator.cxx
index 870eea3ef5b6f57b712f7fc289bed586a0301a0e..b4314d48600f4d29d0d89cc6d6d3098d770cdb69 100644
--- a/Filters/General/vtkQuadraturePointInterpolator.cxx
+++ b/Filters/General/vtkQuadraturePointInterpolator.cxx
@@ -34,7 +34,7 @@
#include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
#include "vtkObjectFactory.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
using std::ostringstream;
#include "vtkQuadraturePointsUtilities.hxx"
diff --git a/Filters/General/vtkQuadraturePointsGenerator.cxx b/Filters/General/vtkQuadraturePointsGenerator.cxx
index 56123a1377cd43ac30ca83d8c1d34bb4f9afaf33..a68e7123e10a8bc99efec58b5571c37f7bc390b7 100644
--- a/Filters/General/vtkQuadraturePointsGenerator.cxx
+++ b/Filters/General/vtkQuadraturePointsGenerator.cxx
@@ -37,7 +37,7 @@
#include "vtkQuadratureSchemeDefinition.h"
#include "vtkQuadraturePointsUtilities.hxx"
-#include "vtksys/ios/sstream"
+#include "sstream"
using std::ostringstream;
//-----------------------------------------------------------------------------
diff --git a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx
index c2ed583f471188ef2b89f222904fac764d9c399d..853ec2a0d3b9e9ee161bc25855c908cb9cfd6780 100644
--- a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx
+++ b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx
@@ -33,7 +33,7 @@
#include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
#include "vtkObjectFactory.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <string>
#include "vtkSmartPointer.h"
using std::ostringstream;
diff --git a/Filters/General/vtkSplitColumnComponents.cxx b/Filters/General/vtkSplitColumnComponents.cxx
index 0144656ffdc8d5115f603270a71a4fd72c9bbaab..1f35c445bf285ad31ba45c784c0a899efb00faa5 100644
--- a/Filters/General/vtkSplitColumnComponents.cxx
+++ b/Filters/General/vtkSplitColumnComponents.cxx
@@ -21,7 +21,7 @@
#include "vtkStdString.h"
#include "vtkTable.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
#include "math.h"
vtkStandardNewMacro(vtkSplitColumnComponents);
diff --git a/Filters/Generic/Testing/Cxx/otherCreation.cxx b/Filters/Generic/Testing/Cxx/otherCreation.cxx
index d2080038e9a6a655b6a5f589c49322d1d1bfeb74..ac0b8f2f3e5f5b94b3dd2d8368db877d388d4e78 100644
--- a/Filters/Generic/Testing/Cxx/otherCreation.cxx
+++ b/Filters/Generic/Testing/Cxx/otherCreation.cxx
@@ -35,7 +35,7 @@
#include "vtkGenericAttribute.h"
#include <cassert>
#include <string>
-#include <vtksys/ios/sstream>
+#include <sstream>
//-----------------------------------------------------------------------------
// Description:
diff --git a/Filters/Hybrid/vtkFacetReader.cxx b/Filters/Hybrid/vtkFacetReader.cxx
index a8c697378fbfaf985b66a9c596ef31e56f7e8481..0cb71096fd34b9a1cc8574739b7448781aa265ac 100644
--- a/Filters/Hybrid/vtkFacetReader.cxx
+++ b/Filters/Hybrid/vtkFacetReader.cxx
@@ -30,7 +30,7 @@
#include "vtkDoubleArray.h"
#include "vtkSmartPointer.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <sys/stat.h>
#include <string>
#include <vector>
diff --git a/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
index f78f5c97caaa89b9b1475b55091fcdc57f6488e4..29beff8dbb18310c5d8bb49851c2a21acb642cb3 100644
--- a/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
+++ b/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
@@ -31,9 +31,9 @@
#include <vtkTableToSparseArray.h>
#include <vtkDenseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
namespace
{
diff --git a/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
index 3e9033ee8de757d64cfd316e3a2d9d9281c1b031..7fa12da2012a312f59d2b4d4f1a4452e11f38368 100644
--- a/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
+++ b/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
@@ -25,9 +25,9 @@
#include <vtkArray.h>
#include <vtkDenseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#include <stdio.h>
#include <string.h>
#include <cassert>
diff --git a/Filters/Matlab/vtkMatlabEngineFilter.cxx b/Filters/Matlab/vtkMatlabEngineFilter.cxx
index 69247e44fdada99071e7b1520118536de097236d..11a37cb8441693c1e3bbf8cc40edc9a106cdf917 100644
--- a/Filters/Matlab/vtkMatlabEngineFilter.cxx
+++ b/Filters/Matlab/vtkMatlabEngineFilter.cxx
@@ -41,7 +41,7 @@
#include <cstdlib>
#include <string>
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <sys/stat.h>
#define BUFFER_SIZE 32768
diff --git a/Filters/Matlab/vtkMatlabEngineInterface.cxx b/Filters/Matlab/vtkMatlabEngineInterface.cxx
index 0bcf57375d8f1255e5108e9c734592c89650aa38..260dce89ea001da8d3d75d686e4e95f24899fe4d 100644
--- a/Filters/Matlab/vtkMatlabEngineInterface.cxx
+++ b/Filters/Matlab/vtkMatlabEngineInterface.cxx
@@ -28,7 +28,7 @@
#include <cstdlib>
#include <string>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <sys/stat.h>
#include <string>
diff --git a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx
index 5c87fa4b38a520a88c99655603692b7ed9211bbd..b8d8fe67ac11e53b9205e8c43ed639151bd0cd7d 100644
--- a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx
+++ b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx
@@ -49,7 +49,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtksys/CommandLineArguments.hxx"
-#include <vtksys/ios/sstream>
+#include <sstream>
namespace
{
diff --git a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx
index 6c7787bb1a07d16317162d1da7c006bd999eabf2..669e13f7c27b02a4e5151862b9c14082a464074c 100644
--- a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx
@@ -31,7 +31,7 @@
#include "vtkUnstructuredGridReader.h"
#include "vtkUnstructuredGridWriter.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// Reference values
static vtkIdType cardCellDistanceSelection2D[] =
diff --git a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx
index 4da79ea4e72c1e0beeb29bff8753e52c1b854888..2613216a1398bae311355c6f6572f3204cf5cb58 100644
--- a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx
@@ -31,7 +31,7 @@
#include "vtkUnstructuredGridReader.h"
#include "vtkUnstructuredGridWriter.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// Reference values
const vtkIdType cardCellDistanceSelection3D[] =
diff --git a/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx b/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx
index ecce375a5274bfcbebeba3714b0c5edcda570c3a..83c08c0ccabcff360139f90d898a7fd7a32b5d10 100644
--- a/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx
@@ -31,7 +31,7 @@
#include "vtkUnstructuredGridReader.h"
#include "vtkUnstructuredGridWriter.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#if 0
// Reference value
diff --git a/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx b/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx
index c00f9665991de70feb52755c60fd77e1d11138e1..c0f2df73eca4e31f4ee0b6060df53268a93e623b 100644
--- a/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx
@@ -31,7 +31,7 @@
#include "vtkUnstructuredGridReader.h"
#include "vtkUnstructuredGridWriter.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// Reference values
const vtkIdType cardSelection[] =
diff --git a/Filters/Selection/vtkLinearSelector.cxx b/Filters/Selection/vtkLinearSelector.cxx
index 40c47a7843dcbd49127fa1771ca12c4e32143be9..39a82a9d099dc8059ddc4bbf7055c4b49cfb9e8c 100644
--- a/Filters/Selection/vtkLinearSelector.cxx
+++ b/Filters/Selection/vtkLinearSelector.cxx
@@ -17,7 +17,7 @@
#include "vtkCompositeDataSet.h"
#include "vtkCompositeDataIterator.h"
-#include <vtksys/stl/vector>
+#include <vector>
vtkStandardNewMacro(vtkLinearSelector);
vtkCxxSetObjectMacro(vtkLinearSelector,Points,vtkPoints);
diff --git a/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx b/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx
index b6cfef1e12f470ad5de09cd08ec7d81853221ee0..b5a4757ea390cd5ee853f4eff641cdb3927445fe 100644
--- a/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx
+++ b/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx
@@ -26,8 +26,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx b/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx
index eb11ade1cbcd7f94df51f38cc261c109b572a1c8..7ade71dd2d53f06d7c9aa49e89e2faf74f9ee1c8 100644
--- a/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx
+++ b/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx
@@ -26,8 +26,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/Sources/vtkGraphToPolyData.cxx b/Filters/Sources/vtkGraphToPolyData.cxx
index eb49f703e9145ca5aec7da98b7a47f270a8a0378..1f88d9b00f23a27d18932eb2fb7ee04649ea5723 100644
--- a/Filters/Sources/vtkGraphToPolyData.cxx
+++ b/Filters/Sources/vtkGraphToPolyData.cxx
@@ -37,9 +37,9 @@
#include "vtkPolyData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
+#include <map>
+#include <utility>
+#include <vector>
vtkStandardNewMacro(vtkGraphToPolyData);
diff --git a/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx
index 3aa72993e30095df9f8d6f42ce4b8ded4d5f07ea..5ef46509289fe6e45345568757125e0cdc8f353a 100644
--- a/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx
+++ b/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx
@@ -19,7 +19,7 @@
#include "vtkTimerLog.h"
#include "vtkCorrelativeStatistics.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
//=============================================================================
// When changing this file, change the corresponding file in
diff --git a/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx
index b4dc1adcb9ba75395bafb084a01015efd0fb4772..d55f007d2f80407baa811ec2d665fcfeecaa4d88 100644
--- a/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx
+++ b/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx
@@ -20,7 +20,7 @@
#include "vtkStdString.h"
#include "vtkTimerLog.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
//=============================================================================
diff --git a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx
index 4c9dd298ec409e85ebf452bb7289fabbc92ce0b4..25e9da2d828e5e92fc8eb9052a1b0f3d9b569a9d 100644
--- a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx
+++ b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx
@@ -8,7 +8,7 @@
#include "vtkIntArray.h"
#include "vtkIdTypeArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkKMeansDistanceFunctorCalculator);
vtkCxxSetObjectMacro(vtkKMeansDistanceFunctorCalculator,FunctionParser,vtkFunctionParser);
diff --git a/Filters/Statistics/vtkPCAStatistics.cxx b/Filters/Statistics/vtkPCAStatistics.cxx
index 2713dc77673971363888fc38a6ffb11ff68a2ac5..10c826937ee071bb9200b223e7a94f12653d04db 100644
--- a/Filters/Statistics/vtkPCAStatistics.cxx
+++ b/Filters/Statistics/vtkPCAStatistics.cxx
@@ -13,7 +13,7 @@
#include <map>
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "alglib/svd.h"
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx
index 8c65d400c037d13c3fcd4c719d1b196d781fb1ca..79b93c047afcfd145e13e5c2f0acf61fef44db78 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx
@@ -19,7 +19,7 @@
#include "vtkTimerLog.h"
#include "vtkCorrelativeStatistics.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
//=============================================================================
// When changing this file, change the corresponding file in
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
index f4da9a38ae986cef619bdd0f06b0faa3d0d1e967..0c1a13442935f5abd41c8c0dafb852bc054358e6 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
@@ -35,9 +35,9 @@
#include <vtkNew.h>
#include <vtkStringArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
namespace
{
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
index cc1f7d7925490c6c913808e30c00427fb37ccc76..bd24be234cf173b6511c1e6aa5b91b5f9cc61835 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
@@ -32,9 +32,9 @@
#include <vtkDataSetAttributes.h>
#include <vtkStringArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
#include <stdio.h>
#include <string.h>
#include <cassert>
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
index 9155ffac7c62b1351c4a91ccf6dd971683492455..5dadad82c9b2d19efe87793da063ace709cc04f5 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
@@ -27,9 +27,9 @@ PURPOSE. See the above copyright notice for more information.
#include <vtkTable.h>
#include <vtkVariant.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
namespace
{
diff --git a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
index 192f76294c724fc3a05831fa6eb7c777e010d066..84d536a4e2789f1d7d8eff50e8776c6e654b5e47 100644
--- a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
+++ b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
@@ -33,10 +33,10 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkTable.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/vector>
+#include <map>
+#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkContingencyStatisticsGnuR);
diff --git a/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.cxx b/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.cxx
index 1f05e9caf90ac20d359a118965c4ca4ce3e1e8d0..d508ae3e869755f13a6fe79a8584ec635ccad630 100644
--- a/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.cxx
+++ b/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.cxx
@@ -27,7 +27,7 @@
#include "vtkObjectFactory.h"
#include "vtkRInterface.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkCorrelativeStatisticsGnuR);
diff --git a/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.cxx b/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.cxx
index 18a55d9f1edefa0c3f17580545391f6f3f7cf418..64b4cf68653fb99057e1b434df50494cce8add22 100644
--- a/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.cxx
+++ b/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.cxx
@@ -27,7 +27,7 @@
#include "vtkRInterface.h"
#include "vtkStringArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkDescriptiveStatisticsGnuR);
diff --git a/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx b/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx
index 18f0bf26a6291564433bd3015b68357cc0b8c038..ff1973a37bc84d8db03733ec1f662cfe5d779552 100644
--- a/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx
+++ b/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx
@@ -20,7 +20,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkRInterface.h"
#include "vtkObjectFactory.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkPCAStatisticsGnuR);
diff --git a/Filters/StatisticsGnuR/vtkRCalculatorFilter.cxx b/Filters/StatisticsGnuR/vtkRCalculatorFilter.cxx
index e2a1f0401f2f7974fbc3dd53340c7a02ab43afa9..02b342f1eeb79f22df3e6f9475f7c08bd96eb854 100644
--- a/Filters/StatisticsGnuR/vtkRCalculatorFilter.cxx
+++ b/Filters/StatisticsGnuR/vtkRCalculatorFilter.cxx
@@ -44,7 +44,7 @@
#include <cstdlib>
#include <string>
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <sys/stat.h>
#define BUFFER_SIZE 32768
diff --git a/GUISupport/Qt/vtkQtTableModelAdapter.cxx b/GUISupport/Qt/vtkQtTableModelAdapter.cxx
index 44ebd2d3e7f0ed1366130841c5eb0b7d184b8ac1..4ae63a22d10f13d4f58465c9468aa94eac0887bf 100644
--- a/GUISupport/Qt/vtkQtTableModelAdapter.cxx
+++ b/GUISupport/Qt/vtkQtTableModelAdapter.cxx
@@ -46,7 +46,7 @@
#include <QImage>
#include <set>
-#include <vtksys/ios/sstream>
+#include <sstream>
//----------------------------------------------------------------------------
class vtkQtTableModelAdapter::vtkInternal {
diff --git a/GUISupport/Qt/vtkQtTreeModelAdapter.cxx b/GUISupport/Qt/vtkQtTreeModelAdapter.cxx
index 612056e1cd9ccfd124ab88ccf307e687c68ab358..45ac497284418abef40b5415c9978f31e300cecb 100644
--- a/GUISupport/Qt/vtkQtTreeModelAdapter.cxx
+++ b/GUISupport/Qt/vtkQtTreeModelAdapter.cxx
@@ -45,7 +45,7 @@
#include <QPixmap>
#include <QMimeData>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <set>
vtkQtTreeModelAdapter::vtkQtTreeModelAdapter(QObject* p, vtkTree* t)
diff --git a/GUISupport/Qt/vtkTDxQtUnixDevices.cxx b/GUISupport/Qt/vtkTDxQtUnixDevices.cxx
index bef3f640a83ba12fd42fbc042ed8976ea6115325..8d80f33352674be7f1460481d6cc3d3e9fbe387e 100644
--- a/GUISupport/Qt/vtkTDxQtUnixDevices.cxx
+++ b/GUISupport/Qt/vtkTDxQtUnixDevices.cxx
@@ -14,7 +14,7 @@ PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkTDxQtUnixDevices.h"
-#include <vtksys/stl/map>
+#include <map>
#include <QApplication> // topLevelWidgets()
#include <QWidget>
#include <X11/Xlib.h> // Needed for X types used in the public interface
diff --git a/GUISupport/QtSQL/vtkQtSQLDatabase.cxx b/GUISupport/QtSQL/vtkQtSQLDatabase.cxx
index bfe2e493a97bcdf46bcbef43f7898c4a3c5b4db8..5c7c62b5df87b0ebd9ec53db7cd39aa5a8d0045e 100644
--- a/GUISupport/QtSQL/vtkQtSQLDatabase.cxx
+++ b/GUISupport/QtSQL/vtkQtSQLDatabase.cxx
@@ -34,7 +34,7 @@
#include <QtSql/QSqlError>
#include <vtksys/SystemTools.hxx>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkQtSQLDatabase);
diff --git a/Geovis/Core/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx b/Geovis/Core/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx
index 14186915499e51453116c87a93f9bd13d93ba948..f46c3a569683ce60433af65f5b3cfe423e0f5952 100644
--- a/Geovis/Core/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx
+++ b/Geovis/Core/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx
@@ -49,7 +49,7 @@
#include "vtkTestUtilities.h"
#include "vtkTIFFReader.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestCoincidentGeoGraphRepresentation2D(int argc, char* argv[])
{
diff --git a/Geovis/Core/Testing/Cxx/TestLabeledGeoView2D.cxx b/Geovis/Core/Testing/Cxx/TestLabeledGeoView2D.cxx
index 46fe88596f653c0525bfba814c60739ac7db90d9..11620c22ac3cb52407f3dcd78fff9f03ae76a30c 100644
--- a/Geovis/Core/Testing/Cxx/TestLabeledGeoView2D.cxx
+++ b/Geovis/Core/Testing/Cxx/TestLabeledGeoView2D.cxx
@@ -40,7 +40,7 @@
#include "vtkStdString.h"
#include "vtkTestUtilities.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestLabeledGeoView2D(int argc, char* argv[])
{
diff --git a/Geovis/Core/vtkGeoFileImageSource.cxx b/Geovis/Core/vtkGeoFileImageSource.cxx
index 21de343e19b435bed2f302dbe138c484b74c47a5..e588ed4556b7cc11f3139f66627914a2f0b4cd11 100644
--- a/Geovis/Core/vtkGeoFileImageSource.cxx
+++ b/Geovis/Core/vtkGeoFileImageSource.cxx
@@ -32,9 +32,9 @@
#include "vtkTransform.h"
#include "vtkXMLImageDataReader.h"
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/utility>
+#include <fstream>
+#include <sstream>
+#include <utility>
vtkStandardNewMacro(vtkGeoFileImageSource);
//----------------------------------------------------------------------------
diff --git a/Geovis/Core/vtkGeoFileTerrainSource.cxx b/Geovis/Core/vtkGeoFileTerrainSource.cxx
index 1834b23c06801c6b4d8e9d5b7056b6bc49231039..af8033fec60516822ad7fcd08701ccfc94504a5a 100644
--- a/Geovis/Core/vtkGeoFileTerrainSource.cxx
+++ b/Geovis/Core/vtkGeoFileTerrainSource.cxx
@@ -28,9 +28,9 @@
#include "vtkStdString.h"
#include "vtkXMLPolyDataReader.h"
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/utility>
+#include <fstream>
+#include <sstream>
+#include <utility>
vtkStandardNewMacro(vtkGeoFileTerrainSource);
//----------------------------------------------------------------------------
diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx
index 817e17446232d7eae3ae625d3a356d3dd13245a4..64bfb5e50f64235c619daabd37a20a14a058c544 100644
--- a/Geovis/Core/vtkGeoProjection.cxx
+++ b/Geovis/Core/vtkGeoProjection.cxx
@@ -22,7 +22,7 @@
#include "vtkObjectFactory.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <string>
#include <map>
#include <vector>
diff --git a/Geovis/Core/vtkGeoProjectionSource.cxx b/Geovis/Core/vtkGeoProjectionSource.cxx
index fe0df8308833f2365ea834ad18d00eaa0b59c3bf..e6fdd00efe9459396714d8d998649dbd17124160 100644
--- a/Geovis/Core/vtkGeoProjectionSource.cxx
+++ b/Geovis/Core/vtkGeoProjectionSource.cxx
@@ -44,8 +44,8 @@
#include "vtkTransform.h"
#include "vtkTransformFilter.h"
-#include <vtksys/stl/stack>
-#include <vtksys/stl/utility>
+#include <stack>
+#include <utility>
// Heap dump method used for debugging threading issues on windows.
diff --git a/IO/Core/Testing/Cxx/TestArraySerialization.cxx b/IO/Core/Testing/Cxx/TestArraySerialization.cxx
index b9b90fd6dec7db7d091c068f8f6bdf6d252215db..b0058f0fd3b53474f2775fe23480c5740adf064d 100644
--- a/IO/Core/Testing/Cxx/TestArraySerialization.cxx
+++ b/IO/Core/Testing/Cxx/TestArraySerialization.cxx
@@ -26,8 +26,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/ios/sstream>
+#include <iostream>
+#include <sstream>
#include <stdexcept>
#define test_expression(expression) \
diff --git a/IO/Core/vtkArrayDataReader.cxx b/IO/Core/vtkArrayDataReader.cxx
index dfa4f934357dbe9c865d7c4a379f67c66279bc0c..284a5411b05ff6fa0ee86948f336979f51d85fcf 100644
--- a/IO/Core/vtkArrayDataReader.cxx
+++ b/IO/Core/vtkArrayDataReader.cxx
@@ -24,7 +24,7 @@
#include "vtkObjectFactory.h"
#include "vtkSmartPointer.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <stdexcept>
vtkStandardNewMacro(vtkArrayDataReader);
diff --git a/IO/Core/vtkArrayDataWriter.cxx b/IO/Core/vtkArrayDataWriter.cxx
index fff8ce978912368ace483eb920a68c0092f4206d..8b0ebd7f06d886b97a7436f2e1aa21f31473f3ad 100644
--- a/IO/Core/vtkArrayDataWriter.cxx
+++ b/IO/Core/vtkArrayDataWriter.cxx
@@ -22,7 +22,7 @@
#include "vtkSmartPointer.h"
#include <stdexcept>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkArrayDataWriter);
diff --git a/IO/Core/vtkArrayReader.cxx b/IO/Core/vtkArrayReader.cxx
index 0a6457168141a132b3afcf2bbb4e8a194583168e..23650b200c30deef5220d04909722d757087c98c 100644
--- a/IO/Core/vtkArrayReader.cxx
+++ b/IO/Core/vtkArrayReader.cxx
@@ -27,7 +27,7 @@
#include "vtkSparseArray.h"
#include "vtkUnicodeString.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <stdexcept>
#include <string>
diff --git a/IO/Core/vtkArrayWriter.cxx b/IO/Core/vtkArrayWriter.cxx
index c267183f88832c1776247642ed56378a68cef556..2d7f70e6652c5935ea3d489b4b9488642d5238a1 100644
--- a/IO/Core/vtkArrayWriter.cxx
+++ b/IO/Core/vtkArrayWriter.cxx
@@ -27,7 +27,7 @@
#include <cmath>
#include <limits>
#include <stdexcept>
-#include <vtksys/ios/sstream>
+#include <sstream>
namespace {
diff --git a/IO/Core/vtkDelimitedTextWriter.cxx b/IO/Core/vtkDelimitedTextWriter.cxx
index 9f70302ba2affd6468ba136ea351fa67b509482d..53de047945dad031f12588cb0965bb9d2766c095 100644
--- a/IO/Core/vtkDelimitedTextWriter.cxx
+++ b/IO/Core/vtkDelimitedTextWriter.cxx
@@ -31,7 +31,7 @@
#include "vtkSmartPointer.h"
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkDelimitedTextWriter);
//-----------------------------------------------------------------------------
diff --git a/IO/Core/vtkJavaScriptDataWriter.cxx b/IO/Core/vtkJavaScriptDataWriter.cxx
index 05ac7f0cff2b6c2746e4cf6b2221fb5e3a99f7f4..0c865b5bac09813903fb8883f22d70ced67aa882 100644
--- a/IO/Core/vtkJavaScriptDataWriter.cxx
+++ b/IO/Core/vtkJavaScriptDataWriter.cxx
@@ -32,7 +32,7 @@
#include "vtkStringArray.h"
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkJavaScriptDataWriter);
//-----------------------------------------------------------------------------
diff --git a/IO/Core/vtkWriter.cxx b/IO/Core/vtkWriter.cxx
index ddd3ee0c7a540c9d4e57cfaf0ae51bd830bfc904..c0d441d8a8b726c5d3f25b6b30421e84d055026a 100644
--- a/IO/Core/vtkWriter.cxx
+++ b/IO/Core/vtkWriter.cxx
@@ -21,7 +21,7 @@
#include "vtkInformation.h"
#include "vtkInformationVector.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// Construct with no start and end write methods or arguments.
diff --git a/IO/EnSight/vtkEnSightGoldReader.cxx b/IO/EnSight/vtkEnSightGoldReader.cxx
index 10f21b5608b7cdd1def8198546b8e8ce179def94..51c945714925b5f7eed663de969d11a88fcda997 100644
--- a/IO/EnSight/vtkEnSightGoldReader.cxx
+++ b/IO/EnSight/vtkEnSightGoldReader.cxx
@@ -28,7 +28,7 @@
#include "vtkUnstructuredGrid.h"
#include <ctype.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <string>
#include <vector>
#include <map>
diff --git a/IO/Exodus/vtkExodusIIReaderParser.h b/IO/Exodus/vtkExodusIIReaderParser.h
index 16276d2370e8475ea6e617367944fb77addd98ee..b5be2cfdb5f420b7feda77219e0552a2eb0a56e3 100644
--- a/IO/Exodus/vtkExodusIIReaderParser.h
+++ b/IO/Exodus/vtkExodusIIReaderParser.h
@@ -24,7 +24,7 @@
#include "vtkXMLParser.h"
#include "vtkSmartPointer.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <map>
#include <vector>
#include <set>
diff --git a/IO/Export/vtkPOVExporter.cxx b/IO/Export/vtkPOVExporter.cxx
index 61809ffb914de484dad3790a5ab3070fd8be9cac..f1e78ec86476a46baf0a4bbb5a309e8cfb436bf4 100644
--- a/IO/Export/vtkPOVExporter.cxx
+++ b/IO/Export/vtkPOVExporter.cxx
@@ -83,7 +83,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkTypeTraits.h"
#include "vtkUnsignedCharArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkObjectFactory.h"
diff --git a/IO/Export/vtkRIBExporter.cxx b/IO/Export/vtkRIBExporter.cxx
index 2388da097ce4af29387b6bd2f40498a8c1c4d1b1..8809ece0ef105923efa14add385d084f84ef24d0 100644
--- a/IO/Export/vtkRIBExporter.cxx
+++ b/IO/Export/vtkRIBExporter.cxx
@@ -40,7 +40,7 @@
#include "vtkTIFFWriter.h"
#include "vtkTexture.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkRIBExporter);
diff --git a/IO/Export/vtkX3DExporter.cxx b/IO/Export/vtkX3DExporter.cxx
index 01c91674299b616f615beef6efd549f388a05e69..36d1c494033cc4fc31b4552c08a352022731ad16 100644
--- a/IO/Export/vtkX3DExporter.cxx
+++ b/IO/Export/vtkX3DExporter.cxx
@@ -44,7 +44,7 @@
#include "vtkX3DExporterXMLWriter.h"
#include "vtkX3D.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
using namespace vtkX3D;
diff --git a/IO/Export/vtkX3DExporterFIWriter.cxx b/IO/Export/vtkX3DExporterFIWriter.cxx
index b17f7c5a6f35698a34d13b49080ea87d459bb650..5d88c9c5c7965abd4b6a1fc515862a6275d62402 100644
--- a/IO/Export/vtkX3DExporterFIWriter.cxx
+++ b/IO/Export/vtkX3DExporterFIWriter.cxx
@@ -22,7 +22,7 @@
#include "vtkUnsignedCharArray.h"
#include "vtkX3D.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
#include <vector>
diff --git a/IO/Export/vtkX3DExporterXMLWriter.cxx b/IO/Export/vtkX3DExporterXMLWriter.cxx
index 0ddd50cb067eb24e42fd4b1bae62dd0c2b0a6224..aa13e8232e6c57ce2b59d60bb7f693b4f5c0a29f 100644
--- a/IO/Export/vtkX3DExporterXMLWriter.cxx
+++ b/IO/Export/vtkX3DExporterXMLWriter.cxx
@@ -22,8 +22,8 @@
#include "vtkCellArray.h"
#include "vtkMath.h"
-#include <vtksys/ios/sstream>
-#include <vtksys/ios/fstream>
+#include <sstream>
+#include <fstream>
#include <string>
#include <cassert>
diff --git a/IO/GeoJSON/vtkGeoJSONWriter.cxx b/IO/GeoJSON/vtkGeoJSONWriter.cxx
index 4e6f54a9680bd93e50d17688f6103054ce43ec21..d796506ffab51bcce9ca48187e8e4918b57ed0ba 100644
--- a/IO/GeoJSON/vtkGeoJSONWriter.cxx
+++ b/IO/GeoJSON/vtkGeoJSONWriter.cxx
@@ -23,7 +23,7 @@
#include "vtkPointData.h"
#include "vtkPolyData.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#if _MSC_VER
#define snprintf _snprintf
diff --git a/IO/Geometry/vtkFLUENTReader.cxx b/IO/Geometry/vtkFLUENTReader.cxx
index 5ac96802560d26212dac79d9451e1fa57bc18290..dee6a49c0ff6055e459422d47f029facad655abe 100644
--- a/IO/Geometry/vtkFLUENTReader.cxx
+++ b/IO/Geometry/vtkFLUENTReader.cxx
@@ -51,8 +51,8 @@
#include <map>
#include <vector>
#include <set>
-#include "vtksys/ios/fstream"
-#include "vtksys/ios/sstream"
+#include "fstream"
+#include "sstream"
#include <algorithm>
#include <ctype.h>
diff --git a/IO/Geometry/vtkOpenFOAMReader.cxx b/IO/Geometry/vtkOpenFOAMReader.cxx
index 09d6f0cba8f7c7f876f2616589ce44185cb5a43d..a69a4224b2ee4572c81a6b773a0be1aad89d566f 100644
--- a/IO/Geometry/vtkOpenFOAMReader.cxx
+++ b/IO/Geometry/vtkOpenFOAMReader.cxx
@@ -56,7 +56,7 @@
#include <vector>
#include "vtksys/SystemTools.hxx"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtk_zlib.h"
#include "vtkCellArray.h"
diff --git a/IO/Geometry/vtkParticleReader.cxx b/IO/Geometry/vtkParticleReader.cxx
index af71e295edd9ad18c5ead6dce558b84aeb2fc9a4..8fefa87070a7e4d6601200ffea01664c7c7aa6fe 100644
--- a/IO/Geometry/vtkParticleReader.cxx
+++ b/IO/Geometry/vtkParticleReader.cxx
@@ -31,7 +31,7 @@
#include <algorithm>
#include <vector>
#include <string>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkParticleReader);
diff --git a/IO/Image/vtkNIFTIImageReader.cxx b/IO/Image/vtkNIFTIImageReader.cxx
index f472693a636e60c4db99f4df9e05e9d7ac1fc54a..7646cb80c86e0aba081b988e6ea7c8e78e7bbf34 100644
--- a/IO/Image/vtkNIFTIImageReader.cxx
+++ b/IO/Image/vtkNIFTIImageReader.cxx
@@ -30,7 +30,7 @@
#include "vtkVersion.h"
#include "vtksys/SystemTools.hxx"
-#include "vtksys/ios/sstream"
+#include "sstream"
// Header for NIFTI
#include "vtkNIFTIImageHeader.h"
diff --git a/IO/Image/vtkNIFTIImageWriter.cxx b/IO/Image/vtkNIFTIImageWriter.cxx
index 55d4717758ccd8c7ce7b4132d01f4d3a8c27f21e..5e2c7e6c48dd254cb2130485973121c46beddc08 100644
--- a/IO/Image/vtkNIFTIImageWriter.cxx
+++ b/IO/Image/vtkNIFTIImageWriter.cxx
@@ -29,7 +29,7 @@
#include "vtkVersion.h"
#include "vtksys/SystemTools.hxx"
-#include "vtksys/ios/sstream"
+#include "sstream"
// Header for NIFTI
#include "vtkNIFTIImageHeader.h"
diff --git a/IO/Infovis/vtkChacoGraphReader.cxx b/IO/Infovis/vtkChacoGraphReader.cxx
index 6e95312a13fb41dd0327585097de1b79abb76160..013a1bc9b5144e872fcd3ba41df0d59af428c454 100644
--- a/IO/Infovis/vtkChacoGraphReader.cxx
+++ b/IO/Infovis/vtkChacoGraphReader.cxx
@@ -51,8 +51,8 @@
#include "vtkSmartPointer.h"
#include "vtkStdString.h"
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/sstream>
+#include <fstream>
+#include <sstream>
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
diff --git a/IO/Infovis/vtkDIMACSGraphReader.cxx b/IO/Infovis/vtkDIMACSGraphReader.cxx
index 1b1c38a41e4596b474ecb425a750d0c9fcf5a17c..47878d85735dc060aeacdc699870e6631e93eb43 100644
--- a/IO/Infovis/vtkDIMACSGraphReader.cxx
+++ b/IO/Infovis/vtkDIMACSGraphReader.cxx
@@ -32,9 +32,9 @@
#include "vtkStringArray.h"
#include "vtkIntArray.h"
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/sstream>
-#include <vtksys/ios/iostream>
+#include <fstream>
+#include <sstream>
+#include <iostream>
using std::ifstream;
using std::istringstream;
diff --git a/IO/Infovis/vtkDelimitedTextReader.cxx b/IO/Infovis/vtkDelimitedTextReader.cxx
index 62cb65b310a6de4e5cf11f908aa2672a58bcbebc..727a85281ddf79855cbd8d62241c8ef19b866a31 100644
--- a/IO/Infovis/vtkDelimitedTextReader.cxx
+++ b/IO/Infovis/vtkDelimitedTextReader.cxx
@@ -35,8 +35,8 @@
#include "vtkTextCodec.h"
#include "vtkTextCodecFactory.h"
-#include <vtksys/ios/sstream>
-#include <vtksys/ios/iostream>
+#include <sstream>
+#include <iostream>
#include <algorithm>
#include <iterator>
#include <stdexcept>
diff --git a/IO/Legacy/vtkCompositeDataReader.cxx b/IO/Legacy/vtkCompositeDataReader.cxx
index b36934137f34717814402b8df667c0a22b4fcb20..e8acce273ab087e65c2239002afb5d627a0f7f3a 100644
--- a/IO/Legacy/vtkCompositeDataReader.cxx
+++ b/IO/Legacy/vtkCompositeDataReader.cxx
@@ -34,7 +34,7 @@
#include <vtksys/RegularExpression.hxx>
#include <vtksys/SystemTools.hxx>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <vector>
diff --git a/IO/Legacy/vtkDataReader.cxx b/IO/Legacy/vtkDataReader.cxx
index 520a2178b74b8735f53fc7e60c3b9be900d318e8..13c51154f6021185ca8deb6dd72d91f66fdd3056 100644
--- a/IO/Legacy/vtkDataReader.cxx
+++ b/IO/Legacy/vtkDataReader.cxx
@@ -45,7 +45,7 @@
#include "vtkUnsignedLongArray.h"
#include "vtkUnsignedShortArray.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// We only have vtkTypeUInt64Array if we have long long
// or we have __int64 with conversion to double.
diff --git a/IO/Legacy/vtkDataWriter.cxx b/IO/Legacy/vtkDataWriter.cxx
index f3684a543df1027b994bcf20d50f7108ea54afd4..196eb7b124b2dc87d9883bc207c77bb3ce011bc9 100644
--- a/IO/Legacy/vtkDataWriter.cxx
+++ b/IO/Legacy/vtkDataWriter.cxx
@@ -44,7 +44,7 @@
#include "vtkUnsignedLongArray.h"
#include "vtkUnsignedShortArray.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkDataWriter);
diff --git a/IO/MINC/vtkMINCImageAttributes.cxx b/IO/MINC/vtkMINCImageAttributes.cxx
index 8112945372e7472a88c498a2d87e8486e27434d7..3acfc67d50cc63bc0c3d6430eb33a2bbc7f0fd1b 100644
--- a/IO/MINC/vtkMINCImageAttributes.cxx
+++ b/IO/MINC/vtkMINCImageAttributes.cxx
@@ -69,7 +69,7 @@ POSSIBILITY OF SUCH DAMAGES.
#include <float.h>
#include <string>
#include <map>
-#include <vtksys/ios/sstream>
+#include <sstream>
//-------------------------------------------------------------------------
// A container for mapping attribute names to arrays
diff --git a/IO/MySQL/vtkMySQLDatabase.cxx b/IO/MySQL/vtkMySQLDatabase.cxx
index 66334000bffd57a98fd076f437930f979e4ae90f..ebc0dc7a3937940283260f58fe89996885df3610 100644
--- a/IO/MySQL/vtkMySQLDatabase.cxx
+++ b/IO/MySQL/vtkMySQLDatabase.cxx
@@ -27,7 +27,7 @@
#include "vtkStringArray.h"
#include <vtksys/SystemTools.hxx>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
diff --git a/IO/NetCDF/Testing/Cxx/SLACParticleReader.cxx b/IO/NetCDF/Testing/Cxx/SLACParticleReader.cxx
index 227ae87180f1edb0259a8ff1414990f186ae6fe0..63ba26901470413e98ca4de99c3c8ddedea4ee2a 100644
--- a/IO/NetCDF/Testing/Cxx/SLACParticleReader.cxx
+++ b/IO/NetCDF/Testing/Cxx/SLACParticleReader.cxx
@@ -39,7 +39,7 @@
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
-#include <vtksys/ios/sstream>
+#include <sstream>
int SLACParticleReader(int argc, char *argv[])
{
diff --git a/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx b/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx
index 82608535647ea5a54102489d8a667647bf73c013..2dd5d9aad9abc888df3b4a55f6e8cf85f883d5fb 100644
--- a/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx
+++ b/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx
@@ -31,7 +31,7 @@
#include "vtkToolkits.h"
#include "vtkIOODBCTestingCxxConfigure.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define LONGSTRING "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
diff --git a/IO/ODBC/vtkODBCDatabase.cxx b/IO/ODBC/vtkODBCDatabase.cxx
index 304124a76f2a5d594bc59f1f869adff0904d2b13..957c4c50a39b5dd3a688fb1b1cb165f237909208 100644
--- a/IO/ODBC/vtkODBCDatabase.cxx
+++ b/IO/ODBC/vtkODBCDatabase.cxx
@@ -39,7 +39,7 @@
#include "vtkStringArray.h"
#include <vtksys/SystemTools.hxx>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
#include <string.h>
diff --git a/IO/ParallelXML/vtkXMLPDataWriter.cxx b/IO/ParallelXML/vtkXMLPDataWriter.cxx
index ec63372af67f5441540943dba1d27734425e8f35..1fa4632c5493792281a04df17b2833890faf6a6a 100644
--- a/IO/ParallelXML/vtkXMLPDataWriter.cxx
+++ b/IO/ParallelXML/vtkXMLPDataWriter.cxx
@@ -19,7 +19,7 @@
#include "vtkErrorCode.h"
#include "vtkMultiProcessController.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkCxxSetObjectMacro(vtkXMLPDataWriter,
Controller,
diff --git a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx
index 010e5b1ebaf4cbeb9f961370fbbb3260a293dbec..d65b9bf572a799feb06b50e040e20025223ae38b 100644
--- a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx
+++ b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx
@@ -24,7 +24,7 @@
#include "vtkXMLDataElement.h"
#include "vtkInformation.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <vector>
//----------------------------------------------------------------------------
diff --git a/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx b/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx
index 3317d29f48a9445f9dd2ab244980f014140bb35f..a4051b66339d49e0f87665a7d4e193d5dddd7406 100644
--- a/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx
+++ b/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx
@@ -26,7 +26,7 @@
#include "vtkObjectFactory.h"
#include "vtkStringArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <vtksys/SystemTools.hxx>
#include "vtkSmartPointer.h"
diff --git a/IO/PostgreSQL/vtkPostgreSQLQuery.cxx b/IO/PostgreSQL/vtkPostgreSQLQuery.cxx
index 82e18fe81395a6dcdc9d427cf7abbd4c800a491b..9b6fed806c3e5fa562e277bd9d57a435e0e6379c 100644
--- a/IO/PostgreSQL/vtkPostgreSQLQuery.cxx
+++ b/IO/PostgreSQL/vtkPostgreSQLQuery.cxx
@@ -29,7 +29,7 @@
#include <cassert>
#include <limits> // man, I hope all platforms have this nowadays
-#include <vtksys/ios/sstream>
+#include <sstream>
#define BEGIN_TRANSACTION "BEGIN"
#define COMMIT_TRANSACTION "COMMIT"
diff --git a/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx b/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx
index 1043562f4c6fbf5f1e99c3c9a4fedcf26eb09c85..c06ea23ad219eb94a74d303bc34b9cf95cf73387 100644
--- a/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx
+++ b/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx
@@ -31,7 +31,7 @@
#include "vtkSmartPointer.h"
#include "vtkStdString.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
diff --git a/IO/SQL/vtkRowQuery.cxx b/IO/SQL/vtkRowQuery.cxx
index 8463658b2e3a63a2c9a06154cad327791aab3080..86bc0f7f624eb5c9d976a57a571955c23d966ac2 100644
--- a/IO/SQL/vtkRowQuery.cxx
+++ b/IO/SQL/vtkRowQuery.cxx
@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkStdString.h"
-#include "vtksys/stl/algorithm"
+#include "algorithm"
#include "vtkVariantArray.h"
#include <ctype.h>
diff --git a/IO/SQL/vtkRowQueryToTable.cxx b/IO/SQL/vtkRowQueryToTable.cxx
index 87e7190d8d0ff27de920091e5f98515461e4f8ef..c190f6add7d5c50b2ce164e4972aa2bbfd89361f 100644
--- a/IO/SQL/vtkRowQueryToTable.cxx
+++ b/IO/SQL/vtkRowQueryToTable.cxx
@@ -29,7 +29,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkRowQueryToTable);
diff --git a/IO/SQL/vtkSQLDatabase.cxx b/IO/SQL/vtkSQLDatabase.cxx
index c84dcc5cee21d781a71e2501e90e70ad2a025fac..141ca67394616b515db4e6106b0124e691bb5804 100644
--- a/IO/SQL/vtkSQLDatabase.cxx
+++ b/IO/SQL/vtkSQLDatabase.cxx
@@ -32,7 +32,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkStdString.h"
#include <vtksys/SystemTools.hxx>
-#include <vtksys/ios/sstream>
+#include <sstream>
class vtkSQLDatabase::vtkCallbackVector :
diff --git a/IO/SQL/vtkSQLiteDatabase.cxx b/IO/SQL/vtkSQLiteDatabase.cxx
index b71adbaeba15e47ee5153d76ad5ac3340bee278b..865167043161477e7fba8b4d2068e0153205d7c4 100644
--- a/IO/SQL/vtkSQLiteDatabase.cxx
+++ b/IO/SQL/vtkSQLiteDatabase.cxx
@@ -26,8 +26,8 @@
#include "vtkStringArray.h"
#include <vtksys/SystemTools.hxx>
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/sstream>
+#include <fstream>
+#include <sstream>
#include <vtksqlite/vtk_sqlite3.h>
diff --git a/IO/SQL/vtkSQLiteQuery.cxx b/IO/SQL/vtkSQLiteQuery.cxx
index f6981c9abf89c1a94271d4a7102d40f9fcd2ad7e..31a15f1813cb7cbfc4b96bb4feb27198b00321ee 100644
--- a/IO/SQL/vtkSQLiteQuery.cxx
+++ b/IO/SQL/vtkSQLiteQuery.cxx
@@ -29,8 +29,8 @@
#include <cassert>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/vector>
+#include <sstream>
+#include <vector>
#define BEGIN_TRANSACTION "BEGIN TRANSACTION"
#define COMMIT_TRANSACTION "COMMIT"
diff --git a/IO/XML/vtkXMLCompositeDataWriter.cxx b/IO/XML/vtkXMLCompositeDataWriter.cxx
index 41196856e09d12a0b8a369b736e2e9bbde962b2a..23480e32d802bc48fd9ae9687a7406313e11f509 100644
--- a/IO/XML/vtkXMLCompositeDataWriter.cxx
+++ b/IO/XML/vtkXMLCompositeDataWriter.cxx
@@ -41,7 +41,7 @@
#include "vtkXMLWriter.h"
#include "vtkDataObjectTreeIterator.h"
#include <vtksys/SystemTools.hxx>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <string>
#include <vector>
diff --git a/IO/XML/vtkXMLPDataReader.cxx b/IO/XML/vtkXMLPDataReader.cxx
index e38bdb67edb5fab85ed8fe2f2a02705aed800961..25c57be48d337c7f8a7b4bbe26f4a1e18b867552 100644
--- a/IO/XML/vtkXMLPDataReader.cxx
+++ b/IO/XML/vtkXMLPDataReader.cxx
@@ -26,7 +26,7 @@
#include "vtkInformation.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
//----------------------------------------------------------------------------
diff --git a/IO/XML/vtkXMLPStructuredDataReader.cxx b/IO/XML/vtkXMLPStructuredDataReader.cxx
index e73ae8ba01dac3e4c21c817ca98e698936aafb57..edbf0377719a04c15cbbec30a5f1fbf6ed7e6419 100644
--- a/IO/XML/vtkXMLPStructuredDataReader.cxx
+++ b/IO/XML/vtkXMLPStructuredDataReader.cxx
@@ -23,7 +23,7 @@
#include "vtkXMLDataElement.h"
#include "vtkXMLStructuredDataReader.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
//----------------------------------------------------------------------------
diff --git a/IO/XML/vtkXMLReader.cxx b/IO/XML/vtkXMLReader.cxx
index 98927a4677e29f9d7fbe7099caea152508c2f9a7..d1f04c1b2c0f3f03fdf03941b4ceda9afa82f564 100644
--- a/IO/XML/vtkXMLReader.cxx
+++ b/IO/XML/vtkXMLReader.cxx
@@ -33,7 +33,7 @@
#include "vtkQuadratureSchemeDefinition.h"
#include "vtkInformationStringKey.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <sys/stat.h>
#include <cassert>
#include <locale> // C++ locale
diff --git a/IO/XML/vtkXMLWriter.h b/IO/XML/vtkXMLWriter.h
index df7eafcae99ef2c3f3e68666c1a555ef2767a7ac..121c7d121098a374db3baf403afea0883282627c 100644
--- a/IO/XML/vtkXMLWriter.h
+++ b/IO/XML/vtkXMLWriter.h
@@ -24,7 +24,7 @@
#include "vtkIOXMLModule.h" // For export macro
#include "vtkAlgorithm.h"
-#include <vtksys/ios/sstream> // For ostringstream ivar
+#include <sstream> // For ostringstream ivar
class vtkAbstractArray;
class vtkArrayIterator;
diff --git a/IO/XMLParser/vtkXMLDataParser.cxx b/IO/XMLParser/vtkXMLDataParser.cxx
index 919c57d9872b84c3bd5f6b674646d929eeabd818..aefe435f4d9739593acef9bed1325ecb22316b0b 100644
--- a/IO/XMLParser/vtkXMLDataParser.cxx
+++ b/IO/XMLParser/vtkXMLDataParser.cxx
@@ -26,7 +26,7 @@
#undef vtkXMLDataHeaderPrivate_DoNotInclude
#include <vtksys/auto_ptr.hxx>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkXMLUtilities.h"
diff --git a/IO/XMLParser/vtkXMLUtilities.cxx b/IO/XMLParser/vtkXMLUtilities.cxx
index dfcf523dd8d24d95d41d37b21906c7c603e5e085..e5b10a32ad0a44dcb53851121a3a8bdfa8e36532 100644
--- a/IO/XMLParser/vtkXMLUtilities.cxx
+++ b/IO/XMLParser/vtkXMLUtilities.cxx
@@ -18,7 +18,7 @@
#include "vtkXMLDataElement.h"
#include "vtkXMLDataParser.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#if !defined(_WIN32) || defined(__CYGWIN__)
# include <unistd.h> /* unlink */
diff --git a/IO/Xdmf2/vtkXdmfReaderInternal.h b/IO/Xdmf2/vtkXdmfReaderInternal.h
index 4604813de4ceac34808f5b100a0a07c18eba5a4e..abfae5079d74d75d49cf33fdd639ceee0ec4d498 100644
--- a/IO/Xdmf2/vtkXdmfReaderInternal.h
+++ b/IO/Xdmf2/vtkXdmfReaderInternal.h
@@ -57,7 +57,7 @@
#include <cassert>
#include <functional>
#include <algorithm>
-#include <vtksys/ios/sstream>
+#include <sstream>
class vtkXdmfDomain;
class VTKIOXDMF2_EXPORT vtkXdmfDocument
diff --git a/Imaging/General/vtkImageGradient.cxx b/Imaging/General/vtkImageGradient.cxx
index 977af377acf769ad47415160aaaac6362397b32c..1e77cb0dac036ef4599b164a8fab2400b96a6ae5 100644
--- a/Imaging/General/vtkImageGradient.cxx
+++ b/Imaging/General/vtkImageGradient.cxx
@@ -23,7 +23,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include <math.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkImageGradient);
diff --git a/Infovis/Boost/Testing/Cxx/TestVariantSerialization.cxx b/Infovis/Boost/Testing/Cxx/TestVariantSerialization.cxx
index 2bd2335a8634bf76ad26a3e7d595c2e9bc90386e..d9bb28c0753edda8f5f8f7ca42d2224152c1245c 100644
--- a/Infovis/Boost/Testing/Cxx/TestVariantSerialization.cxx
+++ b/Infovis/Boost/Testing/Cxx/TestVariantSerialization.cxx
@@ -22,7 +22,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <string.h>
#include <boost/archive/text_iarchive.hpp>
diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx
index 243821ebc7aa00547fdee1b4abb9e518ed66e477..8f9a16600b0cc96d9a5d94d40f68595225782cef 100644
--- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx
+++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx
@@ -26,8 +26,8 @@
#include <vtkSmartPointer.h>
#include <vtkTypedArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx
index afe24fbc3b492239d20ba390582acc8a7507ebe0..7a21166e043eee786b59e95cb77c5345df21268f 100644
--- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx
+++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx
@@ -25,8 +25,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx
index e77be82740b5ccfe62726eb650320730e141e001..bd76b7c5a522b8375e8bcb0fb78f5a3418e2a5e1 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx
@@ -48,7 +48,7 @@
#include <boost/graph/breadth_first_search.hpp>
#include <boost/pending/queue.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx b/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx
index e2a8ff3687906989d86e61ab301cba2ed98b8988..049657a0323dc68adc9331f418f93fe341999ea6 100644
--- a/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx
+++ b/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx
@@ -27,8 +27,8 @@
#include <vtkTable.h>
#include <vtkVariant.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx b/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx
index 23cb533bb3e7a6d2012091a07ec3cc0e7b268e11..dbc9ebec7f96f425fa734f387957485feffc5d46 100644
--- a/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx
+++ b/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx
@@ -26,8 +26,8 @@
#include <vtkSparseArrayToTable.h>
#include <vtkTable.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/ArrayToTable.cxx b/Infovis/Core/Testing/Cxx/ArrayToTable.cxx
index 5572d649ae399c1ac6f61242358c50e3a783cd5f..9568c9dcc4b71c255d67b4b2fb5fcb94d156be3a 100644
--- a/Infovis/Core/Testing/Cxx/ArrayToTable.cxx
+++ b/Infovis/Core/Testing/Cxx/ArrayToTable.cxx
@@ -27,8 +27,8 @@
#include <vtkSparseArray.h>
#include <vtkTable.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx b/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx
index bc759c26acb814cef4d41f7153cec26587aafbf1..afcbef0fcffb290f1717d9456ce5c66824b27352 100644
--- a/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx
+++ b/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx
@@ -25,8 +25,8 @@
#include <vtkSparseArray.h>
#include <vtkTransposeMatrix.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx b/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx
index 2e412cbd39cfe78e2ae82a23846cbcb4ec2221aa..b4d21efbd95904a7821450d7c50f4ec5eb754b33 100644
--- a/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx
+++ b/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx
@@ -27,8 +27,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>
-#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <iostream>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx
index ef410644f18220447db13df194afa4b9ab1d55e1..683361dfbb5c195bc67f7a95e40d104e9b0ae572 100644
--- a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx
+++ b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx
@@ -32,8 +32,8 @@
#include "vtkTable.h"
#include <algorithm>
-#include <vtksys/stl/map>
-#include <vtksys/stl/functional>
+#include <map>
+#include <functional>
// ----------------------------------------------------------------------
diff --git a/Infovis/Core/vtkArrayNorm.cxx b/Infovis/Core/vtkArrayNorm.cxx
index d6947d4eceed9fb060a51b7523e1b9c1b048e8ed..96ea782eda707391a5c5dbffacf7067216ccbcae 100644
--- a/Infovis/Core/vtkArrayNorm.cxx
+++ b/Infovis/Core/vtkArrayNorm.cxx
@@ -27,7 +27,7 @@
#include "vtkSmartPointer.h"
#include "vtkArrayNorm.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <limits>
#include <stdexcept>
diff --git a/Infovis/Core/vtkArrayToTable.cxx b/Infovis/Core/vtkArrayToTable.cxx
index 8d6dddde0058fe8bfab5223c0d779d6d0f018421..81c1d7168203dcccdb88a4bdfea52f8ffea3e97a 100644
--- a/Infovis/Core/vtkArrayToTable.cxx
+++ b/Infovis/Core/vtkArrayToTable.cxx
@@ -43,8 +43,8 @@
#include "vtkTable.h"
#include "vtkUnicodeStringArray.h"
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <sstream>
+#include <stdexcept>
/// Convert a 1D array to a table with one column ...
template<typename ValueT, typename ColumnT>
diff --git a/Infovis/Core/vtkDotProductSimilarity.cxx b/Infovis/Core/vtkDotProductSimilarity.cxx
index ea346444d0be5d2301935fe3c1cd738cab604222..8b729806fd2beed6bb9e938e072eb439be6a6f5d 100644
--- a/Infovis/Core/vtkDotProductSimilarity.cxx
+++ b/Infovis/Core/vtkDotProductSimilarity.cxx
@@ -31,7 +31,7 @@
#include "vtkSmartPointer.h"
#include "vtkTable.h"
-#include <vtksys/stl/algorithm>
+#include <algorithm>
#include <map>
#include <stdexcept>
diff --git a/Infovis/Core/vtkSparseArrayToTable.cxx b/Infovis/Core/vtkSparseArrayToTable.cxx
index 7032a90a73f0cf6bf8d54cec9bc51c5eec5684bb..0f77e9133621009598a432f8e1bbfb93c7b77645 100644
--- a/Infovis/Core/vtkSparseArrayToTable.cxx
+++ b/Infovis/Core/vtkSparseArrayToTable.cxx
@@ -31,8 +31,8 @@
#include "vtkStringArray.h"
#include "vtkTable.h"
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <sstream>
+#include <stdexcept>
template<typename ValueT, typename ValueColumnT>
static bool Convert(vtkArray* Array, const char* ValueColumn, vtkTable* Table)
diff --git a/Infovis/Core/vtkTableToArray.cxx b/Infovis/Core/vtkTableToArray.cxx
index ddea5bd96322ce3ec2bad5573ad41c57d4052d94..b7e0bc0382d92f0c08ddcffa3732c5f8acf8db95 100644
--- a/Infovis/Core/vtkTableToArray.cxx
+++ b/Infovis/Core/vtkTableToArray.cxx
@@ -29,7 +29,7 @@
#include "vtkTableToArray.h"
#include "vtkVariant.h"
-#include <vtksys/stl/algorithm>
+#include <algorithm>
class vtkTableToArray::implementation
{
diff --git a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx
index d7973b246f4f85c3c6b08c7a95148bff0f2b7932..4ec6459aff04187e5b0b6a724a2ecfa50ea95cd6 100644
--- a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx
+++ b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx
@@ -8,7 +8,7 @@
#include "vtkPoints.h"
#include "vtkTree.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
#include <vector>
#include <algorithm>
diff --git a/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx b/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx
index 8f5c575d2aa11e2b07f53d00c33bce5ec74c4411..05a10edeeaf3bc68f2fe5675d608f80cfe324da8 100644
--- a/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx
+++ b/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx
@@ -27,9 +27,9 @@
#include "vtkPoints.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/map>
+#include <utility>
+#include <vector>
+#include <map>
vtkStandardNewMacro(vtkPassThroughEdgeStrategy);
diff --git a/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx b/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx
index 687633ab73b7ff41c1aa5fca5cc880a1060dcbf7..b5240ddc0b77545e8f6e587e8ceb0c17e78cf665 100644
--- a/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx
+++ b/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx
@@ -36,9 +36,9 @@
#include "vtkVariantArray.h"
#include "vtkDataSetAttributes.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <functional>
+#include <vector>
#include <boost/mpi/datatype.hpp> // for get_mpi_datatype
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx
index c851477b0d423e32054c098fe01c69fb5e8dcb65..eebe59d51282b7bb786cc1454d656091a5df106d 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx
@@ -33,9 +33,9 @@
#include "vtkSmartPointer.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <functional>
+#include <vector>
#include <stdlib.h>
#include <cassert>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx
index fe06125143c30a6dee6b78d489d04f553ea52660..e11120d9adf21d4b4ffedae39bd0418eb4c111bb 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx
@@ -38,7 +38,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <boost/graph/use_mpi.hpp>
#include <boost/graph/distributed/mpi_process_group.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx
index 827cfbdf96a2fcbb29b7640b3820ccf8d43bd138..2e54a430cc64cd897ff5f623324efc4a4fe49a42 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx
@@ -31,8 +31,8 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx
index c20e886f063fbfa62493a28730b24a29e5e3ab6c..5ae45145de28071b3c6410b69d044f2b55476099 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx
@@ -37,7 +37,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <boost/graph/use_mpi.hpp>
#include <boost/graph/distributed/mpi_process_group.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx
index fc37543c418ee6fa62691413a00b293148254be3..9cd3a467b786090dbbe40410c7dc0c90ba11cdc9 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx
@@ -47,8 +47,8 @@
#include "vtkViewTheme.h"
#include "vtkIntArray.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx
index d9eb74dad9d63c967cdbc729983f519dfc2eff12..4144be134b3dd697752e16aad4cd5ccc43af540e 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx
@@ -58,7 +58,7 @@
#include "vtkVertexListIterator.h"
#include "vtkViewTheme.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <boost/graph/use_mpi.hpp>
#include <boost/graph/distributed/mpi_process_group.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx b/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx
index 9eb40a51a95ce8f4a9a50ae2595c92eb2c46e612..7ff35d54e10cb0b334d121a1d88d44b03c3c646e 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx
@@ -35,8 +35,8 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx b/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx
index 9d74852bbe8544037a50c88b2a2d1b0d1707ecb1..b5fbbe7c288499446836c85ee60b05e1d15f8fbc 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx
@@ -35,8 +35,8 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx
index 6d02cf252e6d7d941c874d02e68d0264a4eb464d..5733fc22bb5a1b60a2871353552c7b17ea50f212 100644
--- a/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx
+++ b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx
@@ -58,7 +58,7 @@
#include <boost/property_map/vector_property_map.hpp>
#include <boost/pending/queue.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLCollectGraph.cxx b/Infovis/Parallel/vtkPBGLCollectGraph.cxx
index 489790ad838f36a699b34eeda175143d92425273..5f6103dbe65082ce690dc2785f9fac103e2ec2c9 100644
--- a/Infovis/Parallel/vtkPBGLCollectGraph.cxx
+++ b/Infovis/Parallel/vtkPBGLCollectGraph.cxx
@@ -49,9 +49,9 @@
#include <boost/mpi/collectives/all_reduce.hpp>
#include <boost/serialization/vector.hpp>
-#include <vtksys/stl/utility> // for pair
-#include <vtksys/stl/numeric> // for accumulate, partial_sum
-#include <vtksys/stl/functional> // for plus
+#include <utility> // for pair
+#include <numeric> // for accumulate, partial_sum
+#include <functional> // for plus
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
diff --git a/Infovis/Parallel/vtkPBGLCollectGraph.h b/Infovis/Parallel/vtkPBGLCollectGraph.h
index 215f2f321d9a398a7d0617ace50d224ca9fd335e..a19d19fb6ac1577d0744fbbc3f1ef7c9c34cfd93 100644
--- a/Infovis/Parallel/vtkPBGLCollectGraph.h
+++ b/Infovis/Parallel/vtkPBGLCollectGraph.h
@@ -47,9 +47,9 @@
#include "vtkInfovisParallelModule.h" // For export macro
#include "vtkStdString.h" // For string type
-#include <vtksys/stl/utility> // for pair
-#include <vtksys/stl/numeric> // for accumulate, partial_sum
-#include <vtksys/stl/functional> // for plus
+#include <utility> // for pair
+#include <numeric> // for accumulate, partial_sum
+#include <functional> // for plus
#include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLConnectedComponents.cxx b/Infovis/Parallel/vtkPBGLConnectedComponents.cxx
index 1539e9c70dbce825322305eece2376daec1563a2..17f24610fd147c97fe8882d5f6f4c49f89c06f3a 100644
--- a/Infovis/Parallel/vtkPBGLConnectedComponents.cxx
+++ b/Infovis/Parallel/vtkPBGLConnectedComponents.cxx
@@ -54,7 +54,7 @@
#include <boost/graph/strong_components.hpp>
#include <boost/graph/distributed/strong_components.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLGraphAdapter.h b/Infovis/Parallel/vtkPBGLGraphAdapter.h
index 475fdee72aaceb98db574369a58ade7246bb3eea..478b67f39fa85273953df0abfee331c421f9966f 100644
--- a/Infovis/Parallel/vtkPBGLGraphAdapter.h
+++ b/Infovis/Parallel/vtkPBGLGraphAdapter.h
@@ -29,7 +29,7 @@
#include "vtkBoostGraphAdapter.h" // for the sequential BGL adapters
//BTX
-#include <vtksys/stl/map> // required for Boost 1.54.0
+#include <map> // required for Boost 1.54.0
#include <boost/graph/use_mpi.hpp>
#include <boost/graph/distributed/mpi_process_group.hpp>
#include <boost/graph/properties.hpp>
diff --git a/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx b/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx
index 86147ec5ea42ea0675d6e24d9a7637d6266e1f2f..305d48c84c0e47eb0e75fbd183074762a16070dc 100644
--- a/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx
+++ b/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx
@@ -35,7 +35,7 @@
#include "vtkTimerLog.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
diff --git a/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx
index 3259723890c25e8d6a26492f3e1a27fa22b5bf1c..71544aefa6b8a61e2f1b6b33f1b98ed114a7b070 100644
--- a/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx
+++ b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx
@@ -56,8 +56,8 @@
#include <boost/property_map/vector_property_map.hpp>
#include <boost/pending/queue.hpp>
-#include <vtksys/stl/utility> // for pair
-#include <vtksys/stl/iterator> // for back_inserter
+#include <utility> // for pair
+#include <iterator> // for back_inserter
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx b/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx
index 8e7d231371e56cfd8cdb12262b54a1d78c541474..b80a604ff7ae2aa7328d890753c484d26fca8e77 100644
--- a/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx
+++ b/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx
@@ -42,9 +42,9 @@
#include "vtkPointData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/set>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
+#include <set>
+#include <algorithm>
+#include <functional>
#include <boost/mpi/communicator.hpp>
#include <boost/mpi/collectives/scan.hpp>
diff --git a/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx b/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx
index 952739257f872e95f9bce4d33b7fa6845198d1d4..86d7f633d9f8bbedfd8ec6ccf33324c1f635ce32 100644
--- a/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx
+++ b/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx
@@ -37,9 +37,9 @@
#include "vtkPointData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/set>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
+#include <set>
+#include <algorithm>
+#include <functional>
#include <boost/mpi/communicator.hpp>
#include <boost/mpi/collectives/scan.hpp>
diff --git a/Infovis/Parallel/vtkPBGLShortestPaths.cxx b/Infovis/Parallel/vtkPBGLShortestPaths.cxx
index b3e7283efc914542ca5555bc0783007dc28d2390..cad82a7feb5b423b3185781028fc464e30c9b74a 100644
--- a/Infovis/Parallel/vtkPBGLShortestPaths.cxx
+++ b/Infovis/Parallel/vtkPBGLShortestPaths.cxx
@@ -56,7 +56,7 @@
#include <boost/property_map/property_map.hpp>
#include <boost/property_map/vector_property_map.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLVertexColoring.cxx b/Infovis/Parallel/vtkPBGLVertexColoring.cxx
index 9dc9a0a9f0460ca5f9229c49d4824e8722f201c5..cb8eda49827283cfa83dfc285dcf6c7599c2566f 100644
--- a/Infovis/Parallel/vtkPBGLVertexColoring.cxx
+++ b/Infovis/Parallel/vtkPBGLVertexColoring.cxx
@@ -51,7 +51,7 @@
#include <boost/graph/parallel/algorithm.hpp>
#include <boost/property_map/property_map.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
index bfa19bcb28cf3f346b51f942cd011591526c31f3..8ae65a712e36a02c99dcd15d6066da8ad318b964 100644
--- a/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
@@ -24,7 +24,7 @@
#include "vtkTestUtilities.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// Callback for the broken line widget interaction
class vtkBLWCallback : public vtkCommand
diff --git a/Interaction/Widgets/vtkBiDimensionalRepresentation.cxx b/Interaction/Widgets/vtkBiDimensionalRepresentation.cxx
index 338b9acf736d6332a5e46b572b0563f6d1a644b5..8a86b47d96f697ca431d2116843f55b00c01797b 100644
--- a/Interaction/Widgets/vtkBiDimensionalRepresentation.cxx
+++ b/Interaction/Widgets/vtkBiDimensionalRepresentation.cxx
@@ -32,7 +32,7 @@
#include "vtkTextProperty.h"
#include "vtkWindow.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
//----------------------------------------------------------------------
diff --git a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx
index 6ea5600153cde9fa1d47b9e8e45d0d8dcf0fa5b4..69caf1fe2d1c596618b148e8d1c4cff5bf0f69f8 100644
--- a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx
+++ b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx
@@ -32,7 +32,7 @@
#include "vtkObjectFactory.h"
#include "vtkInteractorObserver.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkBiDimensionalRepresentation2D);
diff --git a/Interaction/Widgets/vtkResliceCursorLineRepresentation.cxx b/Interaction/Widgets/vtkResliceCursorLineRepresentation.cxx
index 8253da37dac9f9aee50f8b935c211202e1d432bc..4d11ea3cd8cf63185cfc5f057294ca59d003b7e0 100644
--- a/Interaction/Widgets/vtkResliceCursorLineRepresentation.cxx
+++ b/Interaction/Widgets/vtkResliceCursorLineRepresentation.cxx
@@ -45,7 +45,7 @@
#include "vtkImageReslice.h"
#include "vtkSmartPointer.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkResliceCursorLineRepresentation);
diff --git a/Interaction/Widgets/vtkResliceCursorRepresentation.cxx b/Interaction/Widgets/vtkResliceCursorRepresentation.cxx
index 77ecda96f1c26f1b49f379ee41eae605930ce45e..f7a980a1cbba2c8475818c11847eb1ddf9468d90 100644
--- a/Interaction/Widgets/vtkResliceCursorRepresentation.cxx
+++ b/Interaction/Widgets/vtkResliceCursorRepresentation.cxx
@@ -47,7 +47,7 @@
#include "vtkCamera.h"
#include "vtkImageMapper3D.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkCxxSetObjectMacro(vtkResliceCursorRepresentation, ColorMap, vtkImageMapToColors);
diff --git a/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.cxx b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.cxx
index 59f55391131380fd07ab9a5a391b7f7ee5c37c4e..df4633cb985846a1869a37cd1a5a48576a025739 100644
--- a/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.cxx
+++ b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.cxx
@@ -22,7 +22,7 @@
#include "math.h"
#include <algorithm>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkResliceCursorThickLineRepresentation);
diff --git a/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx b/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx
index 93e5c7273faf03e911f7e8457e0b4bddd671c3da..0ebd605bdb44fd82825331f6ee395e03a94cc93b 100644
--- a/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx
+++ b/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx
@@ -21,7 +21,7 @@
#include "vtkPolyData.h"
#include "vtkDoubleArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define MESSAGE(x)\
cout << (is_server? "SERVER" : "CLIENT") << ":" x << endl;
diff --git a/Rendering/Annotation/vtkPolarAxesActor.cxx b/Rendering/Annotation/vtkPolarAxesActor.cxx
index 070eb3eaea1a0b0f488aa9dc130f5604c21c320f..fc5183e720f3525adabf82ad0514c8c617b82e15 100644
--- a/Rendering/Annotation/vtkPolarAxesActor.cxx
+++ b/Rendering/Annotation/vtkPolarAxesActor.cxx
@@ -30,7 +30,7 @@
#include "vtkTextProperty.h"
#include "vtkViewport.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define VTK_POLAR_AXES_ACTOR_RTOL ( 1. - 10. * VTK_DBL_EPSILON )
diff --git a/Rendering/Context2D/vtkTooltipItem.cxx b/Rendering/Context2D/vtkTooltipItem.cxx
index 206ef8066e9cda914b30b27ac2ff638cb13c8d63..ecfcf304eb9bc676edc950f89fc9b0e2b608a230 100644
--- a/Rendering/Context2D/vtkTooltipItem.cxx
+++ b/Rendering/Context2D/vtkTooltipItem.cxx
@@ -24,7 +24,7 @@
#include "vtkNew.h"
#include "vtkStdString.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
#include "vtkObjectFactory.h"
diff --git a/Rendering/Core/Testing/Cxx/otherCoordinate.cxx b/Rendering/Core/Testing/Cxx/otherCoordinate.cxx
index 5e5b37bd64783d5c7b2b3f1399e89eb6c8bbde5c..f0393af9b6c0af24df6cc65efb85f39563b94821 100644
--- a/Rendering/Core/Testing/Cxx/otherCoordinate.cxx
+++ b/Rendering/Core/Testing/Cxx/otherCoordinate.cxx
@@ -22,7 +22,7 @@
#include "vtkRenderer.h"
#include "vtkCamera.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkDebugLeaks.h"
diff --git a/Rendering/Core/vtkGenericVertexAttributeMapping.cxx b/Rendering/Core/vtkGenericVertexAttributeMapping.cxx
index c0bce2374bd3b5d9d8684b9d1dbd1aebf4a80af0..a64ae583a417d334c94186ecc1f73f16c94861a8 100644
--- a/Rendering/Core/vtkGenericVertexAttributeMapping.cxx
+++ b/Rendering/Core/vtkGenericVertexAttributeMapping.cxx
@@ -18,7 +18,7 @@
#include <string>
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
class vtkGenericVertexAttributeMapping::vtkInternal
{
diff --git a/Rendering/Core/vtkInteractorEventRecorder.cxx b/Rendering/Core/vtkInteractorEventRecorder.cxx
index 5b829316519507cb47391f2e968a03a459cf7131..ee25fe13824397d0c567a6a0a185138c474fa486 100644
--- a/Rendering/Core/vtkInteractorEventRecorder.cxx
+++ b/Rendering/Core/vtkInteractorEventRecorder.cxx
@@ -17,7 +17,7 @@
#include "vtkObjectFactory.h"
#include "vtkRenderWindowInteractor.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
#include <locale>
#include <vtksys/SystemTools.hxx>
diff --git a/Rendering/Core/vtkProperty.cxx b/Rendering/Core/vtkProperty.cxx
index 78657be5cc1fa49f02d8bff88036d1d16cadb093..48d060a37ac55d5e97adcf857b1e1e115b083ee0 100644
--- a/Rendering/Core/vtkProperty.cxx
+++ b/Rendering/Core/vtkProperty.cxx
@@ -23,7 +23,7 @@
#include "vtkTexture.h"
#include <cstdlib>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <map>
#include <vtksys/SystemTools.hxx>
diff --git a/Rendering/Label/vtkDynamic2DLabelMapper.cxx b/Rendering/Label/vtkDynamic2DLabelMapper.cxx
index 8e982944ded8ed47d6b8300aa1c4d46bb385fddc..9bc382aad1860fffba1d8d447baa5f0ba3cd73ae 100644
--- a/Rendering/Label/vtkDynamic2DLabelMapper.cxx
+++ b/Rendering/Label/vtkDynamic2DLabelMapper.cxx
@@ -46,7 +46,7 @@
#include "vtkUnicodeStringArray.h"
#include "vtkViewport.h"
-#include <vtksys/ios/fstream>
+#include <fstream>
using std::ofstream;
#if defined(_WIN32) && !defined(__CYGWIN__)
diff --git a/Rendering/OpenGL/vtkCocoaRenderWindow.mm b/Rendering/OpenGL/vtkCocoaRenderWindow.mm
index be95108ca7c9d44cd0aa220e188932c504a1be5a..afb5cf2628f6f22748badabff42fcb59ab80e311 100644
--- a/Rendering/OpenGL/vtkCocoaRenderWindow.mm
+++ b/Rendering/OpenGL/vtkCocoaRenderWindow.mm
@@ -24,7 +24,7 @@ PURPOSE. See the above copyright notice for more information.
#import "vtkRendererCollection.h"
#import "vtkCocoaGLView.h"
-#import <vtksys/ios/sstream>
+#import <sstream>
vtkStandardNewMacro(vtkCocoaRenderWindow);
diff --git a/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx b/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx
index d98d7cd17e89be58b0c3d634fcc4bf3bb5030a1e..ed86ffe2988ab0a4371272e8fc56b44f2a15a357 100644
--- a/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx
@@ -33,7 +33,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkOpenGLExtensionManager.h"
#include "vtksys/SystemTools.hxx"
-#include "vtksys/ios/sstream"
+#include "sstream"
class vtkOSOpenGLRenderWindow;
class vtkRenderWindow;
diff --git a/Rendering/OpenGL/vtkShaderProgram2.cxx b/Rendering/OpenGL/vtkShaderProgram2.cxx
index 4ceb4931605f3dbd8a6d4a5d1f250ef0d1965afe..3120f954806782edc70c4eebbc953e33792974f3 100644
--- a/Rendering/OpenGL/vtkShaderProgram2.cxx
+++ b/Rendering/OpenGL/vtkShaderProgram2.cxx
@@ -25,7 +25,7 @@
#include "vtkOpenGLError.h"
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
#include "vtkStdString.h"
diff --git a/Rendering/OpenGL/vtkShadowMapBakerPass.cxx b/Rendering/OpenGL/vtkShadowMapBakerPass.cxx
index 15aef0c5fe0b24f99386021fea00fd98f8e1a105..546bc4c0167058e2ba7176724d2b7c03cc0e09d7 100644
--- a/Rendering/OpenGL/vtkShadowMapBakerPass.cxx
+++ b/Rendering/OpenGL/vtkShadowMapBakerPass.cxx
@@ -44,7 +44,7 @@
#include "vtkPerspectiveTransform.h"
#include "vtkTransform.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkStdString.h"
// For vtkShadowMapBakerPassTextures, vtkShadowMapBakerPassLightCameras
diff --git a/Rendering/OpenGL/vtkShadowMapPass.cxx b/Rendering/OpenGL/vtkShadowMapPass.cxx
index 4299f816074add74ecf54e686c19633ff1237525..2f5441e984e7dfc8e053bb936f97a58fe78b2ba1 100644
--- a/Rendering/OpenGL/vtkShadowMapPass.cxx
+++ b/Rendering/OpenGL/vtkShadowMapPass.cxx
@@ -49,7 +49,7 @@
#include "vtkPerspectiveTransform.h"
#include "vtkTransform.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkStdString.h"
#include "vtkImageShiftScale.h"
diff --git a/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx b/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
index 750075eeb5fff78946ad4bbdfe97babd6c3100bc..d671ee5e5931bb00fa5eee520da05168200034c6 100644
--- a/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
@@ -53,7 +53,7 @@ typedef ptrdiff_t GLsizeiptr;
#include "vtksys/SystemTools.hxx"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --git a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx
index 7c077298d3a93b7fbf71e63fe76364c2ec739521..dba7f17ce6bf714546f8d2626bd108558abe0787 100644
--- a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx
+++ b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx
@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkXOpenGLRenderWindow.h"
-#include <vtksys/stl/map>
+#include <map>
#include "vtkTk.h"
diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
index b0cbb6acac6d2c59602a634f896427ddff02576f..6ab2324e4c022f1bb896a97d7157859faca83c69 100644
--- a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
+++ b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
@@ -26,7 +26,7 @@ PURPOSE. See the above copyright notice for more information.
#import "vtkRendererCollection.h"
#import "vtkCocoaGLView.h"
-#import <vtksys/ios/sstream>
+#import <sstream>
vtkStandardNewMacro(vtkCocoaRenderWindow);
diff --git a/Rendering/OpenGL2/vtkEGLRenderWindow.cxx b/Rendering/OpenGL2/vtkEGLRenderWindow.cxx
index 0dc1bba1ad1ccf1d5b9a8d9ae97ea4fa7cf06b9b..ab4de36450d34811dd41b24ae52dbbb8cb7159dd 100644
--- a/Rendering/OpenGL2/vtkEGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkEGLRenderWindow.cxx
@@ -30,7 +30,7 @@
#include "vtksys/SystemTools.hxx"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtk_glew.h"
diff --git a/Rendering/OpenGL2/vtkIOSRenderWindow.mm b/Rendering/OpenGL2/vtkIOSRenderWindow.mm
index fbfae58e66c3f27013023ab5e75847491d56b245..6aa952dbbde3fef9c3ae4bb06d24fc3c24007ce4 100644
--- a/Rendering/OpenGL2/vtkIOSRenderWindow.mm
+++ b/Rendering/OpenGL2/vtkIOSRenderWindow.mm
@@ -22,7 +22,7 @@ PURPOSE. See the above copyright notice for more information.
#import "vtkObjectFactory.h"
#import "vtkRendererCollection.h"
-#import <vtksys/ios/sstream>
+#import <sstream>
#include "vtk_glew.h"
diff --git a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx
index 6fdd5b6a696c877aff6c0180b51ee4c158eed95a..1c77bb3caa43985a3cb928744f81fc07ab8f6aa0 100644
--- a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx
@@ -42,7 +42,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkRendererCollection.h"
#include "vtksys/SystemTools.hxx"
-#include "vtksys/ios/sstream"
+#include "sstream"
class vtkOSOpenGLRenderWindow;
class vtkRenderWindow;
diff --git a/Rendering/OpenGL2/vtkShadowMapBakerPass.cxx b/Rendering/OpenGL2/vtkShadowMapBakerPass.cxx
index 66a977ec8879c039c386fd7837c0d24527c0e1d7..42502edbb36deccedbfffd68502c3a069848ef16 100644
--- a/Rendering/OpenGL2/vtkShadowMapBakerPass.cxx
+++ b/Rendering/OpenGL2/vtkShadowMapBakerPass.cxx
@@ -35,7 +35,7 @@
#include "vtkShadowMapBakerPass.h"
#include "vtkTextureObject.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
#include "vtkStdString.h"
diff --git a/Rendering/OpenGL2/vtkShadowMapPass.cxx b/Rendering/OpenGL2/vtkShadowMapPass.cxx
index 32ac65443900d2038453f0b437cdbc36bc273ac1..aa69340e086942340aaec7a94f3f33b47123e913 100644
--- a/Rendering/OpenGL2/vtkShadowMapPass.cxx
+++ b/Rendering/OpenGL2/vtkShadowMapPass.cxx
@@ -56,7 +56,7 @@
//#include "vtkBreakPoint.h"
#include <cassert>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkStdString.h"
diff --git a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
index eb9984fe09d57e24a8978dceb95df3e5433cd7e4..ff64651942ecae3f3a955cce24d00172018bb5df 100644
--- a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
@@ -24,7 +24,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkWin32RenderWindowInteractor.h"
#include <math.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkOpenGLError.h"
diff --git a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
index 879a7ceb71e5c378f3be559f6b7206e26e1e238e..50db3390850225a2a397c1627ea5bf88c713eb3e 100644
--- a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
@@ -44,7 +44,7 @@ typedef ptrdiff_t GLsizeiptr;
#include "vtksys/SystemTools.hxx"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --git a/Rendering/Parallel/vtkCompositeRGBAPass.cxx b/Rendering/Parallel/vtkCompositeRGBAPass.cxx
index 42741b52220b742245317ce983090c08549c8c01..062e55fb19bcf60a0e9d24a1071fb46d81821c7f 100644
--- a/Rendering/Parallel/vtkCompositeRGBAPass.cxx
+++ b/Rendering/Parallel/vtkCompositeRGBAPass.cxx
@@ -32,7 +32,7 @@
#include "vtkPixelBufferObject.h"
#include "vtkImageExtractComponents.h"
#include "vtkMultiProcessController.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkTimerLog.h"
#include "vtkStdString.h"
#include "vtkImageData.h"
diff --git a/Rendering/Parallel/vtkCompositeZPass.cxx b/Rendering/Parallel/vtkCompositeZPass.cxx
index 14b2913400a544bc7bc6232ccc1611456ee9454e..c6f8a79768ddf3c0772af1d8b96e766e998e414c 100644
--- a/Rendering/Parallel/vtkCompositeZPass.cxx
+++ b/Rendering/Parallel/vtkCompositeZPass.cxx
@@ -32,7 +32,7 @@
#include "vtkPixelBufferObject.h"
#include "vtkImageExtractComponents.h"
#include "vtkMultiProcessController.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkTimerLog.h"
#include "vtkStdString.h"
#include "vtkImageData.h"
diff --git a/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx b/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx
index 7c077298d3a93b7fbf71e63fe76364c2ec739521..dba7f17ce6bf714546f8d2626bd108558abe0787 100644
--- a/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx
+++ b/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx
@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkXOpenGLRenderWindow.h"
-#include <vtksys/stl/map>
+#include <map>
#include "vtkTk.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
index 1b53b002bf04d4c000c88bf28b26d44b944d737e..f335e8da7607c9d5d14a790736c61f419a37976e 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
+++ b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
@@ -79,7 +79,7 @@
#include "vtkCommand.h" // for VolumeMapperRender{Start|End|Progress}Event
#include "vtkPerlinNoise.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include "vtkStdString.h"
#include "vtkShaderProgram2.h"
diff --git a/Testing/Rendering/vtkTesting.cxx b/Testing/Rendering/vtkTesting.cxx
index e0a352c4bece30f29b33949972893544afcb3634..8791abf0584d773e1eec9012356eebb6774bc9e3 100644
--- a/Testing/Rendering/vtkTesting.cxx
+++ b/Testing/Rendering/vtkTesting.cxx
@@ -39,7 +39,7 @@
#include <sys/stat.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <vtksys/SystemTools.hxx>
vtkStandardNewMacro(vtkTesting);
diff --git a/ThirdParty/freerange/freerange b/ThirdParty/freerange/freerange
index f4d3dc4f63f69925054b988cea1cb76d5d3e0582..4fd62cd124bde811046d011a7ed030bcd6d03268 100644
--- a/ThirdParty/freerange/freerange
+++ b/ThirdParty/freerange/freerange
@@ -28,12 +28,12 @@
#include <assert.h>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/deque>
-#include <vtksys/stl/functional>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/stdexcept>
-#include <vtksys/ios/iostream>
+#include <algorithm>
+#include <deque>
+#include <functional>
+#include <vector>
+#include <stdexcept>
+#include <iostream>
#include <stdlib.h>
#include <string.h>
@@ -56,8 +56,8 @@ template< class T, class idx_t, T empty_entry=-1 >
class freerange
{
public:
- typedef vtksys_stl::deque<idx_t> dead_list_entry_t;
- typedef vtksys_stl::vector< dead_list_entry_t > dead_list_t;
+ typedef std::deque<idx_t> dead_list_entry_t;
+ typedef std::vector< dead_list_entry_t > dead_list_t;
protected:
T* array ;
idx_t array_len ; // max id + 1
@@ -119,7 +119,7 @@ class freerange
T* array_tmp = new T [ array_len ];
if ( ! array_tmp )
- throw vtksys_stl::runtime_error( "freerange memory allocation failed" );
+ throw std::runtime_error( "freerange memory allocation failed" );
for ( idx_t i=0; i<array_top; i++ )
array_tmp[i] = array[i];
delete [] array;
@@ -214,7 +214,7 @@ class freerange
array_len = new_size;
T* array_tmp = new T [ array_len ];
if ( ! array_tmp )
- throw vtksys_stl::runtime_error( "freerange memory allocation failed" );
+ throw std::runtime_error( "freerange memory allocation failed" );
if ( array_top > array_len ) {
used -= array_top - array_len;
array_top = array_len;
@@ -226,7 +226,7 @@ class freerange
array_tmp[i] = empty_entry;
array = array_tmp;
for ( i=1; i<dead_size; i++ ) { // dead[0] is unused
- typename dead_list_entry_t::iterator it = vtksys_stl::remove_if( dead[i].begin(), dead[i].end(), vtksys_stl::bind2nd( vtksys_stl::greater_equal<idx_t>(), new_size ) );
+ typename dead_list_entry_t::iterator it = std::remove_if( dead[i].begin(), dead[i].end(), std::bind2nd( std::greater_equal<idx_t>(), new_size ) );
dead[i].erase( it, dead[i].end() );
}
} else { // new_size > array_len
@@ -234,7 +234,7 @@ class freerange
array_len = new_size;
T* array_tmp = new T [ array_len ];
if ( ! array_tmp )
- throw vtksys_stl::runtime_error( "freerange memory allocation failed" );
+ throw std::runtime_error( "freerange memory allocation failed" );
for ( i=0; i<array_top; i++ )
array_tmp[i] = array[i];
for ( i=array_top; i<new_size; ++i )
@@ -292,7 +292,7 @@ class freerange
}
public:
- typedef vtksys_stl::bidirectional_iterator_tag iterator_category;
+ typedef std::bidirectional_iterator_tag iterator_category;
iterator()
{ fl = 0 ; posn = 0 ; }
diff --git a/ThirdParty/freerange/testInsertionDeletion.cxx b/ThirdParty/freerange/testInsertionDeletion.cxx
index 56e8e45a23945d87c5d7246df157e1efcc686f0e..624dc0ee4bc3fb26eb60b6046b7391a7af8ca7b2 100644
--- a/ThirdParty/freerange/testInsertionDeletion.cxx
+++ b/ThirdParty/freerange/testInsertionDeletion.cxx
@@ -18,7 +18,7 @@
----------------------------------------------------------------------------*/
#include "freerange"
-using namespace vtksys_ios;
+using namespace std;
// To test freerange insertion and deletion, we use an action
// table. Each triple of integers in the list below corresponds
diff --git a/ThirdParty/freerange/testIteration.cxx b/ThirdParty/freerange/testIteration.cxx
index 0f51ef088a9cc7b3d2110ec837683cbf5d0fc42c..046767a2a70445c675439299b57c2f64ad8e0141 100644
--- a/ThirdParty/freerange/testIteration.cxx
+++ b/ThirdParty/freerange/testIteration.cxx
@@ -19,7 +19,7 @@
#include "freerange"
#include "vtkSystemIncludes.h"
-using namespace vtksys_ios;
+using namespace std;
// A list of entries to free before iterating
static int flist[] = {
diff --git a/Utilities/EncodeString/vtkEncodeString.cxx b/Utilities/EncodeString/vtkEncodeString.cxx
index dae1a0e721d76b99bffb477d1853d51d9d278c81..4e701da78d466b36710a71bdee7549b55eb9dd4e 100644
--- a/Utilities/EncodeString/vtkEncodeString.cxx
+++ b/Utilities/EncodeString/vtkEncodeString.cxx
@@ -19,7 +19,7 @@
#include "vtkSystemIncludes.h" // for cout,endl
#include <string>
-#include <vtksys/ios/sstream>
+#include <sstream>
//#include <vtksys/SystemTools.hxx>
// Functions from kwsys SystemTools, as we cannot link vtkEncodeString
@@ -95,7 +95,7 @@ public:
~Output()
{
}
- vtksys_ios::ostringstream Stream;
+ std::ostringstream Stream;
bool ProcessFile(const char *inputFile,
const char *stringName,
diff --git a/Utilities/HashSource/vtkHashSource.cxx b/Utilities/HashSource/vtkHashSource.cxx
index 98407275613c5d7a32573017afb55858d8a9fd91..0651bf6e80dcd8e6f32034521752e6e8404fcd63 100644
--- a/Utilities/HashSource/vtkHashSource.cxx
+++ b/Utilities/HashSource/vtkHashSource.cxx
@@ -13,14 +13,14 @@
=========================================================================*/
-#include <vtksys/stl/string>
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/iostream>
+#include <string>
+#include <fstream>
+#include <iostream>
#include <vtksys/MD5.h>
#include <vtksys/SystemTools.hxx>
#include <vtksys/RegularExpression.hxx>
-static vtksys_stl::string HashMD5(vtksys_ios::istream& in)
+static std::string HashMD5(std::istream& in)
{
char hash[33];
vtksysMD5* hasher = vtksysMD5_New();
@@ -28,13 +28,13 @@ static vtksys_stl::string HashMD5(vtksys_ios::istream& in)
vtksys::RegularExpression key("\\$(Revision|Date|RCSfile):[^$]*\\$");
- vtksys_stl::string line;
+ std::string line;
while(vtksys::SystemTools::GetLineFromStream(in, line))
{
// Remove CVS key values from the line (simulate -kk).
while(key.find(line))
{
- vtksys_stl::string tmp = line.substr(0, key.start());
+ std::string tmp = line.substr(0, key.start());
tmp += "$";
tmp += key.match(1);
tmp += "$";
@@ -50,37 +50,37 @@ static vtksys_stl::string HashMD5(vtksys_ios::istream& in)
vtksysMD5_FinalizeHex(hasher, hash);
vtksysMD5_Delete(hasher);
hash[32] = 0;
- return vtksys_stl::string(hash);
+ return std::string(hash);
}
int main(int argc, char *argv[])
{
if(argc < 3)
{
- vtksys_ios::cerr << "Usage: vtkHashSource input.cxx name [output.h]\n";
+ std::cerr << "Usage: vtkHashSource input.cxx name [output.h]\n";
return 1;
}
const char* inFile = argv[1];
const char* name = argv[2];
const char* outFile = argc > 3? argv[3] : 0;
- vtksys_ios::ifstream fin(inFile);
+ std::ifstream fin(inFile);
if(!fin)
{
- vtksys_ios::cerr << "Unable to read \"" << inFile << "\"\n";
+ std::cerr << "Unable to read \"" << inFile << "\"\n";
return 1;
}
- vtksys_stl::string md5 = HashMD5(fin);
+ std::string md5 = HashMD5(fin);
- vtksys_ios::ostream* out = &vtksys_ios::cout;
- vtksys_ios::ofstream fout;
+ std::ostream* out = &std::cout;
+ std::ofstream fout;
if(outFile)
{
fout.open(outFile);
if(!fout)
{
- vtksys_ios::cerr << "Unable to write \"" << outFile << "\"\n";
+ std::cerr << "Unable to write \"" << outFile << "\"\n";
return 1;
}
out = &fout;
diff --git a/Views/Geovis/Testing/Cxx/TestGeoView2D.cxx b/Views/Geovis/Testing/Cxx/TestGeoView2D.cxx
index e475801133b5e3bfd9168a2998d8039686168a02..9bff69cac63714c7eb8623d3850875c1aec94716 100644
--- a/Views/Geovis/Testing/Cxx/TestGeoView2D.cxx
+++ b/Views/Geovis/Testing/Cxx/TestGeoView2D.cxx
@@ -39,7 +39,7 @@
#include "vtkTestUtilities.h"
#include "vtkTIFFReader.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <vtksys/SystemTools.hxx>
int TestGeoView2D(int argc, char* argv[])
diff --git a/Views/Geovis/Testing/Cxx/TestGeoView2DPopulation.cxx b/Views/Geovis/Testing/Cxx/TestGeoView2DPopulation.cxx
index a43a2b8feae36d4ec82e0fa265c92ecc915cd6ec..7ee276a76929ef7046a60a0a7549e73b1c5f4869 100644
--- a/Views/Geovis/Testing/Cxx/TestGeoView2DPopulation.cxx
+++ b/Views/Geovis/Testing/Cxx/TestGeoView2DPopulation.cxx
@@ -54,7 +54,7 @@
#include "vtkTableToPolyData.h"
#include "vtkTextProperty.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestGeoView2DPopulation(int argc, char* argv[])
{
diff --git a/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx b/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx
index a8d336970d8d9251109fe1764e12007428e692e2..074981c76f0c79b9e873681952cdcd349b45a7d9 100644
--- a/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx
+++ b/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx
@@ -80,7 +80,7 @@ PURPOSE. See the above copyright notice for more information.
#include <algorithm>
#include <vector>
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkParallelCoordinatesRepresentation);
diff --git a/Views/Infovis/vtkParallelCoordinatesView.cxx b/Views/Infovis/vtkParallelCoordinatesView.cxx
index 2f1719caf526385272e3ebd07996256c221f1394..24c3de7b28718a802feb43cff6bad1e5318af89a 100644
--- a/Views/Infovis/vtkParallelCoordinatesView.cxx
+++ b/Views/Infovis/vtkParallelCoordinatesView.cxx
@@ -44,7 +44,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkTextProperty.h"
#include "vtkViewTheme.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cassert>
vtkStandardNewMacro(vtkParallelCoordinatesView);
diff --git a/Views/Infovis/vtkRenderView.cxx b/Views/Infovis/vtkRenderView.cxx
index 82f0cce7870a447a7d5b746eba9c67f5d8ca2c20..1db08c77c3be181993ba528489c4a954ef5d9cb3 100644
--- a/Views/Infovis/vtkRenderView.cxx
+++ b/Views/Infovis/vtkRenderView.cxx
@@ -59,7 +59,7 @@
#include "vtkQtLabelRenderStrategy.h"
#endif
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkRenderView);
vtkCxxSetObjectMacro(vtkRenderView, Transform, vtkAbstractTransform);
diff --git a/Web/Core/vtkWebUtilities.cxx b/Web/Core/vtkWebUtilities.cxx
index 6d8180439dfffe6691781614955a704ee993ec5f..a3cd3babd5ff02f9395294092a63a914f4dab340 100644
--- a/Web/Core/vtkWebUtilities.cxx
+++ b/Web/Core/vtkWebUtilities.cxx
@@ -24,7 +24,7 @@
#include "vtkSplitColumnComponents.h"
#include "vtkTable.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkStandardNewMacro(vtkWebUtilities);
//----------------------------------------------------------------------------
diff --git a/Wrapping/PythonCore/PyVTKObject.cxx b/Wrapping/PythonCore/PyVTKObject.cxx
index 65d3435f3b60a6dff36118e8bfe993bcb5740334..a7b16d982fefb72ba97d5806cafe7b2f19015730 100644
--- a/Wrapping/PythonCore/PyVTKObject.cxx
+++ b/Wrapping/PythonCore/PyVTKObject.cxx
@@ -36,7 +36,7 @@
#include "vtkPythonCommand.h"
#include <stddef.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <vtksys/cstddef>
// This will be set to the python type struct for vtkObjectBase
diff --git a/Wrapping/PythonCore/PyVTKSpecialObject.cxx b/Wrapping/PythonCore/PyVTKSpecialObject.cxx
index 9791a63731e1102578e149fa54de3bdeb6186e64..fb0a9a6637b7978994a9d5e5a914c522a4583f37 100644
--- a/Wrapping/PythonCore/PyVTKSpecialObject.cxx
+++ b/Wrapping/PythonCore/PyVTKSpecialObject.cxx
@@ -33,7 +33,7 @@
#include "PyVTKMethodDescriptor.h"
#include "vtkPythonUtil.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
// Silence warning like
// "dereferencing type-punned pointer will break strict-aliasing rules"
diff --git a/Wrapping/PythonCore/vtkPythonUtil.cxx b/Wrapping/PythonCore/vtkPythonUtil.cxx
index 6a56031ad35a1a3582e6516765e865a3da895307..22cd9c8977839eae61b6cbe58c2d0f9bb525689e 100644
--- a/Wrapping/PythonCore/vtkPythonUtil.cxx
+++ b/Wrapping/PythonCore/vtkPythonUtil.cxx
@@ -28,7 +28,7 @@
#include "vtkWeakPointer.h"
#include "vtkWindows.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <map>
#include <vector>
#include <string>
diff --git a/Wrapping/Tools/vtkWrapJava.c b/Wrapping/Tools/vtkWrapJava.c
index 6f763b21eb6c8a8f36156397151fb7da879f650e..20c74c1ebcf8efa5d8dcef837c4810228cc5fd4b 100644
--- a/Wrapping/Tools/vtkWrapJava.c
+++ b/Wrapping/Tools/vtkWrapJava.c
@@ -1300,7 +1300,7 @@ int main(int argc, char *argv[])
fprintf(fp,"#include \"%s.h\"\n",data->Name);
fprintf(fp,"#include \"vtkJavaUtil.h\"\n\n");
fprintf(fp,"#include \"vtkStdString.h\"\n\n");
- fprintf(fp,"#include <vtksys/ios/sstream>\n");
+ fprintf(fp,"#include <sstream>\n");
for (i = 0; i < data->NumberOfSuperClasses; i++)
{
diff --git a/Wrapping/Tools/vtkWrapPython.c b/Wrapping/Tools/vtkWrapPython.c
index 7b57f4e80255f601d2b1fe75281f73e86ef2e8c1..af31c25a946cdf53650bcc970023990ab86da5cd 100644
--- a/Wrapping/Tools/vtkWrapPython.c
+++ b/Wrapping/Tools/vtkWrapPython.c
@@ -375,7 +375,7 @@ int main(int argc, char *argv[])
"#include \"vtkPythonArgs.h\"\n"
"#include \"vtkPythonOverload.h\"\n"
"#include \"vtkConfigure.h\"\n"
- "#include <vtksys/ios/sstream>\n");
+ "#include <sstream>\n");
/* vtkPythonCommand is needed to wrap vtkObject.h */
if (strcmp("vtkObject", name) == 0)
diff --git a/Wrapping/Tools/vtkWrapTcl.c b/Wrapping/Tools/vtkWrapTcl.c
index 3409384b6ddabed78ce4747d4dcacd9eaa56b3fd..dbde0a03dcc377fe9901b436762cd247f15ab128 100644
--- a/Wrapping/Tools/vtkWrapTcl.c
+++ b/Wrapping/Tools/vtkWrapTcl.c
@@ -1146,7 +1146,7 @@ int main(int argc, char *argv[])
fprintf(fp,"#include \"vtkTclUtil.h\"\n");
fprintf(fp,"#include \"vtkStdString.h\"\n");
fprintf(fp,"#include <stdexcept>\n");
- fprintf(fp,"#include <vtksys/ios/sstream>\n");
+ fprintf(fp,"#include <sstream>\n");
if (!data->IsAbstract && strcmp(data->Name, "vtkObjectBase") != 0)
{
if (strcmp(data->Name, "vtkRenderWindowInteractor") == 0)