8 files changed, 39 insertions, 18 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_progress.h b/core/src/fxcodec/codec/fx_codec_progress.h
index 2da92c9b01..45fde21338 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.h
+++ b/core/src/fxcodec/codec/fx_codec_progress.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_CODEC_PROGRESS_H_
-#define _FX_CODEC_PROGRESS_H_
+#ifndef CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+#define CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA 2.2
 #if _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
@@ -220,4 +221,5 @@ class CCodec_ProgressiveDecoder : public ICodec_ProgressiveDecoder {
   FX_BOOL m_BmpIsTopBottom;
   FXCODEC_STATUS m_status;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/src/fxcodec/jbig2/JBig2_Define.h
index ccc30998c9..68e2ff2533 100644
--- a/core/src/fxcodec/jbig2/JBig2_Define.h
+++ b/core/src/fxcodec/jbig2/JBig2_Define.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_DEFINE_H_
-#define _JBIG2_DEFINE_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -33,4 +33,4 @@ struct JBig2HuffmanCode {
 #define JBIG2_MAX_PATTERN_INDEX 65535
 #define JBIG2_MAX_IMAGE_SIZE 65535
 
-#endif
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
index 85b393bd41..afa81796c2 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_HUFFMAN_DECODER_H_
-#define _JBIG2_HUFFMAN_DECODER_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
+
 #include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
 #include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
 class CJBig2_HuffmanDecoder {
@@ -19,4 +20,5 @@ class CJBig2_HuffmanDecoder {
  private:
   CJBig2_BitStream* const m_pStream;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Page.h b/core/src/fxcodec/jbig2/JBig2_Page.h
index 6d5e55a39c..50fe4cef3c 100644
--- a/core/src/fxcodec/jbig2/JBig2_Page.h
+++ b/core/src/fxcodec/jbig2/JBig2_Page.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_PAGE_H_
-#define _JBIG2_PAGE_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -19,4 +19,4 @@ struct JBig2PageInfo {
   FX_WORD m_wMaxStripeSize;
 };
 
-#endif
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.h b/core/src/fxcodec/jbig2/JBig2_PatternDict.h
index ac8e062535..e363c9bce3 100644
--- a/core/src/fxcodec/jbig2/JBig2_PatternDict.h
+++ b/core/src/fxcodec/jbig2/JBig2_PatternDict.h
@@ -4,10 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_PATTERN_DICT_H_
-#define _JBIG2_PATTERN_DICT_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
+
 #include "core/src/fxcodec/jbig2/JBig2_Define.h"
 #include "core/src/fxcodec/jbig2/JBig2_Image.h"
+
 class CJBig2_PatternDict {
  public:
   CJBig2_PatternDict();
@@ -17,4 +19,5 @@ class CJBig2_PatternDict {
   FX_DWORD NUMPATS;
   CJBig2_Image** HDPATS;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.h b/core/src/fxcodec/jbig2/JBig2_Segment.h
index f9e454b4a2..0f76ad2ab3 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.h
+++ b/core/src/fxcodec/jbig2/JBig2_Segment.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_SEGMENT_H_
-#define _JBIG2_SEGMENT_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
 
 #include "core/src/fxcodec/jbig2/JBig2_Define.h"
 #include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
@@ -62,4 +62,5 @@ class CJBig2_Segment {
     void* vd;
   } m_Result;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
diff --git a/core/src/fxcodec/lbmp/fx_bmp.h b/core/src/fxcodec/lbmp/fx_bmp.h
index 06bfe1e99d..610cffc0df 100644
--- a/core/src/fxcodec/lbmp/fx_bmp.h
+++ b/core/src/fxcodec/lbmp/fx_bmp.h
@@ -4,6 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
+#define CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
+
 #include <setjmp.h>
 
 #include "core/include/fxcrt/fx_basic.h"
@@ -60,6 +63,7 @@ typedef struct tagBmpInfoHeader {
   FX_DWORD biClrImportant;
 } BmpInfoHeader, *BmpInfoHeaderPtr;
 #pragma pack()
+
 typedef struct tag_bmp_decompress_struct bmp_decompress_struct;
 typedef bmp_decompress_struct* bmp_decompress_struct_p;
 typedef bmp_decompress_struct_p* bmp_decompress_struct_pp;
@@ -148,8 +152,11 @@ struct tag_bmp_compress_struct {
   uint8_t bit_type;
 #endif
 };
+
 bmp_compress_struct_p _bmp_create_compress();
 void _bmp_destroy_compress(bmp_compress_struct_p bmp_ptr);
 FX_BOOL _bmp_encode_image(bmp_compress_struct_p bmp_ptr,
                           uint8_t*& dst_buf,
                           FX_DWORD& dst_size);
+
+#endif  // CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/src/fxcodec/lgif/fx_gif.h
index 3b4ec0f0e6..2c755d6cde 100644
--- a/core/src/fxcodec/lgif/fx_gif.h
+++ b/core/src/fxcodec/lgif/fx_gif.h
@@ -4,6 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
+#define CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
+
 #include <setjmp.h>
 
 #include "core/include/fxcrt/fx_basic.h"
@@ -298,6 +301,7 @@ struct tag_gif_compress_struct {
   FX_DWORD pte_data_len;
 #endif
 };
+
 void _gif_error(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
 void _gif_warn(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
 gif_decompress_struct_p _gif_create_decompress();
@@ -330,3 +334,5 @@ FX_BOOL _gif_encode(gif_compress_struct_p gif_ptr,
     _gif_error(gif_ptr, "Out Of Memory"); \
     return 0;                             \
   }
+
+#endif  // CORE_SRC_FXCODEC_LGIF_FX_GIF_H_