8 files changed, 39 insertions, 17 deletions
diff --git a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h
index c7dcfc9bf1..1d3ed144e6 100644
--- a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h
+++ b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFAPI_CMAP_INT_H_
-#define _FPDFAPI_CMAP_INT_H_
+#ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
+#define CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
+
 struct FXCMAP_CMap {
     typedef enum { None, Single, Range, Reverse } MapType;
     const char*		m_Name;
@@ -17,4 +18,5 @@ struct FXCMAP_CMap {
     int				m_DWordCount;
     int				m_UseOffset;
 };
-#endif
+
+#endif  // CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h
index 73b28e3735..faa23f929d 100644
--- a/core/src/fpdfapi/fpdf_edit/editint.h
+++ b/core/src/fpdfapi/fpdf_edit/editint.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_EDITINT_
-#define _FPDF_EDITINT_
+#ifndef CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_
+#define CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_
+
 class CPDF_ObjectStream 
 {
 public:
@@ -56,4 +57,5 @@ protected:
     CPDF_ObjectStream	m_ObjStream;
     CFX_ByteTextBuf		m_Buffer;
 };
-#endif
+
+#endif  // CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_
diff --git a/core/src/fpdfapi/fpdf_font/common.h b/core/src/fpdfapi/fpdf_font/common.h
index 4b37a44ccc..923a394662 100644
--- a/core/src/fpdfapi/fpdf_font/common.h
+++ b/core/src/fpdfapi/fpdf_font/common.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_
+#define CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_
+
 typedef signed char TT_int8_t;
 typedef unsigned char TT_uint8_t;
 typedef signed short TT_int16_t;
@@ -14,4 +15,5 @@ typedef FX_INT32 TT_int32_t;
 typedef FX_DWORD TT_uint32_t;
 typedef FX_INT64 TT_int64_t;
 typedef FX_UINT64 TT_uint64_t;
-#endif
+
+#endif  // CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_
diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h
index 56454286df..697ccffafd 100644
--- a/core/src/fpdfapi/fpdf_font/font_int.h
+++ b/core/src/fpdfapi/fpdf_font/font_int.h
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
 typedef void* FXFT_Library;
 class CPDF_CMapManager 
@@ -170,3 +172,5 @@ public:
     CPDF_FontCharMap(CPDF_Font* pFont);
     CPDF_Font*		m_pFont;
 };
+
+#endif  // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
index d231c13ca2..adfff6756a 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
@@ -4,11 +4,13 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef TTGSUBTable_H
-#define TTGSUBTable_H
+#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#define CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+
 #include "../../../include/fxge/fx_freetype.h"
 #include "../../../include/fxcrt/fx_basic.h"
 #include "common.h"
+
 class CFX_GlyphMap
 {
 public:
@@ -420,5 +422,5 @@ public:
 private:
     ~CFX_GSUBTable() { }
 };
-#endif
 
+#endif  // CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h
index 93f34e51a2..7c527150b3 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/src/fpdfapi/fpdf_page/pageint.h
@@ -4,10 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PAGEINT_H_
-#define _PAGEINT_H_
+#ifndef CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
+#define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
+
 #define PARSE_STEP_LIMIT		100
 #define STREAM_PARSE_BUFSIZE	20480
 class CPDF_QuickFontCache;
@@ -465,4 +466,4 @@ protected:
     CFX_MapByteStringToPtr	m_NamingCache;
 };
 
-#endif  // _PAGEINT_H_
+#endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
diff --git a/core/src/fpdfapi/fpdf_parser/filters_int.h b/core/src/fpdfapi/fpdf_parser/filters_int.h
index d1dedc482c..1139371fda 100644
--- a/core/src/fpdfapi/fpdf_parser/filters_int.h
+++ b/core/src/fpdfapi/fpdf_parser/filters_int.h
@@ -4,6 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_FILTERS_INT_H_
+#define CORE_SRC_FPDFAPI_FPDF_PARSER_FILTERS_INT_H_
+
 class CPDF_DecryptFilter : public CFX_DataFilter
 {
 public:
@@ -117,3 +120,5 @@ public:
                                 CFX_BinaryBuf& dest_buf);
     FX_BOOL			ReadLine(FX_LPCBYTE src_buf, int bitsize, int& bitpos);
 };
+
+#endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_FILTERS_INT_H_
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h
index 086a1c24b2..cf2074f5bd 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/src/fpdfapi/fpdf_render/render_int.h
@@ -4,9 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_PAGEOBJ_H_
+#ifndef CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
+#define CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
+
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
-#endif
+
 class CPDF_QuickStretcher;
 #define TYPE3_MAX_BLUES		16
 class CPDF_Type3Glyphs 
@@ -465,3 +467,5 @@ struct _CPDF_UniqueKeyGen {
     FX_CHAR		m_Key[128];
     int			m_KeyLen;
 };
+
+#endif  // CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_