5 files changed, 27 insertions, 17 deletions
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_