9 files changed, 55 insertions, 61 deletions
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index 9b3a5bf7dc..6317cd0b18 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -4,11 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_MODULE_
-#define _FPDF_MODULE_
-#ifndef _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
+
 #include "../fxcrt/fx_ext.h"
-#endif
+
 class CPDF_ModuleMgr;
 class CPDF_PageModuleDef;
 class CPDF_RenderModuleDef;
@@ -193,4 +193,5 @@ public:
         return NULL;
     }
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index b3980a4f0f..69f344cf9c 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -4,11 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_OBJECTS_
-#define _FPDF_OBJECTS_
-#ifndef _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
+
 #include "../fxcrt/fx_ext.h"
-#endif
+
 class CPDF_Document;
 class CPDF_IndirectObjects;
 class CPDF_Null;
@@ -742,4 +742,5 @@ protected:
 
     FX_DWORD				m_LastObjNum;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 0bac0595c2..d549b7713a 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -4,17 +4,13 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_PAGE_
-#define _FPDF_PAGE_
-#ifndef _FPDF_PARSER_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
+
+#include "../fxge/fx_dib.h"
 #include "fpdf_parser.h"
-#endif
-#ifndef _FPDF_RESOURCE_
 #include "fpdf_resource.h"
-#endif
-#ifndef _FX_DIB_H_
-#include "../fxge/fx_dib.h"
-#endif
+
 class CPDF_PageObjects;
 class CPDF_Page;
 class CPDF_Form;
@@ -246,4 +242,5 @@ private:
     CPDF_Document*  m_pDocument;
     CFX_PtrArray    m_pageObjects;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h
index e78c9bb8b2..1b53bdc859 100644
--- a/core/include/fpdfapi/fpdf_pageobj.h
+++ b/core/include/fpdfapi/fpdf_pageobj.h
@@ -4,14 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_PAGEOBJ_H_
-#define _FPDF_PAGEOBJ_H_
-#ifndef _FPDF_RESOURCE_
-#include "fpdf_resource.h"
-#endif
-#ifndef _FX_GE_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
+
 #include "../fxge/fx_ge.h"
-#endif
+#include "fpdf_resource.h"
+
 class CPDF_Path;
 class CPDF_ClipPathData;
 class CPDF_ClipPath;
@@ -717,4 +715,5 @@ protected:
     virtual void		Transform(const CFX_AffineMatrix& matrix) {}
     virtual void		CopyData(const CPDF_PageObject* pSrcObjet) {}
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 20766702e2..0dc9ca64a3 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -4,14 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_PARSER_
-#define _FPDF_PARSER_
-#ifndef _FX_BASIC_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
+
 #include "../fxcrt/fx_ext.h"
-#endif
-#ifndef _FPDF_OBJECTS_
 #include "fpdf_objects.h"
-#endif
+
 class CPDF_Document;
 class IPDF_DocParser;
 class CPDF_Parser;
@@ -947,4 +945,5 @@ enum PDF_DATAAVAIL_STATUS {
     PDF_DATAAVAIL_LOADALLFILE,
     PDF_DATAAVAIL_TRAILER_APPEND
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 2028550546..714fffba5c 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -4,14 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_RENDER_
-#define _FPDF_RENDER_
-#ifndef _FPDF_PAGE_
-#include "fpdf_page.h"
-#endif
-#ifndef _FX_GE_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
+
 #include "../fxge/fx_ge.h"
-#endif
+#include "fpdf_page.h"
+
 class CPDF_RenderContext;
 class CPDF_RenderOptions;
 class CPDF_ImageCache;
@@ -315,4 +313,5 @@ public:
     int					m_HalftoneLimit;
     int					m_RenderStepLimit;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 4a85096900..f1ea6b5a23 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -4,14 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_RESOURCE_
-#define _FPDF_RESOURCE_
-#ifndef _FPDF_PARSER_
-#include "fpdf_parser.h"
-#endif
-#ifndef _FX_FONT_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
+
 #include "../fxge/fx_font.h"
-#endif
+#include "fpdf_parser.h"
+
 class CPDF_Font;
 class CPDF_Type1Font;
 class CPDF_TrueTypeFont;
@@ -946,4 +944,5 @@ private:
     CPDF_Dictionary*		m_pOC;
     CPDF_Dictionary*	InitJPEG(FX_LPBYTE pData, FX_DWORD size);
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h
index 50e5fbc346..fc55fa08a9 100644
--- a/core/include/fpdfapi/fpdf_serial.h
+++ b/core/include/fpdfapi/fpdf_serial.h
@@ -4,14 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_SERIAL_
-#define _FPDF_SERIAL_
-#ifndef _FPDF_PAGE_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_SERIAL_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_SERIAL_H_
+
 #include "fpdf_page.h"
-#endif
-#ifndef _FPDF_PAGEOBJ_H_
 #include "fpdf_pageobj.h"
-#endif
+
 class CPDF_ObjectStream;
 class CPDF_XRefStream;
 CFX_ByteTextBuf& operator << (CFX_ByteTextBuf& buf, const CPDF_Object* pObj);
@@ -202,4 +200,5 @@ protected:
     friend class CPDF_ObjectStream;
     friend class CPDF_XRefStream;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFAPI_FPDF_SERIAL_H_
diff --git a/core/include/fpdfapi/fpdfapi.h b/core/include/fpdfapi/fpdfapi.h
index a2f715d71b..e432823c7a 100644
--- a/core/include/fpdfapi/fpdfapi.h
+++ b/core/include/fpdfapi/fpdfapi.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFAPI_H_
-#define FPDFAPI_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
+#define CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
 
 #include "../fxcrt/fx_basic.h"
 #include "../fxge/fx_ge.h"
@@ -14,4 +14,4 @@
 #include "fpdf_render.h"
 #include "fpdf_serial.h"
 
-#endif  // FPDFAPI_H_
+#endif  // CORE_INCLUDE_FPDFAPI_FPDFAPI_H_