Fixup incorrect include guards.

This CL updates include guards throughout the code base to be in the
chromium style.

BUG=pdfium:65
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1707893004 .

21 files changed, 104 insertions, 63 deletions

diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
index 2e8d6c5c45..c01c4ce035 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ASCIIENCODER_H_
-#define _BC_ASCIIENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
+
 class CBC_Encoder;
 class CBC_EncoderContext;
 class CBC_ASCIIEncoder;
@@ -21,4 +22,5 @@ class CBC_ASCIIEncoder : public CBC_Encoder {
                                     FX_WCHAR digit2,
                                     int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
index 3aa94bff7a..9cdef1996e 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BASE256ENCODER_H_
-#define _BC_BASE256ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
+
 class CBC_Encoder;
 class CBC_Base256Encoder;
 class CBC_Base256Encoder : public CBC_Encoder {
@@ -18,4 +19,5 @@ class CBC_Base256Encoder : public CBC_Encoder {
  private:
   static FX_WCHAR randomize255State(FX_WCHAR ch, int32_t codewordPosition);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
index 249f122820..e082e81487 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_C40ENCODER_H_
-#define _BC_C40ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
+
 class CBC_C40Encoder;
 class CBC_C40Encoder : public CBC_Encoder {
  public:
@@ -28,4 +29,5 @@ class CBC_C40Encoder : public CBC_Encoder {
                                 int32_t& e);
   static CFX_WideString encodeToCodewords(CFX_WideString sb, int32_t startPos);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index 118bc2834c..2008ea7f2c 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXBITMATRIXPARSER_H_
-#define _BC_DATAMATRIXBITMATRIXPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
+
 class CBC_CommonBitMatrix;
 class CBC_DataMatrixVersion;
 class CBC_DataMatrixBitMatrixParser {
@@ -37,4 +38,5 @@ class CBC_DataMatrixBitMatrixParser {
   CBC_CommonBitMatrix* m_readMappingMatrix;
   CBC_DataMatrixVersion* m_version;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index 8f1b277342..ca81e62655 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDATABLOCK_H_
-#define _BC_DATAMATRIXDATABLOCK_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
+
 class CBC_DataMatrixVersion;
 class CBC_DataMatrixDataBlock {
  public:
@@ -24,4 +25,5 @@ class CBC_DataMatrixDataBlock {
 
   CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
index 65785491e4..ba23976842 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
-#define _BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
 class CBC_CommonDecoderResult;
 class CBC_CommonBitSource;
 class CBC_DataMatrixDecodedBitStreamParser {
@@ -54,4 +54,5 @@ class CBC_DataMatrixDecodedBitStreamParser {
   const static int32_t EDIFACT_ENCODE;
   const static int32_t BASE256_ENCODE;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
index 601f9a5d5e..011a8b8e72 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDECODER_H_
-#define _BC_DATAMATRIXDECODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
+
 class CBC_ReedSolomonDecoder;
 class CBC_CommonDecoderResult;
 class CBC_CommonBitMatrix;
@@ -22,4 +23,5 @@ class CBC_DataMatrixDecoder {
                      int32_t& e);
   CBC_ReedSolomonDecoder* m_rsDecoder;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
index 6ed03022ef..5ab8f9d060 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDETECTOR_H_
-#define _BC_DATAMATRIXDETECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
+
 class CBC_CommonBitMatrix;
 class CBC_WhiteRectangleDetector;
 class CBC_ResultPoint;
@@ -70,4 +71,5 @@ class CBC_DataMatrixDetector {
   CBC_WhiteRectangleDetector* m_rectangleDetector;
   const static int32_t INTEGERS[5];
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
index 6e3f67d847..51d22588aa 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXREADER_H_
-#define _BC_DATAMATRIXREADER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
+
 class CBC_BinaryBitmap;
 class CBC_DataMatrixDecoder;
 class CBC_Reader;
@@ -22,4 +23,5 @@ class CBC_DataMatrixReader : public CBC_Reader {
  private:
   CBC_DataMatrixDecoder* m_decoder;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
index 94abdf5721..ce16004817 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXSYMBOLINFO144_H_
-#define _BC_DATAMATRIXSYMBOLINFO144_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
+
 class CBC_SymbolInfo;
 class CBC_DataMatrixSymbolInfo144;
 class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo {
@@ -15,4 +16,5 @@ class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo {
   int32_t getInterleavedBlockCount();
   int32_t getDataLengthForInterleavedBlock(int32_t index);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 004a65e6ce..e96b743164 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXVERSION_H_
-#define _BC_DATAMATRIXVERSION_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
+
 class ECBlocks;
 class CBC_DataMatrixVersion;
 class ECB {
@@ -83,4 +84,5 @@ class CBC_DataMatrixVersion {
   int32_t m_totalCodewords;
   static CFX_PtrArray* VERSIONS;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
index 0cc9fb3987..860199e42d 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DEFAULTPLACEMENT_H_
-#define _BC_DEFAULTPLACEMENT_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+
 class CBC_DefaultPlacement {
  public:
   CBC_DefaultPlacement(CFX_WideString codewords,
@@ -33,4 +34,5 @@ class CBC_DefaultPlacement {
   void corner3(int32_t pos);
   void corner4(int32_t pos);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
index 65f356cba1..26324ed9d6 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_EDIFACTENCODER_H_
-#define _BC_EDIFACTENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
+
 class CBC_EncoderContext;
 class CBC_EdifactEncoder;
 class CBC_EdifactEncoder : public CBC_Encoder {
@@ -24,4 +25,5 @@ class CBC_EdifactEncoder : public CBC_Encoder {
                                           int32_t startPos,
                                           int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
index a7fa323445..36637fd3aa 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ENCODER_H_
-#define _BC_ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+
 class CBC_EncoderContext;
 class CBC_Encoder {
  public:
@@ -14,4 +15,5 @@ class CBC_Encoder {
   virtual int32_t getEncodingMode() = 0;
   virtual void Encode(CBC_EncoderContext& context, int32_t& e) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
index 1a289d5722..9b78f86661 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ENCODERCONTEXT_H_
-#define _BC_ENCODERCONTEXT_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
+
 class CBC_SymbolShapeHint;
 class CBC_SymbolInfo;
 class CBC_Dimension;
@@ -49,4 +50,5 @@ class CBC_EncoderContext : public CBC_SymbolShapeHint {
   CBC_Dimension* m_maxSize;
   int32_t m_skipAtEnd;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
index 7795ee485b..951b9ea572 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ERRORCORRECTION_H_
-#define _BC_ERRORCORRECTION_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
+
 class CBC_SymbolInfo;
 class CBC_ErrorCorrection {
  public:
@@ -34,4 +35,5 @@ class CBC_ErrorCorrection {
                                        int32_t numECWords,
                                        int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
index 59b322b277..17433a169a 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_HIGHLEVALENCODER_H_
-#define _BC_HIGHLEVALENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
+
 class CBC_SymbolShapeHint;
 class CBC_HighLevelEncoder;
 #define ASCII_ENCODATION 0
@@ -70,4 +71,5 @@ class CBC_HighLevelEncoder : public CBC_SymbolShapeHint {
   static FX_BOOL isNativeEDIFACT(FX_WCHAR ch);
   static FX_BOOL isSpecialB256(FX_WCHAR ch);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
index 08fb4d5472..b00e804fa0 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_SYMBOLINFO_H_
-#define _BC_SYMBOLINFO_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+
 class CBC_SymbolShapeHint;
 class CBC_Dimension;
 class CBC_SymbolInfo;
@@ -75,4 +76,5 @@ class CBC_SymbolInfo : public CBC_SymbolShapeHint {
                  int32_t rsBlockData,
                  int32_t rsBlockError);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
index 7ad8a0428f..ea8acdfb0f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_SYMBOLSHAPEHINT_H_
-#define _BC_SYMBOLSHAPEHINT_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
+
 class CBC_SymbolShapeHint {
  public:
   CBC_SymbolShapeHint();
@@ -16,4 +17,5 @@ class CBC_SymbolShapeHint {
     FORCE_RECTANGLE,
   };
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
index 1218e9d2c8..399b21bb90 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_TEXTENCODER_H_
-#define _BC_TEXTENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
+
 class CBC_TextEncoder;
 class CBC_TextEncoder : public CBC_C40Encoder {
  public:
@@ -14,4 +15,5 @@ class CBC_TextEncoder : public CBC_C40Encoder {
   int32_t getEncodingMode();
   int32_t encodeChar(FX_WCHAR c, CFX_WideString& sb, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
index 216987f874..62b35feb66 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_X12ENCODER_H_
-#define _BC_X12ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
+
 class CBC_C40Encoder;
 class CBC_X12Encoder;
 class CBC_X12Encoder : public CBC_C40Encoder {
@@ -19,4 +20,5 @@ class CBC_X12Encoder : public CBC_C40Encoder {
                  int32_t& e);
   int32_t encodeChar(FX_WCHAR c, CFX_WideString& sb, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_