diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h
index d2a25ca12..8a57c73da 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.h
+++ b/Source/CursesDialog/cmCursesBoolWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesBoolWidget_h
-#define __cmCursesBoolWidget_h
+#ifndef cmCursesBoolWidget_h
+#define cmCursesBoolWidget_h
 
 #include "cmCursesWidget.h"
 class cmCursesMainForm;
@@ -37,4 +37,4 @@ protected:
 
 };
 
-#endif // __cmCursesBoolWidget_h
+#endif // cmCursesBoolWidget_h
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.h b/Source/CursesDialog/cmCursesCacheEntryComposite.h
index 98107cc70..7cdf13bad 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.h
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesCacheEntryComposite_h
-#define __cmCursesCacheEntryComposite_h
+#ifndef cmCursesCacheEntryComposite_h
+#define cmCursesCacheEntryComposite_h
 
 #include "../cmCacheManager.h"
 #include "cmCursesLabelWidget.h"
@@ -40,4 +40,4 @@ protected:
   int EntryWidth;
 };
 
-#endif // __cmCursesCacheEntryComposite_h
+#endif // cmCursesCacheEntryComposite_h
diff --git a/Source/CursesDialog/cmCursesDummyWidget.h b/Source/CursesDialog/cmCursesDummyWidget.h
index 9ac13652d..2b3b9b5f3 100644
--- a/Source/CursesDialog/cmCursesDummyWidget.h
+++ b/Source/CursesDialog/cmCursesDummyWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesDummyWidget_h
-#define __cmCursesDummyWidget_h
+#ifndef cmCursesDummyWidget_h
+#define cmCursesDummyWidget_h
 
 #include "cmCursesWidget.h"
 
@@ -33,4 +33,4 @@ protected:
 
 };
 
-#endif // __cmCursesDummyWidget_h
+#endif // cmCursesDummyWidget_h
diff --git a/Source/CursesDialog/cmCursesFilePathWidget.h b/Source/CursesDialog/cmCursesFilePathWidget.h
index 9d2972ee7..6c50dd41a 100644
--- a/Source/CursesDialog/cmCursesFilePathWidget.h
+++ b/Source/CursesDialog/cmCursesFilePathWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesFilePathWidget_h
-#define __cmCursesFilePathWidget_h
+#ifndef cmCursesFilePathWidget_h
+#define cmCursesFilePathWidget_h
 
 #include "cmCursesPathWidget.h"
 
@@ -25,4 +25,4 @@ protected:
 
 };
 
-#endif // __cmCursesFilePathWidget_h
+#endif // cmCursesFilePathWidget_h
diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h
index f9317b9fb..9837f5aa3 100644
--- a/Source/CursesDialog/cmCursesForm.h
+++ b/Source/CursesDialog/cmCursesForm.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesForm_h
-#define __cmCursesForm_h
+#ifndef cmCursesForm_h
+#define cmCursesForm_h
 
 #include "../cmStandardIncludes.h"
 #include "cmCursesStandardIncludes.h"
@@ -73,4 +73,4 @@ protected:
   FORM* Form;
 };
 
-#endif // __cmCursesForm_h
+#endif // cmCursesForm_h
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index cc32d11ea..98170f581 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesLabelWidget_h
-#define __cmCursesLabelWidget_h
+#ifndef cmCursesLabelWidget_h
+#define cmCursesLabelWidget_h
 
 #include "cmCursesWidget.h"
 #include "cmCursesStandardIncludes.h"
@@ -35,4 +35,4 @@ protected:
   void operator=(const cmCursesLabelWidget&);
 };
 
-#endif // __cmCursesLabelWidget_h
+#endif // cmCursesLabelWidget_h
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h
index 1e86974f2..6e37eeade 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.h
+++ b/Source/CursesDialog/cmCursesLongMessageForm.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesLongMessageForm_h
-#define __cmCursesLongMessageForm_h
+#ifndef cmCursesLongMessageForm_h
+#define cmCursesLongMessageForm_h
 
 #include "../cmStandardIncludes.h"
 #include "cmCursesForm.h"
@@ -55,4 +55,4 @@ protected:
 
 };
 
-#endif // __cmCursesLongMessageForm_h
+#endif // cmCursesLongMessageForm_h
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index fba9bc50d..64552525c 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesMainForm_h
-#define __cmCursesMainForm_h
+#ifndef cmCursesMainForm_h
+#define cmCursesMainForm_h
 
 #include "../cmStandardIncludes.h"
 #include "cmCursesForm.h"
@@ -161,4 +161,4 @@ protected:
   bool SearchMode;
 };
 
-#endif // __cmCursesMainForm_h
+#endif // cmCursesMainForm_h
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h
index 5cee489b0..324014eae 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.h
+++ b/Source/CursesDialog/cmCursesOptionsWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesOptionsWidget_h
-#define __cmCursesOptionsWidget_h
+#ifndef cmCursesOptionsWidget_h
+#define cmCursesOptionsWidget_h
 
 #include "cmCursesWidget.h"
 class cmCursesMainForm;
@@ -36,4 +36,4 @@ protected:
   std::vector<std::string>::size_type CurrentOption;
 };
 
-#endif // __cmCursesOptionsWidget_h
+#endif // cmCursesOptionsWidget_h
diff --git a/Source/CursesDialog/cmCursesPathWidget.h b/Source/CursesDialog/cmCursesPathWidget.h
index 45c22a392..18d298aa4 100644
--- a/Source/CursesDialog/cmCursesPathWidget.h
+++ b/Source/CursesDialog/cmCursesPathWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesPathWidget_h
-#define __cmCursesPathWidget_h
+#ifndef cmCursesPathWidget_h
+#define cmCursesPathWidget_h
 
 #include "cmCursesStringWidget.h"
 
@@ -37,4 +37,4 @@ protected:
   std::string::size_type CurrentIndex;
 };
 
-#endif // __cmCursesPathWidget_h
+#endif // cmCursesPathWidget_h
diff --git a/Source/CursesDialog/cmCursesStringWidget.h b/Source/CursesDialog/cmCursesStringWidget.h
index dd8c02a32..fc1b2ba4f 100644
--- a/Source/CursesDialog/cmCursesStringWidget.h
+++ b/Source/CursesDialog/cmCursesStringWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesStringWidget_h
-#define __cmCursesStringWidget_h
+#ifndef cmCursesStringWidget_h
+#define cmCursesStringWidget_h
 
 #include "cmCursesWidget.h"
 
@@ -73,4 +73,4 @@ protected:
   bool Done;
 };
 
-#endif // __cmCursesStringWidget_h
+#endif // cmCursesStringWidget_h
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index d91a0cb5f..7d82864ea 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesWidget_h
-#define __cmCursesWidget_h
+#ifndef cmCursesWidget_h
+#define cmCursesWidget_h
 
 #include "../cmCacheManager.h"
 #include "cmCursesStandardIncludes.h"
@@ -84,4 +84,4 @@ protected:
   int Page;
 };
 
-#endif // __cmCursesWidget_h
+#endif // cmCursesWidget_h
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index bd82f0de9..d910eb7ed 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -10,8 +10,8 @@
   See the License for more information.
 ============================================================================*/
 
-#ifndef __QCMake_h
-#define __QCMake_h
+#ifndef QCMake_h
+#define QCMake_h
 #ifdef _MSC_VER
 #pragma warning ( disable : 4127 )
 #pragma warning ( disable : 4512 )
@@ -152,5 +152,5 @@ protected:
   QAtomicInt InterruptFlag;
 };
 
-#endif // __QCMake_h
+#endif // QCMake_h
 
diff --git a/Source/cmDynamicLoader.h b/Source/cmDynamicLoader.h
index d038b5cb1..84bc9bcba 100644
--- a/Source/cmDynamicLoader.h
+++ b/Source/cmDynamicLoader.h
@@ -15,8 +15,8 @@
 // libraries into a process.
 
 
-#ifndef __cmDynamicLoader_h
-#define __cmDynamicLoader_h
+#ifndef cmDynamicLoader_h
+#define cmDynamicLoader_h
 
 #include "cmStandardIncludes.h"
 
diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in
index 726c843c0..b88328472 100644
--- a/Utilities/cmThirdParty.h.in
+++ b/Utilities/cmThirdParty.h.in
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmThirdParty_h
-#define __cmThirdParty_h
+#ifndef cmThirdParty_h
+#define cmThirdParty_h
 
 /* Whether CMake is using its own utility libraries.  */
 #cmakedefine CMAKE_USE_SYSTEM_CURL
diff --git a/Utilities/cm_bzlib.h b/Utilities/cm_bzlib.h
index d1fffa1aa..567802561 100644
--- a/Utilities/cm_bzlib.h
+++ b/Utilities/cm_bzlib.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_bzlib_h
-#define __cm_bzlib_h
+#ifndef cm_bzlib_h
+#define cm_bzlib_h
 
 /* Use the bzip2 library configured for CMake.  */
 #include "cmThirdParty.h"
diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h
index a3b049bed..c9835e73a 100644
--- a/Utilities/cm_curl.h
+++ b/Utilities/cm_curl.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_curl_h
-#define __cm_curl_h
+#ifndef cm_curl_h
+#define cm_curl_h
 
 /* Use the curl library configured for CMake.  */
 #include "cmThirdParty.h"
diff --git a/Utilities/cm_expat.h b/Utilities/cm_expat.h
index 91f4a7b52..f361541d0 100644
--- a/Utilities/cm_expat.h
+++ b/Utilities/cm_expat.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_expat_h
-#define __cm_expat_h
+#ifndef cm_expat_h
+#define cm_expat_h
 
 /* Use the expat library configured for CMake.  */
 #include "cmThirdParty.h"
diff --git a/Utilities/cm_libarchive.h b/Utilities/cm_libarchive.h
index 1469baeb4..0f18c91a8 100644
--- a/Utilities/cm_libarchive.h
+++ b/Utilities/cm_libarchive.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_libarchive_h
-#define __cm_libarchive_h
+#ifndef cm_libarchive_h
+#define cm_libarchive_h
 
 /* Use the libarchive configured for CMake.  */
 #include "cmThirdParty.h"
diff --git a/Utilities/cm_lzma.h b/Utilities/cm_lzma.h
index c11c916f4..02d7e4fd4 100644
--- a/Utilities/cm_lzma.h
+++ b/Utilities/cm_lzma.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_lzma_h
-#define __cm_lzma_h
+#ifndef cm_lzma_h
+#define cm_lzma_h
 
 /* Use the liblzma configured for CMake.  */
 #include "cmThirdParty.h"
diff --git a/Utilities/cm_xmlrpc.h b/Utilities/cm_xmlrpc.h
index a6b375da8..ac461f9db 100644
--- a/Utilities/cm_xmlrpc.h
+++ b/Utilities/cm_xmlrpc.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_xmlrpc_h
-#define __cm_xmlrpc_h
+#ifndef cm_xmlrpc_h
+#define cm_xmlrpc_h
 
 /* Use the xmlrpc library configured for CMake.  */
 #include "cmThirdParty.h"
diff --git a/Utilities/cm_zlib.h b/Utilities/cm_zlib.h
index fb5832e35..1b5c06e7e 100644
--- a/Utilities/cm_zlib.h
+++ b/Utilities/cm_zlib.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_zlib_h
-#define __cm_zlib_h
+#ifndef cm_zlib_h
+#define cm_zlib_h
 
 /* Use the zlib library configured for CMake.  */
 #include "cmThirdParty.h"
diff --git a/Utilities/cmcompress/cmcompress.h b/Utilities/cmcompress/cmcompress.h
index fdb0d90b7..4cd3a1c3e 100644
--- a/Utilities/cmcompress/cmcompress.h
+++ b/Utilities/cmcompress/cmcompress.h
@@ -35,8 +35,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __cmcompress__h_
-#define __cmcompress__h_
+#ifndef cmcompress__h_
+#define cmcompress__h_
 
 #include <stdio.h>
 
@@ -192,4 +192,4 @@ extern "C"
 #endif
 
 
-#endif /* __cmcompress__h_ */
+#endif /* cmcompress__h_ */