diff --git a/Accelerators/Dax/vtkDaxConfig.h.in b/Accelerators/Dax/vtkDaxConfig.h.in
index 6327ad368e4c52ff52894429c113e65eee197aa3..c177fa1c1e8cbf0d54e526fe4d2aa53702775f82 100644
--- a/Accelerators/Dax/vtkDaxConfig.h.in
+++ b/Accelerators/Dax/vtkDaxConfig.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkDaxConfig_h
-#define __vtkDaxConfig_h
+#ifndef vtkDaxConfig_h
+#define vtkDaxConfig_h
 
 // Boost gives a bunch of warnings with nvcc if you don't specify how shared
 // pointers should handle threads. Dax does not care (it is too careful about
@@ -38,4 +38,4 @@
 #include <dax/internal/Configure.h>
 
 #include <dax/cont/DeviceAdapter.h>
-#endif // __vtkDaxConfig_h
+#endif // vtkDaxConfig_h
diff --git a/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in b/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in
index 58b47a203402eb05ed4eaf6d2555c38f1a5c0d67..795351195bca3ed00934b528e692086270ed4307 100644
--- a/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in
+++ b/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in
@@ -70,8 +70,8 @@
 // iterate over them together, use a struct or class to group them together
 // and use a thread local of that class.
 
-#ifndef __vtkSMPThreadLocal_h
-#define __vtkSMPThreadLocal_h
+#ifndef vtkSMPThreadLocal_h
+#define vtkSMPThreadLocal_h
 
 #include "vtkSystemIncludes.h"
 #include <vector>
diff --git a/Common/Core/SMP/Sequential/vtkAtomicInt.h.in b/Common/Core/SMP/Sequential/vtkAtomicInt.h.in
index 362cdd536f07342fba41ea2815f0f82f51e4c90b..784eec1b4da06c4c13ef520c7c67b6938a3aa56a 100644
--- a/Common/Core/SMP/Sequential/vtkAtomicInt.h.in
+++ b/Common/Core/SMP/Sequential/vtkAtomicInt.h.in
@@ -31,8 +31,8 @@
 // platform or compiler, mutexes, which are significantly slower, are used
 // as a fallback.
 
-#ifndef __vtkAtomicInt_h
-#define __vtkAtomicInt_h
+#ifndef vtkAtomicInt_h
+#define vtkAtomicInt_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in b/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in
index 7ca14262a9a9d5dad2ffe0fde8b656a5993b233c..27b24a045a7ea6cdd82d03cede84b97363b7648f 100644
--- a/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in
+++ b/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in
@@ -33,8 +33,8 @@
 // Note that this particular implementation is designed to work in sequential
 // mode and supports only 1 thread.
 
-#ifndef __vtkSMPThreadLocal_h
-#define __vtkSMPThreadLocal_h
+#ifndef vtkSMPThreadLocal_h
+#define vtkSMPThreadLocal_h
 
 #include "vtkSystemIncludes.h"
 #include <vector>
diff --git a/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in b/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in
index 54e61117fc0393092163a419629ad9ec4de61010..7a8a1c74c2f0338d8da35a26d0fc2e1a287c0c63 100644
--- a/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in
+++ b/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in
@@ -73,8 +73,8 @@
 // iterate over them together, use a struct or class to group them together
 // and use a thread local of that class.
 
-#ifndef __vtkSMPThreadLocal_h
-#define __vtkSMPThreadLocal_h
+#ifndef vtkSMPThreadLocal_h
+#define vtkSMPThreadLocal_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 
diff --git a/Common/Core/SMP/TBB/vtkAtomicInt.h.in b/Common/Core/SMP/TBB/vtkAtomicInt.h.in
index d60865e55baa7e4517d71b0b3dbf19456208a330..15706c4ab60dd6f27c2c8f4e422ea62e69499a2a 100644
--- a/Common/Core/SMP/TBB/vtkAtomicInt.h.in
+++ b/Common/Core/SMP/TBB/vtkAtomicInt.h.in
@@ -15,8 +15,8 @@
 // .NAME vtkAtomicInt -
 // .SECTION Description
 
-#ifndef __vtkAtomicInt_h
-#define __vtkAtomicInt_h
+#ifndef vtkAtomicInt_h
+#define vtkAtomicInt_h
 
 #include <tbb/atomic.h>
 
diff --git a/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in b/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in
index 55805b8ae77e348e1ca6c84504bfffc7bd22da81..0000b7671f43c1dca9a489c1cd7408610ecfa9d4 100644
--- a/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in
+++ b/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in
@@ -70,8 +70,8 @@
 // iterate over them together, use a struct or class to group them together
 // and use a thread local of that class.
 
-#ifndef __vtkSMPThreadLocal_h
-#define __vtkSMPThreadLocal_h
+#ifndef vtkSMPThreadLocal_h
+#define vtkSMPThreadLocal_h
 
 #include <tbb/enumerable_thread_specific.h>
 
diff --git a/Common/Core/vtkConfigure.h.in b/Common/Core/vtkConfigure.h.in
index d3e1799f5544891c8243be97b5abe8cf229c816f..215ef46396ff9c7d107c7d0acdf6df3ff6068b6e 100644
--- a/Common/Core/vtkConfigure.h.in
+++ b/Common/Core/vtkConfigure.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkConfigure_h
-#define __vtkConfigure_h
+#ifndef vtkConfigure_h
+#define vtkConfigure_h
 
 /* This header is configured by VTK's build process.  */
 
diff --git a/Common/Core/vtkFloatingPointExceptionsConfigure.h.in b/Common/Core/vtkFloatingPointExceptionsConfigure.h.in
index ebb9dfeaa602084dbd32d76bf1d8374fd9dbab34..519715d5bd8d0591cf205ac8d5ed43da6bd3016e 100644
--- a/Common/Core/vtkFloatingPointExceptionsConfigure.h.in
+++ b/Common/Core/vtkFloatingPointExceptionsConfigure.h.in
@@ -14,8 +14,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkFloatingPointExceptionsConfigure_h
-#define __vtkFloatingPointExceptionsConfigure_h
+#ifndef vtkFloatingPointExceptionsConfigure_h
+#define vtkFloatingPointExceptionsConfigure_h
 
 #cmakedefine VTK_HAS_FEENABLEEXCEPT
 
@@ -24,4 +24,4 @@
 # define VTK_USE_FENV 1
 #endif
 
-#endif //__vtkFloatingPointExceptionsConfigure_h
+#endif //vtkFloatingPointExceptionsConfigure_h
diff --git a/Common/Core/vtkMathConfigure.h.in b/Common/Core/vtkMathConfigure.h.in
index 7a9432e147cd1b7889797fb5206f1f4fbdd4da6f..bd8a650b2c7a7a67d434886effce3078cd1b03da 100644
--- a/Common/Core/vtkMathConfigure.h.in
+++ b/Common/Core/vtkMathConfigure.h.in
@@ -18,8 +18,8 @@
  See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details.
 ----------------------------------------------------------------------------*/
 
-#ifndef __vtkMathConfigure_h
-#define __vtkMathConfigure_h
+#ifndef vtkMathConfigure_h
+#define vtkMathConfigure_h
 
 #include <cmath>
 #include <float.h> // for _isnan, _finite on Win32
@@ -100,4 +100,4 @@
 # define VTK_NON_FINITE_CAUSES_EXCEPTIONS
 #endif
 
-#endif //__vtkMathConfigure_h
+#endif //vtkMathConfigure_h
diff --git a/Common/Core/vtkToolkits.h.in b/Common/Core/vtkToolkits.h.in
index adfe634314746484c748cfa38e684a57b2e6f515..002038d94c3a949c17afa515f8a739e19d5d83a2 100644
--- a/Common/Core/vtkToolkits.h.in
+++ b/Common/Core/vtkToolkits.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkToolkits_h
-#define __vtkToolkits_h
+#ifndef vtkToolkits_h
+#define vtkToolkits_h
 
 /* This header is configured by VTK's build process.  */
 
diff --git a/Common/Core/vtkTypedArray.h.in b/Common/Core/vtkTypedArray.h.in
index ca98cdb4c7faab84d96bf02b358db1e0b6a78801..c8a4a8cd758f16f8cbcdd5ba71470952c7e5c1dd 100644
--- a/Common/Core/vtkTypedArray.h.in
+++ b/Common/Core/vtkTypedArray.h.in
@@ -18,8 +18,8 @@
 // provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkType@VTK_TYPE_NAME@Array_h
-#define __vtkType@VTK_TYPE_NAME@Array_h
+#ifndef vtkType@VTK_TYPE_NAME@Array_h
+#define vtkType@VTK_TYPE_NAME@Array_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtk@VTK_TYPE_NATIVE@Array.h"
diff --git a/Common/Core/vtkVersionMacros.h.in b/Common/Core/vtkVersionMacros.h.in
index dc14890dbd6322fa15bb25868f8b2878516569a2..e5b467b639e73c50e7aa2fd41a8656139ac9ecd2 100644
--- a/Common/Core/vtkVersionMacros.h.in
+++ b/Common/Core/vtkVersionMacros.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkVersionMacros_h
-#define __vtkVersionMacros_h
+#ifndef vtkVersionMacros_h
+#define vtkVersionMacros_h
 
 /* In development versions the minor component is odd and the build
    component encodes a date in CCYYMMDD format.  In release versions
diff --git a/Domains/Chemistry/vtkChemistryConfigure.h.in b/Domains/Chemistry/vtkChemistryConfigure.h.in
index 45981b567a63817b4067dccb41a3db2dc0152e08..fe8697e9b914f460adc62188f98838542fce5ed1 100644
--- a/Domains/Chemistry/vtkChemistryConfigure.h.in
+++ b/Domains/Chemistry/vtkChemistryConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkDomainsChemistryConfigure_h
-#define __vtkDomainsChemistryConfigure_h
+#ifndef vtkDomainsChemistryConfigure_h
+#define vtkDomainsChemistryConfigure_h
 
 /* Where the Blue Obelisk Data Repository files are installed */
 #define VTK_BODR_DATA_PATH "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_DATA_DIR@/vtkDomainsChemistry"
diff --git a/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in b/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
index b0afd32965d7eabfc7747214253b39c9ef387aa6..19323e9f4e3b1322296774a52ac5544215c2f6ac 100644
--- a/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
+++ b/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkFiltersStatisticsGnuRConfigure_h
-#define __vtkFiltersStatisticsGnuRConfigure_h
+#ifndef vtkFiltersStatisticsGnuRConfigure_h
+#define vtkFiltersStatisticsGnuRConfigure_h
 
 /* Set the whether we have UINTPTR_T defined in support of the GNU R interface */
 #cmakedefine HAVE_VTK_UINTPTR_T
diff --git a/GUISupport/MFC/vtkMFCConfigure.h.in b/GUISupport/MFC/vtkMFCConfigure.h.in
index 098d1289e4c766c25f3d80e6bd748908a080d8fb..8116e30ad17c8e4c84634074365336955feb5cb9 100644
--- a/GUISupport/MFC/vtkMFCConfigure.h.in
+++ b/GUISupport/MFC/vtkMFCConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkMFCConfigure_h
-#define __vtkMFCConfigure_h
+#ifndef vtkMFCConfigure_h
+#define vtkMFCConfigure_h
 
 #include "vtkConfigure.h"
 
diff --git a/IO/FFMPEG/vtkFFMPEGConfig.h.in b/IO/FFMPEG/vtkFFMPEGConfig.h.in
index 825098410dfa0fef2eaa8f3cee10f8ebe3ce0fd6..d0b8cf48a79a42d78f76237337595fa8fc6390e8 100644
--- a/IO/FFMPEG/vtkFFMPEGConfig.h.in
+++ b/IO/FFMPEG/vtkFFMPEGConfig.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkFFMPEGConfig_h
-#define __vtkFFMPEGConfig_h
+#ifndef vtkFFMPEGConfig_h
+#define vtkFFMPEGConfig_h
 
 /* This header is configured by VTK's build process.  */
 
diff --git a/IO/Movie/vtkIOMovieConfigure.h.in b/IO/Movie/vtkIOMovieConfigure.h.in
index 9052d1e7eea1de672bcc8c6d2338bceb9a65ef1b..bee58e24ac75bb8ad02c596b9da24ae330e4652f 100644
--- a/IO/Movie/vtkIOMovieConfigure.h.in
+++ b/IO/Movie/vtkIOMovieConfigure.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkIOMovieConfigure_h
-#define __vtkIOMovieConfigure_h
+#ifndef vtkIOMovieConfigure_h
+#define vtkIOMovieConfigure_h
 
 /* This header contains build settings for the vtkIOMovie module */
 
diff --git a/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in b/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in
index 1ef1891d067481976727d31383cc29f986dec6c1..c527086a26316e4e97edd8f4b41b2879ded607f3 100644
--- a/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in
+++ b/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkIOMySQLTestingCxxConfigure_h
-#define __vtkIOMySQLTestingCxxConfigure_h
+#ifndef vtkIOMySQLTestingCxxConfigure_h
+#define vtkIOMySQLTestingCxxConfigure_h
 
 #cmakedefine VTK_MYSQL_TEST_URL
 #ifdef VTK_MYSQL_TEST_URL
diff --git a/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in b/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in
index 393d905b7e2349c839b8f91c870332ad25079d30..fcfda069128381ac362f615de31afda39a9c3fc0 100644
--- a/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in
+++ b/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkIOODBCTestingCxxConfigure_h
-#define __vtkIOODBCTestingCxxConfigure_h
+#ifndef vtkIOODBCTestingCxxConfigure_h
+#define vtkIOODBCTestingCxxConfigure_h
 
 #cmakedefine VTK_ODBC_TEST_DSN
 #ifdef VTK_ODBC_TEST_DSN
diff --git a/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in b/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in
index 9edcb87881c5c1b515a69ca8337db9dfd231e84c..791a25ac3f088943d72ee1f33a9e08f46cc612a8 100644
--- a/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in
+++ b/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkIOPostgresSQLTestingCxxConfigure_h
-#define __vtkIOPostgresSQLTestingCxxConfigure_h
+#ifndef vtkIOPostgresSQLTestingCxxConfigure_h
+#define vtkIOPostgresSQLTestingCxxConfigure_h
 
 #cmakedefine VTK_PSQL_TEST_URL
 #ifdef VTK_PSQL_TEST_URL
diff --git a/Rendering/OpenGL/vtkOpenGLError.h.in b/Rendering/OpenGL/vtkOpenGLError.h.in
index 0b28de452496460e918bcfa39a9b77f2594c22fe..bd0d520dd96e0421b6da8f5b5b8636a0f494d7af 100644
--- a/Rendering/OpenGL/vtkOpenGLError.h.in
+++ b/Rendering/OpenGL/vtkOpenGLError.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkOpenGLError_h
-#define __vtkOpenGLError_h
+#ifndef vtkOpenGLError_h
+#define vtkOpenGLError_h
 
 #include "vtkgl.h"
 #include "vtkSetGet.h"
diff --git a/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in b/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in
index 329f8d9febd34d7999fa350323af1148a2d72df1..25fdcdca102e46bc01a9733413fee410f348cf32 100644
--- a/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in
+++ b/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkRenderingOpenGLConfigure_h
-#define __vtkRenderingOpenGLConfigure_h
+#ifndef vtkRenderingOpenGLConfigure_h
+#define vtkRenderingOpenGLConfigure_h
 
 /* This header contains build settings for the vtkRenderingOpenGL module. */
 
diff --git a/Rendering/OpenGL/vtkTDxConfigure.h.in b/Rendering/OpenGL/vtkTDxConfigure.h.in
index 6334f3af5428898d868e52fced57f2ccb177f08b..df18f4147687e1a3f1044f9db2834ad1ee16da93 100644
--- a/Rendering/OpenGL/vtkTDxConfigure.h.in
+++ b/Rendering/OpenGL/vtkTDxConfigure.h.in
@@ -13,10 +13,10 @@
 
 =========================================================================*/
 
-#ifndef __vtkTDxConfigure_h
-#define __vtkTDxConfigure_h
+#ifndef vtkTDxConfigure_h
+#define vtkTDxConfigure_h
 
 /* Whether the 3Dconnexion devices are being used */
 #cmakedefine VTK_USE_TDX
 
-#endif /*  __vtkTDxConfigure_h */
+#endif /*  vtkTDxConfigure_h */
diff --git a/Rendering/OpenGL2/vtkOpenGLError.h.in b/Rendering/OpenGL2/vtkOpenGLError.h.in
index 9bc5e864647d6e1c894e4c36e72b48ef2bf5b210..7ce4c030f59671802aa2e6b4fdff1dac340afff6 100644
--- a/Rendering/OpenGL2/vtkOpenGLError.h.in
+++ b/Rendering/OpenGL2/vtkOpenGLError.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkOpenGLError_h
-#define __vtkOpenGLError_h
+#ifndef vtkOpenGLError_h
+#define vtkOpenGLError_h
 
 #include "vtkSetGet.h"
 #include "vtk_glew.h"
diff --git a/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in b/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in
index 3d6605031d62caef759e7328c5ebf2f33a9068ab..ac4e988cc8c54a7f3b2961c84d5176f0d376b2bc 100644
--- a/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in
+++ b/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkRenderingOpenGLConfigure_h
-#define __vtkRenderingOpenGLConfigure_h
+#ifndef vtkRenderingOpenGLConfigure_h
+#define vtkRenderingOpenGLConfigure_h
 
 /* This header contains build settings for the vtkRenderingOpenGL2 module. */
 /* It provides some compatibility with the vtkRenderingOpenGL module. */
diff --git a/Rendering/Tk/vtkTkInternals.h.in b/Rendering/Tk/vtkTkInternals.h.in
index 981ecbabb721a98aaf6c388409d8622dd9493d5d..9d8d45032ee45426caf88e6744332fee8b2bc224 100644
--- a/Rendering/Tk/vtkTkInternals.h.in
+++ b/Rendering/Tk/vtkTkInternals.h.in
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkTkInternals_h
-#define __vtkTkInternals_h
+#ifndef vtkTkInternals_h
+#define vtkTkInternals_h
 
 #include "vtkRenderingOpenGLConfigure.h" // for COCOA, CARBON, X11, WIN32
 
@@ -48,5 +48,5 @@ extern "C"
 #include "tkMacOSXInt.h"
 #endif
 
-#endif /* __vtkTkInternals_h */
+#endif /* vtkTkInternals_h */
 
diff --git a/ThirdParty/expat/vtk_expat.h.in b/ThirdParty/expat/vtk_expat.h.in
index e62aa6ad4a35a21f510d5a5fa3ef63186b0ce062..f7e163a87aba6e20a3506600c3de966984e10285 100644
--- a/ThirdParty/expat/vtk_expat.h.in
+++ b/ThirdParty/expat/vtk_expat.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_expat_h
-#define __vtk_expat_h
+#ifndef vtk_expat_h
+#define vtk_expat_h
 
 /* Use the expat library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_EXPAT
diff --git a/ThirdParty/freetype/vtk_freetype.h.in b/ThirdParty/freetype/vtk_freetype.h.in
index 3174b51b033fdb901d601ecb4b4cfba8f94d5b24..c3f6f4f394d1a80b23de87f0a91037f138ab3a7c 100644
--- a/ThirdParty/freetype/vtk_freetype.h.in
+++ b/ThirdParty/freetype/vtk_freetype.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_freetype_h
-#define __vtk_freetype_h
+#ifndef vtk_freetype_h
+#define vtk_freetype_h
 
 /* Use the freetype library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_FREETYPE
@@ -24,4 +24,4 @@
 # include <vtkfreetype/include/ft2build.h>
 #endif
 
-#endif // #ifndef __vtk_freetype_h
+#endif // #ifndef vtk_freetype_h
diff --git a/ThirdParty/gl2ps/vtk_gl2ps.h.in b/ThirdParty/gl2ps/vtk_gl2ps.h.in
index 723b08acaf2c6cc3fd27480132d55ff50e60b05a..525dfd04ef09e5471f3726e91f10352419180801 100644
--- a/ThirdParty/gl2ps/vtk_gl2ps.h.in
+++ b/ThirdParty/gl2ps/vtk_gl2ps.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_gl2ps_h
-#define __vtk_gl2ps_h
+#ifndef vtk_gl2ps_h
+#define vtk_gl2ps_h
 
 /* Use the gl2ps library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_GL2PS
diff --git a/ThirdParty/glew/vtk_glew.h.in b/ThirdParty/glew/vtk_glew.h.in
index a9773ff4789439c1c9e5c026918b4f4fa57f4332..3f95ba396352d9cfa1b4730afae259e5873a12f5 100644
--- a/ThirdParty/glew/vtk_glew.h.in
+++ b/ThirdParty/glew/vtk_glew.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_glew_h
-#define __vtk_glew_h
+#ifndef vtk_glew_h
+#define vtk_glew_h
 
 #define GLEW_NO_GLU
 
diff --git a/ThirdParty/hdf5/vtk_hdf5.h.in b/ThirdParty/hdf5/vtk_hdf5.h.in
index f9dbddd6b86a05989e6cda88e08d772068d45e90..ddce386c9e8921e6c74eacb7ec937d5c86b6ad5a 100644
--- a/ThirdParty/hdf5/vtk_hdf5.h.in
+++ b/ThirdParty/hdf5/vtk_hdf5.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_hdf5_h
-#define __vtk_hdf5_h
+#ifndef vtk_hdf5_h
+#define vtk_hdf5_h
 
 /* Use the zlib library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_HDF5
diff --git a/ThirdParty/jpeg/vtk_jpeg.h.in b/ThirdParty/jpeg/vtk_jpeg.h.in
index c59bb4dbe13169986567d2f9fd671cb19534b5b5..db840df1647fe1387b97931f4c3597093efd2ae1 100644
--- a/ThirdParty/jpeg/vtk_jpeg.h.in
+++ b/ThirdParty/jpeg/vtk_jpeg.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_jpeg_h
-#define __vtk_jpeg_h
+#ifndef vtk_jpeg_h
+#define vtk_jpeg_h
 
 /* Use the jpeg library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_JPEG
diff --git a/ThirdParty/jsoncpp/vtk_jsoncpp.h.in b/ThirdParty/jsoncpp/vtk_jsoncpp.h.in
index 6a84dc1b77167d105812b47524940c0c7472d145..ac6fd52f6b67e19ff1a60db34c0683accbedba85 100644
--- a/ThirdParty/jsoncpp/vtk_jsoncpp.h.in
+++ b/ThirdParty/jsoncpp/vtk_jsoncpp.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_jsoncpp_h
-#define __vtk_jsoncpp_h
+#ifndef vtk_jsoncpp_h
+#define vtk_jsoncpp_h
 
 /* Use the JsonCpp library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_JSONCPP
diff --git a/ThirdParty/libproj4/vtk_libproj4.h.in b/ThirdParty/libproj4/vtk_libproj4.h.in
index 62af2a8c41cd64d283f73c0303fafdd050bf972c..bd67484886de57b849b89d9234d94b2cbd422ad7 100644
--- a/ThirdParty/libproj4/vtk_libproj4.h.in
+++ b/ThirdParty/libproj4/vtk_libproj4.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_libproj4_h
-#define __vtk_libproj4_h
+#ifndef vtk_libproj4_h
+#define vtk_libproj4_h
 
 /* Use the libproj4 library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_LIBPROJ4
diff --git a/ThirdParty/libxml2/vtk_libxml2.h.in b/ThirdParty/libxml2/vtk_libxml2.h.in
index 5111bc2948470d29c8d5e769a6c2b0da1077ccbf..b8150a23e9e649db853a4150a1ff4a63ae610aea 100644
--- a/ThirdParty/libxml2/vtk_libxml2.h.in
+++ b/ThirdParty/libxml2/vtk_libxml2.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_libxml2_h
-#define __vtk_libxml2_h
+#ifndef vtk_libxml2_h
+#define vtk_libxml2_h
 
 /* Use the libxml2 library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_LIBXML2
diff --git a/ThirdParty/netcdf/vtk_netcdf.h.in b/ThirdParty/netcdf/vtk_netcdf.h.in
index 9046b03a5b19d69758af61c32ca4b89add58d29b..f5a8281a66ce97158d5d07eb0471b64a6de57f0c 100644
--- a/ThirdParty/netcdf/vtk_netcdf.h.in
+++ b/ThirdParty/netcdf/vtk_netcdf.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_netcdf_h
-#define __vtk_netcdf_h
+#ifndef vtk_netcdf_h
+#define vtk_netcdf_h
 
 /* Use the netcdf library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_NETCDF
diff --git a/ThirdParty/netcdf/vtk_netcdfcpp.h.in b/ThirdParty/netcdf/vtk_netcdfcpp.h.in
index 2f8ae973606bda4f209699a453b4e3f25bb5a584..f7fb84090db3ae04585ddc5629ffcf794b18d8a6 100644
--- a/ThirdParty/netcdf/vtk_netcdfcpp.h.in
+++ b/ThirdParty/netcdf/vtk_netcdfcpp.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_netcdfcpp_h
-#define __vtk_netcdfcpp_h
+#ifndef vtk_netcdfcpp_h
+#define vtk_netcdfcpp_h
 
 /* Use the netcdfcpp library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_NETCDF
diff --git a/ThirdParty/oggtheora/vtk_oggtheora.h.in b/ThirdParty/oggtheora/vtk_oggtheora.h.in
index bc40579c5d391063edde97e2bc82427025543b82..03e90232737b97c59d1bf76c73e7b73a46a2ee16 100644
--- a/ThirdParty/oggtheora/vtk_oggtheora.h.in
+++ b/ThirdParty/oggtheora/vtk_oggtheora.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_oggtheora_h
-#define __vtk_oggtheora_h
+#ifndef vtk_oggtheora_h
+#define vtk_oggtheora_h
 
 /* Use the ogg/theora library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_OGGTHEORA
diff --git a/ThirdParty/png/vtk_png.h.in b/ThirdParty/png/vtk_png.h.in
index a51914f0302d01558b3e068b6c821568efacc585..552582b275d18a04ad08dac1c3496c03cbb2925c 100644
--- a/ThirdParty/png/vtk_png.h.in
+++ b/ThirdParty/png/vtk_png.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_png_h
-#define __vtk_png_h
+#ifndef vtk_png_h
+#define vtk_png_h
 
 /* Use the png library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_PNG
diff --git a/ThirdParty/tiff/vtk_tiff.h.in b/ThirdParty/tiff/vtk_tiff.h.in
index 23b6164248ed6f6beff682f1b67e09d533d93394..e101466b7b46bc00eb4868f2fb69766a090ba236 100644
--- a/ThirdParty/tiff/vtk_tiff.h.in
+++ b/ThirdParty/tiff/vtk_tiff.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_tiff_h
-#define __vtk_tiff_h
+#ifndef vtk_tiff_h
+#define vtk_tiff_h
 
 /* Use the tiff library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_TIFF
diff --git a/ThirdParty/xdmf2/vtk_xdmf2.h.in b/ThirdParty/xdmf2/vtk_xdmf2.h.in
index 137d89b9c4ea3a2b8d28c9c74b29387e445d2086..fa5e5b037efaa5e65163065fba0c5af4f00fbeed 100644
--- a/ThirdParty/xdmf2/vtk_xdmf2.h.in
+++ b/ThirdParty/xdmf2/vtk_xdmf2.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_xdmf2_h
-#define __vtk_xdmf2_h
+#ifndef vtk_xdmf2_h
+#define vtk_xdmf2_h
 
 
 #endif
diff --git a/ThirdParty/xdmf3/vtk_xdmf3.h.in b/ThirdParty/xdmf3/vtk_xdmf3.h.in
index d73f4903159e6cc2e8caca5e54acf4a48f8a8a92..d6e851a887a45bf6126afac2cea99e4e3b83b6b7 100644
--- a/ThirdParty/xdmf3/vtk_xdmf3.h.in
+++ b/ThirdParty/xdmf3/vtk_xdmf3.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_xdmf3_h
-#define __vtk_xdmf3_h
+#ifndef vtk_xdmf3_h
+#define vtk_xdmf3_h
 
 /* Use the xdmf library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_XDMF3
diff --git a/ThirdParty/zlib/vtk_zlib.h.in b/ThirdParty/zlib/vtk_zlib.h.in
index 9e987df402ffff9e6cd903272f5a3e5b9c000d54..c880874e4655c76aa7468c3976c129d5dd5b2a09 100644
--- a/ThirdParty/zlib/vtk_zlib.h.in
+++ b/ThirdParty/zlib/vtk_zlib.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_zlib_h
-#define __vtk_zlib_h
+#ifndef vtk_zlib_h
+#define vtk_zlib_h
 
 /* Use the zlib library configured for VTK.  */
 #cmakedefine VTK_USE_SYSTEM_ZLIB
diff --git a/Utilities/Python/vtkPythonConfigure.h.in b/Utilities/Python/vtkPythonConfigure.h.in
index f4ef3bfd0d7b88a133c15ca18297cc38d19dcd13..1d2dcdf45f0724aae8ce506b6d29fc6b33c426d0 100644
--- a/Utilities/Python/vtkPythonConfigure.h.in
+++ b/Utilities/Python/vtkPythonConfigure.h.in
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkPythonConfigure_h
-#define __vtkPythonConfigure_h
+#ifndef vtkPythonConfigure_h
+#define vtkPythonConfigure_h
 
 /* This header is configured by VTK's build process.  */
 
diff --git a/Wrapping/Python/vtkPythonAppInitConfigure.h.in b/Wrapping/Python/vtkPythonAppInitConfigure.h.in
index 735bfe1c44cbc3aa120a4d62040bff4c17cd420d..8c5c660d63985a7d14b294db01b5f43a8d5e2b5a 100644
--- a/Wrapping/Python/vtkPythonAppInitConfigure.h.in
+++ b/Wrapping/Python/vtkPythonAppInitConfigure.h.in
@@ -1,5 +1,5 @@
-#ifndef __vtkPythonAppInitConfigure_h
-#define __vtkPythonAppInitConfigure_h
+#ifndef vtkPythonAppInitConfigure_h
+#define vtkPythonAppInitConfigure_h
 
 #define VTK_PYTHON_LIBRARY_DIR "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"
 
diff --git a/Wrapping/Tcl/vtkTkAppInitConfigure.h.in b/Wrapping/Tcl/vtkTkAppInitConfigure.h.in
index d6fce323b0426ded2e24ca3751d93cf4c2af2c95..3e0dec7da27dacc24aee727cfbfdd162da1011a7 100644
--- a/Wrapping/Tcl/vtkTkAppInitConfigure.h.in
+++ b/Wrapping/Tcl/vtkTkAppInitConfigure.h.in
@@ -1,5 +1,5 @@
-#ifndef __vtkTkAppInitConfigure_h
-#define __vtkTkAppInitConfigure_h
+#ifndef vtkTkAppInitConfigure_h
+#define vtkTkAppInitConfigure_h
 
 /* Whether we are linking to Tcl/Tk statically.  */
 #cmakedefine VTK_TCL_TK_STATIC