diff --git a/api/apitypes.h b/api/apitypes.h
index 2cb38adda..2c0e85c9d 100644
--- a/api/apitypes.h
+++ b/api/apitypes.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_API_APITYPES_H__
-#define TESSERACT_API_APITYPES_H__
+#ifndef TESSERACT_API_APITYPES_H_
+#define TESSERACT_API_APITYPES_H_
 
 #include "publictypes.h"
 
@@ -30,4 +30,4 @@
 // than the lower-level one, and lower-level code should be sure to include
 // only the lower-level file.
 
-#endif  // TESSERACT_API_APITYPES_H__
+#endif  // TESSERACT_API_APITYPES_H_
diff --git a/api/baseapi.h b/api/baseapi.h
index 64f8ba047..c85761117 100644
--- a/api/baseapi.h
+++ b/api/baseapi.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_API_BASEAPI_H__
-#define TESSERACT_API_BASEAPI_H__
+#ifndef TESSERACT_API_BASEAPI_H_
+#define TESSERACT_API_BASEAPI_H_
 
 #define TESSERACT_VERSION_STR "4.00.00alpha"
 #define TESSERACT_VERSION 0x040000
@@ -909,4 +909,4 @@ class TESS_API TessBaseAPI {
 STRING HOcrEscape(const char* text);
 }  // namespace tesseract.
 
-#endif  // TESSERACT_API_BASEAPI_H__
+#endif  // TESSERACT_API_BASEAPI_H_
diff --git a/api/renderer.h b/api/renderer.h
index d868f267f..97ccff267 100644
--- a/api/renderer.h
+++ b/api/renderer.h
@@ -15,8 +15,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_API_RENDERER_H__
-#define TESSERACT_API_RENDERER_H__
+#ifndef TESSERACT_API_RENDERER_H_
+#define TESSERACT_API_RENDERER_H_
 
 // To avoid collision with other typenames include the ABSOLUTE MINIMUM
 // complexity of includes here. Use forward declarations wherever possible
@@ -251,4 +251,4 @@ class TESS_API TessOsdRenderer : public TessResultRenderer {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_API_RENDERER_H__
+#endif  // TESSERACT_API_RENDERER_H_
diff --git a/ccmain/equationdetect.h b/ccmain/equationdetect.h
index 09b553963..ddfdf5f5c 100644
--- a/ccmain/equationdetect.h
+++ b/ccmain/equationdetect.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_EQUATIONDETECT_H__
-#define TESSERACT_CCMAIN_EQUATIONDETECT_H__
+#ifndef TESSERACT_CCMAIN_EQUATIONDETECT_H_
+#define TESSERACT_CCMAIN_EQUATIONDETECT_H_
 
 #include "blobbox.h"
 #include "equationdetectbase.h"
diff --git a/ccmain/ltrresultiterator.h b/ccmain/ltrresultiterator.h
index 3ab70c465..95722cae5 100644
--- a/ccmain/ltrresultiterator.h
+++ b/ccmain/ltrresultiterator.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H__
-#define TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H__
+#ifndef TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_
+#define TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_
 
 #include "platform.h"
 #include "pageiterator.h"
@@ -218,4 +218,4 @@ class ChoiceIterator {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H__
+#endif  // TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_
diff --git a/ccmain/mutableiterator.h b/ccmain/mutableiterator.h
index f097f47e2..54759ba42 100644
--- a/ccmain/mutableiterator.h
+++ b/ccmain/mutableiterator.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_MUTABLEITERATOR_H__
-#define TESSERACT_CCMAIN_MUTABLEITERATOR_H__
+#ifndef TESSERACT_CCMAIN_MUTABLEITERATOR_H_
+#define TESSERACT_CCMAIN_MUTABLEITERATOR_H_
 
 #include "resultiterator.h"
 
@@ -61,4 +61,4 @@ class MutableIterator : public ResultIterator {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCMAIN_MUTABLEITERATOR_H__
+#endif  // TESSERACT_CCMAIN_MUTABLEITERATOR_H_
diff --git a/ccmain/osdetect.h b/ccmain/osdetect.h
index c5dc8d50d..34a8f5e7a 100644
--- a/ccmain/osdetect.h
+++ b/ccmain/osdetect.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_OSDETECT_H__
-#define TESSERACT_CCMAIN_OSDETECT_H__
+#ifndef TESSERACT_CCMAIN_OSDETECT_H_
+#define TESSERACT_CCMAIN_OSDETECT_H_
 
 #include "strngs.h"
 #include "unicharset.h"
@@ -135,4 +135,4 @@ bool os_detect_blob(BLOBNBOX* bbox, OrientationDetector* o,
 // applied for the text to be upright (readable).
 TESS_API int OrientationIdToValue(const int& id);
 
-#endif  // TESSERACT_CCMAIN_OSDETECT_H__
+#endif  // TESSERACT_CCMAIN_OSDETECT_H_
diff --git a/ccmain/pageiterator.h b/ccmain/pageiterator.h
index 56c78150a..719a1b607 100644
--- a/ccmain/pageiterator.h
+++ b/ccmain/pageiterator.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_PAGEITERATOR_H__
-#define TESSERACT_CCMAIN_PAGEITERATOR_H__
+#ifndef TESSERACT_CCMAIN_PAGEITERATOR_H_
+#define TESSERACT_CCMAIN_PAGEITERATOR_H_
 
 #include "publictypes.h"
 #include "platform.h"
@@ -361,4 +361,4 @@ class TESS_API PageIterator {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCMAIN_PAGEITERATOR_H__
+#endif  // TESSERACT_CCMAIN_PAGEITERATOR_H_
diff --git a/ccmain/resultiterator.h b/ccmain/resultiterator.h
index d6e8a9184..e5516836d 100644
--- a/ccmain/resultiterator.h
+++ b/ccmain/resultiterator.h
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_RESULT_ITERATOR_H__
-#define TESSERACT_CCMAIN_RESULT_ITERATOR_H__
+#ifndef TESSERACT_CCMAIN_RESULT_ITERATOR_H_
+#define TESSERACT_CCMAIN_RESULT_ITERATOR_H_
 
 #include "platform.h"
 #include "ltrresultiterator.h"
@@ -241,4 +241,4 @@ class TESS_API ResultIterator : public LTRResultIterator {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCMAIN_RESULT_ITERATOR_H__
+#endif  // TESSERACT_CCMAIN_RESULT_ITERATOR_H_
diff --git a/ccmain/tesseractclass.h b/ccmain/tesseractclass.h
index 8a3b0f921..a6d0d76df 100644
--- a/ccmain/tesseractclass.h
+++ b/ccmain/tesseractclass.h
@@ -23,8 +23,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_TESSERACTCLASS_H__
-#define TESSERACT_CCMAIN_TESSERACTCLASS_H__
+#ifndef TESSERACT_CCMAIN_TESSERACTCLASS_H_
+#define TESSERACT_CCMAIN_TESSERACTCLASS_H_
 
 #include "allheaders.h"
 #include "control.h"
@@ -1277,4 +1277,4 @@ class Tesseract : public Wordrec {
 }  // namespace tesseract
 
 
-#endif  // TESSERACT_CCMAIN_TESSERACTCLASS_H__
+#endif  // TESSERACT_CCMAIN_TESSERACTCLASS_H_
diff --git a/ccmain/thresholder.h b/ccmain/thresholder.h
index 92e2de5f3..0ff8af229 100644
--- a/ccmain/thresholder.h
+++ b/ccmain/thresholder.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_THRESHOLDER_H__
-#define TESSERACT_CCMAIN_THRESHOLDER_H__
+#ifndef TESSERACT_CCMAIN_THRESHOLDER_H_
+#define TESSERACT_CCMAIN_THRESHOLDER_H_
 
 #include "platform.h"
 #include "publictypes.h"
@@ -186,4 +186,4 @@ class TESS_API ImageThresholder {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCMAIN_THRESHOLDER_H__
+#endif  // TESSERACT_CCMAIN_THRESHOLDER_H_
diff --git a/ccstruct/boxread.h b/ccstruct/boxread.h
index f12853dfa..b5c7bb47e 100644
--- a/ccstruct/boxread.h
+++ b/ccstruct/boxread.h
@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#ifndef TESSERACT_CCUTIL_BOXREAD_H__
-#define TESSERACT_CCUTIL_BOXREAD_H__
+#ifndef TESSERACT_CCUTIL_BOXREAD_H_
+#define TESSERACT_CCUTIL_BOXREAD_H_
 
 #include <stdio.h>
 #include "genericvector.h"
@@ -82,4 +82,4 @@ bool ParseBoxFileStr(const char* boxfile_str, int* page_number,
 void MakeBoxFileStr(const char* unichar_str, const TBOX& box, int page_num,
                     STRING* box_str);
 
-#endif  // TESSERACT_CCUTIL_BOXREAD_H__
+#endif  // TESSERACT_CCUTIL_BOXREAD_H_
diff --git a/ccstruct/boxword.h b/ccstruct/boxword.h
index c1fab068b..2a95b273e 100644
--- a/ccstruct/boxword.h
+++ b/ccstruct/boxword.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CSTRUCT_BOXWORD_H__
-#define TESSERACT_CSTRUCT_BOXWORD_H__
+#ifndef TESSERACT_CSTRUCT_BOXWORD_H_
+#define TESSERACT_CSTRUCT_BOXWORD_H_
 
 #include "genericvector.h"
 #include "rect.h"
@@ -98,4 +98,4 @@ class BoxWord {
 }  // namespace tesseract.
 
 
-#endif  // TESSERACT_CSTRUCT_BOXWORD_H__
+#endif  // TESSERACT_CSTRUCT_BOXWORD_H_
diff --git a/ccstruct/ccstruct.h b/ccstruct/ccstruct.h
index 3f92122d6..4bb0e6b75 100644
--- a/ccstruct/ccstruct.h
+++ b/ccstruct/ccstruct.h
@@ -16,8 +16,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCSTRUCT_CCSTRUCT_H__
-#define TESSERACT_CCSTRUCT_CCSTRUCT_H__
+#ifndef TESSERACT_CCSTRUCT_CCSTRUCT_H_
+#define TESSERACT_CCSTRUCT_CCSTRUCT_H_
 
 #include "cutil.h"
 
@@ -41,4 +41,4 @@ class Tesseract;
 }  // namespace tesseract
 
 
-#endif  // TESSERACT_CCSTRUCT_CCSTRUCT_H__
+#endif  // TESSERACT_CCSTRUCT_CCSTRUCT_H_
diff --git a/ccstruct/dppoint.h b/ccstruct/dppoint.h
index fd87bb912..4e35712c2 100644
--- a/ccstruct/dppoint.h
+++ b/ccstruct/dppoint.h
@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#ifndef TESSERACT_CCSTRUCT_DPPOINT_H__
-#define TESSERACT_CCSTRUCT_DPPOINT_H__
+#ifndef TESSERACT_CCSTRUCT_DPPOINT_H_
+#define TESSERACT_CCSTRUCT_DPPOINT_H_
 
 #include "host.h"
 
@@ -98,5 +98,5 @@ class DPPoint {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCSTRUCT_DPPOINT_H__
+#endif  // TESSERACT_CCSTRUCT_DPPOINT_H_
 
diff --git a/ccstruct/matrix.h b/ccstruct/matrix.h
index 4b5b242a4..8e0442ae7 100644
--- a/ccstruct/matrix.h
+++ b/ccstruct/matrix.h
@@ -26,8 +26,8 @@
  ** limitations under the License.
  *
  *********************************************************************************/
-#ifndef TESSERACT_CCSTRUCT_MATRIX_H__
-#define TESSERACT_CCSTRUCT_MATRIX_H__
+#ifndef TESSERACT_CCSTRUCT_MATRIX_H_
+#define TESSERACT_CCSTRUCT_MATRIX_H_
 
 #include <math.h>
 #include "kdpair.h"
@@ -632,4 +632,4 @@ struct MATRIX_COORD {
 // The MatrixCoordPair contains a MATRIX_COORD and its priority.
 typedef tesseract::KDPairInc<float, MATRIX_COORD> MatrixCoordPair;
 
-#endif  // TESSERACT_CCSTRUCT_MATRIX_H__
+#endif  // TESSERACT_CCSTRUCT_MATRIX_H_
diff --git a/ccstruct/otsuthr.h b/ccstruct/otsuthr.h
index 7e7d28175..dd35d23f3 100644
--- a/ccstruct/otsuthr.h
+++ b/ccstruct/otsuthr.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCMAIN_OTSUTHR_H__
-#define TESSERACT_CCMAIN_OTSUTHR_H__
+#ifndef TESSERACT_CCMAIN_OTSUTHR_H_
+#define TESSERACT_CCMAIN_OTSUTHR_H_
 
 struct Pix;
 
@@ -53,4 +53,4 @@ int OtsuStats(const int* histogram, int* H_out, int* omega0_out);
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCMAIN_OTSUTHR_H__
+#endif  // TESSERACT_CCMAIN_OTSUTHR_H_
diff --git a/ccstruct/publictypes.h b/ccstruct/publictypes.h
index 97c9ee8b9..e9d300f96 100644
--- a/ccstruct/publictypes.h
+++ b/ccstruct/publictypes.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCSTRUCT_PUBLICTYPES_H__
-#define TESSERACT_CCSTRUCT_PUBLICTYPES_H__
+#ifndef TESSERACT_CCSTRUCT_PUBLICTYPES_H_
+#define TESSERACT_CCSTRUCT_PUBLICTYPES_H_
 
 // This file contains types that are used both by the API and internally
 // to Tesseract. In order to decouple the API from Tesseract and prevent cyclic
@@ -276,4 +276,4 @@ enum OcrEngineMode {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCSTRUCT_PUBLICTYPES_H__
+#endif  // TESSERACT_CCSTRUCT_PUBLICTYPES_H_
diff --git a/ccutil/bitvector.h b/ccutil/bitvector.h
index 5e7480773..e9df04fa6 100644
--- a/ccutil/bitvector.h
+++ b/ccutil/bitvector.h
@@ -20,8 +20,8 @@
 ///////////////////////////////////////////////////////////////////////
 
 
-#ifndef TESSERACT_CCUTIL_BITVECTOR_H__
-#define TESSERACT_CCUTIL_BITVECTOR_H__
+#ifndef TESSERACT_CCUTIL_BITVECTOR_H_
+#define TESSERACT_CCUTIL_BITVECTOR_H_
 
 #include <assert.h>
 #include <stdio.h>
@@ -140,4 +140,4 @@ class BitVector {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CCUTIL_BITVECTOR_H__
+#endif  // TESSERACT_CCUTIL_BITVECTOR_H_
diff --git a/ccutil/ccutil.h b/ccutil/ccutil.h
index e4ec4f9ae..bb153bd6e 100644
--- a/ccutil/ccutil.h
+++ b/ccutil/ccutil.h
@@ -16,8 +16,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCUTIL_CCUTIL_H__
-#define TESSERACT_CCUTIL_CCUTIL_H__
+#ifndef TESSERACT_CCUTIL_CCUTIL_H_
+#define TESSERACT_CCUTIL_CCUTIL_H_
 
 #include "ambigs.h"
 #include "errcode.h"
@@ -94,4 +94,4 @@ class CCUtil {
 extern CCUtilMutex tprintfMutex;  // should remain global
 }  // namespace tesseract
 
-#endif  // TESSERACT_CCUTIL_CCUTIL_H__
+#endif  // TESSERACT_CCUTIL_CCUTIL_H_
diff --git a/ccutil/host.h b/ccutil/host.h
index 40365c7a8..b42a4dc84 100644
--- a/ccutil/host.h
+++ b/ccutil/host.h
@@ -42,8 +42,8 @@
  ** limitations under the License.
  */
 
-#ifndef   __HOST__
-#define   __HOST__
+#ifndef TESSERACT_CCUTIL_HOST_H_
+#define TESSERACT_CCUTIL_HOST_H_
 
 /******************************************************************************
  **                                IMPORTANT!!!                                                                                                                 **
@@ -146,4 +146,4 @@ template<class T> bool NearlyEqual(T x, T y, T tolerance) {
   return diff <= tolerance && -diff <= tolerance;
 }
 
-#endif
+#endif // TESSERACT_CCUTIL_HOST_H_
diff --git a/ccutil/platform.h b/ccutil/platform.h
index dd9be87ac..eda9b74b7 100644
--- a/ccutil/platform.h
+++ b/ccutil/platform.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCUTIL_PLATFORM_H__
-#define TESSERACT_CCUTIL_PLATFORM_H__
+#ifndef TESSERACT_CCUTIL_PLATFORM_H_
+#define TESSERACT_CCUTIL_PLATFORM_H_
 
 #include <string.h>
 
@@ -89,4 +89,4 @@
       (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 #endif
 
-#endif  // TESSERACT_CCUTIL_PLATFORM_H__
+#endif  // TESSERACT_CCUTIL_PLATFORM_H_
diff --git a/ccutil/tesscallback.h b/ccutil/tesscallback.h
index 1f20c6b47..37d8dc58a 100644
--- a/ccutil/tesscallback.h
+++ b/ccutil/tesscallback.h
@@ -16,8 +16,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef _TESS_CALLBACK_SPECIALIZATIONS_H
-#define _TESS_CALLBACK_SPECIALIZATIONS_H
+#ifndef TESS_CALLBACK_SPECIALIZATIONS_H_
+#define TESS_CALLBACK_SPECIALIZATIONS_H_
 
 #include "host.h"  // For NULL.
 
@@ -9718,4 +9718,4 @@ NewPermanentTessCallback(R (*function)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5), typena
   return new _TessFunctionResultCallback_6_5<false,R,P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5>(function, p1, p2, p3, p4, p5, p6);
 }
 
-#endif /* _TESS_CALLBACK_SPECIALIZATIONS_H */
+#endif // TESS_CALLBACK_SPECIALIZATIONS_H_
diff --git a/ccutil/unichar.h b/ccutil/unichar.h
index b2a1e013f..6dc2c275a 100644
--- a/ccutil/unichar.h
+++ b/ccutil/unichar.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCUTIL_UNICHAR_H__
-#define TESSERACT_CCUTIL_UNICHAR_H__
+#ifndef TESSERACT_CCUTIL_UNICHAR_H_
+#define TESSERACT_CCUTIL_UNICHAR_H_
 
 #include <memory.h>
 #include <string.h>
@@ -162,4 +162,4 @@ class UNICHAR {
   char chars[UNICHAR_LEN];
 };
 
-#endif  // TESSERACT_CCUTIL_UNICHAR_H__
+#endif  // TESSERACT_CCUTIL_UNICHAR_H_
diff --git a/ccutil/unicharmap.h b/ccutil/unicharmap.h
index ad901585c..ecc4065e3 100644
--- a/ccutil/unicharmap.h
+++ b/ccutil/unicharmap.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCUTIL_UNICHARMAP_H__
-#define TESSERACT_CCUTIL_UNICHARMAP_H__
+#ifndef TESSERACT_CCUTIL_UNICHARMAP_H_
+#define TESSERACT_CCUTIL_UNICHARMAP_H_
 
 #include "unichar.h"
 
@@ -79,4 +79,4 @@ class UNICHARMAP {
   UNICHARMAP_NODE* nodes;
 };
 
-#endif  // TESSERACT_CCUTIL_UNICHARMAP_H__
+#endif  // TESSERACT_CCUTIL_UNICHARMAP_H_
diff --git a/ccutil/unicharset.h b/ccutil/unicharset.h
index eb1b4e5f4..19eb7cfc2 100644
--- a/ccutil/unicharset.h
+++ b/ccutil/unicharset.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CCUTIL_UNICHARSET_H__
-#define TESSERACT_CCUTIL_UNICHARSET_H__
+#ifndef TESSERACT_CCUTIL_UNICHARSET_H_
+#define TESSERACT_CCUTIL_UNICHARSET_H_
 
 #include "errcode.h"
 #include "genericvector.h"
@@ -997,4 +997,4 @@ class UNICHARSET {
   int default_sid_;
 };
 
-#endif  // TESSERACT_CCUTIL_UNICHARSET_H__
+#endif  // TESSERACT_CCUTIL_UNICHARSET_H_
diff --git a/ccutil/unicodes.h b/ccutil/unicodes.h
index f6d2bd510..7bab9b005 100644
--- a/ccutil/unicodes.h
+++ b/ccutil/unicodes.h
@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#ifndef TESSERACT_CCUTIL_UNICODES_H__
-#define TESSERACT_CCUTIL_UNICODES_H__
+#ifndef TESSERACT_CCUTIL_UNICODES_H_
+#define TESSERACT_CCUTIL_UNICODES_H_
 
 namespace tesseract {
 
@@ -36,4 +36,4 @@ extern const char *kApostropheLikeUTF8[];
 
 }  // namespace
 
-#endif  // TESSERACT_CCUTIL_UNICODES_H__
+#endif  // TESSERACT_CCUTIL_UNICODES_H_
diff --git a/classify/classify.h b/classify/classify.h
index 0de844152..202a0b9a8 100644
--- a/classify/classify.h
+++ b/classify/classify.h
@@ -16,8 +16,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CLASSIFY_CLASSIFY_H__
-#define TESSERACT_CLASSIFY_CLASSIFY_H__
+#ifndef TESSERACT_CLASSIFY_CLASSIFY_H_
+#define TESSERACT_CLASSIFY_CLASSIFY_H_
 
 #include "adaptive.h"
 #include "ccstruct.h"
@@ -539,4 +539,4 @@ class Classify : public CCStruct {
 };
 }  // namespace tesseract
 
-#endif  // TESSERACT_CLASSIFY_CLASSIFY_H__
+#endif  // TESSERACT_CLASSIFY_CLASSIFY_H_
diff --git a/classify/intfeaturemap.h b/classify/intfeaturemap.h
index 55c5b5cf5..5c5a54b83 100644
--- a/classify/intfeaturemap.h
+++ b/classify/intfeaturemap.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CLASSIFY_INTFEATUREMAP_H__
-#define TESSERACT_CLASSIFY_INTFEATUREMAP_H__
+#ifndef TESSERACT_CLASSIFY_INTFEATUREMAP_H_
+#define TESSERACT_CLASSIFY_INTFEATUREMAP_H_
 
 #include "intfeaturespace.h"
 #include "indexmapbidi.h"
@@ -160,4 +160,4 @@ class IntFeatureMap {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_CLASSIFY_INTFEATUREMAP_H__
+#endif  // TESSERACT_CLASSIFY_INTFEATUREMAP_H_
diff --git a/classify/intfeaturespace.h b/classify/intfeaturespace.h
index e1e8e6ec9..38120b0d0 100644
--- a/classify/intfeaturespace.h
+++ b/classify/intfeaturespace.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CLASSIFY_INTFEATURESPACE_H__
-#define TESSERACT_CLASSIFY_INTFEATURESPACE_H__
+#ifndef TESSERACT_CLASSIFY_INTFEATURESPACE_H_
+#define TESSERACT_CLASSIFY_INTFEATURESPACE_H_
 
 #include "genericvector.h"
 #include "intproto.h"
@@ -107,4 +107,4 @@ class IntFeatureSpace {
 }  // namespace tesseract.
 
 
-#endif  // TESSERACT_CLASSIFY_INTFEATURESPACE_H__
+#endif  // TESSERACT_CLASSIFY_INTFEATURESPACE_H_
diff --git a/classify/mastertrainer.h b/classify/mastertrainer.h
index 8cc7158ac..e1a5b17c4 100644
--- a/classify/mastertrainer.h
+++ b/classify/mastertrainer.h
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TRAINING_MASTERTRAINER_H__
-#define TESSERACT_TRAINING_MASTERTRAINER_H__
+#ifndef TESSERACT_TRAINING_MASTERTRAINER_H_
+#define TESSERACT_TRAINING_MASTERTRAINER_H_
 
 /**----------------------------------------------------------------------------
           Include Files and Type Defines
@@ -309,4 +309,4 @@ class MasterTrainer {
 
 }  // namespace tesseract.
 
-#endif
+#endif // TESSERACT_TRAINING_MASTERTRAINER_H_
diff --git a/classify/trainingsample.h b/classify/trainingsample.h
index 6df1ce824..251e33b6e 100644
--- a/classify/trainingsample.h
+++ b/classify/trainingsample.h
@@ -13,8 +13,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TRAINING_TRAININGSAMPLE_H__
-#define TESSERACT_TRAINING_TRAININGSAMPLE_H__
+#ifndef TESSERACT_TRAINING_TRAININGSAMPLE_H_
+#define TESSERACT_TRAINING_TRAININGSAMPLE_H_
 
 #include "elst.h"
 #include "featdefs.h"
@@ -247,4 +247,4 @@ ELISTIZEH(TrainingSample)
 
 }  // namespace tesseract
 
-#endif  // TESSERACT_TRAINING_TRAININGSAMPLE_H__
+#endif  // TESSERACT_TRAINING_TRAININGSAMPLE_H_
diff --git a/classify/trainingsampleset.h b/classify/trainingsampleset.h
index ad92c6c4f..e7010523d 100644
--- a/classify/trainingsampleset.h
+++ b/classify/trainingsampleset.h
@@ -13,8 +13,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TRAINING_TRAININGSAMPLESET_H__
-#define TESSERACT_TRAINING_TRAININGSAMPLESET_H__
+#ifndef TESSERACT_TRAINING_TRAININGSAMPLESET_H_
+#define TESSERACT_TRAINING_TRAININGSAMPLESET_H_
 
 #include "bitvector.h"
 #include "genericvector.h"
diff --git a/cutil/cutil_class.h b/cutil/cutil_class.h
index 06d325436..8b59b6eb2 100644
--- a/cutil/cutil_class.h
+++ b/cutil/cutil_class.h
@@ -16,8 +16,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_CUTIL_CUTIL_CLASS_H__
-#define TESSERACT_CUTIL_CUTIL_CLASS_H__
+#ifndef TESSERACT_CUTIL_CUTIL_CLASS_H_
+#define TESSERACT_CUTIL_CUTIL_CLASS_H_
 
 #include "ccutil.h"
 #include "const.h"
@@ -34,4 +34,4 @@ class CUtil : public CCUtil {
 
 }  // namespace tesseract
 
-#endif  // TESSERACT_CUTIL_CUTIL_CLASS_H__
+#endif  // TESSERACT_CUTIL_CUTIL_CLASS_H_
diff --git a/opencl/oclkernels.h b/opencl/oclkernels.h
index 5a34fb7a2..cfc0b2af5 100644
--- a/opencl/oclkernels.h
+++ b/opencl/oclkernels.h
@@ -7,8 +7,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef _OCL_KERNEL_H_
-#define _OCL_KERNEL_H_
+
+#ifndef TESSERACT_OPENCL_OCLKERNELS_H_
+#define TESSERACT_OPENCL_OCLKERNELS_H_
+
 #ifndef USE_EXTERNAL_KERNEL
 #define KERNEL( ... )# __VA_ARGS__ "\n"
 // Double precision is a default of spreadsheets
@@ -1210,5 +1212,5 @@ KERNEL(
  ; // close char*
 
 #endif  // USE_EXTERNAL_KERNEL
-#endif  //_OCL_KERNEL_H_
+#endif  // TESSERACT_OPENCL_OCLKERNELS_H_
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/textord/alignedblob.h b/textord/alignedblob.h
index cbc727a18..d5e9d26a2 100644
--- a/textord/alignedblob.h
+++ b/textord/alignedblob.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_ALIGNEDBLOB_H__
-#define TESSERACT_TEXTORD_ALIGNEDBLOB_H__
+#ifndef TESSERACT_TEXTORD_ALIGNEDBLOB_H_
+#define TESSERACT_TEXTORD_ALIGNEDBLOB_H_
 
 #include "bbgrid.h"
 #include "blobbox.h"
@@ -141,5 +141,5 @@ class AlignedBlob : public BlobGrid {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_ALIGNEDBLOB_H__
+#endif  // TESSERACT_TEXTORD_ALIGNEDBLOB_H_
 
diff --git a/textord/bbgrid.h b/textord/bbgrid.h
index 066b5bae1..4d035211a 100644
--- a/textord/bbgrid.h
+++ b/textord/bbgrid.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_BBGRID_H__
-#define TESSERACT_TEXTORD_BBGRID_H__
+#ifndef TESSERACT_TEXTORD_BBGRID_H_
+#define TESSERACT_TEXTORD_BBGRID_H_
 
 #include "clst.h"
 #include "coutln.h"
@@ -958,4 +958,4 @@ void GridSearch<BBC, BBC_CLIST, BBC_C_IT>::SetIterator() {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_BBGRID_H__
+#endif  // TESSERACT_TEXTORD_BBGRID_H_
diff --git a/textord/colfind.h b/textord/colfind.h
index dc40cbb05..60f7f00ec 100644
--- a/textord/colfind.h
+++ b/textord/colfind.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_COLFIND_H__
-#define TESSERACT_TEXTORD_COLFIND_H__
+#ifndef TESSERACT_TEXTORD_COLFIND_H_
+#define TESSERACT_TEXTORD_COLFIND_H_
 
 #include "tabfind.h"
 #include "imagefind.h"
@@ -365,4 +365,4 @@ class ColumnFinder : public TabFind {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_COLFIND_H__
+#endif  // TESSERACT_TEXTORD_COLFIND_H_
diff --git a/textord/colpartition.h b/textord/colpartition.h
index 7fcbc0004..ed1262993 100644
--- a/textord/colpartition.h
+++ b/textord/colpartition.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_COLPARTITION_H__
-#define TESSERACT_TEXTORD_COLPARTITION_H__
+#ifndef TESSERACT_TEXTORD_COLPARTITION_H_
+#define TESSERACT_TEXTORD_COLPARTITION_H_
 
 #include "bbgrid.h"
 #include "blobbox.h"       // For BlobRegionType.
@@ -933,4 +933,4 @@ typedef GridSearch<ColPartition,
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_COLPARTITION_H__
+#endif  // TESSERACT_TEXTORD_COLPARTITION_H_
diff --git a/textord/colpartitiongrid.h b/textord/colpartitiongrid.h
index 42f7d4ed5..a8926e4fc 100644
--- a/textord/colpartitiongrid.h
+++ b/textord/colpartitiongrid.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_COLPARTITIONGRID_H__
-#define TESSERACT_TEXTORD_COLPARTITIONGRID_H__
+#ifndef TESSERACT_TEXTORD_COLPARTITIONGRID_H_
+#define TESSERACT_TEXTORD_COLPARTITIONGRID_H_
 
 #include "bbgrid.h"
 #include "colpartition.h"
@@ -255,4 +255,4 @@ class ColPartitionGrid : public BBGrid<ColPartition,
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_COLPARTITIONGRID_H__
+#endif  // TESSERACT_TEXTORD_COLPARTITIONGRID_H_
diff --git a/textord/colpartitionset.h b/textord/colpartitionset.h
index 37efc81af..a13f30ab4 100644
--- a/textord/colpartitionset.h
+++ b/textord/colpartitionset.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_COLPARTITIONSET_H__
-#define TESSERACT_TEXTORD_COLPARTITIONSET_H__
+#ifndef TESSERACT_TEXTORD_COLPARTITIONSET_H_
+#define TESSERACT_TEXTORD_COLPARTITIONSET_H_
 
 #include "colpartition.h"   // For ColPartition_LIST.
 #include "genericvector.h"  // For GenericVector.
@@ -170,4 +170,4 @@ ELISTIZEH(ColPartitionSet)
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_COLPARTITION_H__
+#endif  // TESSERACT_TEXTORD_COLPARTITION_H_
diff --git a/textord/equationdetectbase.h b/textord/equationdetectbase.h
index d47c74a53..06a26cc73 100644
--- a/textord/equationdetectbase.h
+++ b/textord/equationdetectbase.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_EQUATIONDETECTBASE_H__
-#define TESSERACT_TEXTORD_EQUATIONDETECTBASE_H__
+#ifndef TESSERACT_TEXTORD_EQUATIONDETECTBASE_H_
+#define TESSERACT_TEXTORD_EQUATIONDETECTBASE_H_
 
 class BLOBNBOX_LIST;
 class TO_BLOCK;
@@ -56,4 +56,4 @@ class EquationDetectBase {
 
 };  // namespace tesseract
 
-#endif  // TESSERACT_TEXTORD_EQUATIONDETECTBASE_H__
+#endif  // TESSERACT_TEXTORD_EQUATIONDETECTBASE_H_
diff --git a/textord/imagefind.h b/textord/imagefind.h
index 1bf408eb7..407225cdc 100644
--- a/textord/imagefind.h
+++ b/textord/imagefind.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_IMAGEFIND_H__
-#define TESSERACT_TEXTORD_IMAGEFIND_H__
+#ifndef TESSERACT_TEXTORD_IMAGEFIND_H_
+#define TESSERACT_TEXTORD_IMAGEFIND_H_
 
 #include "host.h"
 
@@ -155,5 +155,5 @@ class ImageFind {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_LINEFIND_H__
+#endif  // TESSERACT_TEXTORD_LINEFIND_H_
 
diff --git a/textord/linefind.h b/textord/linefind.h
index abbd7cdd2..d2e46ec8e 100644
--- a/textord/linefind.h
+++ b/textord/linefind.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_LINEFIND_H__
-#define TESSERACT_TEXTORD_LINEFIND_H__
+#ifndef TESSERACT_TEXTORD_LINEFIND_H_
+#define TESSERACT_TEXTORD_LINEFIND_H_
 
 struct Boxa;
 struct Pix;
@@ -146,5 +146,5 @@ class LineFinder {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_LINEFIND_H__
+#endif  // TESSERACT_TEXTORD_LINEFIND_H_
 
diff --git a/textord/strokewidth.h b/textord/strokewidth.h
index 71ec95da1..497ffaeba 100644
--- a/textord/strokewidth.h
+++ b/textord/strokewidth.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_STROKEWIDTH_H__
-#define TESSERACT_TEXTORD_STROKEWIDTH_H__
+#ifndef TESSERACT_TEXTORD_STROKEWIDTH_H_
+#define TESSERACT_TEXTORD_STROKEWIDTH_H_
 
 #include "blobbox.h"        // BlobNeighourDir.
 #include "blobgrid.h"         // Base class.
@@ -352,4 +352,4 @@ class StrokeWidth : public BlobGrid {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_STROKEWIDTH_H__
+#endif  // TESSERACT_TEXTORD_STROKEWIDTH_H_
diff --git a/textord/tabfind.h b/textord/tabfind.h
index 841c18a9e..0e1f753a4 100644
--- a/textord/tabfind.h
+++ b/textord/tabfind.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_TABFIND_H__
-#define TESSERACT_TEXTORD_TABFIND_H__
+#ifndef TESSERACT_TEXTORD_TABFIND_H_
+#define TESSERACT_TEXTORD_TABFIND_H_
 
 #include "alignedblob.h"
 #include "tesscallback.h"
@@ -382,4 +382,4 @@ class TabFind : public AlignedBlob {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_TABFIND_H__
+#endif  // TESSERACT_TEXTORD_TABFIND_H_
diff --git a/textord/tablefind.h b/textord/tablefind.h
index 3612e48d5..6f955e960 100644
--- a/textord/tablefind.h
+++ b/textord/tablefind.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_TABLEFIND_H__
-#define TESSERACT_TEXTORD_TABLEFIND_H__
+#ifndef TESSERACT_TEXTORD_TABLEFIND_H_
+#define TESSERACT_TEXTORD_TABLEFIND_H_
 
 #include "colpartitiongrid.h"
 #include "elst.h"
@@ -432,4 +432,4 @@ class TableFinder {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_TABLEFIND_H__
+#endif  // TESSERACT_TEXTORD_TABLEFIND_H_
diff --git a/textord/tabvector.h b/textord/tabvector.h
index dbeff1067..e8f058646 100644
--- a/textord/tabvector.h
+++ b/textord/tabvector.h
@@ -17,8 +17,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_TABVECTOR_H__
-#define TESSERACT_TEXTORD_TABVECTOR_H__
+#ifndef TESSERACT_TEXTORD_TABVECTOR_H_
+#define TESSERACT_TEXTORD_TABVECTOR_H_
 
 #include "blobgrid.h"
 #include "clst.h"
@@ -427,4 +427,4 @@ class TabVector : public ELIST2_LINK {
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_TABVECTOR_H__
+#endif  // TESSERACT_TEXTORD_TABVECTOR_H_
diff --git a/textord/textord.h b/textord/textord.h
index b34ecd2ce..6c9b12f78 100644
--- a/textord/textord.h
+++ b/textord/textord.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_TEXTORD_H__
-#define TESSERACT_TEXTORD_TEXTORD_H__
+#ifndef TESSERACT_TEXTORD_TEXTORD_H_
+#define TESSERACT_TEXTORD_TEXTORD_H_
 
 #include "ccstruct.h"
 #include "bbgrid.h"
@@ -400,4 +400,4 @@ class Textord {
 };
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_TEXTORD_H__
+#endif  // TESSERACT_TEXTORD_TEXTORD_H_
diff --git a/textord/workingpartset.h b/textord/workingpartset.h
index f47c66678..0f0b68a61 100644
--- a/textord/workingpartset.h
+++ b/textord/workingpartset.h
@@ -18,8 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_TEXTORD_WORKINGPARSET_H__
-#define TESSERACT_TEXTORD_WORKINGPARSET_H__
+#ifndef TESSERACT_TEXTORD_WORKINGPARSET_H_
+#define TESSERACT_TEXTORD_WORKINGPARSET_H_
 
 #include "blobbox.h"       // For TO_BLOCK_LIST and BLOCK_LIST.
 #include "colpartition.h"  // For ColPartition_LIST.
@@ -87,5 +87,5 @@ ELISTIZEH(WorkingPartSet)
 
 }  // namespace tesseract.
 
-#endif  // TESSERACT_TEXTORD_WORKINGPARSET_H__
+#endif  // TESSERACT_TEXTORD_WORKINGPARSET_H_
 
diff --git a/training/commontraining.h b/training/commontraining.h
index 7f38cf51c..b35f0e7ef 100644
--- a/training/commontraining.h
+++ b/training/commontraining.h
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TESSERACT_TRAINING_COMMONTRAINING_H__
-#define TESSERACT_TRAINING_COMMONTRAINING_H__
+#ifndef TESSERACT_TRAINING_COMMONTRAINING_H_
+#define TESSERACT_TRAINING_COMMONTRAINING_H_
 
 #include "cluster.h"
 #include "commandlineflags.h"
@@ -167,4 +167,4 @@ int NumberOfProtos(
 
 
 void allocNormProtos();
-#endif  // TESSERACT_TRAINING_COMMONTRAINING_H__
+#endif  // TESSERACT_TRAINING_COMMONTRAINING_H_
diff --git a/viewer/scrollview.h b/viewer/scrollview.h
index cf1e182ef..96c14a767 100644
--- a/viewer/scrollview.h
+++ b/viewer/scrollview.h
@@ -29,8 +29,8 @@
 // API calls at all and generate a java user interface from scratch (or
 // basically generate any kind of java program, possibly even dangerous ones).
 
-#ifndef TESSERACT_VIEWER_SCROLLVIEW_H__
-#define TESSERACT_VIEWER_SCROLLVIEW_H__
+#ifndef TESSERACT_VIEWER_SCROLLVIEW_H_
+#define TESSERACT_VIEWER_SCROLLVIEW_H_
 // TODO(rays) Move ScrollView into the tesseract namespace.
 #ifndef OCR_SCROLLVIEW_H__
 
@@ -415,4 +415,4 @@ class ScrollView {
 };
 
 #endif  // OCR_SCROLLVIEW_H__
-#endif  // TESSERACT_VIEWER_SCROLLVIEW_H__
+#endif  // TESSERACT_VIEWER_SCROLLVIEW_H_
diff --git a/viewer/svmnode.h b/viewer/svmnode.h
index 379e212be..98f4e2980 100644
--- a/viewer/svmnode.h
+++ b/viewer/svmnode.h
@@ -25,8 +25,8 @@
 // A SVMenuNode can both be used in the context_ of popup menus as well as
 // menu bars.
 
-#ifndef TESSERACT_VIEWER_SVMNODE_H__
-#define TESSERACT_VIEWER_SVMNODE_H__
+#ifndef TESSERACT_VIEWER_SVMNODE_H_
+#define TESSERACT_VIEWER_SVMNODE_H_
 
 #include "strngs.h"
 
@@ -93,4 +93,4 @@ class SVMenuNode {
   STRING description_;
 };
 
-#endif  // TESSERACT_VIEWER_SVMNODE_H__
+#endif  // TESSERACT_VIEWER_SVMNODE_H_
diff --git a/viewer/svutil.h b/viewer/svutil.h
index 03d0b9147..b56025ec7 100644
--- a/viewer/svutil.h
+++ b/viewer/svutil.h
@@ -21,8 +21,8 @@
 // classes, which are used for thread/process creation & synchronization
 // and network connection.
 
-#ifndef TESSERACT_VIEWER_SVUTIL_H__
-#define TESSERACT_VIEWER_SVUTIL_H__
+#ifndef TESSERACT_VIEWER_SVUTIL_H_
+#define TESSERACT_VIEWER_SVUTIL_H_
 
 #ifdef _WIN32
 #ifndef __GNUC__
@@ -155,4 +155,4 @@ class SVNetwork {
   char* buffer_ptr_;  // Unix (strtok_r)
 };
 
-#endif  // TESSERACT_VIEWER_SVUTIL_H__
+#endif  // TESSERACT_VIEWER_SVUTIL_H_
diff --git a/wordrec/wordrec.h b/wordrec/wordrec.h
index fb54ccae0..f03720d98 100644
--- a/wordrec/wordrec.h
+++ b/wordrec/wordrec.h
@@ -16,8 +16,8 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifndef TESSERACT_WORDREC_WORDREC_H__
-#define TESSERACT_WORDREC_WORDREC_H__
+#ifndef TESSERACT_WORDREC_WORDREC_H_
+#define TESSERACT_WORDREC_WORDREC_H_
 
 #include "associate.h"
 #include "classify.h"
@@ -491,4 +491,4 @@ class Wordrec : public Classify {
 
 }  // namespace tesseract
 
-#endif  // TESSERACT_WORDREC_WORDREC_H__
+#endif  // TESSERACT_WORDREC_WORDREC_H_