Fix ALL the include guards.

Get rid of leading _CAPITAL identifiers. A large number of these didn't actually match the filename. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1160443004
author: Tom Sepez <tsepez@chromium.org> 2015-05-28 13:09:35 -0700
committer: Tom Sepez <tsepez@chromium.org> 2015-05-28 13:09:35 -0700
commit: 6b776fed401f97ce2589a847465280de704b9d7f (patch)
tree: 39f484bd9b3282cbd7e5dbd48c784534e29b59c3
parent: 14f57a153dcbc4c5fedeffe12a3b4f915cc5d558 (diff)
download: pdfium-6b776fed401f97ce2589a847465280de704b9d7f.tar.xz
157 files changed, 667 insertions, 618 deletions
diff --git a/core/include/fdrm/fx_crypt.h b/core/include/fdrm/fx_crypt.h
index adbdf8fa23..7bd69defdf 100644
--- a/core/include/fdrm/fx_crypt.h
+++ b/core/include/fdrm/fx_crypt.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FX_CRYPT_H_
-#define FX_CRYPT_H_
+#ifndef CORE_INCLUDE_FDRM_FX_CRYPT_H_
+#define CORE_INCLUDE_FDRM_FX_CRYPT_H_
 
 #include "../fxcrt/fx_basic.h"
 
@@ -46,4 +46,4 @@ void CRYPT_SetPubKeyDecryptor(FX_BOOL (*func)(FX_LPCBYTE pData, FX_DWORD size, F
 };
 #endif
 
-#endif  // FX_CRYPT_H_
+#endif  // CORE_INCLUDE_FDRM_FX_CRYPT_H_
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_
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index 02bbf249c4..39daf028ac 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -4,12 +4,13 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_AP_H_
-#define _FPDF_AP_H_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
 
 #include "../fxcrt/fx_basic.h"
 #include "../fpdfapi/fpdf_parser.h"
 #include "fpdf_vt.h"
+
 class IPVT_FontMap
 {
 public:
@@ -92,4 +93,4 @@ public:
     static CFX_ByteString					GenerateColorAP(const CPVT_Color & color, const FX_BOOL & bFillOrStroke);
 };
 
-#endif  // _FPDF_AP_H_
+#endif  // CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 31480f90bc..715b79ef42 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -4,14 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_DOC_H_
-#define _FPDF_DOC_H_
-#ifndef _FPDF_PARSER_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
+
 #include "../fpdfapi/fpdf_parser.h"
-#endif
-#ifndef _FPDF_RENDER_
 #include "../fpdfapi/fpdf_render.h"
-#endif
+
 class CPDF_Action;
 class CPDF_Annot;
 class CPDF_AnnotList;
@@ -1751,4 +1749,5 @@ protected:
     CPDF_Stream*			GetIcon(FX_BSTR csEntry);
     friend class			CPDF_FormControl;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h
index a5862e0a8f..2c40ac176d 100644
--- a/core/include/fpdfdoc/fpdf_tagged.h
+++ b/core/include/fpdfdoc/fpdf_tagged.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_TAGGED_H_
-#define _FPDF_TAGGED_H_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
+
 class CPDF_StructTree;
 class CPDF_StructElement;
 struct CPDF_StructKid;
@@ -97,4 +98,5 @@ public:
     virtual int					GetInteger(FX_BSTR owner, FX_BSTR name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index 18ea709bcf..87ef02576b 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_VT_H_
-#define _FPDF_VT_H_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
 
 #include "../fpdfapi/fpdf_parser.h"
 #include "../fxcrt/fx_basic.h"
@@ -448,4 +448,5 @@ public:
 protected:
     ~IPDF_VariableText() { }
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index 8673c1aac1..936e0f1722 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -4,17 +4,13 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_TEXT_H_
-#define _FPDF_TEXT_H_
-#ifndef _FPDF_PARSER_
-#include "../fpdfapi/fpdf_parser.h"
-#endif
-#ifndef _FPDF_PAGEOBJ_H_
-#include "../fpdfapi/fpdf_pageobj.h"
-#endif
-#ifndef _FPDF_PAGE_
+#ifndef CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
+#define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
+
 #include "../fpdfapi/fpdf_page.h"
-#endif
+#include "../fpdfapi/fpdf_pageobj.h"
+#include "../fpdfapi/fpdf_parser.h"
+
 class CPDF_PageObjects;
 #define PDF2TXT_AUTO_ROTATE		1
 #define PDF2TXT_AUTO_WIDTH		2
@@ -170,4 +166,5 @@ public:
 
     virtual void				GetRects(int index, CFX_RectArray& rects) const = 0;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index afa0627648..2d902c898b 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -4,13 +4,13 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_CODEC_H_
-#define _FX_CODEC_H_
-#ifndef _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_H_
+#define CORE_INCLUDE_FXCODEC_FX_CODEC_H_
+
 #include "../fxcrt/fx_ext.h"
-#endif
 #include "fx_codec_def.h"
 #include "fx_codec_provider.h"
+
 class CFX_DIBSource;
 class ICodec_ScanlineDecoder;
 class ICodec_BasicModule;
@@ -286,4 +286,5 @@ public:
 void AdobeCMYK_to_sRGB(FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B);
 void AdobeCMYK_to_sRGB1(FX_BYTE c, FX_BYTE m, FX_BYTE y, FX_BYTE k, FX_BYTE& R, FX_BYTE& G, FX_BYTE& B);
 FX_BOOL MD5ComputeID(FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16]);
-#endif
+
+#endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_H_
diff --git a/core/include/fxcodec/fx_codec_def.h b/core/include/fxcodec/fx_codec_def.h
index 497d4d8fa6..86c059b2e9 100644
--- a/core/include/fxcodec/fx_codec_def.h
+++ b/core/include/fxcodec/fx_codec_def.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_CODEC_DEF_H_
-#define _FX_CODEC_DEF_H_
+#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
+#define CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
+
 enum FXCODEC_STATUS {
     FXCODEC_STATUS_ERROR = -1,
     FXCODEC_STATUS_FRAME_READY,
@@ -67,4 +68,5 @@ enum FXCODEC_STATUS {
 #define EXIFTAG_STRING_IAMGEDESCRIPTION		270
 #define EXIFTAG_STRING_DATETIME				306
 #define EXIFTAG_STRING_COPYRIGHT			33432
-#endif
+
+#endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
diff --git a/core/include/fxcodec/fx_codec_provider.h b/core/include/fxcodec/fx_codec_provider.h
index 53733e7b1d..6d15473ef7 100644
--- a/core/include/fxcodec/fx_codec_provider.h
+++ b/core/include/fxcodec/fx_codec_provider.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_CODEC_PROVIDER_H_
-#define _FX_CODEC_PROVIDER_H_
+#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
+#define CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
+
 class IFX_JpegProvider
 {
 public:
@@ -52,4 +53,5 @@ public:
 protected:
     ~IFX_JpegProvider() { }
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
diff --git a/core/include/fxcrt/fx_arb.h b/core/include/fxcrt/fx_arb.h
index f173ee7f1f..ff86fa6cf7 100644
--- a/core/include/fxcrt/fx_arb.h
+++ b/core/include/fxcrt/fx_arb.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_ARABIC_
-#define _FX_ARABIC_
+#ifndef CORE_INCLUDE_FXCRT_FX_ARB_H_
+#define CORE_INCLUDE_FXCRT_FX_ARB_H_
 
 #include "fx_system.h"
 
@@ -23,4 +23,5 @@ public:
 protected:
     ~IFX_BidiChar() { }
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXCRT_FX_ARB_H_
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index f258029a11..0a5d4907b1 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_BASIC_H_
-#define _FX_BASIC_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
+#define CORE_INCLUDE_FXCRT_FX_BASIC_H_
 
 #include "fx_memory.h"
 #include "fx_stream.h"
@@ -1610,4 +1610,4 @@ public:
     FX_FLOAT i;
 };
 
-#endif
+#endif  // CORE_INCLUDE_FXCRT_FX_BASIC_H_
diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h
index 758d33762e..076c0e6a2f 100644
--- a/core/include/fxcrt/fx_coordinates.h
+++ b/core/include/fxcrt/fx_coordinates.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXCRT_COORDINATES_
-#define _FXCRT_COORDINATES_
+#ifndef CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
+#define CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
 
 #include "fx_basic.h"
 
@@ -903,4 +903,5 @@ public:
     FX_FLOAT f;
 };
 #define CFX_AffineMatrix	CFX_Matrix
-#endif
+
+#endif  // CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index 3db772a08e..3d0cdedf9e 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXCRT_EXTENSION_
-#define _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_
+#define CORE_INCLUDE_FXCRT_FX_EXT_H_
 
 #include "fx_arb.h"
 #include "fx_basic.h"
@@ -90,4 +90,5 @@ public:
         }
     }
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXCRT_FX_EXT_H_
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h
index a75ff25818..c6a7d486f1 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/include/fxcrt/fx_memory.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_MEMORY_H_
-#define _FX_MEMORY_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_MEMORY_H_
+#define CORE_INCLUDE_FXCRT_FX_MEMORY_H_
 
 #include "fx_system.h"
 
@@ -115,5 +115,6 @@ private:
 
     void*	m_pFirstTrunk;
 };
-#endif  // __cplusplust
-#endif  // _FX_MEMORY_H_
+#endif  // __cplusplus
+
+#endif  // CORE_INCLUDE_FXCRT_FX_MEMORY_H_
diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h
index 73bb8a72fe..7f36342160 100644
--- a/core/include/fxcrt/fx_stream.h
+++ b/core/include/fxcrt/fx_stream.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_STREAM_H_
-#define _FX_STREAM_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_STREAM_H_
+#define CORE_INCLUDE_FXCRT_FX_STREAM_H_
 
 #include "fx_memory.h"
 #include "fx_string.h"
@@ -200,4 +200,5 @@ public:
 
     virtual FX_FILESIZE		GetBlockOffset() = 0;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXCRT_FX_STREAM_H_
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index 3614cbe0ee..efbe80accb 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_STRING_H_
-#define _FX_STRING_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_STRING_H_
+#define CORE_INCLUDE_FXCRT_FX_STRING_H_
 
 #include <stdint.h>  // For intptr_t.
 #include <algorithm>
@@ -902,4 +902,5 @@ inline CFX_ByteString	FX_UTF8Encode(const CFX_WideString &wsStr)
 {
     return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength());
 }
-#endif
+
+#endif  // CORE_INCLUDE_FXCRT_FX_STRING_H_
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index 96030ca551..76c6b59a52 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SYSTEM_H_
-#define _FX_SYSTEM_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
+#define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
 
 #define _FX_WIN32_DESKTOP_		1
 #define _FX_LINUX_DESKTOP_		4
@@ -359,4 +359,4 @@ int			FXSYS_round(FX_FLOAT f);
 #define NEVER_INLINE __attribute__((__noinline__))
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
-#endif  // _FX_SYSTEM_H_
+#endif  // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h
index abf953d68a..e764d9fd97 100644
--- a/core/include/fxcrt/fx_ucd.h
+++ b/core/include/fxcrt/fx_ucd.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_UNICODE_
-#define _FX_UNICODE_
+#ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_
+#define CORE_INCLUDE_FXCRT_FX_UCD_H_
 
 #include "fx_system.h"
 
@@ -98,4 +98,5 @@ FX_BOOL FX_IsCombinationChar(FX_WCHAR wch);
 FX_BOOL	FX_IsBidiChar(FX_WCHAR wch);
 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical);
 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, FX_BOOL bRTL, FX_BOOL bVertical);
-#endif
+
+#endif  // CORE_INCLUDE_FXCRT_FX_UCD_H_
diff --git a/core/include/fxcrt/fx_xml.h b/core/include/fxcrt/fx_xml.h
index 7f3dbcc205..b2fb24c6df 100644
--- a/core/include/fxcrt/fx_xml.h
+++ b/core/include/fxcrt/fx_xml.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_XML_H_
-#define _FX_XML_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_XML_H_
+#define CORE_INCLUDE_FXCRT_FX_XML_H_
 
 #include "fx_basic.h"
 
@@ -176,4 +176,5 @@ protected:
     friend class CXML_Parser;
     friend class CXML_Composer;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXCRT_FX_XML_H_
diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h
index 9fb38f8043..440c329439 100644
--- a/core/include/fxge/fpf.h
+++ b/core/include/fxge/fpf.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_PALTFORM_DEVICE_H_
-#define _FX_PALTFORM_DEVICE_H_
+#ifndef CORE_INCLUDE_FXGE_FPF_H_
+#define CORE_INCLUDE_FXGE_FPF_H_
+
 class IFPF_DeviceModule;
 class IFPF_FontMgr;
 class IFPF_Font;
@@ -59,4 +60,5 @@ public:
 
     virtual IFPF_Font*		CreateFont(FX_BSTR bsFamilyname, FX_BYTE charset, FX_DWORD dwStyle, FX_DWORD dwMatch = 0) = 0;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXGE_FPF_H_
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h
index d6e99b7f73..74738d0d0f 100644
--- a/core/include/fxge/fx_dib.h
+++ b/core/include/fxge/fx_dib.h
@@ -4,11 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_DIB_H_
-#define _FPDF_DIB_H_
-#ifndef _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FXGE_FX_DIB_H_
+#define CORE_INCLUDE_FXGE_FX_DIB_H_
+
 #include "../fxcrt/fx_ext.h"
-#endif
+
 enum FXDIB_Format {
     FXDIB_Invalid = 0,
     FXDIB_1bppMask = 0x101,
@@ -602,4 +602,5 @@ protected:
     FX_BOOL				m_bRgbByteOrder;
     int					m_BlendType;
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXGE_FX_DIB_H_
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 7ae3c6d39d..aa985820c8 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FX_FONT_H_
-#define FX_FONT_H_
+#ifndef CORE_INCLUDE_FXGE_FX_FONT_H_
+#define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include "../fxcrt/fx_ext.h"
 #include "fx_dib.h"
@@ -432,4 +432,4 @@ protected:
 };
 IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
 
-#endif  // FX_FONT_H_
+#endif  // CORE_INCLUDE_FXGE_FX_FONT_H_
diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h
index 4b49d5f6ea..6975ead298 100644
--- a/core/include/fxge/fx_freetype.h
+++ b/core/include/fxge/fx_freetype.h
@@ -4,6 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_INCLUDE_FXGE_FX_FREETYPE_H_
+#define CORE_INCLUDE_FXGE_FX_FREETYPE_H_
+
 #include <ft2build.h>
 #include <freetype.h>
 #include <ftglyph.h>
@@ -141,3 +144,5 @@ void FXFT_adobe_name_from_unicode(char* name, wchar_t unicode);
 #ifdef __cplusplus
 };
 #endif
+
+#endif  // CORE_INCLUDE_FXGE_FX_FREETYPE_H_
diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h
index 147e24ce1f..60374eff45 100644
--- a/core/include/fxge/fx_ge.h
+++ b/core/include/fxge/fx_ge.h
@@ -4,14 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_GE_H_
-#define _FX_GE_H_
-#ifndef _FX_DIB_H_
+#ifndef CORE_INCLUDE_FXGE_FX_GE_H_
+#define CORE_INCLUDE_FXGE_FX_GE_H_
+
 #include "fx_dib.h"
-#endif
-#ifndef _FX_FONT_H_
 #include "fx_font.h"
-#endif
+
 class CFX_ClipRgn;
 class CFX_PathData;
 class CFX_GraphStateData;
@@ -23,6 +21,7 @@ class CFX_RenderDevice;
 class IFX_RenderDeviceDriver;
 class CCodec_ModuleMgr;
 class IFXG_PaintModuleMgr;
+
 class CFX_GEModule 
 {
 public:
@@ -729,4 +728,5 @@ private:
 
     void			WritePSBinary(FX_LPCBYTE data, int len);
 };
-#endif
+
+#endif  // CORE_INCLUDE_FXGE_FX_GE_H_
diff --git a/core/include/fxge/fx_ge_apple.h b/core/include/fxge/fx_ge_apple.h
index 44bf2a028a..90cd03455b 100644
--- a/core/include/fxge/fx_ge_apple.h
+++ b/core/include/fxge/fx_ge_apple.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_GE_APPLE_H_
-#define _FX_GE_APPLE_H_
+#ifndef CORE_INCLUDE_FXGE_FX_GE_APPLE_H_
+#define CORE_INCLUDE_FXGE_FX_GE_APPLE_H_
+
 #if _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_
 class CFX_QuartzDevice : public CFX_RenderDevice
 {
@@ -23,4 +24,5 @@ protected:
     FX_BOOL m_bOwnedBitmap;
 };
 #endif
-#endif
+
+#endif  // CORE_INCLUDE_FXGE_FX_GE_APPLE_H_
diff --git a/core/include/fxge/fx_ge_win32.h b/core/include/fxge/fx_ge_win32.h
index d39a8071e3..c9cb2a35a9 100644
--- a/core/include/fxge/fx_ge_win32.h
+++ b/core/include/fxge/fx_ge_win32.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_GE_WIN32_H_
-#define _FX_GE_WIN32_H_
+#ifndef CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
+#define CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
+
 #ifdef _WIN32
 #ifndef _WINDOWS_
 #include <windows.h>
@@ -102,4 +103,5 @@ protected:
     HDC		m_hDC;
 };
 #endif
-#endif
+
+#endif  // CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
diff --git a/core/include/reflow/fpdf_layout.h b/core/include/reflow/fpdf_layout.h
index fc01ba30c8..ebd879c764 100644
--- a/core/include/reflow/fpdf_layout.h
+++ b/core/include/reflow/fpdf_layout.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFAPI_LAYOUT_H_
-#define _FPDFAPI_LAYOUT_H_
+#ifndef CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_
+#define CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_
+
 class IPDF_LayoutElement;
 class IPDF_LayoutProcessor;
 class IPDF_LayoutProvider;
@@ -277,4 +278,4 @@ public:
 
     virtual IPDF_LayoutElement* GetRoot() = 0;
 };
-#endif
+#endif  // CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_
diff --git a/core/include/reflow/reflowengine.h b/core/include/reflow/reflowengine.h
index e6a5265db3..af3c943e97 100644
--- a/core/include/reflow/reflowengine.h
+++ b/core/include/reflow/reflowengine.h
@@ -4,13 +4,15 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _REFLOW_ENGINE_H
-#define _REFLOW_ENGINE_H
+#ifndef CORE_INCLUDE_REFLOW_REFLOWENGINE_H_
+#define CORE_INCLUDE_REFLOW_REFLOWENGINE_H_
+
+#include "../fpdfapi/fpdf_pageobj.h"
 #include "../fpdfapi/fpdf_render.h"
+#include "../fpdfdoc/fpdf_tagged.h"
 #include "../fpdftext/fpdf_text.h"
 #include "fpdf_layout.h"
-#include "../fpdfapi/fpdf_pageobj.h"
-#include "../fpdfdoc/fpdf_tagged.h"
+
 class IPDF_ReflowedPage
 {
 public:
@@ -73,4 +75,5 @@ public:
 IPDF_ReflowedPage* Create_ReflowPage();
 IPDF_ProgressiveReflowPageParser* Create_ReflowPageParser();
 IPDF_ProgressiveReflowPageRender* Create_ReflowPageRender();
-#endif
+
+#endif  // CORE_INCLUDE_REFLOW_REFLOWENGINE_H_
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 df98312824..8b3c5171c8 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_
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index 19c75479ea..4062bf979d 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PDF_VT_H_
-#define _PDF_VT_H_
+#ifndef CORE_SRC_FPDFDOC_PDF_VT_H_
+#define CORE_SRC_FPDFDOC_PDF_VT_H_
 
 class CPVT_Size;
 class CPVT_FloatRect;
@@ -635,4 +635,4 @@ private:
     CPDF_VariableText *						m_pVT;
 };
 
-#endif  // _PDF_VT_H_
+#endif  // CORE_SRC_FPDFDOC_PDF_VT_H_
diff --git a/core/src/fpdfdoc/tagged_int.h b/core/src/fpdfdoc/tagged_int.h
index 7efd682887..75004e51fa 100644
--- a/core/src/fpdfdoc/tagged_int.h
+++ b/core/src/fpdfdoc/tagged_int.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDF_TAGGED_INT_H_
-#define _FPDF_TAGGED_INT_H_
+#ifndef CORE_SRC_FPDFDOC_TAGGED_INT_H_
+#define CORE_SRC_FPDFDOC_TAGGED_INT_H_
 
 #include "../../include/fpdfdoc/fpdf_tagged.h"
 
@@ -91,4 +91,5 @@ protected:
 
     friend class CPDF_StructTreeImpl;
 };
-#endif
+
+#endif  // CORE_SRC_FPDFDOC_TAGGED_INT_H_
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index 0dc17a85c8..01d10236fc 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PDF_TEXT_INT_H_
-#define _PDF_TEXT_INT_H_
+#ifndef CORE_SRC_FPDFTEXT_TEXT_INT_H_
+#define CORE_SRC_FPDFTEXT_TEXT_INT_H_
+
 class CPDF_TextParseOptions 
 {
 public:
@@ -217,4 +218,5 @@ private:
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_LPWSTR pDst);
 void NormalizeString(CFX_WideString& str);
 void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest);
-#endif
+
+#endif  // CORE_SRC_FPDFTEXT_TEXT_INT_H_
diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h
index abbe105305..e1e6bf7099 100644
--- a/core/src/fpdftext/txtproc.h
+++ b/core/src/fpdftext/txtproc.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PDF_TXTPROC_H_
-#define _PDF_TXTPROC_H_
+#ifndef CORE_SRC_FPDFTEXT_TXTPROC_H_
+#define CORE_SRC_FPDFTEXT_TXTPROC_H_
+
 class CTextColumn 
 {
 public:
@@ -67,4 +68,5 @@ private:
     CTextColumn*	FindColumn(FX_FLOAT xpos);
     void	BreakSpace(CPDF_TextObject* pTextObj);
 };
-#endif
+
+#endif  // CORE_SRC_FPDFTEXT_TXTPROC_H_
diff --git a/core/src/fx_jpeglib.h b/core/src/fx_jpeglib.h
index 028a5ee8b9..b098008e6c 100644
--- a/core/src/fx_jpeglib.h
+++ b/core/src/fx_jpeglib.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SRC_JPEGLIB_H_
-#define _FX_SRC_JPEGLIB_H_
-#include "./fxcodec/libjpeg/jpeglib.h"
-#endif
+#ifndef CORE_SRC_FX_JPEGLIB_H_
+#define CORE_SRC_FX_JPEGLIB_H_
+
+#include "fxcodec/libjpeg/jpeglib.h"
+
+#endif  // CORE_SRC_FX_JPEGLIB_H_
diff --git a/core/src/fx_zlib.h b/core/src/fx_zlib.h
index cc5560bf05..8ce27748a2 100644
--- a/core/src/fx_zlib.h
+++ b/core/src/fx_zlib.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SRC_ZLIB_H_
-#define _FX_SRC_ZLIB_H_
-#include "./fxcodec/fx_zlib/zlib_v128/zlib.h"
-#endif
+#ifndef CORE_SRC_FX_ZLIB_H_
+#define CORE_SRC_FX_ZLIB_H_
+
+#include "fxcodec/fx_zlib/zlib_v128/zlib.h"
+
+#endif  // CORE_SRC_FX_ZLIB_H_
diff --git a/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h b/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h
index da480f22a0..5725a57e75 100644
--- a/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h
+++ b/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h
@@ -4,10 +4,13 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_OPENJPEG_H_
-#define _FX_OPENJPEG_H_
+#ifndef CORE_SRC_FXCODEC_FX_LIBOPENJPEG_INCLUDE_FX_OPENJPEG_H_
+#define CORE_SRC_FXCODEC_FX_LIBOPENJPEG_INCLUDE_FX_OPENJPEG_H_
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_WARNINGS
 #endif
+
 #include "../libopenjpeg20/openjpeg.h"
-#endif
+
+#endif  // CORE_SRC_FXCODEC_FX_LIBOPENJPEG_INCLUDE_FX_OPENJPEG_H_
diff --git a/core/src/fxcodec/fx_zlib/include/fx_zlib.h b/core/src/fxcodec/fx_zlib/include/fx_zlib.h
index 955481ce7b..54a674db44 100644
--- a/core/src/fxcodec/fx_zlib/include/fx_zlib.h
+++ b/core/src/fxcodec/fx_zlib/include/fx_zlib.h
@@ -4,7 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_
+#define CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 #include "../zlib_v128/zlib.h"
+
+#endif  // CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_
diff --git a/core/src/fxcodec/lcms2/include/fx_lcms2.h b/core/src/fxcodec/lcms2/include/fx_lcms2.h
index e6413188d8..ca1ed2a2b2 100644
--- a/core/src/fxcodec/lcms2/include/fx_lcms2.h
+++ b/core/src/fxcodec/lcms2/include/fx_lcms2.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_LCMS2_H_
-#define _FX_LCMS2_H_
+#ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
+#define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
+
 #include "../lcms2-2.6/include/lcms2.h"
-#endif
+
+#endif  // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
diff --git a/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h b/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h
index 4ab5775718..92fd8a6362 100644
--- a/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h
+++ b/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_LCMS2_H_
-#define _FX_LCMS2_H_
+#ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
+#define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
+
 #include "../lcms2-2.6/include/lcms2_plugin.h"
-#endif
+
+#endif  // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h
index c459bdcf99..e678cbbe2b 100644
--- a/core/src/fxcrt/extension.h
+++ b/core/src/fxcrt/extension.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXCRT_EXTENSION_IMP_
-#define _FXCRT_EXTENSION_IMP_
+#ifndef CORE_SRC_FXCRT_EXTENSION_H_
+#define CORE_SRC_FXCRT_EXTENSION_H_
 
 #include "fx_safe_types.h"
 
@@ -436,4 +436,5 @@ FX_BOOL FX_GenerateCryptoRandom(FX_LPDWORD pBuffer, FX_INT32 iCount);
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif  // CORE_SRC_FXCRT_EXTENSION_H_
diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h
index b3e906a70f..dda26e6d1f 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/src/fxcrt/fx_arabic.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_ARABIC_IMP
-#define _FX_ARABIC_IMP
+#ifndef CORE_SRC_FXCRT_FX_ARABIC_H_
+#define CORE_SRC_FXCRT_FX_ARABIC_H_
+
 class CFX_BidiChar FX_FINAL : public IFX_BidiChar
 {
 public:
@@ -33,4 +34,5 @@ private:
     FX_INT32	m_iLastStart;
     FX_INT32	m_iLastCount;
 };
-#endif
+
+#endif  // CORE_SRC_FXCRT_FX_ARABIC_H_
diff --git a/core/src/fxcrt/fx_safe_types.h b/core/src/fxcrt/fx_safe_types.h
index 5772fd0e3c..35a906cf27 100644
--- a/core/src/fxcrt/fx_safe_types.h
+++ b/core/src/fxcrt/fx_safe_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FX_SAFE_TYPES_H_
-#define FX_SAFE_TYPES_H_
+#ifndef CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
+#define CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
 
 #include <stdlib.h>  // For size_t.
 
@@ -14,4 +14,4 @@ typedef pdfium::base::CheckedNumeric<FX_INT32> FX_SAFE_INT32;
 typedef pdfium::base::CheckedNumeric<size_t> FX_SAFE_SIZE_T;
 typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE;
 
-#endif  // FX_SAFE_TYPES_H_
+#endif  // CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/src/fxcrt/fxcrt_platforms.h
index dbfa58be1a..be51724352 100644
--- a/core/src/fxcrt/fxcrt_platforms.h
+++ b/core/src/fxcrt/fxcrt_platforms.h
@@ -4,9 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXCRT_PLATFORMS_
-#define _FXCRT_PLATFORMS_
+#ifndef CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
+#define CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
+
 #include "extension.h"
+
 #if _FX_OS_ == _FX_ANDROID_
 void	FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString &bsMode);
 void	FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_WideString &wsMode);
@@ -32,4 +34,5 @@ protected:
     FXSYS_FILE*	m_hFile;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/src/fxcrt/fxcrt_posix.h
index 89162cd037..8c716cd6d6 100644
--- a/core/src/fxcrt/fxcrt_posix.h
+++ b/core/src/fxcrt/fxcrt_posix.h
@@ -4,9 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXCRT_LINUX_
-#define _FXCRT_LINUX_
+#ifndef CORE_SRC_FXCRT_FXCRT_POSIX_H_
+#define CORE_SRC_FXCRT_FXCRT_POSIX_H_
+
 #include "extension.h"
+
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
 class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess
 {
@@ -30,4 +32,5 @@ protected:
     FX_INT32	m_nFD;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXCRT_FXCRT_POSIX_H_
diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/src/fxcrt/fxcrt_windows.h
index 92646b2757..1919f3e4d7 100644
--- a/core/src/fxcrt/fxcrt_windows.h
+++ b/core/src/fxcrt/fxcrt_windows.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXCRT_WINDOWS_
-#define _FXCRT_WINDOWS_
+#ifndef CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
+#define CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
+
 #include "extension.h"
+
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess
 {
@@ -30,4 +32,5 @@ protected:
     FX_LPVOID	m_hFile;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
diff --git a/core/src/fxcrt/plex.h b/core/src/fxcrt/plex.h
index f8f01948e5..a4ac4f7c48 100644
--- a/core/src/fxcrt/plex.h
+++ b/core/src/fxcrt/plex.h
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#ifndef CORE_SRC_FXCRT_PLEX_H_
+#define CORE_SRC_FXCRT_PLEX_H_
 
 struct CFX_Plex {
     CFX_Plex* pNext;
@@ -13,3 +15,5 @@ struct CFX_Plex {
     static CFX_Plex* Create(CFX_Plex*& head, FX_DWORD nMax, FX_DWORD cbElement);
     void FreeDataChain();
 };
+
+#endif  // CORE_SRC_FXCRT_PLEX_H_
diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h
index f0a2485163..7cfeec95f7 100644
--- a/core/src/fxcrt/xml_int.h
+++ b/core/src/fxcrt/xml_int.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXCRT_XML_INT_
-#define _FXCRT_XML_INT_
+#ifndef CORE_SRC_FXCRT_XML_INT_H_
+#define CORE_SRC_FXCRT_XML_INT_H_
+
 class CXML_DataBufAcc : public IFX_BufferRead
 {
 public:
@@ -158,4 +159,5 @@ public:
     void			InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement);
 };
 void FX_XML_SplitQualifiedName(FX_BSTR bsFullName, CFX_ByteStringC &bsSpace, CFX_ByteStringC &bsName);
-#endif
+
+#endif  // CORE_SRC_FXCRT_XML_INT_H_
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h
index c87fc246be..f4b9368eff 100644
--- a/core/src/fxge/agg/include/fx_agg_driver.h
+++ b/core/src/fxge/agg/include/fx_agg_driver.h
@@ -4,10 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_AGG_DEVICE_DRIVER_
-#define _FX_AGG_DEVICE_DRIVER_
+#ifndef FX_AGG_DRIVER_H_
+#define FX_AGG_DRIVER_H_
+
 #include "fxfx_agg_path_storage.h"
 #include "fxfx_agg_rasterizer_scanline_aa.h"
+
 class CAgg_PathData 
 {
 public:
@@ -118,4 +120,5 @@ public:
     CFX_DIBitmap*       m_pOriDevice;
     FX_BOOL             m_bGroupKnockout;
 };
-#endif
+
+#endif  // FX_AGG_DRIVER_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_basics.h b/core/src/fxge/agg/include/fxfx_agg_basics.h
index 57fbd2ebb9..e27a843bba 100644
--- a/core/src/fxge/agg/include/fxfx_agg_basics.h
+++ b/core/src/fxge/agg/include/fxfx_agg_basics.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_BASICS_H_
-#define _FXFX_AGG_BASICS_H_
+#ifndef FXFX_AGG_BASICS_H_
+#define FXFX_AGG_BASICS_H_
+
 #include "../agg23/agg_basics.h"
-#endif
+
+#endif  // FXFX_AGG_BASICS_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h b/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h
index 948b619355..2b64bf900a 100644
--- a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h
+++ b/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_CLIP_LIANG_BARSKY_H_
-#define _FXFX_AGG_CLIP_LIANG_BARSKY_H_
+#ifndef FXFX_AGG_CLIP_LIANG_BARSKY_H_
+#define FXFX_AGG_CLIP_LIANG_BARSKY_H_
+
 #include "../agg23/agg_clip_liang_barsky.h"
-#endif
+
+#endif  // FXFX_AGG_CLIP_LIANG_BARSKY_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h b/core/src/fxge/agg/include/fxfx_agg_conv_dash.h
index 5f80a06e19..fb1e42dae9 100644
--- a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h
+++ b/core/src/fxge/agg/include/fxfx_agg_conv_dash.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_CONV_DASH_H_
-#define _FXFX_AGG_CONV_DASH_H_
+#ifndef FXFX_AGG_CONV_DASH_H_
+#define FXFX_AGG_CONV_DASH_H_
+
 #include "../agg23/agg_conv_dash.h"
-#endif
+
+#endif  // FXFX_AGG_CONV_DASH_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h b/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h
index de38386ea2..531df5012e 100644
--- a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h
+++ b/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_CONV_STROKE_H_
-#define _FXFX_AGG_CONV_STROKE_H_
+#ifndef FXFX_AGG_CONV_STROKE_H_
+#define FXFX_AGG_CONV_STROKE_H_
+
 #include "../agg23/agg_conv_stroke.h"
-#endif
+
+#endif  // FXFX_AGG_CONV_STROKE_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_curves.h b/core/src/fxge/agg/include/fxfx_agg_curves.h
index 54efaa2b26..1879958eca 100644
--- a/core/src/fxge/agg/include/fxfx_agg_curves.h
+++ b/core/src/fxge/agg/include/fxfx_agg_curves.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_CURVERS_H_
-#define _FXFX_AGG_CURVERS_H_
+#ifndef FXFX_AGG_CURVES_H_
+#define FXFX_AGG_CURVES_H_
+
 #include "../agg23/agg_curves.h"
-#endif
+
+#endif  // FXFX_AGG_CURVES_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_path_storage.h b/core/src/fxge/agg/include/fxfx_agg_path_storage.h
index 9168eb26a8..ab7a85bca5 100644
--- a/core/src/fxge/agg/include/fxfx_agg_path_storage.h
+++ b/core/src/fxge/agg/include/fxfx_agg_path_storage.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_PATH_STORAGE_H_
-#define _FXFX_AGG_PATH_STORAGE_H_
+#ifndef FXFX_AGG_PATH_STORAGE_H_
+#define FXFX_AGG_PATH_STORAGE_H_
+
 #include "../agg23/agg_path_storage.h"
-#endif
+
+#endif  // FXFX_AGG_PATH_STORAGE_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h
index 3f61cec51a..a445298f81 100644
--- a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h
+++ b/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_RASTERIZER_SCANLINE_AA_H_
-#define _FXFX_AGG_RASTERIZER_SCANLINE_AA_H_
+#ifndef FXFX_AGG_RASTERIZER_SCANLINE_AA_H_
+#define FXFX_AGG_RASTERIZER_SCANLINE_AA_H_
+
 #include "../agg23/agg_rasterizer_scanline_aa.h"
-#endif
+
+#endif  // FXFX_AGG_RASTERIZER_SCANLINE_AA_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h b/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h
index 11d8cbb0a8..1775dabe3e 100644
--- a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h
+++ b/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_RENDER_SCANLINE_H_
-#define _FXFX_AGG_RENDER_SCANLINE_H_
+#ifndef FXFX_AGG_RENDER_SCANLINE_H_
+#define FXFX_AGG_RENDER_SCANLINE_H_
+
 #include "../agg23/agg_renderer_scanline.h"
-#endif
+
+#endif  // FXFX_AGG_RENDER_SCANLINE_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h b/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h
index eb6886e8de..0eb48b84c0 100644
--- a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h
+++ b/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_RENDERING_BUFFER_H_
-#define _FXFX_AGG_RENDERING_BUFFER_H_
+#ifndef FXFX_AGG_RENDERING_BUFFER_H_
+#define FXFX_AGG_RENDERING_BUFFER_H_
+
 #include "../agg23/agg_rendering_buffer.h"
-#endif
+
+#endif  // FXFX_AGG_RENDERING_BUFFER_H_
diff --git a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h b/core/src/fxge/agg/include/fxfx_agg_scanline_u.h
index cc7d2e7f75..c850f621a3 100644
--- a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h
+++ b/core/src/fxge/agg/include/fxfx_agg_scanline_u.h
@@ -4,7 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFX_AGG_SCANLINE_U_H_
-#define _FXFX_AGG_SCANLINE_U_H_
+#ifndef FXFX_AGG_SCANLINE_U_H_
+#define FXFX_AGG_SCANLINE_U_H_
+
 #include "../agg23/agg_scanline_u.h"
-#endif
+
+#endif  // FXFX_AGG_SCANLINE_U_H_
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
index 4285e13554..135c830c95 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/src/fxge/android/fpf_skiafont.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPF_SKIA_FONT_H_
-#define _FPF_SKIA_FONT_H_
+#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
+#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
+
 #if _FX_OS_ == _FX_ANDROID_
 class CFPF_SkiaFontDescriptor;
 class CFPF_SkiaFontMgr;
@@ -54,4 +55,5 @@ protected:
     FX_DWORD				m_dwRefCount;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h
index 1ec4a1d678..3c072fa186 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.h
+++ b/core/src/fxge/android/fpf_skiafontmgr.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPF_SKIA_FONTMGR_H_
-#define _FPF_SKIA_FONTMGR_H_
+#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
+#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
+
 #if _FX_OS_ == _FX_ANDROID_
 #define FPF_SKIAFONTTYPE_Unknown	0
 #define	FPF_SKIAFONTTYPE_Path		1
@@ -114,4 +115,5 @@ protected:
     CFX_MapPtrToPtr		m_FamilyFonts;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h
index 7f5375172a..f97aa95d23 100644
--- a/core/src/fxge/android/fpf_skiamodule.h
+++ b/core/src/fxge/android/fpf_skiamodule.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPF_MODULE_H_
-#define _FPF_MODULE_H_
+#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_
+#define CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_
+
 #if _FX_OS_ == _FX_ANDROID_
 class CFPF_SkiaFontMgr;
 class CFPF_SkiaDeviceModule : public IFPF_DeviceModule
@@ -19,4 +20,5 @@ protected:
     CFPF_SkiaFontMgr	*m_pFontMgr;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_
diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h
index b6bfdf9396..fb7ff7cd92 100644
--- a/core/src/fxge/android/fx_android_font.h
+++ b/core/src/fxge/android/fx_android_font.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_ANDROID_FONT_H_
-#define _FX_ANDROID_FONT_H_
+#ifndef CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
+#define CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
+
 #if _FX_OS_ == _FX_ANDROID_
 class IFPF_FontMgr;
 class CFX_AndroidFontInfo : public IFX_SystemFontInfo
@@ -33,4 +34,5 @@ protected:
     IFPF_FontMgr		*m_pFontMgr;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h
index 1108fffed4..beef3c7233 100644
--- a/core/src/fxge/android/fx_fpf.h
+++ b/core/src/fxge/android/fx_fpf.h
@@ -4,11 +4,13 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_FPF_H_
-#define _FX_FPF_H_
+#ifndef CORE_SRC_FXGE_ANDROID_FX_FPF_H_
+#define CORE_SRC_FXGE_ANDROID_FX_FPF_H_
+
 #include "../../../include/fxcrt/fx_ext.h"
-#include "../../../include/fxge/fx_ge.h"
-#include "../../../include/fxge/fx_freetype.h"
 #include "../../../include/fxge/fpf.h"
+#include "../../../include/fxge/fx_freetype.h"
+#include "../../../include/fxge/fx_ge.h"
 #include "fx_android_font.h"
-#endif
+
+#endif  // CORE_SRC_FXGE_ANDROID_FX_FPF_H_
diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h
index 6d8260c60f..5b083d83eb 100644
--- a/core/src/fxge/apple/apple_int.h
+++ b/core/src/fxge/apple/apple_int.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _APPLE_INT_H_
-#define _APPLE_INT_H_
+#ifndef CORE_SRC_FXGE_APPLE_APPLE_INT_H_
+#define CORE_SRC_FXGE_APPLE_APPLE_INT_H_
+
 #if _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_
 #if _FX_OS_ == _FX_MACOSX_
 #include <Carbon/Carbon.h>
@@ -243,4 +244,5 @@ FX_DWORD  FX_IOSGetMatchFamilyNameHashcode(FX_LPCSTR pFontName);
 FX_UINT32 FX_IOSGetFamilyNamesCount();
 FX_LPCSTR FX_IOSGetFamilyName( FX_UINT32 uIndex);
 #endif
-#endif
+
+#endif  // CORE_SRC_FXGE_APPLE_APPLE_INT_H_
diff --git a/core/src/fxge/dib/dib_int.h b/core/src/fxge/dib/dib_int.h
index 844c3566ce..c82a0378b8 100644
--- a/core/src/fxge/dib/dib_int.h
+++ b/core/src/fxge/dib/dib_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _DIB_INT_H_
-#define _DIB_INT_H_
+#ifndef CORE_SRC_FXGE_DIB_DIB_INT_H_
+#define CORE_SRC_FXGE_DIB_DIB_INT_H_
 
 class CPDF_FixedMatrix 
 {
@@ -90,4 +90,4 @@ public:
     int		m_State;
 };
 
-#endif  // _DIB_INT_H_
+#endif  // CORE_SRC_FXGE_DIB_DIB_INT_H_
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h
index d6b794a800..34496e8b13 100644
--- a/core/src/fxge/ge/text_int.h
+++ b/core/src/fxge/ge/text_int.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _TEXT_INT_H_
-#define _TEXT_INT_H_
+#ifndef CORE_SRC_FXGE_GE_TEXT_INT_H_
+#define CORE_SRC_FXGE_GE_TEXT_INT_H_
 
 struct _CFX_UniqueKeyGen {
     void		Generate(int count, ...);
@@ -102,4 +102,4 @@ public:
     CFX_ByteString		m_FontTables;
 };
 
-#endif  // _TEXT_INT_H_
+#endif  // CORE_SRC_FXGE_GE_TEXT_INT_H_
diff --git a/core/src/fxge/skia/fx_skia_blitter_new.h b/core/src/fxge/skia/fx_skia_blitter_new.h
index 84fe89dce6..1193e64c1c 100644
--- a/core/src/fxge/skia/fx_skia_blitter_new.h
+++ b/core/src/fxge/skia/fx_skia_blitter_new.h
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef _FX_SKIABLITTER_H_
-#define _FX_SKIABLITTER_H_
-//#define _SKIA_SUPPORT_
+#ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_
+#define CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_
+
 #if defined(_SKIA_SUPPORT_)
 class CFX_SkiaRenderer : public SkBlitter
 {
@@ -226,4 +226,5 @@ public:
 	int m_dstHeight;
 };
 #endif
-#endif
+
+#endif  // CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_
diff --git a/core/src/fxge/skia/fx_skia_device.h b/core/src/fxge/skia/fx_skia_device.h
index e92af2269e..7ae019c124 100644
--- a/core/src/fxge/skia/fx_skia_device.h
+++ b/core/src/fxge/skia/fx_skia_device.h
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef _FX_SKIA_DEVICE_DRIVER_
-#define _FX_SKIA_DEVICE_DRIVER_
-//#define _SKIA_SUPPORT_
+#ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
+#define CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
+
 #if defined(_SKIA_SUPPORT_)
 class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver
 {
@@ -86,5 +86,6 @@ public:
 
 	CFX_AggDeviceDriver* m_pAggDriver;
 };
-#endif 
-#endif// _FX_SKIA_DEVICE_DRIVER_
-\ No newline at end of file
+#endif  // defined(_SKIA_SUPPORT_)
+
+#endif  // CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
diff --git a/core/src/fxge/win32/dwrite_int.h b/core/src/fxge/win32/dwrite_int.h
index 2eecc7c76b..d95f115fbc 100644
--- a/core/src/fxge/win32/dwrite_int.h
+++ b/core/src/fxge/win32/dwrite_int.h
@@ -4,8 +4,9 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_DIRECT_WRITE_
-#define _FX_DIRECT_WRITE_
+#ifndef CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
+#define CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
+
 #ifndef DECLSPEC_UUID
 #if (_MSC_VER >= 1100) && defined (__cplusplus)
 #define DECLSPEC_UUID(x)    __declspec(uuid(x))
@@ -56,4 +57,5 @@ protected:
     void*		    m_pDwFontContext;
     void*	        m_pDwTextRenderer;
 };
-#endif
+
+#endif  // CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h
index bc3eb878d9..7c5c0720b1 100644
--- a/core/src/fxge/win32/win32_int.h
+++ b/core/src/fxge/win32/win32_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_FXGE_WIN32_WIN32_INT_H_
+#define CORE_SRC_FXGE_WIN32_WIN32_INT_H_
 
 struct  WINDIB_Open_Args_;
 class CGdiplusExt
@@ -236,3 +238,5 @@ protected:
     CFX_PSRenderer	m_PSRenderer;
 };
 void _Color2Argb(FX_ARGB& argb, FX_DWORD color, int alpha_flag, void* pIccTransform);
+
+#endif  // CORE_SRC_FXGE_WIN32_WIN32_INT_H_
diff --git a/core/src/reflow/autoreflow.h b/core/src/reflow/autoreflow.h
index 6a137e9ae2..95aebcfcdc 100644
--- a/core/src/reflow/autoreflow.h
+++ b/core/src/reflow/autoreflow.h
@@ -4,10 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _AUTOREFLOW_H
-#define _AUTOREFLOW_H
+#ifndef CORE_SRC_REFLOW_AUTOREFLOW_H_
+#define CORE_SRC_REFLOW_AUTOREFLOW_H_
+
 #include "../../include/reflow/reflowengine.h"
 #include "reflowedpage.h"
+
 class CPDF_AutoReflowElement;
 class CPDF_AutoReflowLayoutProvider;
 typedef CFX_ArrayTemplate<CPDF_AutoReflowElement*> CAR_ElmPtrArray;
@@ -119,4 +121,5 @@ public:
     CFX_PtrArray m_cellArray;
     int			m_Step;
 };
-#endif
+
+#endif  // CORE_SRC_REFLOW_AUTOREFLOW_H_
diff --git a/core/src/reflow/layoutprovider_taggedpdf.h b/core/src/reflow/layoutprovider_taggedpdf.h
index b573c3e5bf..3e11f17067 100644
--- a/core/src/reflow/layoutprovider_taggedpdf.h
+++ b/core/src/reflow/layoutprovider_taggedpdf.h
@@ -4,9 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef LayoutProvider_TaggedPDF_H
-#define LayoutProvider_TaggedPDF_H
+#ifndef CORE_SRC_REFLOW_LAYOUTPROVIDER_TAGGEDPDF_H_
+#define CORE_SRC_REFLOW_LAYOUTPROVIDER_TAGGEDPDF_H_
+
 #include "../../include/reflow/reflowengine.h"
+
 class CPDF_LayoutElement : public IPDF_LayoutElement
 {
 public:
@@ -79,4 +81,5 @@ protected:
     CPDF_StructTree*	m_pPageTree;
     int					m_TopElementIndex;
 };
-#endif
+
+#endif  // CORE_SRC_REFLOW_LAYOUTPROVIDER_TAGGEDPDF_H_
diff --git a/core/src/reflow/reflowedpage.h b/core/src/reflow/reflowedpage.h
index 5ca7a8d947..3fef553d7a 100644
--- a/core/src/reflow/reflowedpage.h
+++ b/core/src/reflow/reflowedpage.h
@@ -4,9 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _REFLOWED_PAGE_H
-#define _REFLOWED_PAGE_H
+#ifndef CORE_SRC_REFLOW_REFLOWEDPAGE_H_
+#define CORE_SRC_REFLOW_REFLOWEDPAGE_H_
+
 #include "../../include/reflow/reflowengine.h"
+
 #define GET_SIGNED(a) ( (a)>0 ? a/a : (a==0 ? 0 : -a/a) )
 class CRF_Data;
 class CRF_LineData;
@@ -368,4 +370,5 @@ public:
     FX_ARGB		m_stroke_argb;
     int			m_fill_mode;
 };
-#endif
+
+#endif  // CORE_SRC_REFLOW_REFLOWEDPAGE_H_
diff --git a/core/src/reflow/reflowedtextpage.h b/core/src/reflow/reflowedtextpage.h
index 397428d178..288ceed48b 100644
--- a/core/src/reflow/reflowedtextpage.h
+++ b/core/src/reflow/reflowedtextpage.h
@@ -4,10 +4,12 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _REFLOWED_TEXT_PAGE_H
-#define _REFLOWED_TEXT_PAGE_H
+#ifndef CORE_SRC_REFLOW_REFLOWEDTEXTPAGE_H_
+#define CORE_SRC_REFLOW_REFLOWEDTEXTPAGE_H_
+
 #include "../../include/reflow/reflowengine.h"
 #include "../../src/reflow/reflowedpage.h"
+
 typedef CFX_SegmentedArray<CRF_CharData*> CRF_CharDataPtrArray;
 typedef CFX_SegmentedArray<FX_INT32> CFX_CountBSINT32Array;
 class CRF_TextPage : public IPDF_TextPage
@@ -68,4 +70,5 @@ private:
     CFX_RectArray			m_rectArray;
     CFX_CountBSINT32Array*	m_CountBSArray;
 };
-#endif
+
+#endif  // CORE_SRC_REFLOW_REFLOWEDTEXTPAGE_H_
diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
index 8601b98194..5e596657ec 100644
--- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
+++ b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _RAO_FONTMAP_H_
-#define _RAO_FONTMAP_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
 
 #include "../pdfwindow/PWL_FontMap.h"
 
@@ -47,4 +47,4 @@ private:
 	CFX_ByteString				m_sAPType;
 };
 
-#endif // _RAO_FONTMAP_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/include/formfiller/FFL_CheckBox.h
index 240e748ea3..bac1b9394b 100644
--- a/fpdfsdk/include/formfiller/FFL_CheckBox.h
+++ b/fpdfsdk/include/formfiller/FFL_CheckBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_CHECKBOX_H_
-#define _FFL_CHECKBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
 
 #include "FFL_FormFiller.h"
 
@@ -25,5 +25,5 @@ public:
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 };
 
-#endif //_FFL_CHECKBOX_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
 
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index e9b88508ff..52fcebdf98 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_COMBOBOX_H_
-#define _FFL_COMBOBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "FFL_FormFiller.h"
@@ -67,8 +67,6 @@ private:
 private:
 	CBA_FontMap*				m_pFontMap;
 	FFL_ComboBoxState				m_State;
-	//CFFL_IM_BOX					m_IMBox;
 };
 
-#endif //_FFL_COMBOBOX_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index 7a3402a7f9..25929e4324 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_FORMFILLER_H_
-#define _FFL_FORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
 
 #include "FFL_IFormFiller.h"
 #include "FFL_CBA_Fontmap.h"
@@ -173,6 +173,4 @@ protected:
 	FX_BOOL						m_bMouseDown;
 };
 
-//#define CFFL_IM_BOX				CFX_ArrayTemplate<CBA_EditInput*>
-
-#endif
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index 393f0be331..cccf84f7b4 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -4,10 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_IFORMFILLER_H_
-#define _FFL_IFORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 
 #include "FormFiller.h"
+
 class CFFL_FormFiller;
 class CFFL_PrivateData;
 
@@ -140,5 +141,5 @@ public:
 	int					nValueAge;
 };
 
-#endif //_FFL_IFORMFILLER_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 
diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h
index 03f71df5b9..b95ad725c2 100644
--- a/fpdfsdk/include/formfiller/FFL_ListBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ListBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_LISTBOX_H_
-#define _FFL_LISTBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
 
 #include "FFL_FormFiller.h"
 
@@ -43,5 +43,4 @@ private:
 };
 
 
-#endif //_FFL_LISTBOX_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
diff --git a/fpdfsdk/include/formfiller/FFL_Notify.h b/fpdfsdk/include/formfiller/FFL_Notify.h
index 1828d97983..d1f43411ee 100644
--- a/fpdfsdk/include/formfiller/FFL_Notify.h
+++ b/fpdfsdk/include/formfiller/FFL_Notify.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_NOTIFY_H_
-#define _FFL_NOTIFY_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
 
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../../core/include/fxcrt/fx_string.h"
@@ -52,5 +52,4 @@ private:
 	FX_INT32								m_nNotifyFlag;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/include/formfiller/FFL_PushButton.h
index 5d115c0771..4cf61a82d0 100644
--- a/fpdfsdk/include/formfiller/FFL_PushButton.h
+++ b/fpdfsdk/include/formfiller/FFL_PushButton.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_PUSHBUTTON_H_
-#define _FFL_PUSHBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
 
 #include "FFL_FormFiller.h"
 
@@ -23,5 +23,4 @@ public:
 									FX_DWORD dwFlags);
 };
 
-#endif //_FFL_PUSHBUTTON_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/include/formfiller/FFL_RadioButton.h
index 2049a45345..8dba93307a 100644
--- a/fpdfsdk/include/formfiller/FFL_RadioButton.h
+++ b/fpdfsdk/include/formfiller/FFL_RadioButton.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_RADIOBUTTON_H_
-#define _FFL_RADIOBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
 
 #include "FFL_FormFiller.h"
 
@@ -23,5 +23,4 @@ public:
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 };
 
-#endif //_FFL_RADIOBUTTON_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h
index 58ac5943eb..2525077b1e 100644
--- a/fpdfsdk/include/formfiller/FFL_TextField.h
+++ b/fpdfsdk/include/formfiller/FFL_TextField.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#if !defined(AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_)
-#define AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
 
 #include "FFL_FormFiller.h"
 
@@ -70,4 +70,4 @@ private:
 
 };
 
-#endif // !defined(AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_)
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
diff --git a/fpdfsdk/include/formfiller/FFL_Utils.h b/fpdfsdk/include/formfiller/FFL_Utils.h
index e64cce9ea4..ff06a347e8 100644
--- a/fpdfsdk/include/formfiller/FFL_Utils.h
+++ b/fpdfsdk/include/formfiller/FFL_Utils.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_UTILS_H_
-#define _FFL_UTILS_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
 
 #include "../../../core/include/fpdfapi/fpdf_parser.h"
 #include "../../../core/include/fxcrt/fx_memory.h"
@@ -21,4 +21,4 @@ public:
 	static FX_BOOL					TraceObject(CPDF_Object* pObj);
 };
 
-#endif  // _FFL_UTILS_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index d8df542179..fdca1ff940 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FORMFILLER_H_
-#define FORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
 
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
@@ -15,4 +15,4 @@
 #include "../fxedit/fx_edit.h"
 #include "../pdfwindow/IPDFWindow.h"
 
-#endif  // FORMFILLER_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h
index 1ec7c09904..2b38a5d5f6 100644
--- a/fpdfsdk/include/fsdk_actionhandler.h
+++ b/fpdfsdk/include/fsdk_actionhandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_ACTIONHANDLER_H_
-#define _FSDK_ACTIONHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
+#define FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
 
 #include "../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../core/include/fxcrt/fx_string.h"
@@ -85,5 +85,4 @@ private:
 	CPDFSDK_MediaActionHandler*		m_pMediaActionHandler;
 };
 
-#endif //_BA_ACTIONHANDLER_H_
-
+#endif  // FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index f4bbf4c0f6..e04f09dd2e 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_ANNOTHANDLER_H_
-#define _FSDK_ANNOTHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
+#define FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 
 #include "../../core/include/fxcrt/fx_basic.h"
 
@@ -252,7 +252,4 @@ protected:
 	FX_BOOL              m_bCircle;
 };
 
-
-
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index 6762bb04f4..dbd7e005b7 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_BASEANNOT_H_
-#define _FSDK_BASEANNOT_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
+#define FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
@@ -190,7 +190,4 @@ protected:
 	
 };
 
-
-
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index 16a23bfea3..85ab3e6fd1 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_BASEFORM_H_
-#define _FSDK_BASEFORM_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
+#define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
@@ -285,5 +285,4 @@ private:
 	CPDFSDK_Annots						m_Annots;
 };
 
-#endif //#define _FSDK_BASEFORM_H_
-
+#endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
diff --git a/fpdfsdk/include/fsdk_common.h b/fpdfsdk/include/fsdk_common.h
index 197917c567..bc7cbcb711 100644
--- a/fpdfsdk/include/fsdk_common.h
+++ b/fpdfsdk/include/fsdk_common.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_COMMON_H_
-#define _FSDK_COMMON_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_COMMON_H_
+#define FPDFSDK_INCLUDE_FSDK_COMMON_H_
 
 #define BFFT_SIGNATURE				"Signature"
 
@@ -42,5 +42,4 @@
 #define BBS_INSET					3
 #define BBS_UNDERLINE				4
 
-
-#endif
+#endif  // FPDFSDK_INCLUDE_FSDK_COMMON_H_
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 13cdbd2f88..8a839ab74d 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFSDK_DEFINE_H
-#define _FPDFSDK_DEFINE_H
+#ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_
+#define FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 
 #ifdef _WIN32
 #include <tchar.h>
@@ -87,4 +87,4 @@ void		FSDK_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable);
 FPDF_BOOL	FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy);
 
 
-#endif//_FPDFSDK_DEFINE_H
+#endif  // FPDFSDK_INCLUDE_FSDK_DEFINE_H_
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index fa943715b7..4b7cc56373 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFSDK_MGR_H
-#define _FPDFSDK_MGR_H
+#ifndef FPDFSDK_INCLUDE_FSDK_MGR_H_
+#define FPDFSDK_INCLUDE_FSDK_MGR_H_
 
 #include "../../public/fpdf_formfill.h"
 #include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define.
@@ -559,5 +559,4 @@ private:
 	}
 };
 
-
-#endif //_FPDFSDK_MGR_H
+#endif  // FPDFSDK_INCLUDE_FSDK_MGR_H_
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
index 4c006c3754..fff7031b55 100644
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ b/fpdfsdk/include/fsdk_rendercontext.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FSDK_RENDERCONTEXT_H_
-#define FSDK_RENDERCONTEXT_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
+#define FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
 
 #include "../../public/fpdf_progressive.h"
 #include "fsdk_define.h"
@@ -40,4 +40,4 @@ private:
 	IFSDK_PAUSE* m_IPause;
 };
 
-#endif  // FSDK_RENDERCONTEXT_H_
+#endif  // FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h
index e0c362276c..f8df723ad0 100644
--- a/fpdfsdk/include/fx_systemhandler.h
+++ b/fpdfsdk/include/fx_systemhandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SYSTEMHANDLER_H_
-#define _FX_SYSTEMHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
+#define FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
 
 typedef FX_LPVOID				FX_HWND;
 typedef FX_LPVOID				FX_HMENU;
@@ -90,5 +90,4 @@ public:
 	virtual void 				SetCharSet(FX_INT32 nCharSet) = 0;
 };
 
-#endif //_FX_SYSTEMHANDLER_H_
-
+#endif  // FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index bf00995ea9..31ede0564b 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_EDIT_H_
-#define _FX_EDIT_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../core/include/fxge/fx_dib.h"
@@ -492,5 +492,4 @@ protected:
         ~IFX_List() { }
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h
index 9e5c40f5ff..237aa66b53 100644
--- a/fpdfsdk/include/fxedit/fxet_edit.h
+++ b/fpdfsdk/include/fxedit/fxet_edit.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXET_EDIT_H_
-#define _FXET_EDIT_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
 #include "fx_edit.h"
@@ -814,5 +814,4 @@ private:
 	IFX_Edit_FontMap*			m_pFontMap;
 };
 
-#endif //_FXET_EDIT_H_
-
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h
index 6b634ffeec..5c689ed439 100644
--- a/fpdfsdk/include/fxedit/fxet_list.h
+++ b/fpdfsdk/include/fxedit/fxet_list.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXET_LIST_H_
-#define _FXET_LIST_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
 
 #include "../../../core/include/fpdfapi/fpdf_parser.h"  // For CPDF_Point.
 #include "fx_edit.h"
@@ -360,4 +360,4 @@ private:
 	FX_INT32						m_nCaretIndex;	//for multiple
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
diff --git a/fpdfsdk/include/fxedit/fxet_stub.h b/fpdfsdk/include/fxedit/fxet_stub.h
index a1aa2e25ca..8fe2f0cd95 100644
--- a/fpdfsdk/include/fxedit/fxet_stub.h
+++ b/fpdfsdk/include/fxedit/fxet_stub.h
@@ -1,26 +1,16 @@
 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
- 
+
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXET_STUB_H_
-#define _FXET_STUB_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
 
-#include "../../../core/include/fpdfapi/fpdf_module.h" 
-#include "../../../core/include/fpdfapi/fpdf_render.h" 
-#include "../../../core/include/fpdfapi/fpdf_pageobj.h" 
-#include "../../../core/include/fpdfdoc/fpdf_vt.h" 
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfapi/fpdf_render.h"
+#include "../../../core/include/fpdfapi/fpdf_pageobj.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
 #include "../fx_systemhandler.h"
-#ifdef FX_READER_DLL
-	#ifdef _DEBUG
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/dbg_w32_vc6/fxcoredll[dbg,w32,vc6].lib")
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/dbg_w32_vc6/fpdfdocdll[dbg,w32,vc6].lib")
-	#else
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/rel_w32_vc6/fxcoredll[rel,w32,vc6].lib")
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/rel_w32_vc6/fpdfdocdll[rel,w32,vc6].lib")
-	#endif
-#endif
-
-#endif 
 
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
diff --git a/fpdfsdk/include/javascript/Consts.h b/fpdfsdk/include/javascript/Consts.h
index 5d1906428c..f7ddc5215b 100644
--- a/fpdfsdk/include/javascript/Consts.h
+++ b/fpdfsdk/include/javascript/Consts.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _CONSTS_H_
-#define _CONSTS_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
 
 #include "JS_Define.h"
 
@@ -124,5 +124,4 @@ public:
 	static int				Init(IJS_Runtime* pRuntime);
 };
 
-#endif //_CONSTS_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
diff --git a/fpdfsdk/include/javascript/Document.h b/fpdfsdk/include/javascript/Document.h
index 0824185aa3..ab1ddb8633 100644
--- a/fpdfsdk/include/javascript/Document.h
+++ b/fpdfsdk/include/javascript/Document.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _DOCUMENT_H_
-#define _DOCUMENT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
 
 #include "JS_Define.h"
 
@@ -272,5 +272,4 @@ public:
 	JS_STATIC_METHOD(mailDoc, Document);
 };
 
-#endif//_DOCUMENT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
diff --git a/fpdfsdk/include/javascript/Field.h b/fpdfsdk/include/javascript/Field.h
index f9e5e49f9e..0da08b6e95 100644
--- a/fpdfsdk/include/javascript/Field.h
+++ b/fpdfsdk/include/javascript/Field.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FIELD_H_
-#define _FIELD_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
 
 #include <string>  // For std::wstring.
 
@@ -356,5 +356,4 @@ public:
 	JS_STATIC_METHOD(signatureValidate, Field);
 };
 
-#endif //_FIELD_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index 4db1bc6e27..0900109021 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IJAVASCRIPT_H_
-#define _IJAVASCRIPT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 
@@ -109,5 +109,4 @@ private:
 	FX_INT32						m_nGlobalDataCount;
 };
 
-#endif //_IJAVASCRIPT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/Icon.h b/fpdfsdk/include/javascript/Icon.h
index 097917a5e5..20a3bb8f68 100644
--- a/fpdfsdk/include/javascript/Icon.h
+++ b/fpdfsdk/include/javascript/Icon.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _ICON_H_
-#define _ICON_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
 
 #include "JS_Define.h"
 
@@ -37,5 +37,4 @@ public:
 	JS_STATIC_PROP(name, Icon);
 };
 
-#endif //_ICON_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index 948178a8e2..ea1e3a18d8 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_CONTEXT_H_
-#define _JS_CONTEXT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
 
 #include "../../../core/include/fxcrt/fx_system.h"
 #include "../../../core/include/fxcrt/fx_string.h"
@@ -94,12 +94,4 @@ private:
 	FX_BOOL						m_bMsgBoxEnable;
 };
 
-// static CFX_WideString JSGetStringFromID(CJS_Context* pContext, UINT ID)
-// {
-// 	ASSERT(pContext != NULL);
-// 
-// 	return JS_LoadString(pContext->GetReaderApp(), ID);
-// }
-
-#endif //_JS_CONTEXT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 4fcd50600c..86c50f30a9 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -4,12 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_DEFINE_H_
-#define _JS_DEFINE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
 
 #include "../jsapi/fxjs_v8.h"
 #include "resource.h"
-
 #include "JS_Object.h"
 #include "JS_Value.h"
 
@@ -466,4 +465,4 @@ if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToV8Value())
 
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p);
 
-#endif //_JS_DEFINE_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
diff --git a/fpdfsdk/include/javascript/JS_EventHandler.h b/fpdfsdk/include/javascript/JS_EventHandler.h
index a6736d319b..d6cdbe81bc 100644
--- a/fpdfsdk/include/javascript/JS_EventHandler.h
+++ b/fpdfsdk/include/javascript/JS_EventHandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_EVENTHANDLER_H_
-#define _JS_EVENTHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "../../../core/include/fxcrt/fx_system.h"
@@ -170,5 +170,4 @@ public:
 	CPDFSDK_Annot*			m_pTargetAnnot;
 };
 
-#endif //_JS_EVENTHANDLER_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
diff --git a/fpdfsdk/include/javascript/JS_GlobalData.h b/fpdfsdk/include/javascript/JS_GlobalData.h
index 17e5e69aed..276ff8cd4b 100644
--- a/fpdfsdk/include/javascript/JS_GlobalData.h
+++ b/fpdfsdk/include/javascript/JS_GlobalData.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_GLOBALDATA_H_
-#define _JS_GLOBALDATA_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 
@@ -94,4 +94,4 @@ private:
 	CFX_WideString								m_sFilePath;
 };
 
-#endif //_JS_GLOBALDATA_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h
index a26482db6a..5828f2ec38 100644
--- a/fpdfsdk/include/javascript/JS_Object.h
+++ b/fpdfsdk/include/javascript/JS_Object.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_OBJECT_H_
-#define _JS_OBJECT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
 
 #include "../fsdk_define.h"  // For FX_UINT
 #include "../fsdk_mgr.h"  // For CPDFDoc_Environment
@@ -291,4 +291,5 @@ private:
 
 	CPDFDoc_Environment*			m_pApp;
 };
-#endif //_JS_OBJECT_H_
+
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index 1f51638bf9..9c3ece3e51 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_RUNTIME_H_
-#define _JS_RUNTIME_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../core/include/fxcrt/fx_basic.h"
@@ -72,5 +72,4 @@ protected:
 	v8::Global<v8::Context> m_context;
 };
 
-#endif //_JS_RUNTIME_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
diff --git a/fpdfsdk/include/javascript/JS_Value.h b/fpdfsdk/include/javascript/JS_Value.h
index faa612d21e..245b736cdf 100644
--- a/fpdfsdk/include/javascript/JS_Value.h
+++ b/fpdfsdk/include/javascript/JS_Value.h
@@ -4,11 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_VALUE_H_
-#define _JS_VALUE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
 
-#include "../jsapi/fxjs_v8.h"
 #include "../../../core/include/fxcrt/fx_basic.h"
+#include "../jsapi/fxjs_v8.h"
 
 class CJS_Array;
 class CJS_Date;
@@ -186,5 +186,4 @@ protected:
 	v8::Isolate* m_isolate;
 };
 
-#endif //_JS_VALUE_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
index 4e545c4f54..96cb9ba31f 100644
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ b/fpdfsdk/include/javascript/JavaScript.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef JAVASCRIPT_H_
-#define JAVASCRIPT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
 
 #include <string>
 #include <vector>
@@ -23,4 +23,4 @@
 #include "../jsapi/fxjs_v8.h"
 #include "../pdfwindow/IPDFWindow.h"
 
-#endif  // JAVASCRIPT_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/PublicMethods.h b/fpdfsdk/include/javascript/PublicMethods.h
index e7a4010016..375ae1fcfe 100644
--- a/fpdfsdk/include/javascript/PublicMethods.h
+++ b/fpdfsdk/include/javascript/PublicMethods.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PUBLICMETHODS_H_
-#define _PUBLICMETHODS_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
 
 #include "JS_Define.h"
 
@@ -100,4 +100,4 @@ public:
 	static CJS_Array		AF_MakeArrayFromList(v8::Isolate* isolate, CJS_Value val);
 };
 
-#endif //_PUBLICMETHODS_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
diff --git a/fpdfsdk/include/javascript/app.h b/fpdfsdk/include/javascript/app.h
index a515df4770..7e51f73135 100644
--- a/fpdfsdk/include/javascript/app.h
+++ b/fpdfsdk/include/javascript/app.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _APP_H_
-#define _APP_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
 
 #include "JS_Define.h"
 
@@ -220,4 +220,4 @@ public:
 
 };
 
-#endif //_APP_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
diff --git a/fpdfsdk/include/javascript/color.h b/fpdfsdk/include/javascript/color.h
index 6eeb37be7e..8aab76fffe 100644
--- a/fpdfsdk/include/javascript/color.h
+++ b/fpdfsdk/include/javascript/color.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _COLOR_H_
-#define _COLOR_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
 
 #include "JS_Define.h"
 // TODO(tsepez): include CPWL_Color.h once its own IWYU is fixed.
@@ -77,5 +77,4 @@ public:
 
 };
 
-#endif //_COLOR_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
diff --git a/fpdfsdk/include/javascript/console.h b/fpdfsdk/include/javascript/console.h
index 60326aaf8b..d49ea418eb 100644
--- a/fpdfsdk/include/javascript/console.h
+++ b/fpdfsdk/include/javascript/console.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _CONSOLE_H_
-#define _CONSOLE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
 
 #include "JS_Define.h"
 
@@ -36,5 +36,4 @@ public:
 	JS_STATIC_METHOD(show, console);
 };
 
-#endif //_CONSOLE_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
diff --git a/fpdfsdk/include/javascript/event.h b/fpdfsdk/include/javascript/event.h
index b3418c2b71..f43def973a 100644
--- a/fpdfsdk/include/javascript/event.h
+++ b/fpdfsdk/include/javascript/event.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _EVENT_H_
-#define _EVENT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
 
 #include "JS_Define.h"
 
@@ -69,4 +69,4 @@ public:
 	JS_STATIC_PROP(willCommit, event);
 };
 
-#endif //_EVENT_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h
index 2690f6822c..fac93d8e5b 100644
--- a/fpdfsdk/include/javascript/global.h
+++ b/fpdfsdk/include/javascript/global.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
 
 #include "JS_Define.h"
 
@@ -86,4 +86,4 @@ public:
 
 };
 
-#endif //_GLOBAL_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
diff --git a/fpdfsdk/include/javascript/report.h b/fpdfsdk/include/javascript/report.h
index 05e7ddd803..9705adac88 100644
--- a/fpdfsdk/include/javascript/report.h
+++ b/fpdfsdk/include/javascript/report.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _REPORT_H_
-#define _REPORT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
 
 #include "JS_Define.h"
 
@@ -33,5 +33,4 @@ public:
 	JS_STATIC_METHOD(writeText, Report);
 };
 
-#endif //_REPORT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
diff --git a/fpdfsdk/include/javascript/util.h b/fpdfsdk/include/javascript/util.h
index 7601f7a4e5..b621067bc3 100644
--- a/fpdfsdk/include/javascript/util.h
+++ b/fpdfsdk/include/javascript/util.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
 
 #include <string>  // For std::wstring.
 
@@ -46,4 +46,5 @@ public:
 };
 
 FX_INT64 FX_atoi64(const char *nptr);
-#endif //_UTIL_H_
+
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index cc1eb6b2c1..f5d699287d 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -7,8 +7,8 @@
 // PDFium wrapper around V8 APIs. PDFium code should include this file rather
 // than including V8 headers directly.
 
-#ifndef FXJSAPI_H
-#define FXJSAPI_H
+#ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
+#define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 
 #include <v8.h>
 #include "../../../core/include/fxcrt/fx_string.h"  // For CFX_WideString
@@ -136,4 +136,4 @@ double							JS_MakeDate(double day, double time);
 bool							JS_PortIsNan(double d);
 double							JS_LocalTime(double d);
 
-#endif //FXJSAPI_H
+#endif  // FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
diff --git a/fpdfsdk/include/pdfwindow/IPDFWindow.h b/fpdfsdk/include/pdfwindow/IPDFWindow.h
index 472737a2e3..0191cac639 100644
--- a/fpdfsdk/include/pdfwindow/IPDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/IPDFWindow.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IPDFWINDOW_H_
-#define _IPDFWINDOW_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
 
 #include "PWL_Button.h"
 #include "PWL_Caret.h"
@@ -25,4 +25,4 @@
 #include "PWL_Utils.h"
 #include "PWL_Wnd.h"
 
-#endif //_IPDFWINDOW_H_
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index dafc7452f2..3cd1e02878 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef PDFWINDOW_H_
-#define PDFWINDOW_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
 
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
@@ -15,4 +15,4 @@
 #include "../fx_systemhandler.h"
 #include "../fxedit/fx_edit.h"
 
-#endif  // PDFWINDOW_H_
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h
index 72adcf9546..9141cf047c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Button.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Button.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_BUTTON_H_
-#define _PWL_BUTTON_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
 
 #include "PWL_Wnd.h"
 
@@ -24,4 +24,4 @@ protected:
 	FX_BOOL						m_bMouseDown;
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h
index 2dfef2ae92..b827f18d3f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Caret.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_CARET_H_
-#define _PWL_CARET_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
 
 #include "PWL_Wnd.h"
 
@@ -50,5 +50,4 @@ private:
 	CPDF_Rect					m_rcInvalid;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
index 0b86add467..826f4dcc3e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_COMBOBOX_H_
-#define _PWL_COMBOBOX_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
 
 #include "PWL_Edit.h"
 #include "PWL_ListBox.h"
@@ -115,5 +115,4 @@ private:
 	void*							m_pFormFiller;
 };
 
-#endif // !defined(AFX_PWL_COMBOBOX_H__9D6645F8_64AA_4806_94E8_95FDEDD39C17__INCLUDED_)
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index d00c311101..9a133d15cc 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_EDIT_H_
-#define _PWL_EDIT_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "PWL_EditCtrl.h"
@@ -139,5 +139,4 @@ private:
 	void*							m_pFormFiller;
 };
 
-#endif 
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index d179e69938..600c348446 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_EDITCTRL_H_
-#define _PWL_EDITCTRL_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "../fxedit/fx_edit.h"
@@ -173,5 +173,4 @@ private:
 	FX_INT32						m_nCodePage;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index 2ff6c0f38c..cdce862b29 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_FONTMAP_H_
-#define _PWL_FONTMAP_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
 
 #include "../../../public/fpdf_sysfontinfo.h"
 #include "../fxedit/fx_edit.h"
@@ -136,4 +136,4 @@ private:
 	CPDF_Document*								m_pAttachedDoc;
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 08f3e4fd8b..cb56a9929e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_ICON_H_
-#define _PWL_ICON_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "PWL_Wnd.h"
@@ -57,6 +57,4 @@ private:
 };
 
 
-#endif // !defined(AFX_PWL_BUTTON_H__5A6080AA_33C5_4FC9_91FC_D9644C41120A__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h
index b85ba4955e..d074b76be1 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_IconList_H_
-#define _PWL_IconList_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "PWL_ListCtrl.h"
@@ -124,7 +124,5 @@ private:
 	CPWL_IconList_Content*				m_pListContent;
 	FX_INT32							m_nListCount;
 };
- 
-#endif //_PWL_IconList_H_
-
 
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h
index 811a3dae07..f724a0a82b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Label.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Label.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_LABEL_H_
-#define _PWL_LABEL_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
 
 #include "PWL_Wnd.h"
 
@@ -42,6 +42,4 @@ private:
 	IFX_Edit*						m_pEdit;
 };
 
-#endif
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index a31818f274..e8e9036b8e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_LISTBOX_H_
-#define _PWL_LISTBOX_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
 
 #include "../fxedit/fx_edit.h"
 #include "PWL_Wnd.h"
@@ -101,6 +101,4 @@ private:
 	void*							m_pFormFiller;
 };
 
-#endif // !defined(AFX_PWL_LISTBOX_H__F8C0DD72_CC3C_4806_86FB_E9D02B04A34B__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
index 5a1f06045a..65df7aecfc 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_LISTCTRL_H_
-#define _PWL_LISTCTRL_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
 
 #include "PWL_Wnd.h"
 
@@ -44,5 +44,4 @@ private:
 	FX_FLOAT							m_fBottomSpace;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h
index 25290928db..c5cdc4dd9c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_NOTE_H_
-#define _PWL_NOTE_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
 
 #include "PWL_Button.h"
 #include "PWL_Edit.h"
@@ -357,5 +357,4 @@ private:
 	CFX_WideString						m_sReplyString;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
index dc1f18fce9..2f0473f1d2 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_SCROLLBAR_H_
-#define _PWL_SCROLLBAR_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
 
 #include "PWL_Wnd.h"
 
@@ -163,6 +163,4 @@ private:
 	FX_FLOAT					m_fOldPosButton;
 };
 
-#endif // !defined(AFX_PWL_SCROLLBAR_H__DCFEC082_2651_48A4_B8F3_63F1B3CC5E10__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h
index 6860d814c0..bdc1406a3d 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_SIGNATURE_H_
-#define _PWL_SIGNATURE_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
 
 #include "PWL_Icon.h"
 #include "PWL_Wnd.h"
@@ -64,6 +64,4 @@ private:
 	FX_BOOL								m_bFlagExist;
 };
 
-#endif // _PWL_SIGNATURE_H_
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
index 2df3d5d369..9b4ffd2341 100644
--- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
+++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_SPECIALBUTTON_H_
-#define _PWL_SPECIALBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
 
 #include "PWL_Button.h"
 
@@ -53,6 +53,4 @@ private:
 	FX_BOOL						m_bChecked;
 };
 
-#endif
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index 3eeaa7ac81..51514f2513 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_UTILS_H_
-#define _PWL_UTILS_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
 
 #include "../../../core/include/fpdfapi/fpdf_parser.h"  // For CPDF_Point.
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"  // For CPVT_WordRange.
@@ -240,6 +240,4 @@ private:
 	static void								GetGraphics_Foxit(CFX_ByteString& sPathData, CFX_PathData& path, const CPDF_Rect& crBBox, const PWL_PATH_TYPE type);
 };
 
-#endif // !defined(AFX_PWL_UTILS_H__D32812AD_A875_4E08_9D3C_0A57020987C6__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 8b766ec984..4fa1c7639b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_WND_H_
-#define _PWL_WND_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
@@ -474,28 +474,4 @@ private:
 	FX_BOOL							m_bEnabled;
 };
 
-// #ifndef VK_END
-// 
-// #define VK_END            0x23
-// #define VK_HOME           0x24
-// #define VK_LEFT           0x25
-// #define VK_UP             0x26
-// #define VK_RIGHT          0x27
-// #define VK_DOWN           0x28
-// #define VK_INSERT         0x2D
-// #define VK_DELETE         0x2E
-// 
-// #define VK_BACK           0x08
-// #define VK_TAB            0x09
-// 
-// #define VK_CLEAR          0x0C
-// #define VK_RETURN         0x0D
-// #define VK_ESCAPE         0x1B
-// #define VK_SPACE          0x20
-// #endif
-// 
-// #define VK_NONE			  0
-
-#endif // !defined(AFX_PWL_WND_H__D32812AD_A875_4E08_9D3C_0A57020987C6__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
diff --git a/fpdfsdk/src/resource.h b/fpdfsdk/src/resource.h
index b58f09272f..1ba20957a6 100644
--- a/fpdfsdk/src/resource.h
+++ b/fpdfsdk/src/resource.h
@@ -4,13 +4,15 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef FPDFSDK_SRC_RESOURCE_H_
+#define FPDFSDK_SRC_RESOURCE_H_
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by fpdfsdkdll.rc
 //
-
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        104
@@ -19,3 +21,5 @@
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
+
+#endif  // FPDFSDK_SRC_RESOURCE_H_
author	Tom Sepez <tsepez@chromium.org>	2015-05-28 13:09:35 -0700
committer	Tom Sepez <tsepez@chromium.org>	2015-05-28 13:09:35 -0700
commit	6b776fed401f97ce2589a847465280de704b9d7f (patch)
tree	39f484bd9b3282cbd7e5dbd48c784534e29b59c3
parent	14f57a153dcbc4c5fedeffe12a3b4f915cc5d558 (diff)
download	pdfium-6b776fed401f97ce2589a847465280de704b9d7f.tar.xz