10 files changed, 50 insertions, 30 deletions
diff --git a/xfa/src/fee/include/fx_wordbreak.h b/xfa/src/fee/include/fx_wordbreak.h
index d5b56ddff8..0146df26b0 100644
--- a/xfa/src/fee/include/fx_wordbreak.h
+++ b/xfa/src/fee/include/fx_wordbreak.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_WORDBREAK_H
-#define _FX_WORDBREAK_H
+#ifndef XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
+#define XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
+
 class IFX_CharIter;
 
 class IFX_WordBreak {
@@ -22,4 +23,5 @@ class IFX_WordBreak {
   virtual FX_BOOL IsEOF(FX_BOOL bTail = TRUE) const = 0;
 };
 IFX_WordBreak* FX_WordBreak_Create();
-#endif
+
+#endif  // XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
diff --git a/xfa/src/fee/include/ifde_txtedtbuf.h b/xfa/src/fee/include/ifde_txtedtbuf.h
index c8c6e52cfe..f4a9c119b9 100644
--- a/xfa/src/fee/include/ifde_txtedtbuf.h
+++ b/xfa/src/fee/include/ifde_txtedtbuf.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IFDE_TXTEDTBUF_H
-#define _IFDE_TXTEDTBUF_H
+#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
+#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
+
 #define FDE_DEFCHUNKLENGTH (1024)
 
 class IFDE_TxtEdtBuf {
@@ -32,4 +33,5 @@ class IFDE_TxtEdtBuf {
 
   virtual FX_BOOL Optimize(IFX_Pause* pPause = NULL) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h
index 4ddbdb0e97..8af71d6de0 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/include/ifde_txtedtengine.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IFDE_TXTEDTENGINE_H
-#define _IFDE_TXTEDTENGINE_H
+#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
+#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
+
 class IFDE_TxtEdtBuf;
 class IFDE_TxtEdtPage;
 class IFDE_TxtEdtEngine;
@@ -256,4 +257,5 @@ class IFDE_TxtEdtParag {
                             int32_t& nStart,
                             int32_t& nCount) const = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
diff --git a/xfa/src/fee/include/ifde_txtedtpage.h b/xfa/src/fee/include/ifde_txtedtpage.h
index 2bc810f291..63b488f17f 100644
--- a/xfa/src/fee/include/ifde_txtedtpage.h
+++ b/xfa/src/fee/include/ifde_txtedtpage.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IFDE_TXTEDTPAGE_H
-#define _IFDE_TXTEDTPAGE_H
+#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
+#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
+
 class IFDE_TxtEdtEngine;
 class IFDE_TxtEdtPage;
 class IFDE_TxtEdtPage : public IFDE_CanvasSet, public IFX_TxtAccess {
@@ -35,4 +36,5 @@ class IFDE_TxtEdtPage : public IFDE_CanvasSet, public IFX_TxtAccess {
   virtual void UnloadPage(FX_LPCRECTF pClipBox = NULL) = 0;
   virtual const CFX_RectF& GetContentsBox() = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.h b/xfa/src/fee/src/fee/fde_txtedtblock.h
index 80135336e4..60261d0a89 100644
--- a/xfa/src/fee/src/fee/fde_txtedtblock.h
+++ b/xfa/src/fee/src/fee/fde_txtedtblock.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_TXTEDTBLOCK_H
-#define _FDE_TXTEDTBLOCK_H
+#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBLOCK_H_
+#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBLOCK_H_
+
 #ifdef FDE_USEFORMATBLOCK
 class CFDE_TxtEdtEngine;
 class CFDE_TxtEdtBlock;
@@ -234,4 +235,5 @@ class CFDE_TxtEdtField_Fixed : public CFDE_TxtEdtField {
   virtual ~CFDE_TxtEdtField_Fixed() {}
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBLOCK_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h
index 2df443cca6..fd551aa9cc 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.h
+++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_TXTEDTBUF_H
-#define _FDE_TXTEDTBUF_H
+#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
+#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
+
 class IFX_CharIter;
 class CFDE_TxtEdtBufIter;
 class CFDE_TxtEdtBuf;
@@ -91,4 +92,5 @@ class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf {
   CFX_PtrArray m_Chunks;
   IFX_MEMAllocator* m_pAllocator;
 };
-#endif
+
+#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h
index 70ecd23e06..fa114ba9bf 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_TXTEDTENGINE_H
-#define _FDE_TXTEDTENGINE_H
+#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
+#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
+
 class CFDE_TxtEdtBuf;
 class CFDE_TxtEdtPage;
 class IFX_TxtBreak;
@@ -369,4 +370,5 @@ class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord {
   FX_BOOL m_bSel;
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h
index 1c6926a574..e27a284d63 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_TXTEDTPAGE_H
-#define _FDE_TXTEDTPAGE_H
+#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
+#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
+
 class CFDE_TxtEdtEngine;
 class IFX_CharIter;
 class CFDE_TxtEdtPage;
@@ -151,4 +152,5 @@ class CFDE_TxtEdtPage : public IFDE_TxtEdtPage {
   CFX_RectF m_rtPageCanvas;
   int32_t* m_pCharWidth;
 };
-#endif
+
+#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/src/fee/fde_txtedtparag.h
index bedcb8b3f3..09c4aef2a3 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.h
+++ b/xfa/src/fee/src/fee/fde_txtedtparag.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_TXTEDTPARAG_H
-#define _FDE_TXTEDTPARAG_H
+#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
+#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
+
 class CFDE_TxtEdtEngine;
 class CFDE_TxtEdtParag;
 class CFDE_TxtEdtParag : public IFDE_TxtEdtParag {
@@ -29,4 +30,5 @@ class CFDE_TxtEdtParag : public IFDE_TxtEdtParag {
   void* m_lpData;
   CFDE_TxtEdtEngine* m_pEngine;
 };
-#endif
+
+#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
index efe170d028..6fe76bdfdd 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_WORDBREAK_IMPL_H
-#define _FX_WORDBREAK_IMPL_H
+#ifndef XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+#define XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+
 extern const FX_WORD gs_FX_WordBreak_Table[16];
 extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1];
 enum FX_WordBreakProp {
@@ -65,4 +66,5 @@ class CFX_WordBreak : public IFX_WordBreak {
   IFX_CharIter* m_pPreIter;
   IFX_CharIter* m_pCurIter;
 };
-#endif
+
+#endif  // XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_