diff --git a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx
index df61dd71e937388e8c318a5edee53a8c2b22668d..56943122b108f56dd3695b3a56a1ce8edaef6ab2 100644
--- a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx
+++ b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx
@@ -28,7 +28,6 @@
 #include "vtkmlib/DataSetConverters.h"
 
 #include "vtkObjectFactory.h"
-#include "vtkPointData.h"
 #include "vtkSmartPointer.h"
 
 #include "vtkmFilterPolicy.h"
diff --git a/Common/Core/Testing/Cxx/TestGenericDataArrayAPI.cxx b/Common/Core/Testing/Cxx/TestGenericDataArrayAPI.cxx
index e5024632b9d0a341c0b48fe8892256366a91d895..d593e4d616c1d4ccae3ba5f7d069db55ac8b03c6 100644
--- a/Common/Core/Testing/Cxx/TestGenericDataArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestGenericDataArrayAPI.cxx
@@ -30,7 +30,6 @@
 #include <vector>
 
 // Concrete classes for testing:
-#include "vtkAOSDataArrayTemplate.h"
 #include "vtkCharArray.h"
 #include "vtkDoubleArray.h"
 #include "vtkFloatArray.h"
diff --git a/Common/DataModel/Testing/Cxx/BezierInterpolation.cxx b/Common/DataModel/Testing/Cxx/BezierInterpolation.cxx
index c8a478eb6af1ce5ae849f03bb880f7698e140c96..961574c40adcf9be944305d910e389c3a38ab9e8 100644
--- a/Common/DataModel/Testing/Cxx/BezierInterpolation.cxx
+++ b/Common/DataModel/Testing/Cxx/BezierInterpolation.cxx
@@ -26,7 +26,6 @@
 #include "vtkRegressionTestImage.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
-#include "vtkTable.h"
 
 #include <cmath>
 #include <sstream>
diff --git a/Common/DataModel/Testing/Cxx/LagrangeHexahedron.cxx b/Common/DataModel/Testing/Cxx/LagrangeHexahedron.cxx
index 9c6c603d408975a6c76172a5ed22bea073f5fc21..d6b5ce0a7cabf70ca90e7d9649357d3916c65ea7 100644
--- a/Common/DataModel/Testing/Cxx/LagrangeHexahedron.cxx
+++ b/Common/DataModel/Testing/Cxx/LagrangeHexahedron.cxx
@@ -33,7 +33,6 @@
 #include "vtkRegressionTestImage.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
-#include "vtkTable.h"
 
 #include <sstream>
 #include <vector>
diff --git a/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx b/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx
index 5f64dc5fb6919ad93b6beb957ef11c79c7a72235..6b3a6c2ba3d9c3e08d5e572142102b02ab2b1557 100644
--- a/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx
+++ b/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx
@@ -19,7 +19,6 @@
 
 #include "vtkCutter.h"
 #include "vtkNew.h"
-#include "vtkPlane.h"
 #include "vtkTestUtilities.h"
 #include "vtkXMLPolyDataWriter.h"
 #include "vtkXMLUnstructuredGridReader.h"
diff --git a/Common/DataModel/Testing/Cxx/TestPolyhedron3.cxx b/Common/DataModel/Testing/Cxx/TestPolyhedron3.cxx
index 8163dd3693dd003c4b2d86c87f0c14811d4b7cd1..5af2f1cdb16fa8820f2591ed5412c4f6ff07e89f 100644
--- a/Common/DataModel/Testing/Cxx/TestPolyhedron3.cxx
+++ b/Common/DataModel/Testing/Cxx/TestPolyhedron3.cxx
@@ -20,7 +20,6 @@
 
 #include "vtkClipDataSet.h"
 #include "vtkNew.h"
-#include "vtkPlane.h"
 #include "vtkTestUtilities.h"
 
 #include "vtkUnstructuredGridReader.h"
diff --git a/Common/DataModel/Testing/Cxx/quadraticIntersection.cxx b/Common/DataModel/Testing/Cxx/quadraticIntersection.cxx
index 6a5d1ab7835e30af4cd190f6ae85995888a17c16..0c0a7a0292361f10cce8c80557116ff7f922d69f 100644
--- a/Common/DataModel/Testing/Cxx/quadraticIntersection.cxx
+++ b/Common/DataModel/Testing/Cxx/quadraticIntersection.cxx
@@ -46,14 +46,12 @@
 
 #include <vtkActor.h>
 #include <vtkCellArray.h>
-#include <vtkPoints.h>
 #include <vtkPolyData.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkProperty.h>
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkRenderer.h>
-#include <vtkSmartPointer.h>
 #include <vtkVersion.h>
 
 void ViewportRange(int testNum, double* range)
diff --git a/Common/DataModel/vtkHexahedron.cxx b/Common/DataModel/vtkHexahedron.cxx
index d4c2a8ff1c95b60551b84aa571dbb996407c7521..b46b0c2e91f402e499ef4f231f97b7d254581e87 100644
--- a/Common/DataModel/vtkHexahedron.cxx
+++ b/Common/DataModel/vtkHexahedron.cxx
@@ -20,7 +20,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkIncrementalPointLocator.h"
 #include "vtkLine.h"
-#include "vtkMarchingCubesTriangleCases.h"
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
diff --git a/Common/DataModel/vtkPixel.cxx b/Common/DataModel/vtkPixel.cxx
index 959871e4e37c294d4d6d3d7c41010b46798fcc93..af03e3def7d5fe47967df1bc383f07db028591ba 100644
--- a/Common/DataModel/vtkPixel.cxx
+++ b/Common/DataModel/vtkPixel.cxx
@@ -19,7 +19,6 @@
 #include "vtkDataArrayRange.h"
 #include "vtkIncrementalPointLocator.h"
 #include "vtkLine.h"
-#include "vtkMarchingSquaresLineCases.h"
 #include "vtkMath.h"
 #include "vtkMathUtilities.h"
 #include "vtkObjectFactory.h"
diff --git a/Common/DataModel/vtkVoxel.cxx b/Common/DataModel/vtkVoxel.cxx
index 7ec9cc53b93d51f8d32ccc5471d6f08bba10dc02..b139dd7b2fae2bbce64e75552407c87ed114b148 100644
--- a/Common/DataModel/vtkVoxel.cxx
+++ b/Common/DataModel/vtkVoxel.cxx
@@ -21,7 +21,6 @@
 #include "vtkDataArrayRange.h"
 #include "vtkIncrementalPointLocator.h"
 #include "vtkLine.h"
-#include "vtkMarchingCubesTriangleCases.h"
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 #include "vtkPixel.h"
diff --git a/Domains/Chemistry/Testing/Cxx/TestPDBBallAndStick.cxx b/Domains/Chemistry/Testing/Cxx/TestPDBBallAndStick.cxx
index b2fe554cdb965ba9cc730beba3eb63af24479ee2..055f5d24f9bbe309a972c42e95192a2b6cda8edc 100644
--- a/Domains/Chemistry/Testing/Cxx/TestPDBBallAndStick.cxx
+++ b/Domains/Chemistry/Testing/Cxx/TestPDBBallAndStick.cxx
@@ -27,7 +27,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-#include "vtkCamera.h"
 #include "vtkTimerLog.h"
 
 int TestPDBBallAndStick(int argc, char* argv[])
diff --git a/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadows.cxx b/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadows.cxx
index 07aeb54ae89b16e7bd1505d192827642150ae4e5..8bd9d8756d1e1cb05746413754c997eddd5da3cc 100644
--- a/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadows.cxx
+++ b/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadows.cxx
@@ -29,7 +29,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-#include "vtkCamera.h"
 #include "vtkTimerLog.h"
 
 int TestPDBBallAndStickShadows(int argc, char* argv[])
diff --git a/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadowsDOFSSAA.cxx b/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadowsDOFSSAA.cxx
index 36b693386cf659bb5c21ae3237c0c32423e1e020..698e0c6310f1f32c8e42a55d621f54168637e8ae 100644
--- a/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadowsDOFSSAA.cxx
+++ b/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickShadowsDOFSSAA.cxx
@@ -44,7 +44,6 @@
 #include "vtkLookupTable.h"
 #include "vtkPeriodicTable.h"
 
-#include "vtkCamera.h"
 #include "vtkTimerLog.h"
 
 int TestPDBBallAndStickShadowsDOFSSAA(int argc, char* argv[])
diff --git a/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickTranslucent.cxx b/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickTranslucent.cxx
index c03f2f315a302ce1693cfc9ee9b61fc409eb267d..219fbdeacb1baf7b269d6d819c1d5d7858509480 100644
--- a/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickTranslucent.cxx
+++ b/Domains/ChemistryOpenGL2/Testing/Cxx/TestPDBBallAndStickTranslucent.cxx
@@ -29,7 +29,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-#include "vtkCamera.h"
 #include "vtkTimerLog.h"
 
 int TestPDBBallAndStickTranslucent(int argc, char* argv[])
diff --git a/Filters/Core/Testing/Cxx/TestProbeFilterOutputAttributes.cxx b/Filters/Core/Testing/Cxx/TestProbeFilterOutputAttributes.cxx
index 8e98258adadb084e5bcd07be2b9cc7768b86ecee..a847392ecf7dc4c91a0ce27c02d61326dcb04f43 100644
--- a/Filters/Core/Testing/Cxx/TestProbeFilterOutputAttributes.cxx
+++ b/Filters/Core/Testing/Cxx/TestProbeFilterOutputAttributes.cxx
@@ -22,7 +22,6 @@
 #include "vtkNew.h"
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
-#include "vtkProbeFilter.h"
 #include "vtkRTAnalyticSource.h"
 #include "vtkSmartPointer.h"
 #include "vtkSphereSource.h"
diff --git a/Filters/Core/Testing/Cxx/TestResampleToImage.cxx b/Filters/Core/Testing/Cxx/TestResampleToImage.cxx
index e3492105ce5834ab456d3c7ad0b8622223f922e5..dac2674c95b5f799e41efe1d9f0e3bf2a101c33a 100644
--- a/Filters/Core/Testing/Cxx/TestResampleToImage.cxx
+++ b/Filters/Core/Testing/Cxx/TestResampleToImage.cxx
@@ -29,7 +29,6 @@
 #include "vtkPlane.h"
 #include "vtkPointData.h"
 #include "vtkRTAnalyticSource.h"
-#include "vtkResampleToImage.h"
 #include "vtkUnsignedCharArray.h"
 #include "vtkUnstructuredGrid.h"
 #include <iostream>
diff --git a/Filters/Core/vtkCompositeCutter.cxx b/Filters/Core/vtkCompositeCutter.cxx
index ac3e4a4031be949abeff42adafa5f41992443c94..2b65b5fdcf52fdc6bf16691e426c259d32e2b5ca 100644
--- a/Filters/Core/vtkCompositeCutter.cxx
+++ b/Filters/Core/vtkCompositeCutter.cxx
@@ -32,7 +32,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-#include "vtkObjectFactory.h"
 #include "vtkSmartPointer.h"
 #include <cassert>
 #include <cmath>
diff --git a/Filters/Core/vtkPolyDataNormals.cxx b/Filters/Core/vtkPolyDataNormals.cxx
index 6fd698c9c0b7c17aaf386475fed7eb54d182a947..f4de42d42615203b784f1ad56de73d4733c659a0 100644
--- a/Filters/Core/vtkPolyDataNormals.cxx
+++ b/Filters/Core/vtkPolyDataNormals.cxx
@@ -29,8 +29,6 @@
 #include "vtkPriorityQueue.h"
 #include "vtkTriangleStrip.h"
 
-#include "vtkNew.h"
-
 vtkStandardNewMacro(vtkPolyDataNormals);
 
 // Construct with feature angle=30, splitting and consistency turned on,
diff --git a/Filters/FlowPaths/vtkVectorFieldTopology.cxx b/Filters/FlowPaths/vtkVectorFieldTopology.cxx
index 18ff40111a3250e53ed77519e26c7dc18c7f58a2..39c4cb9f238da9354bc51c02e4aa9f328ad63aa2 100644
--- a/Filters/FlowPaths/vtkVectorFieldTopology.cxx
+++ b/Filters/FlowPaths/vtkVectorFieldTopology.cxx
@@ -55,7 +55,6 @@
 #include <vtkTriangle.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkVector.h>
-#include <vtkVectorFieldTopology.h>
 #include <vtkVertex.h>
 
 // Eigen3
diff --git a/Filters/Parallel/vtkExtractCTHPart.cxx b/Filters/Parallel/vtkExtractCTHPart.cxx
index 2b277573905586f4cba239238bcda2868a0ab581..b3ea95216d62ca4f1400f2c709e8889626592a81 100644
--- a/Filters/Parallel/vtkExtractCTHPart.cxx
+++ b/Filters/Parallel/vtkExtractCTHPart.cxx
@@ -30,7 +30,6 @@
 #include "vtkDataSetSurfaceFilter.h"
 #include "vtkDoubleArray.h"
 #include "vtkExecutive.h"
-#include "vtkExtractCTHPart.h"
 #include "vtkGarbageCollector.h"
 #include "vtkImageData.h"
 #include "vtkInformation.h"
diff --git a/Filters/ParallelStatistics/Testing/Cxx/TestPCorrelativeStatistics.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestPCorrelativeStatistics.cxx
index 08c24fdb54b6c5b8d404f384209b5807560200a2..428fc1a18321270ba2715b249eb61dd68532d3d5 100644
--- a/Filters/ParallelStatistics/Testing/Cxx/TestPCorrelativeStatistics.cxx
+++ b/Filters/ParallelStatistics/Testing/Cxx/TestPCorrelativeStatistics.cxx
@@ -24,7 +24,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkMathUtilities.h"
 #include "vtkMultiBlockDataSet.h"
 #include "vtkNew.h"
-#include "vtkPCorrelativeStatistics.h"
 #include "vtkSmartPointer.h"
 #include "vtkTable.h"
 
diff --git a/Filters/ParallelStatistics/Testing/Cxx/TestPDescriptiveStatistics.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestPDescriptiveStatistics.cxx
index 3f7de92201a83e641931d5cc1ff9ba8c9e036ce3..9b504663729aac0a64bdd3c46e18738a90659844 100644
--- a/Filters/ParallelStatistics/Testing/Cxx/TestPDescriptiveStatistics.cxx
+++ b/Filters/ParallelStatistics/Testing/Cxx/TestPDescriptiveStatistics.cxx
@@ -23,7 +23,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkMathUtilities.h"
 #include "vtkMultiBlockDataSet.h"
 #include "vtkNew.h"
-#include "vtkPDescriptiveStatistics.h"
 #include "vtkSmartPointer.h"
 #include "vtkTable.h"
 
diff --git a/Filters/Points/Testing/Cxx/PlotSPHKernels.cxx b/Filters/Points/Testing/Cxx/PlotSPHKernels.cxx
index dc21607febeaafa53c59993c81b2c28da9d9d5c3..5e3be8fd24ea21811c1e462f5fb1b5f4c7760373 100644
--- a/Filters/Points/Testing/Cxx/PlotSPHKernels.cxx
+++ b/Filters/Points/Testing/Cxx/PlotSPHKernels.cxx
@@ -30,7 +30,6 @@
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkRenderer.h>
-#include <vtkSmartPointer.h>
 #include <vtkTable.h>
 
 //------------------------------------------------------------------------------
diff --git a/GUISupport/Qt/Testing/Cxx/QVTKTableModelAdapterTestClass.cxx b/GUISupport/Qt/Testing/Cxx/QVTKTableModelAdapterTestClass.cxx
index bacdbc6d30607dc87c168f05f57298a68a913ad2..605a00de82cb939dc28e0aeb26f8dfc37a7a91a8 100644
--- a/GUISupport/Qt/Testing/Cxx/QVTKTableModelAdapterTestClass.cxx
+++ b/GUISupport/Qt/Testing/Cxx/QVTKTableModelAdapterTestClass.cxx
@@ -12,8 +12,6 @@
 #include "vtkStringArray.h"
 #include "vtkTable.h"
 
-#include <QCoreApplication>
-
 using namespace std;
 
 QVTKTableModelAdapterTestClass::QVTKTableModelAdapterTestClass(QObject* parent)
diff --git a/IO/Chemistry/vtkGaussianCubeReader.cxx b/IO/Chemistry/vtkGaussianCubeReader.cxx
index 8c2d8097db55d495d74d5228dcee7337b5a6d2f1..9893ddcb60067ba8db7f39e222c68e4eb9b1bbab 100644
--- a/IO/Chemistry/vtkGaussianCubeReader.cxx
+++ b/IO/Chemistry/vtkGaussianCubeReader.cxx
@@ -27,7 +27,6 @@
 #include "vtkTransform.h"
 #include "vtkUnsignedCharArray.h"
 #include "vtkUnsignedIntArray.h"
-#include <vtksys/SystemTools.hxx>
 
 #include <vtksys/SystemTools.hxx>
 
diff --git a/IO/H5part/vtkH5PartReader.cxx b/IO/H5part/vtkH5PartReader.cxx
index 01173d5be5b714fcb5d51aaf0ab35f8a40ddcf80..7705ed26b5b24351a165bb5efc685e385507a8ea 100644
--- a/IO/H5part/vtkH5PartReader.cxx
+++ b/IO/H5part/vtkH5PartReader.cxx
@@ -62,15 +62,7 @@
 #include <vtksys/RegularExpression.hxx>
 #include <vtksys/SystemTools.hxx>
 //
-#include "vtkCharArray.h"
-#include "vtkDoubleArray.h"
-#include "vtkFloatArray.h"
-#include "vtkIntArray.h"
-#include "vtkLongArray.h"
-#include "vtkShortArray.h"
 #include "vtkSmartPointer.h"
-#include "vtkUnsignedCharArray.h"
-#include "vtkUnsignedShortArray.h"
 
 #include <algorithm>
 
diff --git a/IO/XML/Testing/Cxx/TestXMLUnstructuredGridReader.cxx b/IO/XML/Testing/Cxx/TestXMLUnstructuredGridReader.cxx
index b2ad8758fd185e7d7ebd068f8d285b0901fbd479..b86d6d0338e6781d2b2cb23742c3093eb98115a2 100644
--- a/IO/XML/Testing/Cxx/TestXMLUnstructuredGridReader.cxx
+++ b/IO/XML/Testing/Cxx/TestXMLUnstructuredGridReader.cxx
@@ -28,7 +28,6 @@
 #include "vtkRenderer.h"
 #include "vtkXMLUnstructuredGridReader.h"
 
-#include "vtkNew.h"
 #include <string>
 
 static const char* testXML1 = R"==(<?xml version="1.0"?>
diff --git a/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx b/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
index 0d3a3a1dc34114965a1d24ab44299b73d574c43a..df1983c521ba733d536d780ec85f2ccf2a2618af 100644
--- a/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
+++ b/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
@@ -16,7 +16,6 @@
 #include "vtkXMLPolyDataReader.h"
 #include "vtkXMLPolyDataWriter.h"
 
-#include "vtkPointSource.h"
 #include "vtkPoints.h"
 
 #include "vtkTestUtilities.h"
diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostDividedEdgeBundling.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostDividedEdgeBundling.cxx
index 30a6988f23f6a5feaf97d720e9d5fe82026f58fe..4774dc45b974b40e980386f2e29b94679d4f1dfd 100644
--- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostDividedEdgeBundling.cxx
+++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostDividedEdgeBundling.cxx
@@ -31,7 +31,6 @@
 #include "vtkContextItem.h"
 #include "vtkContextScene.h"
 #include "vtkContextTransform.h"
-#include "vtkNew.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
diff --git a/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx
index fd17224ad990c08db7ffcfbe2de396730a716c9d..ee3561af49486f211d054f23cecbf85317cce084 100644
--- a/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx
@@ -32,7 +32,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 #include "vtkSliderRepresentation2D.h"
-#include "vtkSmartPointer.h"
 #include "vtkSphere.h"
 #include "vtkSphereSource.h"
 #include "vtkWidgetEvent.h"
diff --git a/Interaction/Widgets/vtkImageCroppingRegionsWidget.cxx b/Interaction/Widgets/vtkImageCroppingRegionsWidget.cxx
index c17b7610a7c58a2bbc923f14bc1ef897e098d9cd..33cbbfdd1f1d023f11e60ede3f29eca7329f7239 100644
--- a/Interaction/Widgets/vtkImageCroppingRegionsWidget.cxx
+++ b/Interaction/Widgets/vtkImageCroppingRegionsWidget.cxx
@@ -17,7 +17,6 @@
 #include "vtkCallbackCommand.h"
 #include "vtkCamera.h"
 #include "vtkCoordinate.h"
-#include "vtkImageCroppingRegionsWidget.h"
 #include "vtkImageData.h"
 #include "vtkLineSource.h"
 #include "vtkObjectFactory.h"
diff --git a/Rendering/Annotation/Testing/Cxx/TestCubeAxes2DMode.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxes2DMode.cxx
index 624136ca7f06c6540bfd441d400a780d94c66ab9..c4176d98804d98da57b8c56a137eda754bcb9ce8 100644
--- a/Rendering/Annotation/Testing/Cxx/TestCubeAxes2DMode.cxx
+++ b/Rendering/Annotation/Testing/Cxx/TestCubeAxes2DMode.cxx
@@ -32,8 +32,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkStructuredGrid.h"
 #include "vtkTextProperty.h"
 
-#include "vtkCubeAxesActor.h"
-
 int TestCubeAxes2DMode(int argc, char* argv[])
 {
   // Create plane source
diff --git a/Rendering/Context2D/vtkLabeledContourPolyDataItem.cxx b/Rendering/Context2D/vtkLabeledContourPolyDataItem.cxx
index 3a96ba85cc0d0d0a2f383df0fbea26c7b4ad5c91..f551fc2af4f7b44e6c3447b7f9bbb89cdae64b40 100644
--- a/Rendering/Context2D/vtkLabeledContourPolyDataItem.cxx
+++ b/Rendering/Context2D/vtkLabeledContourPolyDataItem.cxx
@@ -37,13 +37,9 @@
 
 #include "vtkPointData.h"
 
-#include "vtkPolyData.h"
 #include "vtkPolyDataMapper.h"
 #include "vtkRenderWindow.h"
-#include "vtkRenderer.h"
 #include "vtkTextActor3D.h"
-#include "vtkTextProperty.h"
-#include "vtkTextPropertyCollection.h"
 
 #include "vtkTextRenderer.h"
 #include "vtkTimerLog.h"
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx
index 2f1c5a7c9d1a702a2e81239c4f4bf2fe835ca985..61b99f8ed8dc04a615fafa25066c99ffeb30bb35 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx
@@ -55,8 +55,6 @@
 #include "vtkViewport.h"
 #include "vtkWindow.h"
 
-#include "vtkObjectFactory.h"
-
 #include "vtkOpenGLContextDevice2DPrivate.h"
 
 #include <algorithm>
diff --git a/Rendering/LICOpenGL2/vtkSurfaceLICInterface.cxx b/Rendering/LICOpenGL2/vtkSurfaceLICInterface.cxx
index baa3e32560307e6faa7f8872c32329b6750e09d8..55d4b0194c5be97c29d686a7137dc01d625e9806 100644
--- a/Rendering/LICOpenGL2/vtkSurfaceLICInterface.cxx
+++ b/Rendering/LICOpenGL2/vtkSurfaceLICInterface.cxx
@@ -31,7 +31,6 @@
 #include "vtkScalarsToColors.h"
 #include "vtkShaderProgram.h"
 #include "vtkSurfaceLICComposite.h"
-#include "vtkTextureObjectVS.h"
 
 #include "vtkOpenGLIndexBufferObject.h"
 #include "vtkOpenGLVertexArrayObject.h"
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestCameraShiftScale.cxx b/Rendering/OpenGL2/Testing/Cxx/TestCameraShiftScale.cxx
index bfd0c985188e272145fda9a53bd292dad5e80563..32de79e8d837b49a53dd5825ab1f6f1f797f8808 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestCameraShiftScale.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestCameraShiftScale.cxx
@@ -29,8 +29,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 namespace
 {
 
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestCompositePolyDataMapper2CameraShiftScale.cxx b/Rendering/OpenGL2/Testing/Cxx/TestCompositePolyDataMapper2CameraShiftScale.cxx
index e31c871ddd578fd2743e72cf53f7ffddd371ff05..f325a237f04c92d35417cf9c4c9a413cd71733e4 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestCompositePolyDataMapper2CameraShiftScale.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestCompositePolyDataMapper2CameraShiftScale.cxx
@@ -30,8 +30,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 namespace
 {
 void createData(vtkMultiBlockDataSet* data)
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestLightingMapLuminancePass.cxx b/Rendering/OpenGL2/Testing/Cxx/TestLightingMapLuminancePass.cxx
index f418412211273c9d87a5cae23848c5b868e72769..3a37908d04e164fa1d9ac06f9a539e9669263edb 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestLightingMapLuminancePass.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestLightingMapLuminancePass.cxx
@@ -37,7 +37,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkSequencePass.h"
 #include "vtkSmartPointer.h"
-#include "vtkTestUtilities.h"
 
 int TestLightingMapLuminancePass(int argc, char* argv[])
 {
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestLightingMapNormalsPass.cxx b/Rendering/OpenGL2/Testing/Cxx/TestLightingMapNormalsPass.cxx
index 7f9001e91dee5a2d33de1e8c33d87b54586b2ae5..15a5c1533d06ec9cbdb41ae43e2d9dc59ab74c90 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestLightingMapNormalsPass.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestLightingMapNormalsPass.cxx
@@ -37,7 +37,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkSequencePass.h"
 #include "vtkSmartPointer.h"
-#include "vtkTestUtilities.h"
 
 int TestLightingMapNormalsPass(int argc, char* argv[])
 {
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestProgramPointSize.cxx b/Rendering/OpenGL2/Testing/Cxx/TestProgramPointSize.cxx
index eb7d1b2cfe174435aea14d5277f7e8eb4a63a617..eadadab7c87ce10750c69635369daab1b1694f16 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestProgramPointSize.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestProgramPointSize.cxx
@@ -26,8 +26,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 //------------------------------------------------------------------------------
 int TestProgramPointSize(int argc, char* argv[])
 {
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestSharedRenderWindow.cxx b/Rendering/OpenGL2/Testing/Cxx/TestSharedRenderWindow.cxx
index ba3f3b17ce51a239287ba2c25c502ead06f07f51..67f25e0457fd9be0d21cfff8f810f3417824c136 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestSharedRenderWindow.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestSharedRenderWindow.cxx
@@ -26,8 +26,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 //------------------------------------------------------------------------------
 int TestSharedRenderWindow(int argc, char* argv[])
 {
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestSpherePoints.cxx b/Rendering/OpenGL2/Testing/Cxx/TestSpherePoints.cxx
index 7507f566ebe9b8d9469b8b10675d8f9531c30b2a..356aedfa5d7b23686f0ddb4d482f61d2a0254dad 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestSpherePoints.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestSpherePoints.cxx
@@ -26,8 +26,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 //------------------------------------------------------------------------------
 int TestSpherePoints(int argc, char* argv[])
 {
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestSphereVertex.cxx b/Rendering/OpenGL2/Testing/Cxx/TestSphereVertex.cxx
index a8ce79a6412278752da3a47f6a4271ae7b2ebbee..3a6747e8a24523cbf93fdffff3d4208dca7cb966 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestSphereVertex.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestSphereVertex.cxx
@@ -25,8 +25,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 //------------------------------------------------------------------------------
 int TestSphereVertex(int argc, char* argv[])
 {
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx b/Rendering/OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx
index 8c1769318293ba19bc9ee55e5dafc429a350beb1..cb190b704ac1fa49fc60195ea97909a4023a086f 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx
@@ -31,8 +31,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 //------------------------------------------------------------------------------
 int TestVBOPLYMapper(int argc, char* argv[])
 {
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestWindowBlits.cxx b/Rendering/OpenGL2/Testing/Cxx/TestWindowBlits.cxx
index 004e0d0c6760f494e4b34f4b30c94d082c17a430..ef2375224c6acbeed7018293dc66ffd4d0cfc09b 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestWindowBlits.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestWindowBlits.cxx
@@ -29,8 +29,6 @@
 
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkOpenGLRenderWindow.h"
-
 #include "vtk_glew.h"
 
 class vtkStartRenderObserver : public vtkCommand
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
index f497f3b95b4e35e04771d8a1c7e5ad6501a31250..f145757b093071aa56ebd26d16dc0a749d6fa447 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
@@ -17,8 +17,6 @@
 
 #include "vtkOpenGLHelper.h"
 
-#include <cassert>
-
 #include "vtkFloatArray.h"
 #include "vtkImageData.h"
 #include "vtkJPEGReader.h"
diff --git a/Rendering/SceneGraph/vtkRendererNode.cxx b/Rendering/SceneGraph/vtkRendererNode.cxx
index f5b145fc93bd3dc9f417dc8cdb4e75af3c867478..797e89fdcb0b71548f6f7b70af978bb7b7737dd0 100644
--- a/Rendering/SceneGraph/vtkRendererNode.cxx
+++ b/Rendering/SceneGraph/vtkRendererNode.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderer.h"
-#include "vtkRendererNode.h"
 
 //============================================================================
 vtkStandardNewMacro(vtkRendererNode);
diff --git a/Views/Infovis/Testing/Cxx/TestColumnTree.cxx b/Views/Infovis/Testing/Cxx/TestColumnTree.cxx
index b5c946ee6e7615d6333625ce4ee377f0ef9c694e..918b2924c0b30607b291cd16549f83a86929aa77 100644
--- a/Views/Infovis/Testing/Cxx/TestColumnTree.cxx
+++ b/Views/Infovis/Testing/Cxx/TestColumnTree.cxx
@@ -27,7 +27,6 @@
 #include "vtkContextScene.h"
 #include "vtkContextTransform.h"
 #include "vtkContextView.h"
-#include "vtkNew.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
diff --git a/Views/Infovis/Testing/Cxx/TestDendrogramItem.cxx b/Views/Infovis/Testing/Cxx/TestDendrogramItem.cxx
index f8b44a51180b14b27c8de2bb66083fc37a9f160d..1b022dd38eee4b527f66e1420e4e0ce61f68b92b 100644
--- a/Views/Infovis/Testing/Cxx/TestDendrogramItem.cxx
+++ b/Views/Infovis/Testing/Cxx/TestDendrogramItem.cxx
@@ -25,7 +25,6 @@
 #include "vtkContextInteractorStyle.h"
 #include "vtkContextScene.h"
 #include "vtkContextTransform.h"
-#include "vtkNew.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
diff --git a/Views/Infovis/Testing/Cxx/TestHeatmapItem.cxx b/Views/Infovis/Testing/Cxx/TestHeatmapItem.cxx
index 800d2bea4c9e9e4e66cdb6f62cbbc9b1cadcc01a..064fa9d146d916f1be543861b959aa7cc64d7f3b 100644
--- a/Views/Infovis/Testing/Cxx/TestHeatmapItem.cxx
+++ b/Views/Infovis/Testing/Cxx/TestHeatmapItem.cxx
@@ -23,7 +23,6 @@
 #include "vtkContextInteractorStyle.h"
 #include "vtkContextScene.h"
 #include "vtkContextTransform.h"
-#include "vtkNew.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
diff --git a/Views/Infovis/Testing/Cxx/TestTanglegramItem.cxx b/Views/Infovis/Testing/Cxx/TestTanglegramItem.cxx
index 5e3881971841768b7474e267a877bb18836c6ddb..d654947062c6bdff6119c4b45c798f80fb6ebdd8 100644
--- a/Views/Infovis/Testing/Cxx/TestTanglegramItem.cxx
+++ b/Views/Infovis/Testing/Cxx/TestTanglegramItem.cxx
@@ -27,7 +27,6 @@
 #include "vtkContextMouseEvent.h"
 #include "vtkContextScene.h"
 #include "vtkContextTransform.h"
-#include "vtkNew.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
diff --git a/Views/Infovis/Testing/Cxx/TestTreeHeatmapAutoCollapse.cxx b/Views/Infovis/Testing/Cxx/TestTreeHeatmapAutoCollapse.cxx
index a8ed499c2c8ef733a6aa58eaa0ad8b631d35b3e5..788588e49a848b082cc202ce924b4490f2bf84e9 100644
--- a/Views/Infovis/Testing/Cxx/TestTreeHeatmapAutoCollapse.cxx
+++ b/Views/Infovis/Testing/Cxx/TestTreeHeatmapAutoCollapse.cxx
@@ -27,7 +27,6 @@
 #include "vtkContextInteractorStyle.h"
 #include "vtkContextScene.h"
 #include "vtkContextTransform.h"
-#include "vtkNew.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
diff --git a/Views/Infovis/Testing/Cxx/TestTreeHeatmapItem.cxx b/Views/Infovis/Testing/Cxx/TestTreeHeatmapItem.cxx
index 43042ac5383e590dc256ddc8a0f4a7b21e73fd97..9bf38732d4594b52f5c7347154ecfed1bea807a0 100644
--- a/Views/Infovis/Testing/Cxx/TestTreeHeatmapItem.cxx
+++ b/Views/Infovis/Testing/Cxx/TestTreeHeatmapItem.cxx
@@ -27,7 +27,6 @@
 #include "vtkContextMouseEvent.h"
 #include "vtkContextScene.h"
 #include "vtkContextTransform.h"
-#include "vtkNew.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"