4 files changed, 24 insertions, 12 deletions
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_