Fixup incorrect include guards.

This CL updates include guards throughout the code base to be in the chromium style. BUG=pdfium:65 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1707893004 .
author: Dan Sinclair <dsinclair@chromium.org> 2016-02-18 15:02:55 -0500
committer: Dan Sinclair <dsinclair@chromium.org> 2016-02-18 15:02:55 -0500
commit: c7cd809fccd7c5f90c8a2db7ddec7289f9630f53 (patch)
tree: 8ed5c89990a552395ac3943330eb6776dc1f41e5
parent: c5ac0202004cd38071a9f6f0d7f3e5d8669ccfbb (diff)
download: pdfium-c7cd809fccd7c5f90c8a2db7ddec7289f9630f53.tar.xz
360 files changed, 1716 insertions, 1064 deletions
diff --git a/core/include/fxcodec/fx_codec_flate.h b/core/include/fxcodec/fx_codec_flate.h
index eaecef49ca..a0d151d258 100644
--- a/core/include/fxcodec/fx_codec_flate.h
+++ b/core/include/fxcodec/fx_codec_flate.h
@@ -4,6 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_FLATE_H_
+#define CORE_INCLUDE_FXCODEC_FX_CODEC_FLATE_H_
+
 #include "third_party/zlib_v128/zlib.h"
 
 #ifdef __cplusplus
@@ -26,3 +29,5 @@ void FPDFAPI_FlateEnd(void* context);
 #ifdef __cplusplus
 }  // extern "C"
 #endif
+
+#endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_FLATE_H_
diff --git a/core/src/fxcodec/codec/fx_codec_progress.h b/core/src/fxcodec/codec/fx_codec_progress.h
index 2da92c9b01..45fde21338 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.h
+++ b/core/src/fxcodec/codec/fx_codec_progress.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_CODEC_PROGRESS_H_
-#define _FX_CODEC_PROGRESS_H_
+#ifndef CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+#define CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA 2.2
 #if _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
@@ -220,4 +221,5 @@ class CCodec_ProgressiveDecoder : public ICodec_ProgressiveDecoder {
   FX_BOOL m_BmpIsTopBottom;
   FXCODEC_STATUS m_status;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/src/fxcodec/jbig2/JBig2_Define.h
index ccc30998c9..68e2ff2533 100644
--- a/core/src/fxcodec/jbig2/JBig2_Define.h
+++ b/core/src/fxcodec/jbig2/JBig2_Define.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_DEFINE_H_
-#define _JBIG2_DEFINE_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -33,4 +33,4 @@ struct JBig2HuffmanCode {
 #define JBIG2_MAX_PATTERN_INDEX 65535
 #define JBIG2_MAX_IMAGE_SIZE 65535
 
-#endif
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
index 85b393bd41..afa81796c2 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_HUFFMAN_DECODER_H_
-#define _JBIG2_HUFFMAN_DECODER_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
+
 #include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
 #include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
 class CJBig2_HuffmanDecoder {
@@ -19,4 +20,5 @@ class CJBig2_HuffmanDecoder {
  private:
   CJBig2_BitStream* const m_pStream;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Page.h b/core/src/fxcodec/jbig2/JBig2_Page.h
index 6d5e55a39c..50fe4cef3c 100644
--- a/core/src/fxcodec/jbig2/JBig2_Page.h
+++ b/core/src/fxcodec/jbig2/JBig2_Page.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_PAGE_H_
-#define _JBIG2_PAGE_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -19,4 +19,4 @@ struct JBig2PageInfo {
   FX_WORD m_wMaxStripeSize;
 };
 
-#endif
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.h b/core/src/fxcodec/jbig2/JBig2_PatternDict.h
index ac8e062535..e363c9bce3 100644
--- a/core/src/fxcodec/jbig2/JBig2_PatternDict.h
+++ b/core/src/fxcodec/jbig2/JBig2_PatternDict.h
@@ -4,10 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_PATTERN_DICT_H_
-#define _JBIG2_PATTERN_DICT_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
+
 #include "core/src/fxcodec/jbig2/JBig2_Define.h"
 #include "core/src/fxcodec/jbig2/JBig2_Image.h"
+
 class CJBig2_PatternDict {
  public:
   CJBig2_PatternDict();
@@ -17,4 +19,5 @@ class CJBig2_PatternDict {
   FX_DWORD NUMPATS;
   CJBig2_Image** HDPATS;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.h b/core/src/fxcodec/jbig2/JBig2_Segment.h
index f9e454b4a2..0f76ad2ab3 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.h
+++ b/core/src/fxcodec/jbig2/JBig2_Segment.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JBIG2_SEGMENT_H_
-#define _JBIG2_SEGMENT_H_
+#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
+#define CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
 
 #include "core/src/fxcodec/jbig2/JBig2_Define.h"
 #include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
@@ -62,4 +62,5 @@ class CJBig2_Segment {
     void* vd;
   } m_Result;
 };
-#endif
+
+#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
diff --git a/core/src/fxcodec/lbmp/fx_bmp.h b/core/src/fxcodec/lbmp/fx_bmp.h
index 06bfe1e99d..610cffc0df 100644
--- a/core/src/fxcodec/lbmp/fx_bmp.h
+++ b/core/src/fxcodec/lbmp/fx_bmp.h
@@ -4,6 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
+#define CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
+
 #include <setjmp.h>
 
 #include "core/include/fxcrt/fx_basic.h"
@@ -60,6 +63,7 @@ typedef struct tagBmpInfoHeader {
   FX_DWORD biClrImportant;
 } BmpInfoHeader, *BmpInfoHeaderPtr;
 #pragma pack()
+
 typedef struct tag_bmp_decompress_struct bmp_decompress_struct;
 typedef bmp_decompress_struct* bmp_decompress_struct_p;
 typedef bmp_decompress_struct_p* bmp_decompress_struct_pp;
@@ -148,8 +152,11 @@ struct tag_bmp_compress_struct {
   uint8_t bit_type;
 #endif
 };
+
 bmp_compress_struct_p _bmp_create_compress();
 void _bmp_destroy_compress(bmp_compress_struct_p bmp_ptr);
 FX_BOOL _bmp_encode_image(bmp_compress_struct_p bmp_ptr,
                           uint8_t*& dst_buf,
                           FX_DWORD& dst_size);
+
+#endif  // CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/src/fxcodec/lgif/fx_gif.h
index 3b4ec0f0e6..2c755d6cde 100644
--- a/core/src/fxcodec/lgif/fx_gif.h
+++ b/core/src/fxcodec/lgif/fx_gif.h
@@ -4,6 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
+#define CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
+
 #include <setjmp.h>
 
 #include "core/include/fxcrt/fx_basic.h"
@@ -298,6 +301,7 @@ struct tag_gif_compress_struct {
   FX_DWORD pte_data_len;
 #endif
 };
+
 void _gif_error(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
 void _gif_warn(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
 gif_decompress_struct_p _gif_create_decompress();
@@ -330,3 +334,5 @@ FX_BOOL _gif_encode(gif_compress_struct_p gif_ptr,
     _gif_error(gif_ptr, "Out Of Memory"); \
     return 0;                             \
   }
+
+#endif  // CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
index 5ec6de5644..0956fcfa7e 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFXFA_APP_H_
-#define FPDFXFA_APP_H_
+#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_APP_H_
+#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_APP_H_
 
 #include "xfa/include/fxfa/fxfa.h"
 
@@ -95,4 +95,4 @@ class CPDFXFA_App : public IXFA_AppProvider {
   bool m_bOwnedRuntime;
 };
 
-#endif  // FPDFXFA_APP_H_
+#endif  // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_APP_H_
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index eb064d2682..fb976a256f 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFXFA_DOC_H_
-#define FPDFXFA_DOC_H_
+#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_DOC_H_
+#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_DOC_H_
 
 #include <vector>
 
@@ -227,4 +227,4 @@ class CPDFXFA_Document : public IXFA_DocProvider {
   CFX_ArrayTemplate<CPDFXFA_Page*> m_XFAPageList;
 };
 
-#endif  // FPDFXFA_DOC_H_
+#endif  // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_DOC_H_
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
index 814599cc7e..2354a34b18 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFXFA_PAGEVIEW_H_
-#define _FPDFXFA_PAGEVIEW_H_
+#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGEVIEW_H_
+#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGEVIEW_H_
 
 class CPDFXFA_Page {
  public:
@@ -63,4 +63,4 @@ class CPDFXFA_Page {
   int m_iRef;
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGEVIEW_H_
diff --git a/samples/image_diff_png.h b/samples/image_diff_png.h
index 7e0afecf83..7bb395a4a5 100644
--- a/samples/image_diff_png.h
+++ b/samples/image_diff_png.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 TOOLS_IMAGEDIFF_IMAGE_DIFF_PNG_H_
-#define TOOLS_IMAGEDIFF_IMAGE_DIFF_PNG_H_
+#ifndef SAMPLES_IMAGE_DIFF_PNG_H_
+#define SAMPLES_IMAGE_DIFF_PNG_H_
 
 #include <stdlib.h>  // for size_t.
 
@@ -35,4 +35,4 @@ bool EncodeBGRAPNG(const unsigned char* input,
 
 }  // namespace image_diff_png
 
-#endif  // TOOLS_IMAGEDIFF_IMAGE_DIFF_PNG_H_
+#endif  // SAMPLES_IMAGE_DIFF_PNG_H_
diff --git a/testing/test_support.h b/testing/test_support.h
index 359324d16a..f135425b51 100644
--- a/testing/test_support.h
+++ b/testing/test_support.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 TESTING_EMBEDDER_TEST_SUPPORT_H_
-#define TESTING_EMBEDDER_TEST_SUPPORT_H_
+#ifndef TESTING_TEST_SUPPORT_H_
+#define TESTING_TEST_SUPPORT_H_
 
 #include <stdlib.h>
 #include <memory>
@@ -107,4 +107,4 @@ class TestSaver : public FPDF_FILEWRITE {
   std::string m_String;
 };
 
-#endif  // TESTING_EMBEDDER_TEST_SUPPORT_H_
+#endif  // TESTING_TEST_SUPPORT_H_
diff --git a/xfa/include/foxitxfa.h b/xfa/include/foxitxfa.h
index 2c8af137ea..dad9aac645 100644
--- a/xfa/include/foxitxfa.h
+++ b/xfa/include/foxitxfa.h
@@ -6,8 +6,9 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef _FOXIT_XFA_H_
-#define _FOXIT_XFA_H_
+#ifndef XFA_INCLUDE_FOXITXFA_H_
+#define XFA_INCLUDE_FOXITXFA_H_
+
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxge/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
@@ -18,4 +19,5 @@
 #include "xfa/include/fwl/fwl.h"
 #include "xfa/include/fxjse/fxjse.h"
 #include "xfa/include/fxfa/fxfa.h"
-#endif
+
+#endif  // XFA_INCLUDE_FOXITXFA_H_
diff --git a/xfa/include/fwl/adapter/fwl_adapternative.h b/xfa/include/fwl/adapter/fwl_adapternative.h
index 3ea5c89270..83e6fd9af8 100644
--- a/xfa/include/fwl/adapter/fwl_adapternative.h
+++ b/xfa/include/fwl/adapter/fwl_adapternative.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_ADAPTERNATIVE_H_
-#define FWL_ADAPTERNATIVE_H_
+#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERNATIVE_H_
+#define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERNATIVE_H_
 
 class IFWL_WidgetMgrDelegate;
 class IFWL_AdapterWidgetMgr;
@@ -21,4 +21,4 @@ class IFWL_AdapterNative {
   virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0;
 };
 
-#endif  // FWL_ADAPTERNATIVE_H_
+#endif  // XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERNATIVE_H_
diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
index d45b82a8e6..1bb9c9e72f 100644
--- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_ADAPTERTHREADMGR_H_
-#define FWL_ADAPTERTHREADMGR_H_
+#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_
+#define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_
 
 class IFWL_Thread;
 
@@ -21,4 +21,4 @@ class IFWL_AdapterThreadMgr {
   virtual FWL_ERR Stop(FWL_HTHREAD hThread, int32_t iExitCode) = 0;
   virtual IFWL_Thread* GetCurrentThread() = 0;
 };
-#endif  // FWL_ADAPTERTHREADMGR_H_
+#endif  // XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_
diff --git a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h
index 37cdf86f23..f8b0daab86 100644
--- a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h
+++ b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_ADAPTER_TIMERMGR_H
-#define _FWL_ADAPTER_TIMERMGR_H
+#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTIMERMGR_H_
+#define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTIMERMGR_H_
 
 #include "xfa/include/fwl/core/fwl_error.h"
 #include "xfa/include/fwl/core/fwl_timer.h"
@@ -21,4 +21,5 @@ class IFWL_AdapterTimerMgr {
                         FX_BOOL bImmediately = TRUE) = 0;
   virtual FWL_ERR Stop(FWL_HTIMER hTimer) = 0;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTIMERMGR_H_
diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
index 9edae0dfc2..ed9bd0fa80 100644
--- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_ADAPTER_WIDGETMGR_H
-#define _FWL_ADAPTER_WIDGETMGR_H
+#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_
+#define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_
+
 class IFWL_Widget;
 class IFWL_Menu;
 class IFWL_MenuDP;
@@ -73,4 +74,5 @@ class IFWL_AdapterWidgetMgr {
                               const CFX_RectF& rtAnchor,
                               CFX_RectF& rtPopup) = 0;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_
diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
index 29ed93edd5..751ab36970 100644
--- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h
+++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SDAPATER_IMP_H
-#define _FWL_SDAPATER_IMP_H
+#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_SDAPATERIMP_H_
+#define XFA_INCLUDE_FWL_ADAPTER_FWL_SDAPATERIMP_H_
+
 class IFWL_AdapterNative;
 class IFWL_AdapterWidgetMgr;
 class IFWL_AdapterThreadMgr;
@@ -88,4 +89,5 @@ class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr {
   virtual FWL_ERR Stop(FWL_HTHREAD hThread, int32_t iExitCode);
   virtual IFWL_Thread* GetCurrentThread();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_ADAPTER_FWL_SDAPATERIMP_H_
diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h
index 2b3654d7b2..a0a6b816fd 100644
--- a/xfa/include/fwl/basewidget/fwl_barcode.h
+++ b/xfa/include/fwl/basewidget/fwl_barcode.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_BARCODE_H
-#define _FWL_BARCODE_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_
+
 #include "fwl_edit.h"
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_BarcodeDP;
@@ -57,4 +59,5 @@ class IFWL_Barcode : public IFWL_Edit {
  protected:
   IFWL_Barcode();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_
diff --git a/xfa/include/fwl/basewidget/fwl_caret.h b/xfa/include/fwl/basewidget/fwl_caret.h
index f88dee601d..7b022e7816 100644
--- a/xfa/include/fwl/basewidget/fwl_caret.h
+++ b/xfa/include/fwl/basewidget/fwl_caret.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CARET_H
-#define _FWL_CARET_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_Caret;
@@ -28,4 +29,5 @@ class IFWL_Caret : public IFWL_Widget {
  protected:
   IFWL_Caret();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_
diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h
index 6e6cec5e76..616fef5397 100644
--- a/xfa/include/fwl/basewidget/fwl_checkbox.h
+++ b/xfa/include/fwl/basewidget/fwl_checkbox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CHECKBOX_H
-#define _FWL_CHECKBOX_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_CheckBoxDP;
@@ -78,4 +79,4 @@ class IFWL_CheckBox : public IFWL_Widget {
   IFWL_CheckBox();
 };
 
-#endif
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_
diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h
index db23d34f5c..624061f387 100644
--- a/xfa/include/fwl/basewidget/fwl_combobox.h
+++ b/xfa/include/fwl/basewidget/fwl_combobox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_COMBOBOX_H
-#define _FWL_COMBOBOX_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_ListBox;
@@ -136,4 +137,5 @@ class IFWL_ComboBox : public IFWL_Widget {
  protected:
   IFWL_ComboBox();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h
index 79cb5f5fcb..5932991f6f 100644
--- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h
+++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_DATETIMEPICKER_H
-#define _FWL_DATETIMEPICKER_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_DateTimePickerDP;
@@ -102,4 +103,5 @@ class IFWL_DateTimePicker : public IFWL_Widget {
  protected:
   IFWL_DateTimePicker();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h
index 878e5319fc..915f149c09 100644
--- a/xfa/include/fwl/basewidget/fwl_edit.h
+++ b/xfa/include/fwl/basewidget/fwl_edit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_EDIT_H_
-#define FWL_EDIT_H_
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_
 
 #include <vector>
 
@@ -168,4 +168,4 @@ class IFWL_Edit : public IFWL_Widget {
   IFWL_Edit();
 };
 
-#endif  // FWL_EDIT_H_
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_
diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h
index d28b8896f7..49f291e813 100644
--- a/xfa/include/fwl/basewidget/fwl_listbox.h
+++ b/xfa/include/fwl/basewidget/fwl_listbox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_LISTBOX_H
-#define _FWL_LISTBOX_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_ListBoxDP;
@@ -126,4 +127,5 @@ class IFWL_ListBox : public IFWL_Widget {
  protected:
   IFWL_ListBox();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
diff --git a/xfa/include/fwl/basewidget/fwl_menu.h b/xfa/include/fwl/basewidget/fwl_menu.h
index b2e7ec00ac..9b6f321d94 100644
--- a/xfa/include/fwl/basewidget/fwl_menu.h
+++ b/xfa/include/fwl/basewidget/fwl_menu.h
@@ -4,12 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_MENU_H
-#define _FWL_MENU_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_MENU_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_MENU_H_
+
 #define FWL_CLASS_Menu L"FWL_MENU"
 #define FWL_CLASSHASH_Menu 3957949655
 #define FWL_STYLEEXT_MNU_Horz (0L << 0)
 #define FWL_STYLEEXT_MNU_Vert (1L << 0)
 #define FWL_STYLEEXT_MNU_Dock (1L << 1)
 #define FWL_STYLEEXT_MNU_OwnerDraw (1L << 2)
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_
diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h
index 9c2a7df996..3053947180 100644
--- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h
+++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_MONTHCALENDAR_H
-#define _FWL_MONTHCALENDAR_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_
+
 class IFWL_MonthCalendarDP;
 class IFWL_MonthCalendar;
 #define FWL_CLASS_MonthCalendar L"FWL_MONTHCALENDAR"
@@ -127,4 +128,5 @@ class IFWL_MonthCalendar : public IFWL_Widget {
  protected:
   IFWL_MonthCalendar();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_
diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h
index bb7d911f90..0b206c2d04 100644
--- a/xfa/include/fwl/basewidget/fwl_picturebox.h
+++ b/xfa/include/fwl/basewidget/fwl_picturebox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PICTUREBOX_H
-#define _FWL_PICTUREBOX_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_PictureBoxDP;
@@ -49,4 +50,5 @@ class IFWL_PictureBox : public IFWL_Widget {
  protected:
   IFWL_PictureBox();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_
diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h
index 8e459d2f78..500cc0dcc1 100644
--- a/xfa/include/fwl/basewidget/fwl_pushbutton.h
+++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PUSHBUTTON_H
-#define _FWL_PUSHBUTTON_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_PushButtonDP;
@@ -51,4 +52,5 @@ class IFWL_PushButton : public IFWL_Widget {
  protected:
   IFWL_PushButton();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_
diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h
index c8a0d91446..691ec8826c 100644
--- a/xfa/include/fwl/basewidget/fwl_scrollbar.h
+++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SCROLLBAR_H
-#define _FWL_SCROLLBAR_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_ScrollBarDP;
@@ -66,4 +67,5 @@ class IFWL_ScrollBar : public IFWL_Widget {
  protected:
   IFWL_ScrollBar();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_
diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h
index 5e89e43b84..a501cea864 100644
--- a/xfa/include/fwl/basewidget/fwl_spinbutton.h
+++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SPINBUTTON_H
-#define _FWL_SPINBUTTON_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_SpinButton;
@@ -39,4 +40,5 @@ class IFWL_SpinButton : public IFWL_Widget {
  protected:
   IFWL_SpinButton();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_
diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
index 1d63ba8096..9fcec86ea4 100644
--- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
+++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_TOOLTIP_H
-#define _FWL_TOOLTIP_H
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_
+
 class CFWL_WidgetImpProperties;
 class IFWL_Form;
 class IFWL_ToolTipDP;
@@ -41,4 +42,5 @@ class IFWL_ToolTip : public IFWL_Form {
  protected:
   IFWL_ToolTip();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_
diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h
index 7fc6cd700b..2797dc8f18 100644
--- a/xfa/include/fwl/basewidget/fxmath_barcode.h
+++ b/xfa/include/fwl/basewidget/fxmath_barcode.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXMATH_BARCODE_H_
-#define _FXMATH_BARCODE_H_
+#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
+#define XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
+
 class IFX_Barcode {
  public:
   virtual ~IFX_Barcode() {}
@@ -45,4 +46,5 @@ class IFX_Barcode {
   virtual FX_BOOL SetTruncated(FX_BOOL truncated) = 0;
 };
 IFX_Barcode* FX_Barcode_Create(BC_TYPE type);
-#endif
+
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h
index 1c33d47908..9bfb519d88 100644
--- a/xfa/include/fwl/core/fwl_app.h
+++ b/xfa/include/fwl/core/fwl_app.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_APP_H
-#define _FWL_APP_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_APP_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_APP_H_
+
 class IFWL_NoteThread;
 class IFWL_AdapterNative;
 class IFWL_Widget;
@@ -37,4 +38,5 @@ extern FWL_ERR FWL_Execute(const CFX_WideStringC& wsExecutable,
                            const CFX_WideStringC& wsParameters);
 FWL_ERR FWL_SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen);
 FX_BOOL FWL_AppIsActived();
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_APP_H_
diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h
index 3050f8724d..c665469aec 100644
--- a/xfa/include/fwl/core/fwl_content.h
+++ b/xfa/include/fwl/core/fwl_content.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CONTENT_H
-#define _FWL_CONTENT_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
+
 class IFWL_Widget;
 class IFWL_Content;
 class IFWL_Content : public IFWL_Widget {
@@ -22,4 +23,5 @@ class IFWL_Content : public IFWL_Widget {
  protected:
   IFWL_Content();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
diff --git a/xfa/include/fwl/core/fwl_form.h b/xfa/include/fwl/core/fwl_form.h
index 23a6cdd6ce..e79d88da5a 100644
--- a/xfa/include/fwl/core/fwl_form.h
+++ b/xfa/include/fwl/core/fwl_form.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_FORM_H
-#define _FWL_FORM_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
+
 class IFWL_Widget;
 class IFWL_Panel;
 class IFWL_Form;
@@ -80,4 +81,5 @@ class IFWL_Form : public IFWL_Panel {
  protected:
   IFWL_Form();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index 64142cdb6a..e7071af7b3 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_GRID_H
-#define _FWL_GRID_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
+
 class IFWL_Widget;
 class IFWL_Content;
 #define FWL_CLASS_Grid L"FWL_GRID"
@@ -80,4 +81,5 @@ class IFWL_Grid : public IFWL_Content {
  protected:
   IFWL_Grid();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index ef86927263..5277af3f11 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_NOTE_H
-#define _FWL_NOTE_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
+
 class IFWL_Target;
 class IFWL_Widget;
 class IFWL_NoteThread;
@@ -373,4 +374,5 @@ typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message* msg, void* info);
 FWL_ERR FWL_SetHook(IFWL_NoteDriver* driver,
                     FWLMessageHookCallback callback,
                     void* info);
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h
index b528ff52f2..94e01bca60 100644
--- a/xfa/include/fwl/core/fwl_panel.h
+++ b/xfa/include/fwl/core/fwl_panel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PANEL_H
-#define _FWL_PANEL_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
+
 class IFWL_Widget;
 class IFWL_Content;
 class IFWL_Panel;
@@ -37,4 +38,5 @@ class IFWL_CustomPanel : public IFWL_Widget {
  protected:
   IFWL_CustomPanel();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h
index 141b296b4c..7eaf0b25f3 100644
--- a/xfa/include/fwl/core/fwl_target.h
+++ b/xfa/include/fwl/core/fwl_target.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_TARGET_H_
-#define FWL_TARGET_H_
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ -48,4 +48,4 @@ class IFWL_Target {
   CFWL_TargetImp* m_pImpl;
 };
 
-#endif  // FWL_TARGET_H_
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index aba5f7892e..2700e3bd55 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_THEME_H
-#define _FWL_THEME_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
+
 class IFWL_Widget;
 class CFWL_ThemePart;
 class CFWL_ThemeBackground;
@@ -79,4 +80,5 @@ class IFWL_ThemeProvider {
                            FX_FLOAT fy) = 0;
   virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) = 0;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h
index 0db473c062..c10f72900c 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_THREAD_H_
-#define FWL_THREAD_H_
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_THREAD_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_THREAD_H_
 
 // The FWL thread/app code contains three parallel inheritance hierarchies,
 // which reference each other via pointers as follows:
@@ -48,4 +48,4 @@ class IFWL_NoteThread : public IFWL_Thread {
   IFWL_NoteDriver* GetNoteDriver();
 };
 
-#endif  // FWL_THREAD_H_
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_THREAD_H_
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index 9eb8994763..2cec462535 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGET_H
-#define _FWL_WIDGET_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
+
 class IFWL_Target;
 class IFWL_ThemeProvider;
 class CFWL_WidgetImpProperties;
@@ -120,4 +121,5 @@ FWL_ERR FWL_Accelerator_SetThread(CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_Accelerator_SetForm(IFWL_Form* pFrom,
                                 CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_EnabelWidget(IFWL_Widget* widget, FX_BOOL bEnable);
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
diff --git a/xfa/include/fwl/core/fwl_widgetdef.h b/xfa/include/fwl/core/fwl_widgetdef.h
index 9b1eefb0fa..548fe92019 100644
--- a/xfa/include/fwl/core/fwl_widgetdef.h
+++ b/xfa/include/fwl/core/fwl_widgetdef.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGETDEF_H
-#define _FWL_WIDGETDEF_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGETDEF_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_WIDGETDEF_H_
+
 #define FWL_WGTSTYLE_OverLapper (0L << 0)
 #define FWL_WGTSTYLE_Popup (1L << 0)
 #define FWL_WGTSTYLE_Child (2L << 0)
@@ -244,4 +245,5 @@
 #define FWL_VKEY_Unknown 0
 #define FWL_VKEYSTATE_Toggled 0x0001
 #define FWL_VKEYSTATE_Down 0x0100
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGETDEF_H_
diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h
index c2dfefa36a..2420f6927f 100644
--- a/xfa/include/fwl/core/fwl_widgetmgr.h
+++ b/xfa/include/fwl/core/fwl_widgetmgr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGETMGR_H
-#define _FWL_WIDGETMGR_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
+
 class IFWL_Widget;
 class IFWL_WidgetMgr;
 class IFWL_WidgetMgrDelegate;
@@ -51,4 +52,5 @@ class IFWL_WidgetMgrDelegate {
 FWL_ERR FWL_WidgetMgrSnapshot(IFWL_Widget* pWidget,
                               const CFX_WideString* saveFile,
                               const CFX_Matrix* pMatrix = NULL);
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
diff --git a/xfa/include/fwl/fwl.h b/xfa/include/fwl/fwl.h
index 999e9a9fc1..6ba115f0c9 100644
--- a/xfa/include/fwl/fwl.h
+++ b/xfa/include/fwl/fwl.h
@@ -6,8 +6,9 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef _FWL_H
-#define _FWL_H
+#ifndef XFA_INCLUDE_FWL_FWL_H_
+#define XFA_INCLUDE_FWL_FWL_H_
+
 #include "xfa/include/fwl/core/fwl_error.h"
 #include "xfa/include/fwl/core/fwl_target.h"
 #include "xfa/include/fwl/core/fwl_thread.h"
@@ -72,4 +73,5 @@
 #include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 #include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
-#endif
+
+#endif  // XFA_INCLUDE_FWL_FWL_H_
diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index 5a8cc89775..1049e8abcd 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_LIGHTWIDGET_APP_H_
-#define FWL_LIGHTWIDGET_APP_H_
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
 
 class CFWL_Theme;
 class IFWL_App;
@@ -25,4 +25,5 @@ class CFWL_App {
   IFWL_App* m_pIface;
   CFWL_Theme* m_pTheme;
 };
-#endif  // FWL_LIGHTWIDGET_APP_H_
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h
index 99a3713955..32505f16d5 100644
--- a/xfa/include/fwl/lightwidget/barcode.h
+++ b/xfa/include/fwl/lightwidget/barcode.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_BARCODE_LIGHT_H
-#define _FWL_BARCODE_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_BarcodeDP;
@@ -114,4 +115,5 @@ class CFWL_Barcode : public CFWL_Edit {
   };
   CFWL_BarcodeDP m_barcodeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
diff --git a/xfa/include/fwl/lightwidget/caret.h b/xfa/include/fwl/lightwidget/caret.h
index d7284dff43..db7e09d188 100644
--- a/xfa/include/fwl/lightwidget/caret.h
+++ b/xfa/include/fwl/lightwidget/caret.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CARET_LIGHT_H
-#define _FWL_CARET_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class CFWL_Caret;
@@ -22,4 +23,5 @@ class CFWL_Caret : public CFWL_Widget {
   CFWL_Caret();
   virtual ~CFWL_Caret();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h
index c0d5aaaa55..c357de9f81 100644
--- a/xfa/include/fwl/lightwidget/checkbox.h
+++ b/xfa/include/fwl/lightwidget/checkbox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CHECKBOX_LIGHT_H
-#define _FWL_CHECKBOX_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_CheckBoxDP;
@@ -35,4 +36,5 @@ class CFWL_CheckBox : public CFWL_Widget {
   };
   CFWL_CheckBoxDP m_checkboxData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h
index 6b7a6b017c..e29e51879b 100644
--- a/xfa/include/fwl/lightwidget/datetimepicker.h
+++ b/xfa/include/fwl/lightwidget/datetimepicker.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_DATETIMEPICKER_LIGHT_H
-#define _FWL_DATETIMEPICKER_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_DateTimePickerDP;
@@ -58,4 +59,5 @@ class CFWL_DateTimePicker : public CFWL_Widget {
   };
   CFWL_DateTimePickerDP m_DateTimePickerDP;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h
index b1dc79cfc7..24a04a35eb 100644
--- a/xfa/include/fwl/lightwidget/edit.h
+++ b/xfa/include/fwl/lightwidget/edit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_LIGHTWIDGET_EDIT_H_
-#define FWL_LIGHTWIDGET_EDIT_H_
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_EDIT_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_EDIT_H_
 
 #include <vector>
 
@@ -64,4 +64,4 @@ class CFWL_Edit : public CFWL_Widget {
   virtual ~CFWL_Edit();
 };
 
-#endif  // FWL_LIGHTWIDGET_EDIT_H_
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_EDIT_H_
diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h
index 11c0e3badb..bd994ac1e8 100644
--- a/xfa/include/fwl/lightwidget/picturebox.h
+++ b/xfa/include/fwl/lightwidget/picturebox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PICTUREBOX_LIGHT_H
-#define _FWL_PICTUREBOX_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_PictureBoxDP;
@@ -60,4 +61,5 @@ class CFWL_PictureBox : public CFWL_Widget {
   };
   CFWL_PictureBoxDP m_PictureBoxDP;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h
index 3874289a02..709a52710a 100644
--- a/xfa/include/fwl/lightwidget/pushbutton.h
+++ b/xfa/include/fwl/lightwidget/pushbutton.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PUSHBUTTON_LIGHT_H
-#define _FWL_PUSHBUTTON_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_PushButtonDP;
@@ -33,4 +34,5 @@ class CFWL_PushButton : public CFWL_Widget {
   };
   CFWL_PushButtonDP m_buttonData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
diff --git a/xfa/include/fwl/lightwidget/scrollbar.h b/xfa/include/fwl/lightwidget/scrollbar.h
index e28bdaaae8..e835bdeb5a 100644
--- a/xfa/include/fwl/lightwidget/scrollbar.h
+++ b/xfa/include/fwl/lightwidget/scrollbar.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SCROLLBAR_LIGHT_H
-#define _FWL_SCROLLBAR_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class CFWL_ScrollBar;
@@ -28,4 +29,5 @@ class CFWL_ScrollBar : public CFWL_Widget {
   CFWL_ScrollBar();
   virtual ~CFWL_ScrollBar();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h
index ed8396e7e6..fb82548ca0 100644
--- a/xfa/include/fwl/lightwidget/tooltipctrl.h
+++ b/xfa/include/fwl/lightwidget/tooltipctrl.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_ToolTip_LIGHT_H
-#define _FWL_ToolTip_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_ToolTipDP;
@@ -50,4 +51,5 @@ class CFWL_ToolTip : public CFWL_Widget {
   };
   CFWL_ToolTipDP m_tooltipData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index a375ee72fd..c10428e505 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGET_LIGHT_H
-#define _FWL_WIDGET_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
 
 #include "xfa/include/fwl/core/fwl_widget.h"
 
@@ -104,4 +104,5 @@ class CFWL_WidgetDelegate {
   virtual FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix = NULL);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
diff --git a/xfa/include/fwl/theme/barcodetp.h b/xfa/include/fwl/theme/barcodetp.h
index 7a16afcac3..8ae47979d6 100644
--- a/xfa/include/fwl/theme/barcodetp.h
+++ b/xfa/include/fwl/theme/barcodetp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_BARCODETP_H
-#define _FWL_BARCODETP_H
+#ifndef XFA_INCLUDE_FWL_THEME_BARCODETP_H_
+#define XFA_INCLUDE_FWL_THEME_BARCODETP_H_
+
 class CFWL_WidgetTP;
 class CFWL_BarcodeTP;
 class CFWL_BarcodeTP : public CFWL_WidgetTP {
@@ -15,4 +16,5 @@ class CFWL_BarcodeTP : public CFWL_WidgetTP {
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_BARCODETP_H_
diff --git a/xfa/include/fwl/theme/carettp.h b/xfa/include/fwl/theme/carettp.h
index f3f5992636..0ce0c641dd 100644
--- a/xfa/include/fwl/theme/carettp.h
+++ b/xfa/include/fwl/theme/carettp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CARETTP_H
-#define _FWL_CARETTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_CARETTP_H_
+#define XFA_INCLUDE_FWL_THEME_CARETTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_CaretTP;
 class CFWL_CaretTP : public CFWL_WidgetTP {
@@ -22,4 +23,5 @@ class CFWL_CaretTP : public CFWL_WidgetTP {
                    CFX_Color* crFill,
                    CFX_Matrix* pMatrix = NULL);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_CARETTP_H_
diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h
index edc3f7170f..5b25379dc6 100644
--- a/xfa/include/fwl/theme/checkboxtp.h
+++ b/xfa/include/fwl/theme/checkboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CHECKBOXTP_H
-#define _FWL_CHECKBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_CheckBoxTP;
 class CFWL_CheckBoxTP : public CFWL_WidgetTP {
@@ -78,4 +79,5 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP {
   } * m_pThemeData;
   CFX_Path* m_pCheckPath;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h
index 84dbdbabf3..8b6a221920 100644
--- a/xfa/include/fwl/theme/comboboxtp.h
+++ b/xfa/include/fwl/theme/comboboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_COMBOBOXTP_H
-#define _FWL_COMBOBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_ComboBoxTP;
 class CFWL_ComboBoxTP : public CFWL_WidgetTP {
@@ -24,4 +25,5 @@ class CFWL_ComboBoxTP : public CFWL_WidgetTP {
                          FX_DWORD dwStates,
                          CFX_Matrix* pMatrix);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
diff --git a/xfa/include/fwl/theme/datetimepickertp.h b/xfa/include/fwl/theme/datetimepickertp.h
index 5fe43f3d49..400795da6e 100644
--- a/xfa/include/fwl/theme/datetimepickertp.h
+++ b/xfa/include/fwl/theme/datetimepickertp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_DATETIMEPICKERTP_H
-#define _FWL_DATETIMEPICKERTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
+#define XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_DateTimePickerTP;
 class CFWL_DateTimePickerTP : public CFWL_WidgetTP {
@@ -22,4 +23,5 @@ class CFWL_DateTimePickerTP : public CFWL_WidgetTP {
     FX_ARGB BoxBkColor[13][2];
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
diff --git a/xfa/include/fwl/theme/edittp.h b/xfa/include/fwl/theme/edittp.h
index babea93807..681e579a70 100644
--- a/xfa/include/fwl/theme/edittp.h
+++ b/xfa/include/fwl/theme/edittp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_EDITTP_H
-#define _FWL_EDITTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_EDITTP_H_
+#define XFA_INCLUDE_FWL_THEME_EDITTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_EditTP;
 class CFWL_EditTP : public CFWL_WidgetTP {
@@ -17,4 +18,5 @@ class CFWL_EditTP : public CFWL_WidgetTP {
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_EDITTP_H_
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index 83085040b1..61a7b24ab9 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_FORM_THEMEPROVIDER_H
-#define _FWL_FORM_THEMEPROVIDER_H
+#ifndef XFA_INCLUDE_FWL_THEME_FORMTP_H_
+#define XFA_INCLUDE_FWL_THEME_FORMTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_FormTP;
 class CFWL_FormTP : public CFWL_WidgetTP {
@@ -105,4 +106,5 @@ class CFWL_FormTP : public CFWL_WidgetTP {
     FX_ARGB clrTransWhite;
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_FORMTP_H_
diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h
index c44fcc72bc..efab981a0d 100644
--- a/xfa/include/fwl/theme/listboxtp.h
+++ b/xfa/include/fwl/theme/listboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_LISTBOXTP_H
-#define _FWL_LISTBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_ScrollBarTP;
 class CFWL_ListBoxTP;
@@ -25,4 +26,5 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP {
                        void* pData = NULL,
                        CFX_Matrix* pMatrix = NULL);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h
index 27773df1e0..da9fadbcaf 100644
--- a/xfa/include/fwl/theme/monthcalendartp.h
+++ b/xfa/include/fwl/theme/monthcalendartp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_MONTHCALENDARTP_H
-#define _FWL_MONTHCALENDARTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
+#define XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_MonthCalendarTP;
 class CFWL_MonthCalendarTP : public CFWL_WidgetTP {
@@ -46,4 +47,5 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP {
   } * m_pThemeData;
   CFX_WideString wsResource;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
diff --git a/xfa/include/fwl/theme/pictureboxtp.h b/xfa/include/fwl/theme/pictureboxtp.h
index f15b220093..7621d3b8f8 100644
--- a/xfa/include/fwl/theme/pictureboxtp.h
+++ b/xfa/include/fwl/theme/pictureboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PICTUREBOXTP_H
-#define _FWL_PICTUREBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_PictureBoxTP;
 class CFWL_PictureBoxTP : public CFWL_WidgetTP {
@@ -15,4 +16,5 @@ class CFWL_PictureBoxTP : public CFWL_WidgetTP {
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index 632ded96c7..43fcca7073 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PUSHBUTTONTP_H
-#define _FWL_PUSHBUTTONTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
+#define XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_PushButtonTP;
 class CFWL_PushButtonTP : public CFWL_WidgetTP {
@@ -39,4 +40,5 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP {
     FX_ARGB clrFill[5];
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h
index d708066d4d..e9bd200827 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/include/fwl/theme/scrollbartp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SCROLLBARTP_H
-#define _FWL_SCROLLBARTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
+#define XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_ScrollBarTP;
 class CFWL_ScrollBarTP : public CFWL_WidgetTP {
@@ -52,4 +53,5 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
     FX_ARGB clrTrackBKEnd;
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h
index bd9474351f..abbb47ef8f 100644
--- a/xfa/include/fwl/theme/utils.h
+++ b/xfa/include/fwl/theme/utils.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_THEME_UTILS_H_
-#define FWL_THEME_UTILS_H_
+#ifndef XFA_INCLUDE_FWL_THEME_UTILS_H_
+#define XFA_INCLUDE_FWL_THEME_UTILS_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -72,4 +72,5 @@ typedef struct _FWLCOLOR {
 #define FWLTHEME_CAPACITY_ScrollBarWidth 17.0f
 #define FWLTHEME_CAPACITY_CXBorder 1.0f
 #define FWLTHEME_CAPACITY_CYBorder 1.0f
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_UTILS_H_
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index 5a1b18469c..c92f392abe 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXFA_H_
-#define FXFA_H_
+#ifndef XFA_INCLUDE_FXFA_FXFA_H_
+#define XFA_INCLUDE_FXFA_FXFA_H_
 
 #include <vector>
 
@@ -843,4 +843,4 @@ class IXFA_ChecksumContext {
 };
 IXFA_ChecksumContext* XFA_Checksum_Create();
 
-#endif  // FXFA_H_
+#endif  // XFA_INCLUDE_FXFA_FXFA_H_
diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h
index 6e1979e042..e8731d23d8 100644
--- a/xfa/include/fxfa/fxfa_basic.h
+++ b/xfa/include/fxfa/fxfa_basic.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_BASIC_H
-#define _FXFA_BASIC_H
+#ifndef XFA_INCLUDE_FXFA_FXFA_BASIC_H_
+#define XFA_INCLUDE_FXFA_FXFA_BASIC_H_
 
 #include "xfa/include/fxjse/fxjse.h"
 
@@ -1081,4 +1081,5 @@ typedef XFA_SCRIPTATTRIBUTEINFO const* XFA_LPCSCRIPTATTRIBUTEINFO;
 XFA_LPCSCRIPTATTRIBUTEINFO XFA_GetScriptAttributeByName(
     XFA_ELEMENT eElement,
     const CFX_WideStringC& wsAttributeName);
-#endif
+
+#endif  // XFA_INCLUDE_FXFA_FXFA_BASIC_H_
diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index f549a63e30..426ad73791 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXFA_OBJECTACC_H_
-#define FXFA_OBJECTACC_H_
+#ifndef XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_
+#define XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_
 
 #include "core/include/fxge/fx_dib.h"  // For FX_ARGB.
 
@@ -853,4 +853,4 @@ class CXFA_Manifest : public CXFA_Data {
   CFX_WideString GetRefContent(int32_t nIndex);
 };
 
-#endif  // FXFA_OBJECTACC_H_
+#endif  // XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_
diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h
index eda5e5769a..5994b81b3c 100644
--- a/xfa/include/fxfa/fxfa_widget.h
+++ b/xfa/include/fxfa/fxfa_widget.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_WIDGET_H
-#define _FXFA_WIDGET_H
+#ifndef XFA_INCLUDE_FXFA_FXFA_WIDGET_H_
+#define XFA_INCLUDE_FXFA_FXFA_WIDGET_H_
+
 class CXFA_Node;
 class CXFA_FFDocView;
 class CXFA_FFDoc;
@@ -115,4 +116,5 @@ class CXFA_WidgetAcc : public CXFA_WidgetData {
   CXFA_WidgetLayoutData* m_pLayoutData;
   uint32_t m_nRecursionDepth;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FXFA_FXFA_WIDGET_H_
diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h
index c0ad758598..1d6f360391 100644
--- a/xfa/src/fdp/include/fde.h
+++ b/xfa/src/fdp/include/fde.h
@@ -6,8 +6,9 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef _FDE
-#define _FDE
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_H_
+
 #include "fde_mem.h"
 #include "fde_xml.h"
 #include "fde_img.h"
@@ -19,4 +20,5 @@
 #include "fde_css.h"
 #include "fde_rdv.h"
 #include "fde_rdr.h"
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_H_
diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h
index 81fb9ed06b..f68da73a77 100644
--- a/xfa/src/fdp/include/fde_brs.h
+++ b/xfa/src/fdp/include/fde_brs.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_BRUSH
-#define _FDE_BRUSH
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_BRS_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_BRS_H_
+
 class IFDE_Image;
 class IFDE_Path;
 class IFDE_Brush;
@@ -140,4 +141,5 @@ class IFDE_LinearGradientBrush : public IFDE_Brush {
   virtual int32_t GetWrapMode() const = 0;
   virtual void SetWrapMode(int32_t iWrapMode) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_BRS_H_
diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h
index d4a675e82e..5e4da8fe35 100644
--- a/xfa/src/fdp/include/fde_css.h
+++ b/xfa/src/fdp/include/fde_css.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_CSS
-#define _FDE_CSS
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
+
 class IFDE_HTMNotify;
 class IFDE_CSSValue;
 class IFDE_CSSPrimitiveValue;
@@ -1082,4 +1083,5 @@ class IFDE_CSSStyleSelector {
                             int32_t iDeclCount,
                             IFDE_CSSComputedStyle* pDestStyle) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h
index d7a5fc618f..4388bbfae5 100644
--- a/xfa/src/fdp/include/fde_img.h
+++ b/xfa/src/fdp/include/fde_img.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_IMAGE
-#define _FDE_IMAGE
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
+
 class IFDE_Image;
 #define FDE_IMAGEFORMAT_Unknown -1
 #define FDE_IMAGEFORMAT_BMP 0
@@ -82,4 +83,5 @@ typedef struct _FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS {
   int32_t iContrast;
 } FDE_CONTRASTPARAMS, *FDE_LPCONTRASTPARAMS;
 typedef FDE_CONTRASTPARAMS const* FDE_LPCCONTRASTPARAMS;
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
diff --git a/xfa/src/fdp/include/fde_mem.h b/xfa/src/fdp/include/fde_mem.h
index 739c417337..9a292bef04 100644
--- a/xfa/src/fdp/include/fde_mem.h
+++ b/xfa/src/fdp/include/fde_mem.h
@@ -6,12 +6,12 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef FDE_MEM_H_
-#define FDE_MEM_H_
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_MEM_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_MEM_H_
 
 #include "core/include/fxcrt/fx_memory.h"
 
 #define FDE_NewWith FXTARGET_NewWith
 #define FDE_DeleteWith FXTARGET_DeleteWith
 
-#endif  // FDE_MEM_H_
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_MEM_H_
diff --git a/xfa/src/fdp/include/fde_pen.h b/xfa/src/fdp/include/fde_pen.h
index 170471fa0d..a335c972ee 100644
--- a/xfa/src/fdp/include/fde_pen.h
+++ b/xfa/src/fdp/include/fde_pen.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_PEN
-#define _FDE_PEN
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_PEN_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_PEN_H_
+
 class IFDE_Pen;
 #define FDE_PENTYPE_Unknown FDE_BRUSHTYPE_Unknown
 #define FDE_PENTYPE_SolidColor FDE_BRUSHTYPE_Solid
@@ -61,4 +62,5 @@ class IFDE_Pen {
   virtual FX_BOOL SetCompoundPatterns(
       const CFDE_CompoundPatterns& compoundPatterns) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_PEN_H_
diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h
index 4b64393fe0..5f3e93d93c 100644
--- a/xfa/src/fdp/include/fde_psr.h
+++ b/xfa/src/fdp/include/fde_psr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_PARSER
-#define _FDE_PARSER
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
+
 enum FDE_VISUALOBJTYPE {
   FDE_VISUALOBJ_Canvas = 0x00,
   FDE_VISUALOBJ_Text = 0x01,
@@ -102,4 +103,5 @@ class IFDE_VisualSetIterator {
                                  FDE_HVISUALOBJ* phCanvasObj = NULL,
                                  IFDE_CanvasSet** ppCanvasSet = NULL) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
diff --git a/xfa/src/fdp/include/fde_pth.h b/xfa/src/fdp/include/fde_pth.h
index 6db03e251d..41cb367613 100644
--- a/xfa/src/fdp/include/fde_pth.h
+++ b/xfa/src/fdp/include/fde_pth.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_PATH
-#define _FDE_PATH
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
+
 class IFDE_Path;
 class IFDE_Path {
  public:
@@ -30,4 +31,5 @@ class IFDE_Path {
                        FX_FLOAT fLineWidth,
                        FX_FLOAT fMiterLimit) const = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h
index a69404cbb3..8aca67361b 100644
--- a/xfa/src/fdp/include/fde_rdr.h
+++ b/xfa/src/fdp/include/fde_rdr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_RENDERCONTEXT
-#define _FDE_RENDERCONTEXT
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
+
 class IFDE_Page;
 class IFDE_RenderDevice;
 
@@ -33,4 +34,5 @@ class IFDE_RenderContext {
   virtual FDE_RENDERSTATUS DoRender(IFX_Pause* pPause = NULL) = 0;
   virtual void StopRender() = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h
index 5c6a2d19ba..2d9e3800ef 100644
--- a/xfa/src/fdp/include/fde_rdv.h
+++ b/xfa/src/fdp/include/fde_rdv.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_RENDERDEVICE
-#define _FDE_RENDERDEVICE
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
+
 class IFDE_Pen;
 class IFDE_Brush;
 class IFDE_Image;
@@ -100,4 +101,5 @@ class IFDE_RenderDevice {
                                 const CFX_RectF& rect,
                                 const CFX_Matrix* pMatrix = NULL) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h
index 43eb9553bb..3e7fcf9f38 100644
--- a/xfa/src/fdp/include/fde_tto.h
+++ b/xfa/src/fdp/include/fde_tto.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_TEXTOUT
-#define _FDE_TEXTOUT
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
+
 class IFDE_TextOut;
 #define FDE_TTOSTYLE_Underline 0x0001
 #define FDE_TTOSTYLE_Strikeout 0x0002
@@ -94,4 +95,5 @@ class IFDE_TextOut {
                              const CFX_RectF& rect) = 0;
   virtual int32_t GetTotalLines() = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index 5a8a33504b..40b0480e8c 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FDE_XML_H_
-#define FDE_XML_H_
+#ifndef XFA_SRC_FDP_INCLUDE_FDE_XML_H_
+#define XFA_SRC_FDP_INCLUDE_FDE_XML_H_
 
 class IFDE_XMLNode;
 class IFDE_XMLInstruction;
@@ -230,4 +230,4 @@ class IFDE_XMLSyntaxParser {
   virtual void GetTargetData(CFX_WideString& wsData) const = 0;
 };
 
-#endif  // FDE_XML_H_
+#endif  // XFA_SRC_FDP_INCLUDE_FDE_XML_H_
diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fdp/src/css/fde_csscache.h
index 674a202656..637fd11866 100644
--- a/xfa/src/fdp/src/css/fde_csscache.h
+++ b/xfa/src/fdp/src/css/fde_csscache.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_CSSCACHE
-#define _FDE_CSSCACHE
+#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_
+#define XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_
+
 typedef struct _FDE_CSSCACHEITEM : public CFX_Target {
   _FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p);
   ~_FDE_CSSCACHEITEM();
@@ -71,4 +72,5 @@ class CFDE_CSSAccelerator : public IFDE_CSSAccelerator, public CFX_Target {
  protected:
   CFDE_CSSTagStack m_Stack;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_
diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h
index cd1b8ed5c2..d4e4be5094 100644
--- a/xfa/src/fdp/src/css/fde_cssdatatable.h
+++ b/xfa/src/fdp/src/css/fde_cssdatatable.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_CSSDATATABLE
-#define _FDE_CSSDATATABLE
+#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_
+#define XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_
+
 class CFDE_CSSFunction : public CFX_Target {
  public:
   CFDE_CSSFunction(const FX_WCHAR* pszFuncName, IFDE_CSSValueList* pArgList)
@@ -192,4 +193,4 @@ FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue,
                         int32_t& iOffset,
                         int32_t& iLength);
 
-#endif
+#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_
diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.h b/xfa/src/fdp/src/css/fde_cssdeclaration.h
index 7442706d96..8670e5e169 100644
--- a/xfa/src/fdp/src/css/fde_cssdeclaration.h
+++ b/xfa/src/fdp/src/css/fde_cssdeclaration.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_CSSDECLARATION
-#define _FDE_CSSDECLARATION
+#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_
+#define XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_
+
 #include "fde_cssdatatable.h"
+
 typedef struct _FDE_CSSPROPERTYHOLDER : public CFX_Target {
   int16_t eProperty;
   int16_t bImportant;
@@ -148,4 +150,5 @@ class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target {
   FDE_LPCSSCUSTOMPROPERTY m_pFirstCustom;
   FDE_LPCSSCUSTOMPROPERTY m_pLastCustom;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_
diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h
index 965ece666d..4814a9c818 100644
--- a/xfa/src/fdp/src/css/fde_cssstyleselector.h
+++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_CSSSTYLESELECTOR
-#define _FDE_CSSSTYLESELECTOR
+#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_
+#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_
+
 #define FDE_CSSUNIVERSALHASH ('*')
 typedef struct _FDE_CSSRULEDATA : public CFX_Target {
  public:
@@ -883,4 +884,5 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
   CFDE_CSSNonInheritedData m_NonInheritedData;
   CFX_WideStringArray m_CustomProperties;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_
diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.h b/xfa/src/fdp/src/css/fde_cssstylesheet.h
index 9fece7b3f2..596443bfcb 100644
--- a/xfa/src/fdp/src/css/fde_cssstylesheet.h
+++ b/xfa/src/fdp/src/css/fde_cssstylesheet.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_CSSSTYLESHEET
-#define _FDE_CSSSTYLESHEET
+#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_
+#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_
+
 #include "fde_cssdeclaration.h"
+
 class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target {
  public:
   CFDE_CSSSelector(FDE_CSSSELECTORTYPE eType,
@@ -134,4 +136,5 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target {
   CFDE_CSSSelectorArray m_Selectors;
   CFX_MapPtrToPtr m_StringCache;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_
diff --git a/xfa/src/fdp/src/css/fde_csssyntax.h b/xfa/src/fdp/src/css/fde_csssyntax.h
index cf04c655a9..e0f03bba57 100644
--- a/xfa/src/fdp/src/css/fde_csssyntax.h
+++ b/xfa/src/fdp/src/css/fde_csssyntax.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_CSSSYNTAX
-#define _FDE_CSSSYNTAX
+#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
+#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
+
 class CFDE_CSSTextBuf : public CFX_Target {
  public:
   CFDE_CSSTextBuf();
@@ -107,4 +108,5 @@ class CFDE_CSSSyntaxParser : public IFDE_CSSSyntaxParser, public CFX_Target {
   FDE_CSSSYNTAXSTATUS m_eStatus;
   CFX_StackTemplate<FDE_CSSSYNTAXMODE> m_ModeStack;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
diff --git a/xfa/src/fdp/src/fde/fde_devbasic.h b/xfa/src/fdp/src/fde/fde_devbasic.h
index 4cd4890985..e5c27be2e0 100644
--- a/xfa/src/fdp/src/fde/fde_devbasic.h
+++ b/xfa/src/fdp/src/fde/fde_devbasic.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_DEVICE_BASIC_IMP
-#define _FDE_DEVICE_BASIC_IMP
+#ifndef XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_
+#define XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_
+
 struct FDE_HATCHDATA {
   int32_t iWidth;
   int32_t iHeight;
@@ -13,4 +14,5 @@ struct FDE_HATCHDATA {
 };
 typedef FDE_HATCHDATA const* FDE_LPCHATCHDATA;
 FDE_LPCHATCHDATA FDE_DEVGetHatchData(int32_t iHatchStyle);
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_
diff --git a/xfa/src/fdp/src/fde/fde_gdidevice.h b/xfa/src/fdp/src/fde/fde_gdidevice.h
index f495e63cf6..c7b70f4dd7 100644
--- a/xfa/src/fdp/src/fde/fde_gdidevice.h
+++ b/xfa/src/fdp/src/fde/fde_gdidevice.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_GDIPLUSDEVICE_IMP
-#define _FDE_GDIPLUSDEVICE_IMP
+#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GDIDEVICE_H_
+#define XFA_SRC_FDP_SRC_FDE_FDE_GDIDEVICE_H_
+
 #ifdef _FDEPLUS
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
@@ -154,4 +155,5 @@ class CFDE_GdiDevice : public IFDE_RenderDevice, public CFX_Target {
 };
 #endif
 #endif
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_FDE_FDE_GDIDEVICE_H_
diff --git a/xfa/src/fdp/src/fde/fde_gedevice.h b/xfa/src/fdp/src/fde/fde_gedevice.h
index 189bd0fa31..dc22f7b0d4 100644
--- a/xfa/src/fdp/src/fde/fde_gedevice.h
+++ b/xfa/src/fdp/src/fde/fde_gedevice.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_FXGEDEVICE_IMP
-#define _FDE_FXGEDEVICE_IMP
+#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_
+#define XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_
+
 #ifndef _FDEPLUS
 class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target {
  public:
@@ -130,4 +131,5 @@ class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target {
   int32_t m_iCharCount;
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_
diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h
index dd97e7f776..c883ebc794 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.h
+++ b/xfa/src/fdp/src/fde/fde_geobject.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_GRAPHOBJS_IMP
-#define _FDE_GRAPHOBJS_IMP
+#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
+#define XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
+
 #ifndef _FDEPLUS
 #include "xfa/src/foxitlib.h"
 class CFDE_GEFontMgr;
@@ -52,4 +53,5 @@ class CFDE_Path : public IFDE_Path, public CFX_Target {
   CFX_PathData m_Path;
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
diff --git a/xfa/src/fdp/src/fde/fde_iterator.h b/xfa/src/fdp/src/fde/fde_iterator.h
index 2e1304bdef..c9fb8e423d 100644
--- a/xfa/src/fdp/src/fde/fde_iterator.h
+++ b/xfa/src/fdp/src/fde/fde_iterator.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_ITERATOR_IMP
-#define _FDE_ITERATOR_IMP
+#ifndef XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_
+#define XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_
+
 typedef struct _FDE_CANVASITEM : public CFX_Target {
   IFDE_CanvasSet* pCanvas;
   FDE_HVISUALOBJ hCanvas;
@@ -30,4 +31,5 @@ class CFDE_VisualSetIterator : public IFDE_VisualSetIterator,
   FX_DWORD m_dwFilter;
   CFX_StackTemplate<FDE_CANVASITEM> m_CanvasStack;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_
diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h
index de973b636a..91162edeb4 100644
--- a/xfa/src/fdp/src/fde/fde_object.h
+++ b/xfa/src/fdp/src/fde/fde_object.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_BASEOBJECT_IMP
-#define _FDE_BASEOBJECT_IMP
+#ifndef XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_
+#define XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_
+
 class CFDE_Pen : public IFDE_Pen, public CFX_Target {
  public:
   CFDE_Pen()
@@ -234,4 +235,5 @@ class CFDE_LinearBrush : public IFDE_LinearGradientBrush, public CFX_Target {
   int32_t m_iWrapMode;
   CFX_Matrix m_Matrix;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_
diff --git a/xfa/src/fdp/src/fde/fde_render.h b/xfa/src/fdp/src/fde/fde_render.h
index cb52224a45..50f76f394e 100644
--- a/xfa/src/fdp/src/fde/fde_render.h
+++ b/xfa/src/fdp/src/fde/fde_render.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_RENDER_IMP
-#define _FDE_RENDER_IMP
+#ifndef XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_
+#define XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_
+
 class CFDE_RenderContext;
 class CFDE_RenderContext : public IFDE_RenderContext,
                            public CFX_ThreadLock,
@@ -36,4 +37,5 @@ class CFDE_RenderContext : public IFDE_RenderContext,
   int32_t m_iCharPosCount;
   IFDE_VisualSetIterator* m_pIterator;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_
diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h
index 97bf51756f..ac9d88381a 100644
--- a/xfa/src/fdp/src/tto/fde_textout.h
+++ b/xfa/src/fdp/src/tto/fde_textout.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_TEXTOUT_IMP
-#define _FDE_TEXTOUT_IMP
+#ifndef XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_
+#define XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_
+
 struct FDE_TTOPIECE {
  public:
   int32_t iStartChar;
@@ -164,4 +165,5 @@ class CFDE_TextOut : public IFDE_TextOut, public CFX_Target {
   CFX_Int32Array m_hotKeys;
   CFX_RectFArray m_rectArray;
 };
-#endif
+
+#endif  // XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_
diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.h b/xfa/src/fdp/src/xml/fde_xml_imp.h
index cc83aa594e..2fed05c0fb 100644
--- a/xfa/src/fdp/src/xml/fde_xml_imp.h
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FDE_XML_IMP_H_
-#define FDE_XML_IMP_H_
+#ifndef XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_
+#define XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_
 
 #define _FDE_BLOCK_BUFFER
 #ifdef _FDE_BLOCK_BUFFER
@@ -372,4 +372,4 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target {
 #endif
 };
 
-#endif  // FDE_XML_IMP_H_
+#endif  // XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_
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_
diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h
index adc4d2bd95..ba72ff3e25 100644
--- a/xfa/src/fgas/include/fgas.h
+++ b/xfa/src/fgas/include/fgas.h
@@ -6,8 +6,9 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef _FGAS_
-#define _FGAS_
+#ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_
+#define XFA_SRC_FGAS_INCLUDE_FGAS_H_
+
 #include "fx_sys.h"
 #include "fx_mem.h"
 #include "fx_lgg.h"
@@ -23,4 +24,5 @@
 #include "fx_lbk.h"
 #include "fx_tbk.h"
 #include "fx_rbk.h"
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FGAS_H_
diff --git a/xfa/src/fgas/include/fx_alg.h b/xfa/src/fgas/include/fx_alg.h
index 11ccdc63a7..dd593202da 100644
--- a/xfa/src/fgas/include/fx_alg.h
+++ b/xfa/src/fgas/include/fx_alg.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_ALGORITHM
-#define _FX_ALGORITHM
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
+
 #define FX_IsOdd(a) ((a)&1)
 #ifdef __cplusplus
 extern "C" {
@@ -44,4 +45,5 @@ class CFX_DSPATemplate {
     return -1;
   }
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
diff --git a/xfa/src/fgas/include/fx_cpg.h b/xfa/src/fgas/include/fx_cpg.h
index 357ffd820a..84914766e6 100644
--- a/xfa/src/fgas/include/fx_cpg.h
+++ b/xfa/src/fgas/include/fx_cpg.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_CODEPAGE
-#define _FX_CODEPAGE
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
+
 class IFX_CodePage;
 #define FX_CODEPAGE_DefANSI 0
 #define FX_CODEPAGE_DefOEM 1
@@ -245,4 +246,5 @@ class IFX_CodePage {
   virtual FX_BOOL IsValidUnicode(FX_WCHAR wUnicode) const = 0;
   virtual FX_WORD GetCharcode(FX_WCHAR wUnicode) const = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h
index 773acbd2fb..f5bbee7f81 100644
--- a/xfa/src/fgas/include/fx_datetime.h
+++ b/xfa/src/fgas/include/fx_datetime.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_DATETIME_H_
-#define _FX_DATETIME_H_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
+
 class CFX_Unitime;
 class CFX_DateTime;
 typedef int64_t FX_UNITIME;
@@ -389,4 +390,5 @@ class CFX_DateTime {
  private:
   FX_DATETIME m_DateTime;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h
index 894ad183f5..34abab8846 100644
--- a/xfa/src/fgas/include/fx_fnt.h
+++ b/xfa/src/fgas/include/fx_fnt.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_FONT
-#define _FX_FONT
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
+
 class IFX_Font;
 class IFX_FontMgr;
 #define FX_FONTSTYLE_Normal 0x00
@@ -261,4 +262,5 @@ class IFX_FontMgr {
   virtual void RemoveFont(IFX_Font* pFont) = 0;
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
diff --git a/xfa/src/fgas/include/fx_lbk.h b/xfa/src/fgas/include/fx_lbk.h
index 2f0a300cd4..12a0fc1cad 100644
--- a/xfa/src/fgas/include/fx_lbk.h
+++ b/xfa/src/fgas/include/fx_lbk.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_LINEBREAK
-#define _FX_LINEBREAK
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_LBK_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_LBK_H_
 
 #include "core/include/fxcrt/fx_system.h"
 #include "xfa/src/fgas/include/fx_utl.h"
@@ -36,4 +36,5 @@ void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
 void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
                               int32_t iLength,
                               CFX_Int32MassArray& bp);
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_LBK_H_
diff --git a/xfa/src/fgas/include/fx_lgg.h b/xfa/src/fgas/include/fx_lgg.h
index ff30c53bc7..68e7ebd3ba 100644
--- a/xfa/src/fgas/include/fx_lgg.h
+++ b/xfa/src/fgas/include/fx_lgg.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_LANGUAGE
-#define _FX_LANGUAGE
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_LGG_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_LGG_H_
+
 #define FX_LANG_Neutral 0x0000
 #define FX_LANG_Invariant 0x007f
 #define FX_LANG_UserDefault 0x0400
@@ -264,4 +265,5 @@
 #define FX_LANG_YiPRC 0x0478
 #define FX_LANG_Yiddish 0x043d
 #define FX_LANG_Yoruba_Nigeria 0x046a
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_LGG_H_
diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index 7ead311c53..36d19b5e14 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_LOCALE_H_
-#define _FX_LOCALE_H_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
+
 class CFX_Unitime;
 class IFX_Locale;
 class IFX_FormatString;
@@ -200,4 +201,5 @@ class CFX_Decimal {
   uint32_t m_uLo;
   uint32_t m_uMid;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
diff --git a/xfa/src/fgas/include/fx_mem.h b/xfa/src/fgas/include/fx_mem.h
index 5d933dc06c..d59d391d44 100644
--- a/xfa/src/fgas/include/fx_mem.h
+++ b/xfa/src/fgas/include/fx_mem.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_MEMORY
-#define _FX_MEMORY
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_MEM_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_MEM_H_
 
 #include "core/include/fxcrt/fx_memory.h"  // For FX_Alloc().
 
@@ -53,4 +53,5 @@ class CFX_Target {
     (pointer)->~__class__();                                   \
     (pointer)->operator delete((pointer), (__allocator__));    \
   }
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_MEM_H_
diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h
index e344959830..e3e0595f59 100644
--- a/xfa/src/fgas/include/fx_rbk.h
+++ b/xfa/src/fgas/include/fx_rbk.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_RTFBREAK
-#define _FX_RTFBREAK
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
+
 class IFX_Unknown;
 class IFX_Font;
 class CFX_Char;
@@ -225,4 +226,5 @@ class IFX_RTFBreak {
                                CFX_RectFArray& rtArray,
                                FX_BOOL bCharBBox = FALSE) const = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
diff --git a/xfa/src/fgas/include/fx_sax.h b/xfa/src/fgas/include/fx_sax.h
index 70978a017b..02468d31d2 100644
--- a/xfa/src/fgas/include/fx_sax.h
+++ b/xfa/src/fgas/include/fx_sax.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SAX_
-#define _FX_SAX_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
+
 class IFX_SAXReaderHandler;
 class IFX_SAXReader;
 #define FX_SAXPARSEMODE_NotConvert_amp 0x0001
@@ -60,4 +61,5 @@ class IFX_SAXReader {
   virtual void SetHandler(IFX_SAXReaderHandler* pHandler) = 0;
 };
 IFX_SAXReader* FX_SAXReader_Create();
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
diff --git a/xfa/src/fgas/include/fx_stm.h b/xfa/src/fgas/include/fx_stm.h
index 43a2c8de08..0f0385b5ec 100644
--- a/xfa/src/fgas/include/fx_stm.h
+++ b/xfa/src/fgas/include/fx_stm.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_STREAM
-#define _FX_STREAM
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_STM_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_STM_H_
+
 class IFX_Stream;
 IFX_FileRead* FX_CreateFileRead(IFX_Stream* pBaseStream,
                                 FX_BOOL bReleaseStream = FALSE);
@@ -69,4 +70,5 @@ class IFX_Stream {
                                          int32_t iOffset,
                                          int32_t iLength) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_STM_H_
diff --git a/xfa/src/fgas/include/fx_sys.h b/xfa/src/fgas/include/fx_sys.h
index f2fe2157c6..b4732d7728 100644
--- a/xfa/src/fgas/include/fx_sys.h
+++ b/xfa/src/fgas/include/fx_sys.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SYSTEM
-#define _FX_SYSTEM
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -62,4 +63,5 @@ typedef FX_VERSION const* FX_LPCVERSION;
 #ifdef __cplusplus
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h
index d9fef51f65..6ebfd4ce04 100644
--- a/xfa/src/fgas/include/fx_tbk.h
+++ b/xfa/src/fgas/include/fx_tbk.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_TEXTBREAK
-#define _FX_TEXTBREAK
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_TBK_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_TBK_H_
 
 #include "core/include/fxcrt/fx_ucd.h"
 
@@ -211,4 +211,5 @@ class IFX_TxtBreak {
                                CFX_RectFArray& rtArray,
                                FX_BOOL bCharBBox = FALSE) const = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_TBK_H_
diff --git a/xfa/src/fgas/include/fx_ucd.h b/xfa/src/fgas/include/fx_ucd.h
index 6aa11ce8b4..51a0a1f2fc 100644
--- a/xfa/src/fgas/include/fx_ucd.h
+++ b/xfa/src/fgas/include/fx_ucd.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FGAS_UNICODE_
-#define _FGAS_UNICODE_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
+
 #define FX_JAPCHARPROPERTYEX_Left 0x01
 #define FX_JAPCHARPROPERTYEX_Center 0x02
 #define FX_JAPCHARPROPERTYEX_Right 0x03
@@ -30,4 +31,5 @@ FX_BOOL FX_AdjustJapCharDisplayPos(FX_WCHAR wch,
                                    FX_FLOAT fFontSize,
                                    FX_BOOL bVertical,
                                    CFX_PointF& ptOffset);
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h
index 0e4a35a651..cd7f2a7ef2 100644
--- a/xfa/src/fgas/include/fx_utl.h
+++ b/xfa/src/fgas/include/fx_utl.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_UTILS
-#define _FX_UTILS
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_UTL_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_UTL_H_
 
 #include "fx_mem.h"
 #include "core/include/fxcrt/fx_coordinates.h"  // For CFX_Rect.
@@ -721,4 +721,5 @@ class CFX_CPLTree {
  protected:
   CPLTreeNode m_Root;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_INCLUDE_FX_UTL_H_
diff --git a/xfa/src/fgas/src/crt/fx_memory.h b/xfa/src/fgas/src/crt/fx_memory.h
index e181ce834d..931bfbf334 100644
--- a/xfa/src/fgas/src/crt/fx_memory.h
+++ b/xfa/src/fgas/src/crt/fx_memory.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_MEMORY_IMP
-#define _FX_MEMORY_IMP
+#ifndef XFA_SRC_FGAS_SRC_CRT_FX_MEMORY_H_
+#define XFA_SRC_FGAS_SRC_CRT_FX_MEMORY_H_
+
 class CFX_DefStore;
 class CFX_StaticStore;
 class CFX_FixedStore;
@@ -132,4 +133,5 @@ class CFX_DynamicStore : public IFX_MEMAllocator, public CFX_Target {
   FX_LPDYNAMICSTORECHUNK m_pChunk;
   FX_LPDYNAMICSTORECHUNK AllocChunk(size_t size);
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_CRT_FX_MEMORY_H_
diff --git a/xfa/src/fgas/src/crt/fx_stream.h b/xfa/src/fgas/src/crt/fx_stream.h
index 122cda1e39..15646a5de9 100644
--- a/xfa/src/fgas/src/crt/fx_stream.h
+++ b/xfa/src/fgas/src/crt/fx_stream.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_STREAM_IMP
-#define _FX_STREAM_IMP
+#ifndef XFA_SRC_FGAS_SRC_CRT_FX_STREAM_H_
+#define XFA_SRC_FGAS_SRC_CRT_FX_STREAM_H_
+
 class CFX_StreamImp;
 class CFX_FileStreamImp;
 class CFX_BufferStreamImp;
@@ -308,4 +309,4 @@ class CFGAS_FileWrite : public IFX_FileWrite {
   FX_BOOL m_bReleaseStream;
 };
 
-#endif
+#endif  // XFA_SRC_FGAS_SRC_CRT_FX_STREAM_H_
diff --git a/xfa/src/fgas/src/crt/fx_utils.h b/xfa/src/fgas/src/crt/fx_utils.h
index 35fdd54423..e491ec024f 100644
--- a/xfa/src/fgas/src/crt/fx_utils.h
+++ b/xfa/src/fgas/src/crt/fx_utils.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_UTILS_IMP
-#define _FX_UTILS_IMP
+#ifndef XFA_SRC_FGAS_SRC_CRT_FX_UTILS_H_
+#define XFA_SRC_FGAS_SRC_CRT_FX_UTILS_H_
+
 class CFX_BaseMassArrayImp : public CFX_Target {
  public:
   CFX_BaseMassArrayImp(int32_t iChunkSize, int32_t iBlockSize);
@@ -33,4 +34,5 @@ class CFX_BaseMassArrayImp : public CFX_Target {
               int32_t iSrcStart = 0,
               int32_t iSrcCount = -1);
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_CRT_FX_UTILS_H_
diff --git a/xfa/src/fgas/src/fgas_base.h b/xfa/src/fgas/src/fgas_base.h
index df5e56a192..1f5f7797ef 100644
--- a/xfa/src/fgas/src/fgas_base.h
+++ b/xfa/src/fgas/src/fgas_base.h
@@ -6,9 +6,11 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef _FXMATH_BASE_
-#define _FXMATH_BASE_
+#ifndef XFA_SRC_FGAS_SRC_FXGAS_BASE_H_
+#define XFA_SRC_FGAS_SRC_FXGAS_BASE_H_
+
 #include "xfa/src/foxitlib.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "xfa/src/fgas/include/fgas.h"
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_FXGAS_BASE_H_
diff --git a/xfa/src/fgas/src/font/fx_fontutils.h b/xfa/src/fgas/src/font/fx_fontutils.h
index 0bac043d48..100a70ae78 100644
--- a/xfa/src/fgas/src/font/fx_fontutils.h
+++ b/xfa/src/fgas/src/font/fx_fontutils.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FGAS_FONTUTIL_H_
-#define _FGAS_FONTUTIL_H_
+#ifndef XFA_SRC_FGAS_SRC_FONT_FX_FONTUTILS_H_
+#define XFA_SRC_FGAS_SRC_FONT_FX_FONTUTILS_H_
+
 typedef struct _FGAS_FONTUSB {
   FX_WCHAR wStartUnicode;
   FX_WCHAR wEndUnicode;
@@ -18,4 +19,5 @@ FX_DWORD FGAS_GetFontFamilyHash(const FX_WCHAR* pszFontFamily,
                                 FX_DWORD dwFontStyles,
                                 FX_WORD wCodePage);
 FGAS_LPCFONTUSB FGAS_GetUnicodeBitField(FX_WCHAR wUnicode);
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_FONT_FX_FONTUTILS_H_
diff --git a/xfa/src/fgas/src/font/fx_gdifont.h b/xfa/src/fgas/src/font/fx_gdifont.h
index 648a37c521..b267e979a9 100644
--- a/xfa/src/fgas/src/font/fx_gdifont.h
+++ b/xfa/src/fgas/src/font/fx_gdifont.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_GDIOBJECT_IMP
-#define _FX_GDIOBJECT_IMP
+#ifndef XFA_SRC_FGAS_SRC_FONT_FX_GDIFONT_H_
+#define XFA_SRC_FGAS_SRC_FONT_FX_GDIFONT_H_
+
 #ifdef _FXPLUS
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
@@ -103,4 +104,5 @@ class CFX_GdiFont : public IFX_Font, public CFX_ThreadLock {
 };
 #endif
 #endif
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_FONT_FX_GDIFONT_H_
diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h
index 9137cba82d..cddc984ca7 100644
--- a/xfa/src/fgas/src/font/fx_gefont.h
+++ b/xfa/src/fgas/src/font/fx_gefont.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_GRAPHOBJS_IMP
-#define _FX_GRAPHOBJS_IMP
+#ifndef XFA_SRC_FGAS_SRC_FONT_FX_GEFONT_H_
+#define XFA_SRC_FGAS_SRC_FONT_FX_GEFONT_H_
+
 #ifndef _FXPLUS
 class CFX_GEFontMgr;
 #ifndef FXFONT_SUBST_ITALIC
@@ -87,4 +88,5 @@ class CFX_GEFont : public IFX_Font, public CFX_ThreadLock {
                         FX_BOOL bCharCode = FALSE);
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_FONT_FX_GEFONT_H_
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index fe14ad7984..1d750e17fa 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_FONTMGR_IMP
-#define _FX_FONTMGR_IMP
+#ifndef XFA_SRC_FGAS_SRC_FONT_FX_STDFONTMGR_H_
+#define XFA_SRC_FGAS_SRC_FONT_FX_STDFONTMGR_H_
+
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 int32_t FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, FX_DWORD dwFontStyles);
 FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams,
@@ -231,4 +232,5 @@ class CFX_FontMgrImp : public IFX_FontMgr {
   void* m_pUserData;
 };
 #endif
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_FONT_FX_STDFONTMGR_H_
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h
index fbb955566a..895661149d 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.h
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_RTFBREAK_IMP
-#define _FX_RTFBREAK_IMP
+#ifndef XFA_SRC_FGAS_SRC_LAYOUT_FX_RTFBREAK_H_
+#define XFA_SRC_FGAS_SRC_LAYOUT_FX_RTFBREAK_H_
 
 #include "core/include/fxcrt/fx_arb.h"
 
@@ -171,4 +171,5 @@ class CFX_RTFBreak : public IFX_RTFBreak {
                           FX_BOOL bAllChars,
                           FX_DWORD dwStatus);
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_LAYOUT_FX_RTFBREAK_H_
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h
index 6644725e1b..e9164fdade 100644
--- a/xfa/src/fgas/src/layout/fx_textbreak.h
+++ b/xfa/src/fgas/src/layout/fx_textbreak.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_TEXTBREAK_IMP
-#define _FX_TEXTBREAK_IMP
+#ifndef XFA_SRC_FGAS_SRC_LAYOUT_FX_TEXTBREAK_H_
+#define XFA_SRC_FGAS_SRC_LAYOUT_FX_TEXTBREAK_H_
 
 #include "core/include/fxcrt/fx_memory.h"
 
@@ -168,4 +168,5 @@ class CFX_TxtBreak : public IFX_TxtBreak {
                      CFX_TxtLine* pNextLine,
                      FX_BOOL bAllChars = FALSE);
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_LAYOUT_FX_TEXTBREAK_H_
diff --git a/xfa/src/fgas/src/layout/fx_unicode.h b/xfa/src/fgas/src/layout/fx_unicode.h
index 92ec5004ea..8c6149a3a8 100644
--- a/xfa/src/fgas/src/layout/fx_unicode.h
+++ b/xfa/src/fgas/src/layout/fx_unicode.h
@@ -4,12 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FGAS_UNICODE_IMP
-#define _FGAS_UNICODE_IMP
+#ifndef XFA_SRC_FGAS_SRC_LAYOUT_FX_UNICODE_H_
+#define XFA_SRC_FGAS_SRC_LAYOUT_FX_UNICODE_H_
+
 typedef struct _FX_TPO {
   int32_t index;
   int32_t pos;
 } FX_TPO;
 typedef CFX_MassArrayTemplate<FX_TPO> CFX_TPOArray;
 void FX_TEXTLAYOUT_PieceSort(CFX_TPOArray& tpos, int32_t iStart, int32_t iEnd);
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_LAYOUT_FX_UNICODE_H_
diff --git a/xfa/src/fgas/src/localization/fx_localeimp.h b/xfa/src/fgas/src/localization/fx_localeimp.h
index 1de517f8b6..02e4c5254f 100644
--- a/xfa/src/fgas/src/localization/fx_localeimp.h
+++ b/xfa/src/fgas/src/localization/fx_localeimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_LOCALE_IMP_H_
-#define _FX_LOCALE_IMP_H_
+#ifndef XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEIMP_H_
+#define XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEIMP_H_
+
 class CFX_LCNumeric;
 class CFX_Locale : public IFX_Locale {
  public:
@@ -113,4 +114,5 @@ class CFX_FormatString : public IFX_FormatString {
   IFX_LocaleMgr* m_pLocaleMgr;
   FX_BOOL m_bUseLCID;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEIMP_H_
diff --git a/xfa/src/fgas/src/localization/fx_localemgr.h b/xfa/src/fgas/src/localization/fx_localemgr.h
index 1428a4346a..96f072a7e2 100644
--- a/xfa/src/fgas/src/localization/fx_localemgr.h
+++ b/xfa/src/fgas/src/localization/fx_localemgr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_LOCALEMGR_IMP_H_
-#define _FX_LOCALEMGR_IMP_H_
+#ifndef XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEMGR_H_
+#define XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEMGR_H_
+
 class CFX_LocaleMgr : public IFX_LocaleMgr {
  public:
   CFX_LocaleMgr(FX_WORD wDefLCID);
@@ -21,4 +22,5 @@ class CFX_LocaleMgr : public IFX_LocaleMgr {
   CFX_MapPtrToPtr m_lcid2locale;
   FX_WORD m_wDefLCID;
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEMGR_H_
diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.h b/xfa/src/fgas/src/xml/fx_sax_imp.h
index 76809b9503..8418c4e0c1 100644
--- a/xfa/src/fgas/src/xml/fx_sax_imp.h
+++ b/xfa/src/fgas/src/xml/fx_sax_imp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SAX_IMP_
-#define _FX_SAX_IMP_
+#ifndef XFA_SRC_FGAS_SRC_XML_FX_SAX_IMP_H_
+#define XFA_SRC_FGAS_SRC_XML_FX_SAX_IMP_H_
 
 class CFX_SAXFile {
  public:
@@ -131,4 +131,5 @@ class CFX_SAXReader : public IFX_SAXReader {
   void ReallocNameBuffer();
   void ParseChar(uint8_t ch);
 };
-#endif
+
+#endif  // XFA_SRC_FGAS_SRC_XML_FX_SAX_IMP_H_
diff --git a/xfa/src/foxitlib.h b/xfa/src/foxitlib.h
index 9d0fdbc994..ef8250f6b9 100644
--- a/xfa/src/foxitlib.h
+++ b/xfa/src/foxitlib.h
@@ -6,12 +6,14 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef _FOXIT_LIB_H_
-#define _FOXIT_LIB_H_
+#ifndef XFA_SRC_FXJSE_FOXITLIB_H_
+#define XFA_SRC_FXJSE_FOXITLIB_H_
+
 #include "xfa/include/foxitxfa.h"
 #include "xfa/src/fgas/include/fgas.h"
 #include "xfa/src/fdp/include/fde.h"
 #include "xfa/src/fee/include/ifde_txtedtengine.h"
 #include "xfa/src/fee/include/ifde_txtedtpage.h"
 #include "xfa/src/fee/include/fx_wordbreak.h"
-#endif
+
+#endif  // XFA_SRC_FXJSE_FOXITLIB_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h
index 55f5219307..53749f4653 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_BARCODE_IMP_H
-#define _FWL_BARCODE_IMP_H
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -48,4 +49,5 @@ class CFWL_BarcodeImpDelegate : public CFWL_EditImpDelegate {
   CFWL_BarcodeImpDelegate(CFWL_BarcodeImp* pOwner);
   FWL_ERR OnProcessEvent(CFWL_Event* pEvent) override;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
index e26baf3685..ffbcfc0db9 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CARET_IMP_H
-#define _FWL_CARET_IMP_H
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H
 
 #include "xfa/include/fwl/core/fwl_timer.h"
 
@@ -64,4 +64,5 @@ class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate {
  protected:
   CFWL_CaretImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h
index 10af174068..eb32380fba 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CHECKBOX_IMP_H
-#define _FWL_CHECKBOX_IMP_H
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -59,4 +60,5 @@ class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate {
   void OnKeyDown(CFWL_MsgKey* pMsg);
   CFWL_CheckBoxImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
index 86b9348bcd..68514262a1 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_COMBOBOX_IMP_H
-#define _FWL_COMBOBOX_IMP_H
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_COMBOBOXIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_COMBOBOXIMP_H_
 
 #include <memory>
 
@@ -233,4 +233,5 @@ class CFWL_ComboProxyImpDelegate : public CFWL_WidgetImpDelegate {
   IFWL_Form* m_pForm;
   CFWL_ComboBoxImp* m_pComboBox;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_COMBOBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
index 91411fca29..148b48a25d 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_DATETIMEPICKER_IMP_H
-#define _FWL_DATETIMEPICKER_IMP_H
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_DATETIMEPICKERIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_DATETIMEPICKERIMP_H_
 
 #include <memory>
 
@@ -228,4 +228,5 @@ class CFWL_DateTimePickerImpDelegate : public CFWL_WidgetImpDelegate {
  private:
   void DisForm_OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE);
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_DATETIMEPICKERIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
index d7e736106e..8961954d77 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_EDITIMP_H_
-#define FWL_EDITIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
 
 #include <memory>
 #include <vector>
@@ -207,4 +207,4 @@ class CFWL_EditImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_EditImp* m_pOwner;
 };
 
-#endif  // FWL_EDITIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h b/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
index 97468f11de..1921bd7540 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_FORMPROXY_IMP_H
-#define _FWL_FORMPROXY_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -37,4 +38,5 @@ class CFWL_FormProxyImpDelegate : public CFWL_WidgetImpDelegate {
  protected:
   CFWL_FormProxyImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h
index 0745619df8..2f91cbcbcb 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_LISTBOX_IMP_H
-#define _FWL_LISTBOX_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
 
 #include <memory>
 
@@ -116,4 +116,5 @@ class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate {
   void DispatchSelChangedEv();
   CFWL_ListBoxImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
index f39ca82e37..fa7a73ff3e 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_MONTHCALENDAR_IMP_H
-#define _FWL_MONTHCALENDAR_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -245,4 +246,5 @@ class CFWL_MonthCalendarImpDelegate : public CFWL_WidgetImpDelegate {
   void OnMouseLeave(CFWL_MsgMouse* pMsg);
   CFWL_MonthCalendarImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h
index f75dba90a0..1df9b8ae01 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PICTUREBOX_IMP_H
-#define _FWL_PICTUREBOX_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -48,4 +49,5 @@ class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate {
  protected:
   CFWL_PictureBoxImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h b/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h
index 608402e7be..669bb17026 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PUSHBUTTON_IMP_H
-#define _FWL_PUSHBUTTON_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -60,4 +61,5 @@ class CFWL_PushButtonImpDelegate : public CFWL_WidgetImpDelegate {
   void OnKeyDown(CFWL_MsgKey* pMsg);
   CFWL_PushButtonImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
index 052bac83ce..a48f077325 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SCROLLBAR_IMP_H
-#define _FWL_SCROLLBAR_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -135,4 +136,5 @@ class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate {
 
   CFWL_ScrollBarImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h b/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
index 99b99d2dfb..0d8dbbe14a 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SPINBUTTON_IMP_H
-#define _FWL_SPINBUTTON_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -65,4 +66,5 @@ class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate {
   void OnKeyDown(CFWL_MsgKey* pMsg);
   CFWL_SpinButtonImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
index 2ca464bd2b..25796f60a5 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_ToolTip_IMP_H
-#define _FWL_ToolTip_IMP_H
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_TOOLTIP_CTRLIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_TOOLTIP_CTRLIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -80,4 +81,5 @@ class CFWL_ToolTipImpDelegate : public CFWL_WidgetImpDelegate {
   void OnKeyDown(CFWL_MsgKey* pMsg);
   CFWL_ToolTipImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_TOOLTIP_CTRLIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
index 93e4255b5c..ae39b8b3cf 100644
--- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXMATH_BARCODEIMP_H_
-#define _FXMATH_BARCODEIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
+
 class CFX_Barcode : public IFX_Barcode {
  public:
   CFX_Barcode();
@@ -49,4 +50,5 @@ class CFX_Barcode : public IFX_Barcode {
  protected:
   CBC_CodeBase* m_pBCEngine;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_appimp.h b/xfa/src/fwl/src/core/include/fwl_appimp.h
index 627876674f..d30c1b0aab 100644
--- a/xfa/src/fwl/src/core/include/fwl_appimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_appimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_APPIMP_H_
-#define FWL_APPIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_APPIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_APPIMP_H_
 
 #include <memory>
 
@@ -35,4 +35,4 @@ class CFWL_AppImp : public CFWL_NoteThreadImp {
   IFWL_ThemeProvider* m_pThemeProvider;
 };
 
-#endif  // FWL_APPIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_APPIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_contentimp.h b/xfa/src/fwl/src/core/include/fwl_contentimp.h
index ce45719f7a..8839f37d30 100644
--- a/xfa/src/fwl/src/core/include/fwl_contentimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_contentimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CONTENT_IMP_H
-#define _FWL_CONTENT_IMP_H
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_
+
 class CFWL_WidgetImp;
 class IFWL_Widget;
 class CFWL_ContentImp;
@@ -29,4 +30,5 @@ class CFWL_ContentImp : public CFWL_WidgetImp {
   FX_FLOAT m_fHeightMin;
   FX_FLOAT m_fHeightMax;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/include/fwl_formimp.h
index a4aba47c03..c85bd6cf48 100644
--- a/xfa/src/fwl/src/core/include/fwl_formimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_formimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_FORM_IMP_H
-#define _FWL_FORM_IMP_H
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_
+
 class CFWL_NoteLoop;
 class CFWL_PanelImp;
 class CFWL_WidgetImpProperties;
@@ -185,4 +186,5 @@ class CFWL_FormImpDelegate : public CFWL_WidgetImpDelegate {
   void OnClose(CFWL_MsgClose* pMsg);
   CFWL_FormImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h
index 864e90f6fd..2ee22183af 100644
--- a/xfa/src/fwl/src/core/include/fwl_gridimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_GRID_IMP_H
-#define _FWL_GRID_IMP_H
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_
+
 class CFWL_Content;
 class IFWL_Widget;
 class CFWL_GridLength;
@@ -189,4 +190,5 @@ class CFWL_GridImpDelegate : public CFWL_WidgetImpDelegate {
  protected:
   CFWL_GridImp* m_pOwner;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h
index e28372e593..32a8f91a59 100644
--- a/xfa/src/fwl/src/core/include/fwl_noteimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_NOTE_IMP_H
-#define _FWL_NOTE_IMP_H
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_NOTEIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_NOTEIMP_H_
 
 #include "xfa/include/fwl/core/fwl_note.h"
 
@@ -155,4 +155,5 @@ class CFWL_ToolTipContainer {
  private:
   static CFWL_ToolTipContainer* s_pInstance;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_NOTEIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_panelimp.h b/xfa/src/fwl/src/core/include/fwl_panelimp.h
index 1c05db3363..7904148257 100644
--- a/xfa/src/fwl/src/core/include/fwl_panelimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_panelimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PANEL_IMP_H
-#define _FWL_PANEL_IMP_H
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_
+
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -26,4 +27,5 @@ class CFWL_PanelImp : public CFWL_WidgetImp {
  protected:
   IFWL_Content* m_pContent;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h
index ee88b42813..e9c9aeb099 100644
--- a/xfa/src/fwl/src/core/include/fwl_targetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_TARGETIMP_H_
-#define FWL_TARGETIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_TARGETIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_TARGETIMP_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "xfa/include/fwl/core/fwl_target.h"
@@ -24,4 +24,4 @@ class CFWL_TargetImp {
   CFWL_TargetImp();
 };
 
-#endif  // FWL_TARGETIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_TARGETIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/include/fwl_threadimp.h
index 9bf186980e..169de6a06d 100644
--- a/xfa/src/fwl/src/core/include/fwl_threadimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_threadimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_THREADIMP_H_
-#define FWL_THREADIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_THREADIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_THREADIMP_H_
 
 #include "xfa/include/fwl/core/fwl_thread.h"  // For FWL_HTHREAD.
 
@@ -37,4 +37,4 @@ class CFWL_NoteThreadImp : public CFWL_ThreadImp {
   CFWL_NoteDriver* const m_pNoteDriver;
 };
 
-#endif  // FWL_THREADIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_THREADIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
index 47a6775ab6..22cba226d2 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_WIDGETIMP_H_
-#define FWL_WIDGETIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETIMP_H_
 
 #include "xfa/include/fwl/core/fwl_widget.h"
 #include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
@@ -160,4 +160,4 @@ class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate {
                        const CFX_Matrix* pMatrix = NULL) override;
 };
 
-#endif  // FWL_WIDGETIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
index aa2a7a01cf..cb6b6b3c15 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGETMGR_IMP_H
-#define _FWL_WIDGETMGR_IMP_H
+#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_
+
 class CFWL_TargetImp;
 class IFWL_Widget;
 class IFWL_AdapterWidgetMgr;
@@ -165,4 +166,5 @@ class CFWL_WidgetMgrDelegate : public IFWL_WidgetMgrDelegate {
 
   CFWL_WidgetMgr* m_pWidgetMgr;
 };
-#endif
+
+#endif  // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_
diff --git a/xfa/src/fxbarcode/BC_Binarizer.h b/xfa/src/fxbarcode/BC_Binarizer.h
index 6a220e7187..131e39df7b 100644
--- a/xfa/src/fxbarcode/BC_Binarizer.h
+++ b/xfa/src/fxbarcode/BC_Binarizer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BINARIZER_H_
-#define _BC_BINARIZER_H_
+#ifndef XFA_SRC_FXBARCODE_BC_BINARIZER_H_
+#define XFA_SRC_FXBARCODE_BC_BINARIZER_H_
+
 class CBC_LuminanceSource;
 class CBC_CommonBitMatrix;
 class CBC_CommonBitArray;
@@ -23,4 +24,5 @@ class CBC_Binarizer {
  private:
   CBC_LuminanceSource* m_source;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_BINARIZER_H_
diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.h b/xfa/src/fxbarcode/BC_BinaryBitmap.h
index 8745d20702..0554dfaba4 100644
--- a/xfa/src/fxbarcode/BC_BinaryBitmap.h
+++ b/xfa/src/fxbarcode/BC_BinaryBitmap.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BINARYBITMAP_H_
-#define _BC_BINARYBITMAP_H_
+#ifndef XFA_SRC_FXBARCODE_BC_BINARYBITMAP_H_
+#define XFA_SRC_FXBARCODE_BC_BINARYBITMAP_H_
+
 class CBC_Binarizer;
 class CBC_CommonBitMatrix;
 class CBC_CommonBitArray;
@@ -26,4 +27,5 @@ class CBC_BinaryBitmap {
   CBC_Binarizer* m_binarizer;
   CBC_CommonBitMatrix* m_matrix;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_BINARYBITMAP_H_
diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h
index 59241e1d25..f4c5f2f3ea 100644
--- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h
+++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BUFFEREDIMAGELUMINANCESOURCE_H_
-#define _BC_BUFFEREDIMAGELUMINANCESOURCE_H_
+#ifndef XFA_SRC_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
+#define XFA_SRC_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
+
 class CBC_LuminanceSource;
 class CBC_BufferedImageLuminanceSource;
 class CBC_BufferedImageLuminanceSource : public CBC_LuminanceSource {
@@ -26,4 +27,5 @@ class CBC_BufferedImageLuminanceSource : public CBC_LuminanceSource {
   CFX_DIBitmap* m_pBitmap;
   const CFX_WideString m_filename;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
diff --git a/xfa/src/fxbarcode/BC_DecoderResult.h b/xfa/src/fxbarcode/BC_DecoderResult.h
index 508cdc3664..21d2cc0e4f 100644
--- a/xfa/src/fxbarcode/BC_DecoderResult.h
+++ b/xfa/src/fxbarcode/BC_DecoderResult.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DECODERRESULT_H_
-#define _BC_DECODERRESULT_H_
+#ifndef XFA_SRC_FXBARCODE_BC_DECODERRESULT_H_
+#define XFA_SRC_FXBARCODE_BC_DECODERRESULT_H_
+
 class CBC_DecoderResult;
 class CBC_DecoderResult {
  public:
@@ -31,4 +32,5 @@ class CBC_DecoderResult {
   int32_t m_erasures;
   void* m_other;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_DECODERRESULT_H_
diff --git a/xfa/src/fxbarcode/BC_Dimension.h b/xfa/src/fxbarcode/BC_Dimension.h
index 45f8baba4a..5a16b8f855 100644
--- a/xfa/src/fxbarcode/BC_Dimension.h
+++ b/xfa/src/fxbarcode/BC_Dimension.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DIMENSION_H_
-#define _BC_DIMENSION_H_
+#ifndef XFA_SRC_FXBARCODE_BC_DIMENSION_H_
+#define XFA_SRC_FXBARCODE_BC_DIMENSION_H_
+
 class CBC_Dimension;
 class CBC_Dimension {
  public:
@@ -21,4 +22,5 @@ class CBC_Dimension {
   int32_t m_width;
   int32_t m_height;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_DIMENSION_H_
diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.h b/xfa/src/fxbarcode/BC_LuminanceSource.h
index 464ed8b27c..e78f9ba889 100644
--- a/xfa/src/fxbarcode/BC_LuminanceSource.h
+++ b/xfa/src/fxbarcode/BC_LuminanceSource.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_LUMINANCESOURCE_H
-#define _BC_LUMINANCESOURCE_H
+#ifndef XFA_SRC_FXBARCODE_BC_LUMINANCESOURCE_H_
+#define XFA_SRC_FXBARCODE_BC_LUMINANCESOURCE_H_
+
 class CBC_LuminanceSource;
 class CBC_LuminanceSource {
  public:
@@ -21,4 +22,5 @@ class CBC_LuminanceSource {
   int32_t m_width;
   int32_t m_height;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_LUMINANCESOURCE_H_
diff --git a/xfa/src/fxbarcode/BC_Reader.h b/xfa/src/fxbarcode/BC_Reader.h
index 37e2efd776..1f19a2f278 100644
--- a/xfa/src/fxbarcode/BC_Reader.h
+++ b/xfa/src/fxbarcode/BC_Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_READER_H_
-#define _BC_READER_H_
+#ifndef XFA_SRC_FXBARCODE_BC_READER_H_
+#define XFA_SRC_FXBARCODE_BC_READER_H_
+
 class CBC_BinaryBitmap;
 class CBC_Reader;
 class CBC_Reader {
@@ -17,4 +18,5 @@ class CBC_Reader {
                                 int32_t hints,
                                 int32_t& e) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_READER_H_
diff --git a/xfa/src/fxbarcode/BC_ResultPoint.h b/xfa/src/fxbarcode/BC_ResultPoint.h
index 8fe91c1255..e2c92a6aa6 100644
--- a/xfa/src/fxbarcode/BC_ResultPoint.h
+++ b/xfa/src/fxbarcode/BC_ResultPoint.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_RESULTPOINT_H_
-#define _BC_RESULTPOINT_H_
+#ifndef XFA_SRC_FXBARCODE_BC_RESULTPOINT_H_
+#define XFA_SRC_FXBARCODE_BC_RESULTPOINT_H_
+
 class CBC_ResultPoint;
 class CBC_ResultPoint {
  public:
@@ -19,4 +20,5 @@ class CBC_ResultPoint {
   FX_FLOAT m_x;
   FX_FLOAT m_y;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_RESULTPOINT_H_
diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.h b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
index 7255a40b13..c46840ac4d 100644
--- a/xfa/src/fxbarcode/BC_UtilCodingConvert.h
+++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_UTILCODINGCONVERT_H_
-#define _BC_UTILCODINGCONVERT_H_
+#ifndef XFA_SRC_FXBARCODE_BC_UTILCODINGCONVERT_H_
+#define XFA_SRC_FXBARCODE_BC_UTILCODINGCONVERT_H_
+
 class CBC_UtilCodingConvert;
 class CBC_UtilCodingConvert {
  public:
@@ -23,4 +24,5 @@ class CBC_UtilCodingConvert {
   static void UnicodeToUTF8(const CFX_WideString& source,
                             CFX_ByteString& result);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_UTILCODINGCONVERT_H_
diff --git a/xfa/src/fxbarcode/BC_UtilRSS.h b/xfa/src/fxbarcode/BC_UtilRSS.h
index bcb1af4433..7f87bbb138 100644
--- a/xfa/src/fxbarcode/BC_UtilRSS.h
+++ b/xfa/src/fxbarcode/BC_UtilRSS.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_UTILRESS_H_
-#define _BC_UTILRESS_H_
+#ifndef XFA_SRC_FXBARCODE_BC_UTILRSS_H_
+#define XFA_SRC_FXBARCODE_BC_UTILRSS_H_
+
 class CBC_RssPair;
 class CBC_UtilRSS {
  public:
@@ -26,4 +27,5 @@ class CBC_UtilRSS {
  private:
   CBC_UtilRSS();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_BC_UTILRSS_H_
diff --git a/xfa/src/fxbarcode/barcode.h b/xfa/src/fxbarcode/barcode.h
index 739e810d38..2228ca1ccb 100644
--- a/xfa/src/fxbarcode/barcode.h
+++ b/xfa/src/fxbarcode/barcode.h
@@ -6,5 +6,10 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
+#ifndef XFA_SRC_FXBARCODE_BARCODE_H_
+#define XFA_SRC_FXBARCODE_BARCODE_H_
+
 #include "xfa/src/foxitlib.h"
 #include "utils.h"
+
+#endif  // XFA_SRC_FXBARCODE_BARCODE_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.h b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
index fb93a9e912..c2364c2bc8 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONBITARRAY_H_
-#define _BC_COMMONBITARRAY_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
+
 class CBC_CommonBitArray {
  public:
   CBC_CommonBitArray(CBC_CommonBitArray* array);
@@ -28,4 +29,5 @@ class CBC_CommonBitArray {
   int32_t m_size;
   CFX_Int32Array m_bits;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
index d60e437ea1..75e0b43502 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONBITMATRIX_H_
-#define _BC_COMMONBITMATRIX_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
+
 class CBC_CommonBitArray;
 class CBC_CommonBitMatrix {
  public:
@@ -38,4 +39,5 @@ class CBC_CommonBitMatrix {
   int32_t m_rowSize;
   int32_t* m_bits;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.h b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
index 098a6060d3..546e5e9d5c 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitSource.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONBITSOURCE_H_
-#define _BC_COMMONBITSOURCE_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_
+
 class CBC_CommonBitSource {
  public:
   CBC_CommonBitSource(CFX_ByteArray* bytes);
@@ -19,4 +20,5 @@ class CBC_CommonBitSource {
   int32_t m_byteOffset;
   int32_t m_bitOffset;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.h b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
index 6e89aa4518..1653596e57 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONBYTEARRAY_H_
-#define _BC_COMMONBYTEARRAY_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
+
 class CBC_CommonByteArray {
  private:
   int32_t m_size;
@@ -26,4 +27,5 @@ class CBC_CommonByteArray {
   void Set(uint8_t* source, int32_t offset, int32_t count);
   void Set(CFX_ByteArray* source, int32_t offset, int32_t count);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
index db01704a23..371c185659 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONBYTEMATRIX_H_
-#define _BC_COMMONBYTEMATRIX_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
+
 class CBC_CommonByteMatrix {
  public:
   CBC_CommonByteMatrix(int32_t width, int32_t height);
@@ -25,4 +26,5 @@ class CBC_CommonByteMatrix {
   int32_t m_width;
   int32_t m_height;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
index 6626f7be7e..9ca6548533 100644
--- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONCHARACTERSETECI_H_
-#define _BC_COMMONCHARACTERSETECI_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
+
 class CBC_CommonECI;
 class CBC_CommonCharacterSetECI;
 class CBC_CommonCharacterSetECI : public CBC_CommonECI {
@@ -23,4 +24,5 @@ class CBC_CommonCharacterSetECI : public CBC_CommonECI {
   CFX_ByteString m_encodingName;
   static void initialize();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
index 93bab384ab..219a9f3a87 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONDECODERRESULT_H_
-#define _BC_COMMONDECODERRESULT_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
+
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_PDF417ResultMetadata;
 class CBC_CommonDecoderResult {
@@ -37,4 +38,5 @@ class CBC_CommonDecoderResult {
   CFX_ByteString m_pdf417ecLevel;
   CBC_PDF417ResultMetadata* m_other;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.h b/xfa/src/fxbarcode/common/BC_CommonECI.h
index 07b7e41870..3f46b3560c 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONECI_H_
-#define _BC_COMMONECI_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONECI_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONECI_H_
+
 class CBC_CommonECI {
  public:
   CBC_CommonECI(int32_t value);
@@ -17,4 +18,5 @@ class CBC_CommonECI {
  private:
   int32_t m_value;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONECI_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
index f53bb00632..70e7bfb1ae 100644
--- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMMONPERSPECTIVETRANSFORM_H_
-#define _BC_COMMONPERSPECTIVETRANSFORM_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_
+
 class CBC_CommonPerspectiveTransform {
  public:
   CBC_CommonPerspectiveTransform(FX_FLOAT a11,
@@ -58,4 +59,5 @@ class CBC_CommonPerspectiveTransform {
  private:
   FX_FLOAT m_a11, m_a12, m_a13, m_a21, m_a22, m_a23, m_a31, m_a32, m_a33;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
index 52b653542c..86ac2eabe2 100644
--- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_GLOBALHISTOGRAMBINARIZER_H_
-#define _BC_GLOBALHISTOGRAMBINARIZER_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
+
 class CBC_CommonBinarizer;
 class CBC_CommonBitArray;
 class CBC_CommonBitMatrix;
@@ -27,4 +28,5 @@ class CBC_GlobalHistogramBinarizer : public CBC_Binarizer {
   CFX_ByteArray m_luminance;
   CFX_Int32Array m_buckets;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
index f0de614d99..e5f296c1af 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_WHITERECTANLEDETECTOR_H_
-#define _BC_WHITERECTANLEDETECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANLEDETECTOR_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANLEDETECTOR_H_
+
 class CBC_CommonBitMatrix;
 class CBC_ResultPoint;
 class CBC_WhiteRectangleDetector {
@@ -45,4 +46,5 @@ class CBC_WhiteRectangleDetector {
   int32_t m_downInit;
   int32_t m_upInit;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANLEDETECTOR_H_
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 138163b10d..1976cdad2b 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_READSOLOMON_H_
-#define _BC_READSOLOMON_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMON_H_
+#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMON_H_
+
 class CBC_ReedSolomonGF256;
 class CBC_ReedSolomonGF256Poly;
 class CBC_ReedSolomonEncoder {
@@ -21,4 +22,5 @@ class CBC_ReedSolomonEncoder {
   void Encode(CFX_Int32Array* toEncode, int32_t ecBytes, int32_t& e);
   virtual void Init();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMON_H_
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
index e230a3af74..cb8eefca61 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_REEDSOLOMONDECODER_H_
-#define _BC_REEDSOLOMONDECODER_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
+#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
+
 class CBC_ReedSolomonGF256;
 class CBC_ReedSolomonGF256Poly;
 class CBC_ReedSolomonDecoder {
@@ -27,4 +28,5 @@ class CBC_ReedSolomonDecoder {
                                       FX_BOOL dataMatrix,
                                       int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index d414f13d3c..d635694c10 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_REEDSOLOMONGF256_H_
-#define _BC_REEDSOLOMONGF256_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
+#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
+
 class CBC_ReedSolomonGF256Poly;
 class CBC_ReedSolomonGF256 {
  public:
@@ -33,4 +34,5 @@ class CBC_ReedSolomonGF256 {
   CBC_ReedSolomonGF256Poly* m_zero;
   CBC_ReedSolomonGF256Poly* m_one;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index 2ff7602eba..e427215cca 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_READSOLOMONGF256POLY_H_
-#define _BC_READSOLOMONGF256POLY_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMONGF256POLY_H_
+#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMONGF256POLY_H_
+
 class CBC_ReedSolomonGF256;
 class CBC_ReedSolomonGF256Poly {
  public:
@@ -35,4 +36,5 @@ class CBC_ReedSolomonGF256Poly {
   CBC_ReedSolomonGF256* m_field;
   CFX_Int32Array m_coefficients;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMONGF256POLY_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
index 2e8d6c5c45..c01c4ce035 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ASCIIENCODER_H_
-#define _BC_ASCIIENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
+
 class CBC_Encoder;
 class CBC_EncoderContext;
 class CBC_ASCIIEncoder;
@@ -21,4 +22,5 @@ class CBC_ASCIIEncoder : public CBC_Encoder {
                                     FX_WCHAR digit2,
                                     int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
index 3aa94bff7a..9cdef1996e 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BASE256ENCODER_H_
-#define _BC_BASE256ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
+
 class CBC_Encoder;
 class CBC_Base256Encoder;
 class CBC_Base256Encoder : public CBC_Encoder {
@@ -18,4 +19,5 @@ class CBC_Base256Encoder : public CBC_Encoder {
  private:
   static FX_WCHAR randomize255State(FX_WCHAR ch, int32_t codewordPosition);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
index 249f122820..e082e81487 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_C40ENCODER_H_
-#define _BC_C40ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
+
 class CBC_C40Encoder;
 class CBC_C40Encoder : public CBC_Encoder {
  public:
@@ -28,4 +29,5 @@ class CBC_C40Encoder : public CBC_Encoder {
                                 int32_t& e);
   static CFX_WideString encodeToCodewords(CFX_WideString sb, int32_t startPos);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index 118bc2834c..2008ea7f2c 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXBITMATRIXPARSER_H_
-#define _BC_DATAMATRIXBITMATRIXPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
+
 class CBC_CommonBitMatrix;
 class CBC_DataMatrixVersion;
 class CBC_DataMatrixBitMatrixParser {
@@ -37,4 +38,5 @@ class CBC_DataMatrixBitMatrixParser {
   CBC_CommonBitMatrix* m_readMappingMatrix;
   CBC_DataMatrixVersion* m_version;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index 8f1b277342..ca81e62655 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDATABLOCK_H_
-#define _BC_DATAMATRIXDATABLOCK_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
+
 class CBC_DataMatrixVersion;
 class CBC_DataMatrixDataBlock {
  public:
@@ -24,4 +25,5 @@ class CBC_DataMatrixDataBlock {
 
   CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
index 65785491e4..ba23976842 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
-#define _BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
 class CBC_CommonDecoderResult;
 class CBC_CommonBitSource;
 class CBC_DataMatrixDecodedBitStreamParser {
@@ -54,4 +54,5 @@ class CBC_DataMatrixDecodedBitStreamParser {
   const static int32_t EDIFACT_ENCODE;
   const static int32_t BASE256_ENCODE;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
index 601f9a5d5e..011a8b8e72 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDECODER_H_
-#define _BC_DATAMATRIXDECODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
+
 class CBC_ReedSolomonDecoder;
 class CBC_CommonDecoderResult;
 class CBC_CommonBitMatrix;
@@ -22,4 +23,5 @@ class CBC_DataMatrixDecoder {
                      int32_t& e);
   CBC_ReedSolomonDecoder* m_rsDecoder;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
index 6ed03022ef..5ab8f9d060 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXDETECTOR_H_
-#define _BC_DATAMATRIXDETECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
+
 class CBC_CommonBitMatrix;
 class CBC_WhiteRectangleDetector;
 class CBC_ResultPoint;
@@ -70,4 +71,5 @@ class CBC_DataMatrixDetector {
   CBC_WhiteRectangleDetector* m_rectangleDetector;
   const static int32_t INTEGERS[5];
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
index 6e3f67d847..51d22588aa 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXREADER_H_
-#define _BC_DATAMATRIXREADER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
+
 class CBC_BinaryBitmap;
 class CBC_DataMatrixDecoder;
 class CBC_Reader;
@@ -22,4 +23,5 @@ class CBC_DataMatrixReader : public CBC_Reader {
  private:
   CBC_DataMatrixDecoder* m_decoder;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXREADER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
index 94abdf5721..ce16004817 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXSYMBOLINFO144_H_
-#define _BC_DATAMATRIXSYMBOLINFO144_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
+
 class CBC_SymbolInfo;
 class CBC_DataMatrixSymbolInfo144;
 class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo {
@@ -15,4 +16,5 @@ class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo {
   int32_t getInterleavedBlockCount();
   int32_t getDataLengthForInterleavedBlock(int32_t index);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 004a65e6ce..e96b743164 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DATAMATRIXVERSION_H_
-#define _BC_DATAMATRIXVERSION_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
+
 class ECBlocks;
 class CBC_DataMatrixVersion;
 class ECB {
@@ -83,4 +84,5 @@ class CBC_DataMatrixVersion {
   int32_t m_totalCodewords;
   static CFX_PtrArray* VERSIONS;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
index 0cc9fb3987..860199e42d 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DEFAULTPLACEMENT_H_
-#define _BC_DEFAULTPLACEMENT_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+
 class CBC_DefaultPlacement {
  public:
   CBC_DefaultPlacement(CFX_WideString codewords,
@@ -33,4 +34,5 @@ class CBC_DefaultPlacement {
   void corner3(int32_t pos);
   void corner4(int32_t pos);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
index 65f356cba1..26324ed9d6 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_EDIFACTENCODER_H_
-#define _BC_EDIFACTENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
+
 class CBC_EncoderContext;
 class CBC_EdifactEncoder;
 class CBC_EdifactEncoder : public CBC_Encoder {
@@ -24,4 +25,5 @@ class CBC_EdifactEncoder : public CBC_Encoder {
                                           int32_t startPos,
                                           int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
index a7fa323445..36637fd3aa 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ENCODER_H_
-#define _BC_ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+
 class CBC_EncoderContext;
 class CBC_Encoder {
  public:
@@ -14,4 +15,5 @@ class CBC_Encoder {
   virtual int32_t getEncodingMode() = 0;
   virtual void Encode(CBC_EncoderContext& context, int32_t& e) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
index 1a289d5722..9b78f86661 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ENCODERCONTEXT_H_
-#define _BC_ENCODERCONTEXT_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
+
 class CBC_SymbolShapeHint;
 class CBC_SymbolInfo;
 class CBC_Dimension;
@@ -49,4 +50,5 @@ class CBC_EncoderContext : public CBC_SymbolShapeHint {
   CBC_Dimension* m_maxSize;
   int32_t m_skipAtEnd;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
index 7795ee485b..951b9ea572 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ERRORCORRECTION_H_
-#define _BC_ERRORCORRECTION_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
+
 class CBC_SymbolInfo;
 class CBC_ErrorCorrection {
  public:
@@ -34,4 +35,5 @@ class CBC_ErrorCorrection {
                                        int32_t numECWords,
                                        int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
index 59b322b277..17433a169a 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_HIGHLEVALENCODER_H_
-#define _BC_HIGHLEVALENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
+
 class CBC_SymbolShapeHint;
 class CBC_HighLevelEncoder;
 #define ASCII_ENCODATION 0
@@ -70,4 +71,5 @@ class CBC_HighLevelEncoder : public CBC_SymbolShapeHint {
   static FX_BOOL isNativeEDIFACT(FX_WCHAR ch);
   static FX_BOOL isSpecialB256(FX_WCHAR ch);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
index 08fb4d5472..b00e804fa0 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_SYMBOLINFO_H_
-#define _BC_SYMBOLINFO_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+
 class CBC_SymbolShapeHint;
 class CBC_Dimension;
 class CBC_SymbolInfo;
@@ -75,4 +76,5 @@ class CBC_SymbolInfo : public CBC_SymbolShapeHint {
                  int32_t rsBlockData,
                  int32_t rsBlockError);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
index 7ad8a0428f..ea8acdfb0f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_SYMBOLSHAPEHINT_H_
-#define _BC_SYMBOLSHAPEHINT_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
+
 class CBC_SymbolShapeHint {
  public:
   CBC_SymbolShapeHint();
@@ -16,4 +17,5 @@ class CBC_SymbolShapeHint {
     FORCE_RECTANGLE,
   };
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
index 1218e9d2c8..399b21bb90 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_TEXTENCODER_H_
-#define _BC_TEXTENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
+
 class CBC_TextEncoder;
 class CBC_TextEncoder : public CBC_C40Encoder {
  public:
@@ -14,4 +15,5 @@ class CBC_TextEncoder : public CBC_C40Encoder {
   int32_t getEncodingMode();
   int32_t encodeChar(FX_WCHAR c, CFX_WideString& sb, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
index 216987f874..62b35feb66 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_X12ENCODER_H_
-#define _BC_X12ENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
+
 class CBC_C40Encoder;
 class CBC_X12Encoder;
 class CBC_X12Encoder : public CBC_C40Encoder {
@@ -19,4 +20,5 @@ class CBC_X12Encoder : public CBC_C40Encoder {
                  int32_t& e);
   int32_t encodeChar(FX_WCHAR c, CFX_WideString& sb, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.h b/xfa/src/fxbarcode/oned/BC_OneDReader.h
index 45585d44c5..17e0934287 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDREADER_H_
-#define _BC_ONEDREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
+
 class CBC_Reader;
 class CBC_BinaryBitmap;
 class CBC_CommonBitArray;
@@ -43,4 +44,5 @@ class CBC_OneDReader : public CBC_Reader {
                                const int32_t* pattern,
                                int32_t maxIndividualVariance);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.h b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
index 0fb2c8690c..0a3e3c3d5d 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDUPCEANREADER_H_
-#define _BC_ONEDUPCEANREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
+
 class CBC_OneDReader;
 class CBC_CommonBitArray;
 class CBC_OneDimReader;
@@ -57,4 +58,5 @@ class CBC_OneDimReader : public CBC_OneDReader {
                                     int32_t endStart,
                                     int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
index 6218890a7f..e1cf9d8698 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODABARREADER_H_
-#define _BC_ONEDCODABARREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
+
 class CBC_CommonBitArray;
 class CBC_OneDReader;
 class CBC_OnedCodaBarReader;
@@ -28,4 +29,5 @@ class CBC_OnedCodaBarReader : public CBC_OneDReader {
 
   const static FX_CHAR STARTEND_ENCODING[8];
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
index 4530a140fb..3671821bce 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODABARWRITER_H_
-#define _BC_ONEDCODABARWRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
+
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
 class CBC_OnedCodaBarWriter;
@@ -49,4 +50,5 @@ class CBC_OnedCodaBarWriter : public CBC_OneDimWriter {
   FX_CHAR m_chEnd;
   int32_t m_iWideNarrRatio;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
index a8924828e4..592df3a02d 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA128READER_H_
-#define _BC_ONEDCODA128READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
+
 class CBC_OneDReader;
 class CBC_CommonBitArray;
 class CBC_OnedCoda128Reader;
@@ -43,4 +44,5 @@ class CBC_OnedCode128Reader : public CBC_OneDReader {
                      int32_t rowOffset,
                      int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
index 94b0c9bc5a..b53cc95820 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA128WRITER_H_
-#define _BC_ONEDCODA128WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
+
 class CBC_OneDimWriter;
 class CBC_OnedCoda128Writer;
 class CBC_OnedCode128Writer : public CBC_OneDimWriter {
@@ -45,4 +46,5 @@ class CBC_OnedCode128Writer : public CBC_OneDimWriter {
   const static int32_t CODE_CODE_C;
   const static int32_t CODE_STOP;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
index d450aa69bb..c1a70b8318 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA39READER_H_
-#define _BC_ONEDCODA39READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
+
 class CBC_OneDReader;
 class CBC_CommonBitArray;
 class CBC_OnedCoda39Reader;
@@ -32,4 +33,5 @@ class CBC_OnedCode39Reader : public CBC_OneDReader {
   FX_CHAR PatternToChar(int32_t pattern, int32_t& e);
   CFX_ByteString DecodeExtended(CFX_ByteString& encoded, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
index e5a6c68754..1e422827d5 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA39WRITER_H_
-#define _BC_ONEDCODA39WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
+
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
 class CBC_OnedCoda39Writer;
@@ -49,4 +50,5 @@ class CBC_OnedCode39Writer : public CBC_OneDimWriter {
   int32_t m_iWideNarrRatio;
   FX_BOOL m_extendedMode;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
index 24b808eb6f..cf9e647c85 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN13READER_H_
-#define _BC_ONEDEAN13READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
 class CBC_OneDimReader;
 class CBC_CommonBitArray;
 class CBC_OnedEAN13Reader;
@@ -27,4 +27,5 @@ class CBC_OnedEAN13Reader : public CBC_OneDimReader {
                        int32_t& e);
   friend class CBC_OnedUPCAReader;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
index ba755c900d..8fd42733f3 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN13WRITER_H_
-#define _BC_ONEDEAN13WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
+
 class CBC_OneDimWriter;
 class CBC_OnedEAN13Writer;
 class CBC_OnedEAN13Writer : public CBC_OneDimWriter {
@@ -48,4 +49,5 @@ class CBC_OnedEAN13Writer : public CBC_OneDimWriter {
                  int32_t multiple,
                  int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
index 56a5e952fd..b9f14d6c85 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN8READER_H_
-#define _BC_ONEDEAN8READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
+
 class CBC_OneDimReader;
 class CBC_CommonBitArray;
 class CBC_OnedEAN8Reader;
@@ -20,4 +21,5 @@ class CBC_OnedEAN8Reader : public CBC_OneDimReader {
                        CFX_ByteString& result,
                        int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
index cca1f8470c..fd858fcc02 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN8WRITER_H_
-#define _BC_ONEDEAN8WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
+
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
 class CBC_OnedEAN8Writer;
@@ -50,4 +51,5 @@ class CBC_OnedEAN8Writer : public CBC_OneDimWriter {
                  int32_t multiple,
                  int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
index a3feb52116..2b6bd1785a 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDUPCAREADER_H_
-#define _BC_ONEDUPCAREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
+
 class CBC_BinaryBitmap;
 class CBC_CommonBitArray;
 class CBC_OneDimReader;
@@ -38,4 +39,5 @@ class CBC_OnedUPCAReader : public CBC_OneDimReader {
                        int32_t& e);
   CFX_ByteString MaybeReturnResult(CFX_ByteString& result, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
index 97b422d626..1b5ce48040 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDUPCAWRITER_H_
-#define _BC_ONEDUPCAWRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
+
 class CBC_Writer;
 class CBC_OnedEAN13Writer;
 class CBC_OnedUPCAWriter;
@@ -51,4 +52,5 @@ class CBC_OnedUPCAWriter : public CBC_OneDimWriter {
                  int32_t multiple,
                  int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
index e1dee6814d..6da9cb934d 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417_H_
-#define _BC_PDF417_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417_H_
+
 class CBC_Compaction;
 class CBC_BarcodeRow;
 class CBC_BarcodeMatrix;
@@ -56,4 +57,5 @@ class CBC_PDF417 {
                                       int32_t errorCorrectionCodeWords,
                                       int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index e974d71678..9c44cee288 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BARCODEMATRIX_H_
-#define _BC_BARCODEMATRIX_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
+
 class CBC_BarcodeRow;
 class CBC_BarcodeMatrix {
  public:
@@ -31,4 +32,5 @@ class CBC_BarcodeMatrix {
   int32_t m_outWidth;
   int32_t m_outHeight;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
index cdffa83e19..4bec2939ee 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BARCODEMETADATA_H_
-#define _BC_BARCODEMETADATA_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
+
 class CBC_BarcodeMetadata;
 class CBC_BarcodeMetadata {
  public:
@@ -27,4 +28,5 @@ class CBC_BarcodeMetadata {
   int32_t m_rowCountLowerPart;
   int32_t m_rowCount;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index c989f85f0e..16f351681c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BARCODEROW_H_
-#define _BC_BARCODEROW_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
+
 class CBC_BarcodeRow {
  public:
   CBC_BarcodeRow(int32_t width);
@@ -21,4 +22,5 @@ class CBC_BarcodeRow {
   CFX_ByteArray m_output;
   int32_t m_currentLocation;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
index 17c3a0478a..a02c2ab1fb 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BARCODEVALUE_H_
-#define _BC_BARCODEVALUE_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
+
 class CBC_BarcodeValue {
  public:
   CBC_BarcodeValue();
@@ -18,4 +19,5 @@ class CBC_BarcodeValue {
   CFX_Int32Array m_keys;
   CFX_Int32Array m_values;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index d51900459a..045f89f318 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_BOUNDINGBOX_H_
-#define _BC_BOUNDINGBOX_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_BOUNDINGBOX_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_BOUNDINGBOX_H_
+
 class CBC_CommonBitMatrix;
 class CBC_ResultPoint;
 class CBC_BoundingBox {
@@ -53,4 +54,5 @@ class CBC_BoundingBox {
             CBC_ResultPoint* bottomRight);
   void calculateMinMaxValues();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_BOUNDINGBOX_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
index f917484a23..0ff5ceb5ee 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_CODEWORD_H_
-#define _BC_CODEWORD_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_CODEWORD_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_CODEWORD_H_
+
 class CBC_Codeword {
  public:
   CBC_Codeword(int32_t startX, int32_t endX, int32_t bucket, int32_t value);
@@ -30,4 +31,5 @@ class CBC_Codeword {
   int32_t m_value;
   int32_t m_rowNumber;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_CODEWORD_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
index 5bb6779dc1..78a26e9306 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417CODEWORDDECODER_H_
-#define _BC_PDF417CODEWORDDECODER_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
+
 class CBC_PDF417CodewordDecoder;
 #define column 8
 class CBC_PDF417Common;
@@ -24,4 +25,5 @@ class CBC_PDF417CodewordDecoder {
   static int32_t getBitValue(CFX_Int32Array& moduleBitCount);
   static int32_t getClosestDecodedValue(CFX_Int32Array& moduleBitCount);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
index c551fe67df..16882e3bd4 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417COMMON_H_
-#define _BC_PDF417COMMON_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMMON_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMMON_H_
+
 class CBC_PDF417Common {
  public:
   CBC_PDF417Common();
@@ -27,4 +28,5 @@ class CBC_PDF417Common {
   static CFX_Int32Array* EMPTY_INT_ARRAY;
   static int32_t findCodewordIndex(FX_DWORD symbol);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMMON_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
index 9416bd603c..4c60e2d841 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_COMPACTION_H_
-#define _BC_COMPACTION_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
+
 class CBC_Compaction;
 enum Compaction { AUTO, TEXT, BYTES, NUMERIC };
 class CBC_Compaction {
@@ -13,4 +14,5 @@ class CBC_Compaction {
   CBC_Compaction();
   virtual ~CBC_Compaction();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
index 739dc46add..52901c66bf 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
@@ -59,4 +59,5 @@ class CBC_DecodedBitStreamPaser {
                                               int32_t count,
                                               int32_t& e);
 };
+
 #endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
index 7edffe93ca..969d513c7e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_EDTECTIONRESULT_H_
-#define _BC_EDTECTIONRESULT_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULT_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULT_H_
+
 class CBC_BarcodeMetadata;
 class CBC_BoundingBox;
 class CBC_Codeword;
@@ -52,4 +53,5 @@ class CBC_DetectionResult {
   static FX_BOOL adjustRowNumber(CBC_Codeword* codeword,
                                  CBC_Codeword* otherCodeword);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULT_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
index 35f78445b4..279b2c1057 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DETECTIONRESULTCOLUMN_H_
-#define _BC_DETECTIONRESULTCOLUMN_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTCOLUMN_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTCOLUMN_H_
+
 class CBC_Codeword;
 class CBC_BoundingBox;
 class CBC_DetectionResultColumn {
@@ -28,4 +29,5 @@ class CBC_DetectionResultColumn {
  private:
   static int32_t MAX_NEARBY_DISTANCE;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTCOLUMN_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h
index 9969039dee..e235586fcd 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DETECTIONRESULTROWINDICATORCOLUMN_H_
-#define _BC_DETECTIONRESULTROWINDICATORCOLUMN_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTROWINDICATORCOLUMN_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTROWINDICATORCOLUMN_H_
+
 class CBC_BarcodeMetadata;
 class CBC_BoundingBox;
 class CBC_DetectionResultRowIndicatorColumn;
@@ -29,4 +30,5 @@ class CBC_DetectionResultRowIndicatorColumn : public CBC_DetectionResultColumn {
   void removeIncorrectCodewords(CFX_PtrArray* codewords,
                                 CBC_BarcodeMetadata barcodeMetadata);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTIONRESULTROWINDICATORCOLUMN_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
index eeef455a08..604bc3084a 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DETECTOR_H_
-#define _BC_DETECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTOR_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTOR_H_
+
 class CBC_PDF417DetectorResult;
 class CBC_BinaryBitmap;
 class CBC_CommonBitMatrix;
@@ -63,4 +64,5 @@ class CBC_Detector {
                                       int32_t* pattern,
                                       int32_t maxIndividualVariance);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTOR_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
index c12614d720..dbc2ffcf35 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417DETECTORRESULT_H_
-#define _BC_PDF417DETECTORRESULT_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
+
 class CBC_CommonBitMatrix;
 class CBC_PDF417DetectorResult {
  public:
@@ -18,4 +19,5 @@ class CBC_PDF417DetectorResult {
   CBC_CommonBitMatrix* m_bits;
   CFX_PtrArray* m_points;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
index d1b0a1ecb0..d7d1623452 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_DIMENSIONS_H_
-#define _BC_DIMENSIONS_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
+
 class CBC_Dimensions {
  public:
   CBC_Dimensions(int32_t minCols,
@@ -24,4 +25,5 @@ class CBC_Dimensions {
   int32_t m_minRows;
   int32_t m_maxRows;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
index 1ebfd0e506..8966ae109c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417ECERRORCORRECTION_H_
-#define _BC_PDF417ECERRORCORRECTION_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECERRORCORRECTION_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECERRORCORRECTION_H_
+
 class CBC_PDF417ECModulusGF;
 class CBC_PDF417ECModulusPoly;
 class CBC_PDF417ECErrorCorrection {
@@ -34,4 +35,5 @@ class CBC_PDF417ECErrorCorrection {
       CFX_Int32Array& errorLocations,
       int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECERRORCORRECTION_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
index 74aea400a3..c73f3eb9fa 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417ECMODULUSGF_H_
-#define _BC_PDF417ECMODULUSGF_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECMODULUSGF_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECMODULUSGF_H_
+
 class CBC_PDF417ECModulusPoly;
 class CBC_PDF417Common;
 class CBC_PDF417ECModulusGF {
@@ -35,4 +36,5 @@ class CBC_PDF417ECModulusGF {
   CBC_PDF417ECModulusPoly* m_one;
   int32_t m_modulus;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECMODULUSGF_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
index ec69241bb5..89384fcd69 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417ECMODULUSPOLY_H_
-#define _BC_PDF417ECMODULUSPOLY_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECMODULUSPOLY_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECMODULUSPOLY_H_
+
 class CBC_PDF417ECModulusGF;
 class CBC_PDF417ECModulusPoly {
  public:
@@ -34,4 +35,5 @@ class CBC_PDF417ECModulusPoly {
   CBC_PDF417ECModulusGF* m_field;
   CFX_Int32Array m_coefficients;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECMODULUSPOLY_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index 561b9fc077..e043bacfdf 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417ERRORCORRECTION_H_
-#define _BC_PDF417ERRORCORRECTION_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
+
 class CBC_PDF417ErrorCorrection {
  public:
   CBC_PDF417ErrorCorrection();
@@ -21,4 +22,5 @@ class CBC_PDF417ErrorCorrection {
  private:
   static int32_t EC_COEFFICIENTS[][2500];
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h
index c7f42188b8..5c19d86b97 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417READER_H_
-#define _BC_PDF417READER_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417READER_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417READER_H_
+
 class CBC_BinaryBitmap;
 class CBC_ResultPoint;
 class CBC_PDF417Reader;
@@ -26,4 +27,5 @@ class CBC_PDF417Reader : public CBC_Reader {
   static int32_t getMaxCodewordWidth(CFX_PtrArray& p);
   static int32_t getMinCodewordWidth(CFX_PtrArray& p);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417READER_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index 1a9d297700..a95203d600 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417READER_H_
-#define _BC_PDF417READER_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
+
 class CBC_PDF417ResultMetadata {
  public:
   CBC_PDF417ResultMetadata();
@@ -25,4 +26,5 @@ class CBC_PDF417ResultMetadata {
   CFX_Int32Array m_optionalData;
   FX_BOOL m_lastSegment;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
index 60dab2c2fe..a0ac8888b1 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417SCANNINGDECODER_H_
-#define _BC_PDF417SCANNINGDECODER_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417SCANNINGDECODER_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417SCANNINGDECODER_H_
+
 class CBC_CommonDecoderResult;
 class CBC_CommonBitMatrix;
 class CBC_ErrorCorrection;
@@ -116,4 +117,5 @@ class CBC_PDF417ScanningDecoder {
   static int32_t getCodewordBucketNumber(int32_t codeword);
   static int32_t getCodewordBucketNumber(CFX_Int32Array& moduleBitCount);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417SCANNINGDECODER_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h
index 382cef4948..3bfae5e05d 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_PDF417WRITER_H_
-#define _BC_PDF417WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417WRITER_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417WRITER_H_
+
 class CBC_TwoDimWriter;
 class CBC_PDF417Writer;
 class CBC_PDF417Writer : public CBC_TwoDimWriter {
@@ -23,4 +24,5 @@ class CBC_PDF417Writer : public CBC_TwoDimWriter {
   void rotateArray(CFX_ByteArray& bitarray, int32_t width, int32_t height);
   FX_BOOL m_bTruncated;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417WRITER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
index eecfa0c88e..245f407b80 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_FINDERPATTERNINFO_H_
-#define _BC_FINDERPATTERNINFO_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
+
 class CBC_QRFinderPattern;
 class CBC_QRFinderPatternInfo {
  private:
@@ -20,4 +21,5 @@ class CBC_QRFinderPatternInfo {
   CBC_QRFinderPattern* GetTopLeft();
   CBC_QRFinderPattern* GetTopRight();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
index d2e36fb7d0..a32fd3500b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRALIGNMENTPATTERN_H_
-#define _BC_QRALIGNMENTPATTERN_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
 class CBC_CommonBitArray;
 class CBC_ResultPoint;
 class CBC_REAI013x0x1xDecoder;
@@ -23,4 +23,5 @@ class CBC_QRAlignmentPattern : public CBC_ResultPoint {
   FX_FLOAT GetY();
   CBC_QRAlignmentPattern* Clone();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
index 791107967c..922c2bb891 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRALIGNMENTPATTERNFINDER_H_
-#define _BC_QRALIGNMENTPATTERNFINDER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
+
 class CBC_CommonBitMatrix;
 class CBC_QRAlignmentPattern;
 class CBC_QRAlignmentPatternFinder {
@@ -38,4 +39,5 @@ class CBC_QRAlignmentPatternFinder {
                                                int32_t j);
   static FX_FLOAT CenterFromEnd(const CFX_Int32Array& stateCount, int32_t end);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 3d23c0c561..3ad6fb2c27 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRABITMATRIXPARSER_H_
-#define _BC_QRABITMATRIXPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRABITMATRIXPARSER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRABITMATRIXPARSER_H_
+
 class CBC_CommonBitMatrix;
 class CBC_QRCoderVersion;
 class CBC_QRCoderFormatInformation;
@@ -27,4 +28,5 @@ class CBC_QRBitMatrixParser {
   CFX_ByteArray* ReadCodewords(int32_t& e);
   virtual void Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRABITMATRIXPARSER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
index 0646cb61e1..98bf976e06 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODEREADER_H_
-#define _BC_QRCODEREADER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODEREADER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODEREADER_H_
+
 class CBC_QRDetector;
 class CBC_BinaryBitmap;
 class CBC_QRCoderDecoder;
@@ -38,4 +39,5 @@ class CBC_QRCodeReader : public CBC_Reader {
   CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e);
   virtual void Init();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODEREADER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
index d5b39baed4..bd7bc59656 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERWRITER_H_
-#define _BC_QRCODERWRITER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERWRITER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERWRITER_H_
+
 #include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
+
 class CBC_TwoDimWriter;
 class CBC_MultiBarCodes;
 class CBC_QRCoderWriter;
@@ -37,4 +39,5 @@ class CBC_QRCodeWriter : public CBC_TwoDimWriter {
  private:
   int32_t m_iVersion;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERWRITER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
index 729f13863b..e7087b33d7 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODER_H_
-#define _BC_QRCODER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODER_H_
+
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRCoderMode;
 class CBC_CommonByteMatrix;
@@ -52,4 +53,5 @@ class CBC_QRCoder {
   void SetMatrix(CBC_CommonByteMatrix* value);
   static FX_BOOL IsValidMaskPattern(int32_t maskPattern);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
index 214d641c53..b6b4a48588 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRECODERBITVECTOR_H_
-#define _BC_QRECODERBITVECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRECODERBITVECTOR_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRECODERBITVECTOR_H_
+
 class CBC_QRCoderBitVector {
  private:
   int32_t m_sizeInBits;
@@ -28,4 +29,5 @@ class CBC_QRCoderBitVector {
   void Clear();
   virtual void Init();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRECODERBITVECTOR_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
index 4401617a44..30551fe610 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERBLOCKPAIR_H_
-#define _BC_QRCODERBLOCKPAIR_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
+
 class CBC_CommonByteArray;
 class CBC_QRCoderBlockPair {
  private:
@@ -20,4 +21,5 @@ class CBC_QRCoderBlockPair {
   CBC_CommonByteArray* GetDataBytes();
   CBC_CommonByteArray* GetErrorCorrectionBytes();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
index 3a2a99c304..26952ee9e0 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERDECODER_H_
-#define _BC_QRCODERDECODER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
+
 class CBC_CommonBitMatrix;
 class CBC_ReedSolomonDecoder;
 class CBC_CommonDecoderResult;
@@ -32,4 +33,5 @@ class CBC_QRCoderDecoder {
                      int32_t& e);
   virtual void Init();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
index 8b7b29443a..67b3987efa 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERECB_H_
-#define _BC_QRCODERECB_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECB_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECB_H_
+
 class CBC_QRCoderECB {
  private:
   int32_t m_count;
@@ -17,4 +18,5 @@ class CBC_QRCoderECB {
   int32_t GetCount();
   int32_t GetDataCodeWords();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECB_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index df542fc00f..d2ba509631 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERECBLOCKS_H_
-#define _BC_QRCODERECBLOCKS_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
+
 class CBC_QRCoderECB;
 class CBC_QRCoderECBlocks {
  private:
@@ -23,4 +24,5 @@ class CBC_QRCoderECBlocks {
   int32_t GetTotalECCodeWords();
   CFX_PtrArray* GetECBlocks();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 38d74233bb..05fc2f8551 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERENCODER_H_
-#define _BC_QRCODERENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
+
 class Make_Pair;
 class CBC_QRCoder;
 class CBC_QRCoderErrorCorrectionLevel;
@@ -126,4 +127,5 @@ class CBC_QRCoderEncoder {
                                       CFX_ByteString& encoding,
                                       int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index 1576f42667..fbe050d352 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERERRORCORRECTIONLEVEL_H_
-#define _BC_QRCODERERRORCORRECTIONLEVEL_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
+
 class CBC_QRCoderErrorCorrectionLevel {
  private:
   int32_t m_ordinal;
@@ -28,4 +29,5 @@ class CBC_QRCoderErrorCorrectionLevel {
   static void Destroy();
   static CBC_QRCoderErrorCorrectionLevel* ForBits(int32_t bits);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
index f0d8bca62d..4d6402a20b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERFORMATINFORMATION_H_
-#define _BC_QRCODERFORMATINFORMATION_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERFORMATINFORMATION_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERFORMATINFORMATION_H_
+
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRCoderFormatInformation {
  private:
@@ -27,4 +28,5 @@ class CBC_QRCoderFormatInformation {
   static CBC_QRCoderFormatInformation* DoDecodeFormatInformation(
       int32_t maskedFormatInfo);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERFORMATINFORMATION_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
index bc2ad9f6ae..ad6274c8a2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERMASKUTIL_H_
-#define _BC_QRCODERMASKUTIL_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
 class CBC_CommonByteMatrix;
 class CBC_QRCoderMaskUtil {
  public:
@@ -23,4 +23,5 @@ class CBC_QRCoderMaskUtil {
   static int32_t ApplyMaskPenaltyRule1Internal(CBC_CommonByteMatrix* matrix,
                                                FX_BOOL isHorizontal);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
index aa7fce3ff8..be38c8a4ff 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERMATRIXUTIL_H_
-#define _BC_QRCODERMATRIXUTIL_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
+
 class CBC_CommonByteMatrix;
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRCoderBitVector;
@@ -82,4 +83,5 @@ class CBC_QRCoderMatrixUtil {
                                                    CBC_CommonByteMatrix* matrix,
                                                    int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
index 55e1b09885..354daf51c1 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERMODE_H_
-#define _BC_QRCODERMODE_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
+
 class CBC_QRCoderVersion;
 class CBC_QRCoderMode {
  private:
@@ -41,4 +42,5 @@ class CBC_QRCoderMode {
   CFX_ByteString GetName();
   static void Destroy();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
index 5f4637127e..1f64faa98e 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRCODERVERSION_H_
-#define _BC_QRCODERVERSION_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
+
 class CBC_QRCoderECBlocks;
 class CBC_CommonBitMatrix;
 class CBC_QRCoderErrorCorrectionLevel;
@@ -46,4 +47,5 @@ class CBC_QRCoderVersion {
                                                       int32_t& e);
   static void Destroy();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
index cbe2f7d867..63ee10ef06 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRDATABLOCK_H_
-#define _BC_QRDATABLOCK_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
+
 class CBC_QRCoderVersion;
 class CBC_QRCoderECBlocks;
 class CBC_QRCoderECB;
@@ -25,4 +26,5 @@ class CBC_QRDataBlock {
                                      CBC_QRCoderErrorCorrectionLevel* ecLevel,
                                      int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
index b44d59f80e..b32a35d822 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRDATAMASK_H_
-#define _BC_QRDATAMASK_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
+
 class CBC_CommonBitMatrix;
 class CBC_QRDataMask {
  public:
@@ -20,4 +21,5 @@ class CBC_QRDataMask {
   static int32_t BuildDataMasks();
   static void Destroy();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
index cec8c14876..c014e4dec7 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRDECODEDBITSTREAMPARSER_H_
-#define _BC_QRDECODEDBITSTREAMPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRDECODEDBITSTREAMPARSER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRDECODEDBITSTREAMPARSER_H_
+
 class CBC_CommonDecoderResult;
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_CommonBitSource;
@@ -54,4 +55,5 @@ class CBC_QRDecodedBitStreamParser {
       int32_t byteModeDecode,
       int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRDECODEDBITSTREAMPARSER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.h b/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
index ad783029fe..45d2f5345f 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRDETECTOR_H_
-#define _BC_QRDETECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
+
 class CBC_ResultPoint;
 class CBC_CommonBitMatrix;
 class CBC_QRDetectorResult;
@@ -61,4 +62,5 @@ class CBC_QRDetector {
                                          int32_t dimension,
                                          int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
index 7ae290cc16..3086cb8c95 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRDETECTORRESULT_H_
-#define _BC_QRDETECTORRESULT_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
+
 class CBC_CommonBitMatrix;
 class CBC_ResultPoint;
 class CBC_QRDetectorResult {
@@ -19,4 +20,5 @@ class CBC_QRDetectorResult {
   CBC_CommonBitMatrix* GetBits();
   CFX_PtrArray* GetPoints();
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h
index fd8a625fc6..3e71034de3 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRFINDERPATTERN_H_
-#define _BC_QRFINDERPATTERN_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRFINDERPATTERN_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRFINDERPATTERN_H_
+
 class CBC_ResultPoint;
 class CBC_QRFinderPattern;
 class CBC_QRFinderPattern : public CBC_ResultPoint {
@@ -26,4 +27,5 @@ class CBC_QRFinderPattern : public CBC_ResultPoint {
   CBC_QRFinderPattern* Clone();
 };
 typedef CBC_QRFinderPattern FinderPattern;
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRFINDERPATTERN_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
index 70663a3f07..7f9209d214 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRFINDERPATTERNFINDER_H_
-#define _BC_QRFINDERPATTERNFINDER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
+
 class CBC_CommonBitMatrix;
 class CBC_QRFinderPattern;
 class CBC_ResultPoint;
@@ -50,4 +51,5 @@ class CBC_QRFinderPatternFinder {
   static FX_BOOL FoundPatternCross(const CFX_Int32Array& stateCount);
   static FX_FLOAT Distance(CBC_ResultPoint* point1, CBC_ResultPoint* point2);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
index a860d3a38c..a3f412435d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_QRGRIDSAMPLER_H_
-#define _BC_QRGRIDSAMPLER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_
+
 class CBC_CommonBitMatrix;
 class CBC_CommonPerspectiveTransform;
 class CBC_CommonDefaultGridSampler;
@@ -43,4 +44,5 @@ class CBC_QRGridSampler {
                                   CFX_FloatArray* points,
                                   int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_
diff --git a/xfa/src/fxbarcode/utils.h b/xfa/src/fxbarcode/utils.h
index 49aa539270..341d65bb36 100644
--- a/xfa/src/fxbarcode/utils.h
+++ b/xfa/src/fxbarcode/utils.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_UTILS_H_
-#define _BC_UTILS_H_
+#ifndef XFA_SRC_FXBARCODE_UTILS_H_
+#define XFA_SRC_FXBARCODE_UTILS_H_
+
 typedef CFX_MapPtrTemplate<void*, int32_t> CFX_PtrToInt32;
 FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst,
                                  FX_DWORD first,
@@ -213,4 +214,5 @@ enum BCFORMAT {
 #define BC_EXCEPTION_CHECK_ReturnValue(e, v) \
   if (e != BCExceptionNO)                    \
     return v;
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_UTILS_H_
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h
index 96c7fd222f..5927e5335f 100644
--- a/xfa/src/fxfa/src/app/xfa_checksum.h
+++ b/xfa/src/fxfa/src/app/xfa_checksum.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_CHECKSUM_IMP_H
-#define _FXFA_FORMFILLER_CHECKSUM_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_
+
 class CXFA_SAXReaderHandler;
 class CXFA_ChecksumContext;
 class CXFA_SAXContext {
@@ -63,4 +64,5 @@ class CXFA_ChecksumContext : public IXFA_ChecksumContext {
   uint8_t* m_pByteContext;
   CFX_ByteString m_bsChecksum;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
index f41495b4e9..c26876a4e3 100644
--- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLERCONFIGACC_IMP_H
-#define _FXFA_FORMFILLERCONFIGACC_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCONFIGACC_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFCONFIGACC_H_
+
 class CXFA_FFConfigAcc {
  public:
   CXFA_FFConfigAcc(CXFA_Node* pNode);
@@ -22,4 +23,5 @@ class CXFA_FFConfigAcc {
   CXFA_Node* m_pNode;
   CXFA_Node* m_pPsMapNode;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFCONFIGACC_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.h b/xfa/src/fxfa/src/app/xfa_ffapp.h
index 515e192430..2b04782108 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.h
+++ b/xfa/src/fxfa/src/app/xfa_ffapp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FFAPP_H_
-#define XFA_FFAPP_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
 
 class CXFA_FileRead : public IFX_FileRead {
  public:
@@ -69,4 +69,4 @@ class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative {
   CFWL_SDAdapterThreadMgr* m_pAdapterThreadMgr;
 };
 
-#endif  // XFA_FFAPP_H_
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.h b/xfa/src/fxfa/src/app/xfa_ffbarcode.h
index 0d52486d16..58826869b5 100644
--- a/xfa/src/fxfa/src/app/xfa_ffbarcode.h
+++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_BARCODE_IMP_H
-#define _FXFA_FORMFILLER_BARCODE_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
+
 class CXFA_FFTextEdit;
 class CXFA_FFBarcode : public CXFA_FFTextEdit {
  public:
@@ -92,4 +93,5 @@ struct XFA_BARCODETYPEENUMINFO {
 };
 typedef XFA_BARCODETYPEENUMINFO const* XFA_LPCBARCODETYPEENUMINFO;
 extern const XFA_BARCODETYPEENUMINFO g_XFABarCodeTypeEnumData[];
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
index fc05aefbc9..38b0184384 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_CHECKBUTTON_IMP_H
-#define _FXFA_FORMFILLER_CHECKBUTTON_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_
+
 class CXFA_FFExclGroup;
 class CXFA_FFCheckButton : public CXFA_FFField {
  public:
@@ -36,4 +37,5 @@ class CXFA_FFCheckButton : public CXFA_FFField {
   IFWL_WidgetDelegate* m_pOldDelegate;
   CFX_RectF m_rtCheckBox;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h
index b8140b33d5..3646dc826f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h
+++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_CHOICELIST_IMP_H
-#define _FXFA_FORMFILLER_CHOICELIST_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_
+
 class CXFA_FFListBox : public CXFA_FFField {
  public:
   CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -88,4 +89,5 @@ class CXFA_FFComboBox : public CXFA_FFField {
  protected:
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h
index f5e6f95250..e2e5bec9ef 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXFA_SRC_APP_XFA_FFDOC_H_
-#define FXFA_SRC_APP_XFA_FFDOC_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_
 
 #include "xfa/include/fxfa/fxfa.h"
 
@@ -61,4 +61,4 @@ class CXFA_FFDoc : public IXFA_Doc {
   FX_BOOL m_bOwnStream;
 };
 
-#endif  // FXFA_SRC_APP_XFA_FFDOC_H_
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
index 4fdf849bf7..36fb149cca 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FFDOCHANDLER_H_
-#define XFA_FFDOCHANDLER_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
 
 class CXFA_FFDocHandler : public IXFA_DocHandler {
  public:
@@ -45,4 +45,4 @@ class CXFA_FFDocHandler : public IXFA_DocHandler {
  protected:
 };
 
-#endif  // XFA_FFDOCHANDLER_H_
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h
index df709251ca..511302119d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXFA_SRC_APP_XFA_FFDOCVIEW_H_
-#define FXFA_SRC_APP_XFA_FFDOCVIEW_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_
 
 #include "xfa_ffdoc.h"
 
@@ -168,4 +168,4 @@ class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator {
   CXFA_WidgetAcc* m_pCurWidgetAcc;
 };
 
-#endif  // FXFA_SRC_APP_XFA_FFDOCVIEW_H_
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.h b/xfa/src/fxfa/src/app/xfa_ffdraw.h
index 3833a845f4..fba7d4ed8a 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdraw.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdraw.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_DRAW_IMP_H
-#define _FXFA_FORMFILLER_DRAW_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_
+
 class CXFA_FFDraw : public CXFA_FFWidget {
  public:
   CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -13,4 +14,5 @@ class CXFA_FFDraw : public CXFA_FFWidget {
 
  protected:
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h
index ba247674b5..2b6d39216e 100644
--- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h
+++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_EXCLGROUP_IMP_H
-#define _FXFA_FORMFILLER_EXCLGROUP_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_
+
 class CXFA_FFExclGroup : public CXFA_FFWidget {
  public:
   CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -18,4 +19,5 @@ class CXFA_FFExclGroup : public CXFA_FFWidget {
 
  protected:
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.h b/xfa/src/fxfa/src/app/xfa_fffield.h
index 7b7d6a738d..eb4bd0348c 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.h
+++ b/xfa/src/fxfa/src/app/xfa_fffield.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_FIELD_IMP_H
-#define _FXFA_FORMFILLER_FIELD_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
+
 #define XFA_MINUI_HEIGHT 4.32f
 #define XFA_DEFAULTUI_HEIGHT 2.0f
 class CXFA_TextLayout;
@@ -89,4 +90,5 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
   CFX_RectF m_rtUI;
   CFX_RectF m_rtCaption;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.h b/xfa/src/fxfa/src/app/xfa_ffimage.h
index 1cc47b5973..8bece23818 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimage.h
+++ b/xfa/src/fxfa/src/app/xfa_ffimage.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DRAW_IMAGE_IMP_H
-#define _XFA_DRAW_IMAGE_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
+
 class CXFA_FFImage : public CXFA_FFDraw {
  public:
   CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -18,4 +19,5 @@ class CXFA_FFImage : public CXFA_FFDraw {
   virtual FX_BOOL LoadWidget();
   virtual void UnloadWidget();
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.h b/xfa/src/fxfa/src/app/xfa_ffimageedit.h
index 388585fe0a..09fc2e9c68 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.h
+++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_IMAGEEDIT_IMP_H
-#define _FXFA_FORMFILLER_IMAGEEDIT_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
+
 class CXFA_FFImageEdit : public CXFA_FFField {
  public:
   CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -29,4 +30,5 @@ class CXFA_FFImageEdit : public CXFA_FFField {
   virtual FX_BOOL CommitData();
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h
index e49fe6579d..311d99b95d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.h
+++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FFNOTIFY_H_
-#define _FXFA_FFNOTIFY_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
+
 class CXFA_FFNotify : public IXFA_Notify {
  public:
   CXFA_FFNotify(CXFA_FFDoc* pDoc);
@@ -92,4 +93,5 @@ class CXFA_FFNotify : public IXFA_Notify {
                                   void* pParam2);
   CXFA_FFDoc* m_pDoc;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.h b/xfa/src/fxfa/src/app/xfa_ffpageview.h
index 457650d0ea..6d1926ea12 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpageview.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_PAGEVIEW_IMP_H
-#define _FXFA_FORMFILLER_PAGEVIEW_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_
+
 class CXFA_FFWidget;
 class CXFA_FFDocView;
 class CXFA_FFPageView : public CXFA_ContainerLayoutItem, public IXFA_PageView {
@@ -104,4 +105,5 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator {
                       FX_BOOL& bContentArea,
                       FX_BOOL bMarsterPage = FALSE);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.h b/xfa/src/fxfa/src/app/xfa_ffpath.h
index 457abe30d6..b970c989c4 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpath.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpath.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DRAW_PATH_IMP_H
-#define _XFA_DRAW_PATH_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
+
 class CXFA_FFLine : public CXFA_FFDraw {
  public:
   CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -36,4 +37,5 @@ class CXFA_FFRectangle : public CXFA_FFDraw {
                             FX_DWORD dwStatus = 0,
                             int32_t iRotate = 0);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
index 96b71c5327..e3761d142f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_PUSHBUTTON_IMP_H
-#define _FXFA_FORMFILLER_PUSHBUTTON_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
+
 #define XFA_FWL_PSBSTYLEEXT_HiliteNone (0L << 0)
 #define XFA_FWL_PSBSTYLEEXT_HiliteInverted (1L << 0)
 #define XFA_FWL_PSBSTYLEEXT_HilitePush (2L << 0)
@@ -40,4 +41,5 @@ class CXFA_FFPushButton : public CXFA_FFField {
   CXFA_TextProvider* m_pRollProvider;
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.h b/xfa/src/fxfa/src/app/xfa_ffsignature.h
index 36b1ddca39..79cc0ad407 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsignature.h
+++ b/xfa/src/fxfa/src/app/xfa_ffsignature.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_SIGNATURE_IMP_H
-#define _FXFA_FORMFILLER_SIGNATURE_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
+
 class CXFA_FFSignature final : public CXFA_FFField {
  public:
   CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -38,4 +39,5 @@ class CXFA_FFSignature final : public CXFA_FFField {
 
  protected:
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.h b/xfa/src/fxfa/src/app/xfa_ffsubform.h
index 8a6f069ca1..ae548cca7d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsubform.h
+++ b/xfa/src/fxfa/src/app/xfa_ffsubform.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_SUBFORM_IMP_H
-#define _FXFA_FORMFILLER_SUBFORM_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_
+
 class CXFA_FFSubForm : public CXFA_FFWidget {
  public:
   CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
   virtual ~CXFA_FFSubForm();
-
- protected:
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.h b/xfa/src/fxfa/src/app/xfa_fftext.h
index 5d8a4701a6..f4decf215e 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.h
+++ b/xfa/src/fxfa/src/app/xfa_fftext.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_DRAWTEXT_IMP_H
-#define _FXFA_FORMFILLER_DRAWTEXT_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
+
 class CXFA_TextLayout;
 class CXFA_FFText : public CXFA_FFDraw {
  public:
@@ -26,4 +27,5 @@ class CXFA_FFText : public CXFA_FFDraw {
   virtual const FX_WCHAR* GetLinkURLAtPoint(FX_FLOAT fx, FX_FLOAT fy);
   void FWLToClient(FX_FLOAT& fx, FX_FLOAT& fy);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.h b/xfa/src/fxfa/src/app/xfa_fftextedit.h
index 0f99a69084..e6c11ca610 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.h
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FFTEXTEDIT_H_
-#define XFA_FFTEXTEDIT_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_
 
 class CXFA_FFTextEdit : public CXFA_FFField {
  public:
@@ -131,4 +131,4 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit {
   virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent);
 };
 
-#endif  // XFA_FFTEXTEDIT_H_
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h
index 8262be8c13..7b373b25e4 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FFWIDGET_H_
-#define XFA_FFWIDGET_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_
 
 #include <vector>
 
@@ -186,4 +186,4 @@ void XFA_DrawBox(CXFA_Box box,
                  CFX_Matrix* pMatrix,
                  FX_DWORD dwFlags = 0);
 
-#endif  // XFA_FFWIDGET_H_
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
index 4be5fadc20..7a8dd94bfe 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_WIDGETACC_IMP_H
-#define _FXFA_FORMFILLER_WIDGETACC_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_
+
 #include "xfa_textlayout.h"
+
 enum XFA_TEXTPROVIDERTYPE {
   XFA_TEXTPROVIDERTYPE_Text,
   XFA_TEXTPROVIDERTYPE_Datasets,
@@ -38,4 +40,5 @@ class CXFA_TextProvider : public IXFA_TextProvider {
   XFA_TEXTPROVIDERTYPE m_eType;
   CXFA_Node* m_pTextNode;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
index e6d7721b21..2f3453d84f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FFWIDGETHANDLER_H_
-#define XFA_FFWIDGETHANDLER_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_
 
 #include <vector>
 
@@ -172,4 +172,4 @@ class CXFA_FFMenuHandler : public IXFA_MenuHandler {
                                         const CFX_ByteStringC& bsReplace);
 };
 
-#endif  //  XFA_FFWIDGETHANDLER_H_
+#endif  //  XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h
index 84f59bc214..e3fb99e824 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.h
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FONTMGR_H_
-#define XFA_FONTMGR_H_
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_
 
 #include <map>
 
@@ -90,4 +90,4 @@ class CXFA_FontMgr {
   std::map<CFX_ByteString, IFX_Font*> m_FontMap;
 };
 
-#endif  //  XFA_FONTMGR_H_
+#endif  //  XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.h b/xfa/src/fxfa/src/app/xfa_fwladapter.h
index 2b05d1ec89..91210717c1 100644
--- a/xfa/src/fxfa/src/app/xfa_fwladapter.h
+++ b/xfa/src/fxfa/src/app/xfa_fwladapter.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FWL_ADAPTER_IMP_H
-#define _XFA_FWL_ADAPTER_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
+
 class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr {
  public:
   virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect);
@@ -15,4 +16,5 @@ class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr {
                               const CFX_RectF& rtAnchor,
                               CFX_RectF& rtPopup);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h
index 8b4c9385bf..eabde0481b 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.h
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FWL_THEME_IMP_H
-#define _XFA_FWL_THEME_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
+
 class CXFA_FWLTheme : public IFWL_ThemeProvider {
  public:
   CXFA_FWLTheme(CXFA_FFApp* pApp);
@@ -89,4 +90,5 @@ class CXFA_FWLEditTP : public CFWL_EditTP {
  public:
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/src/app/xfa_rendercontext.h
index cdb2bea4f7..9f91d23e56 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.h
+++ b/xfa/src/fxfa/src/app/xfa_rendercontext.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H
-#define _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
+
 class CXFA_RenderContext : public IXFA_RenderContext {
  public:
   CXFA_RenderContext();
@@ -28,4 +29,5 @@ class CXFA_RenderContext : public IXFA_RenderContext {
   FX_DWORD m_dwStatus;
   CFX_RectF m_rtClipRect;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h
index 0078ec74bb..44a27ad46c 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/src/app/xfa_textlayout.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_TEXTLAYOUT_H
-#define _FXFA_TEXTLAYOUT_H
+#ifndef XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
+#define XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
+
 #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001
 class CXFA_TextTabstopsContext;
 class IXFA_TextProvider {
@@ -403,4 +404,5 @@ class CXFA_TextLayout {
   CXFA_TextTabstopsContext* m_pTabstopContext;
   FX_BOOL m_bBlockContinue;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/src/common/fxfa_localevalue.h
index d29e70f501..1157e9970d 100644
--- a/xfa/src/fxfa/src/common/fxfa_localevalue.h
+++ b/xfa/src/fxfa/src/common/fxfa_localevalue.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_WIDGETVALUE_H
-#define _FXFA_WIDGETVALUE_H
+#ifndef XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_
+#define XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_
+
 class IFX_Locale;
 class CFX_Unitime;
 class CXFA_LocaleMgr;
@@ -103,4 +104,5 @@ class CXFA_LocaleValue {
   FX_DWORD m_dwType;
   FX_BOOL m_bValid;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_
diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h
index 26db24237b..269cab605e 100644
--- a/xfa/src/fxfa/src/common/xfa_common.h
+++ b/xfa/src/fxfa/src/common/xfa_common.h
@@ -6,8 +6,9 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef _XFA_COMMON_H_
-#define _XFA_COMMON_H_
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_
+
 #include "xfa_utils.h"
 #include "xfa_object.h"
 #include "xfa_document.h"
@@ -17,4 +18,5 @@
 #include "xfa_doclayout.h"
 #include "xfa_localemgr.h"
 #include "xfa_fm2jsapi.h"
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_
diff --git a/xfa/src/fxfa/src/common/xfa_docdata.h b/xfa/src/fxfa/src/common/xfa_docdata.h
index 59084e9655..b1b78eba6f 100644
--- a/xfa/src/fxfa/src/common/xfa_docdata.h
+++ b/xfa/src/fxfa/src/common/xfa_docdata.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DOCDATA_H
-#define _XFA_DOCDATA_H
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_
+
 enum XFA_DATAFORMAT {
   XFA_DATAFORMAT_XDP,
 };
@@ -28,4 +29,5 @@ class IXFA_PacketImport {
   virtual void Release() = 0;
   virtual FX_BOOL ImportData(IFX_FileRead* pDataDocument) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_
diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h
index d59ae89828..5ac4cb945f 100644
--- a/xfa/src/fxfa/src/common/xfa_doclayout.h
+++ b/xfa/src/fxfa/src/common/xfa_doclayout.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DOCLAYOUT_H_
-#define _XFA_DOCLAYOUT_H_
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_
+
 #define _XFA_LAYOUTITEM_ProcessCACHE_
 
 class CXFA_ContainerLayoutItem;
@@ -130,4 +131,5 @@ class IXFA_DocLayout {
   virtual IXFA_LayoutPage* GetPage(int32_t index) const = 0;
   virtual CXFA_LayoutItem* GetLayoutItem(CXFA_Node* pFormItem) = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_
diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h
index e041514b19..5498b1f831 100644
--- a/xfa/src/fxfa/src/common/xfa_document.h
+++ b/xfa/src/fxfa/src/common/xfa_document.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DOCUMENT_H
-#define _XFA_DOCUMENT_H
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
 
 class CXFA_Document;
 class CXFA_LayoutItem;
@@ -193,4 +193,5 @@ class CXFA_Document : public IXFA_ObjFactory {
   FX_DWORD m_dwDocFlags;
   friend class CXFA_SimpleParser;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
diff --git a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h
index 6e9aa04b79..67f3b7e193 100644
--- a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h
+++ b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h
@@ -4,12 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM2JS_API_H
-#define _XFA_FM2JS_API_H
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
+
 #define FOXIT_XFA_FM2JS_FORMCALC_RUNTIME "foxit_xfa_formcalc_runtime"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 typedef struct XFA_HFM2JSCONTEXT_ { void** pData; } * XFA_HFM2JSCONTEXT;
 int32_t XFA_FM2JS_Translate(const CFX_WideStringC& wsFormcalc,
                             CFX_WideTextBuf& wsJavascript,
@@ -22,7 +25,9 @@ void XFA_FM2JS_ContextInitialize(XFA_HFM2JSCONTEXT hFM2JSContext,
 void XFA_FM2JS_GlobalPropertyGetter(XFA_HFM2JSCONTEXT hFM2JSContext,
                                     FXJSE_HVALUE hValue);
 void XFA_FM2JS_ContextRelease(XFA_HFM2JSCONTEXT hFM2JSContext);
+
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h
index 432913baf2..6583ddb061 100644
--- a/xfa/src/fxfa/src/common/xfa_localemgr.h
+++ b/xfa/src/fxfa/src/common/xfa_localemgr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_LOCALEMGR_H
-#define _FXFA_LOCALEMGR_H
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
+
 class CXFA_Node;
 class IFX_Locale;
 class IFX_LocaleMgr;
@@ -67,4 +68,5 @@ class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider {
  private:
   FX_TIMEZONE m_tz;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h
index b6bc340bf4..a565922157 100644
--- a/xfa/src/fxfa/src/common/xfa_object.h
+++ b/xfa/src/fxfa/src/common/xfa_object.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_OBJECT_H_
-#define XFA_OBJECT_H_
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
 
 class CXFA_ArrayNodeList;
 class CXFA_AttachNodeList;
@@ -798,4 +798,4 @@ inline const CXFA_NodeList* ToNodeList(const CXFA_Object* pObj) {
   return pObj ? pObj->AsNodeList() : nullptr;
 }
 
-#endif  // XFA_OBJECT_H_
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
diff --git a/xfa/src/fxfa/src/common/xfa_parser.h b/xfa/src/fxfa/src/common/xfa_parser.h
index 5c8ea88f56..80cae0065b 100644
--- a/xfa/src/fxfa/src/common/xfa_parser.h
+++ b/xfa/src/fxfa/src/common/xfa_parser.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_PARSER_H
-#define _XFA_PARSER_H
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H
+
 class IFX_Stream;
 class IXFA_Parser {
  public:
@@ -32,4 +33,5 @@ class IXFA_DocParser : public IXFA_Parser {
   virtual CXFA_Document* GetDocument() const = 0;
   virtual IXFA_Notify* GetNotify() const = 0;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H
diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h
index fa419c712a..68f8117041 100644
--- a/xfa/src/fxfa/src/common/xfa_script.h
+++ b/xfa/src/fxfa/src/common/xfa_script.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_SCRIPT_H
-#define _FXFA_SCRIPT_H
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H
+
 #define XFA_RESOLVENODE_Children 0x0001
 #define XFA_RESOLVENODE_Attributes 0x0004
 #define XFA_RESOLVENODE_Properties 0x0008
@@ -106,4 +107,5 @@ class IXFA_ScriptContext {
   virtual FX_BOOL IsRunAtClient() = 0;
 };
 IXFA_ScriptContext* XFA_ScriptContext_Create(CXFA_Document* pDocument);
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H
diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h
index 47fd9e90e2..4ebc59b4fa 100644
--- a/xfa/src/fxfa/src/common/xfa_utils.h
+++ b/xfa/src/fxfa/src/common/xfa_utils.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_UTILS_H_
-#define _XFA_UTILS_H_
+#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
+#define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
+
 FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier(
     IFDE_XMLElement* pNode,
     const CFX_WideStringC& wsQualifier,
@@ -211,4 +212,5 @@ void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode,
                                          IFX_Stream* pStream,
                                          const FX_CHAR* pChecksum = NULL,
                                          FX_BOOL bSaveXML = FALSE);
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h
index 0021d3a428..87318d5491 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_error.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_error.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM_ERROR_H
-#define _XFA_FM_ERROR_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_
+
 enum XFA_FM_ERRMSG {
   FMERR_UNSUPPORTED_CHAR,
   FMERR_BAD_SUFFIX_NUMBER,
@@ -25,4 +26,5 @@ class CXFA_FMErrorInfo {
   CFX_WideString message;
 };
 const FX_WCHAR* XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg);
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h
index 8515f0204b..a3464a2d13 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_expression.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM_EXPRESSION_H
-#define _XFA_FM_EXPRESSION_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_
+
 enum XFA_FM_EXPTYPE {
   XFA_FM_EXPTYPE_UNKNOWN,
   XFA_FM_EXPTYPE_FUNC,
@@ -175,4 +176,5 @@ class CXFA_FMForeachExpression : public CXFA_FMLoopExpression {
   CFX_PtrArray* m_pAccessors;
   CXFA_FMExpression* m_pList;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h
index 8ff12f724b..cb10391517 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM2JS_H
-#define _XFA_FM2JS_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_
+
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/common/xfa_utils.h"
 #include "xfa/src/fxfa/src/common/xfa_object.h"
@@ -28,4 +29,5 @@ typedef CFX_ArrayTemplate<CFX_WideStringC> CFX_WideStringCArray;
 #include "xfa_fmparse.h"
 #include "xfa_program.h"
 #include "xfa_fm2jscontext.h"
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
index e7b5aa5264..75d3b15583 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM2JS_CONTEXT_H
-#define _XFA_FM2JS_CONTEXT_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_
+
 class CXFA_FM2JSContext {
  public:
   static void Abs(FXJSE_HOBJECT hThis,
@@ -446,4 +447,5 @@ class CXFA_FM2JSContext {
   FXJSE_HVALUE m_hValue;
   CXFA_Document* m_pDocument;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
index ed950c5aa4..bac6729795 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM_PARSE_H
-#define _XFA_FM_PARSE_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_
 
 #include <memory>
 
@@ -49,4 +49,4 @@ class CXFA_FMParse {
   CXFA_FMErrorInfo* m_pErrorInfo;
 };
 
-#endif
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/src/fm2js/xfa_lexer.h
index 14b927d6d9..5db3b093cd 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM_LEXER_H
-#define _XFA_FM_LEXER_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_
 
 #include <memory>
 
@@ -128,4 +128,4 @@ class CXFA_FMLexer {
   CXFA_FMErrorInfo* m_pErrorInfo;
 };
 
-#endif
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.h b/xfa/src/fxfa/src/fm2js/xfa_program.h
index 39a19e24a2..6f3a390991 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_program.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_program.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM_PROGRAM_H
-#define _XFA_FM_PROGRAM_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_
+
 class CXFA_FMProgram {
  public:
   CXFA_FMProgram();
@@ -20,4 +21,5 @@ class CXFA_FMProgram {
   CXFA_FMParse m_parse;
   CXFA_FMFunctionDefinition* m_globalFunction;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
index 07c9f33946..4412cbd248 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_FM_SIMPLEEXPRESSION_H
-#define _XFA_FM_SIMPLEEXPRESSION_H
+#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_
+#define XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_
+
 enum XFA_FM_SimpleExpressionType {
   ASSIGN,
   LOGICALOR,
@@ -266,4 +267,5 @@ class CXFA_FMMethodCallExpression : public CXFA_FMBinExpression {
 
  protected:
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.h b/xfa/src/fxfa/src/parser/xfa_basic_imp.h
index 95d4fb135c..966d27e946 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.h
@@ -4,14 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_BASIC_IMP
-#define _XFA_BASIC_IMP
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_
+
 typedef struct _XFA_NOTSUREATTRIBUTE {
   XFA_ELEMENT eElement;
   XFA_ATTRIBUTE eAttribute;
   XFA_ATTRIBUTETYPE eType;
   void* pValue;
 } XFA_NOTSUREATTRIBUTE, *XFA_LPNOTSUREATTRIBUTE;
+
 typedef XFA_NOTSUREATTRIBUTE const* XFA_LPCNOTSUREATTRIBUTE;
 XFA_LPCNOTSUREATTRIBUTE XFA_GetNotsureAttribute(
     XFA_ELEMENT eElement,
@@ -63,4 +65,5 @@ class CXFA_WideTextRead : public IFX_Stream {
   int32_t m_iPosition;
   int32_t m_iRefCount;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h
index 0f385ba3c7..d890f9247d 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
-#define _XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
+
 void XFA_DataDescription_UpdateDataRelation(CXFA_Node* pDataNode,
                                             CXFA_Node* pDataDescriptionNode);
 CXFA_Node* XFA_DataDescription_MaybeCreateDataNode(
@@ -13,4 +14,5 @@ CXFA_Node* XFA_DataDescription_MaybeCreateDataNode(
     CXFA_Node* pDataParent,
     XFA_ELEMENT eNodeType,
     const CFX_WideStringC& wsName);
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h
index ca755c6df0..72c40dcf63 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DOCUMENT_DATAMERGER_IMP_H_
-#define _XFA_DOCUMENT_DATAMERGER_IMP_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
+
 CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer(
     CXFA_Document* pDocument,
     CXFA_Node* pFormParent,
@@ -17,4 +18,5 @@ CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument,
                                              XFA_ELEMENT eClassID,
                                              FX_DWORD dwNameHash,
                                              CXFA_Node* pFormParent);
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
index 6af69ead7d..78b364053e 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DOCUMENT_LAYOUT_IMP_H_
-#define _XFA_DOCUMENT_LAYOUT_IMP_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
+
 class CXFA_ItemLayoutProcessor;
 class CXFA_LayoutPageMgr;
 class CXFA_LayoutAppAdapter;
@@ -42,4 +43,5 @@ class CXFA_LayoutProcessor : public IXFA_DocLayout {
   uint32_t m_nProgressCounter;
   FX_BOOL m_bNeeLayout;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/src/parser/xfa_document_serialize.h
index d50f0d2674..bcec733772 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_DOCUMENT_SERIALIZE_H_
-#define _XFA_DOCUMENT_SERIALIZE_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_
+
 class CXFA_DataImporter : public IXFA_PacketImport {
  public:
   CXFA_DataImporter(CXFA_Document* pDocument);
@@ -32,4 +33,5 @@ class CXFA_DataExporter : public IXFA_PacketExport {
                  const FX_CHAR* pChecksum);
   CXFA_Document* m_pDocument;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
index 123f2e4e52..6ae4706343 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_LAYOUT_APPADAPTER_H_
-#define _XFA_LAYOUT_APPADAPTER_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
+
 class CXFA_TraverseStrategy_PageAreaContainerLayoutItem {
  public:
   static inline CXFA_ContainerLayoutItem* GetFirstChild(
@@ -70,4 +71,5 @@ class CXFA_TraverseStrategy_ContentLayoutItem {
 };
 FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant);
 void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem);
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
index 980eaee4e7..f53b19fe26 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_LAYOUT_ITEMLAYOUT_H_
-#define _XFA_LAYOUT_ITEMLAYOUT_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
+
 #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1)
 #define XFA_LAYOUT_FLOAT_PERCISION (0.0005f)
 #include "float.h"
@@ -183,4 +184,5 @@ class CXFA_ItemLayoutProcessor {
   FX_BOOL m_bHasAvailHeight;
 };
 FX_BOOL XFA_ItemLayoutProcessor_IsTakingSpace(CXFA_Node* pNode);
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
index 1bbe9fa0c7..94da5a41ed 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_LAYOUT_PAGEMGR_H_
-#define _XFA_LAYOUT_PAGEMGR_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
+
 class CXFA_ContainerRecord {
  public:
   CXFA_ContainerRecord(CXFA_ContainerLayoutItem* pPageSet = NULL,
@@ -149,4 +150,5 @@ class CXFA_LayoutPageMgr {
   CFX_MapPtrToPtr m_NodeToContent;
 #endif
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/src/parser/xfa_locale.h
index 7b52d08132..60336f6e88 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.h
+++ b/xfa/src/fxfa/src/parser/xfa_locale.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_LOCALE_H
-#define _FXFA_LOCALE_H
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
+
 class CXFA_XMLLocale : public IFX_Locale {
  public:
   CXFA_XMLLocale(CXML_Element* pLocaleData);
@@ -85,4 +86,5 @@ class CXFA_NodeLocale : public IFX_Locale {
 
   CXFA_Node* m_pLocale;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.h b/xfa/src/fxfa/src/parser/xfa_parser_imp.h
index 83ff212b91..6c6593ae03 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_PARSER_IMP
-#define _XFA_PARSER_IMP
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_
+
 #define _XFA_VERIFY_Checksum_
 class CXFA_XMLParser;
 class CXFA_SimpleParser : public IXFA_Parser {
@@ -131,4 +132,5 @@ class CXFA_XMLParser : public IFDE_XMLParser {
   CFX_WideString m_ws2;
   FX_DWORD m_dwStatus;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h
index c5fb31e86d..8be21a762f 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _SCRIPT_DATAWINDOW_H_
-#define _SCRIPT_DATAWINDOW_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
+
 class CScript_DataWindow : public CXFA_OrdinaryObject {
  public:
   CScript_DataWindow(CXFA_Document* pDocument);
@@ -27,4 +28,5 @@ class CScript_DataWindow : public CXFA_OrdinaryObject {
                                    FX_BOOL bSetting,
                                    XFA_ATTRIBUTE eAttribute);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h
index 8ba8135cf3..31646cc8d6 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _SCRIPT_EVENTPSEUDOMODEL_H_
-#define _SCRIPT_EVENTPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
+
 #define XFA_EVENT_CHANGE 0
 #define XFA_EVENT_COMMITKEY 1
 #define XFA_EVENT_FULLTEXT 2
@@ -88,4 +89,5 @@ class CScript_EventPseudoModel : public CXFA_OrdinaryObject {
                                         FX_DWORD dwFlag,
                                         FX_BOOL bSetting);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h
index 29e5dd59b9..f17a85dc06 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _SCRIPT_HOSTPSEUDOMODEL_H_
-#define _SCRIPT_HOSTPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
+
 class CScript_HostPseudoModel : public CXFA_OrdinaryObject {
  public:
   CScript_HostPseudoModel(CXFA_Document* pDocument);
@@ -81,4 +82,5 @@ class CScript_HostPseudoModel : public CXFA_OrdinaryObject {
       int32_t iArgIndex,
       CFX_WideString& wsValue);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/src/parser/xfa_script_imp.h
index 9692a8a71f..8b1b6c6914 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_imp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SCRIPT_IMP_H_
-#define XFA_SCRIPT_IMP_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_
 
 #include <map>
 
@@ -120,4 +120,4 @@ class CXFA_ScriptContext : public IXFA_ScriptContext {
   XFA_ATTRIBUTEENUM m_eRunAtType;
 };
 
-#endif  //  XFA_SCRIPT_IMP_H_
+#endif  //  XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h
index ccff992fd6..f0420e71fd 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _SCRIPT_LAYOUTPSEUDOMODEL_H_
-#define _SCRIPT_LAYOUTPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
+
 enum XFA_LAYOUTMODEL_HWXY {
   XFA_LAYOUTMODEL_H,
   XFA_LAYOUTMODEL_W,
@@ -55,4 +56,5 @@ class CScript_LayoutPseudoModel : public CXFA_OrdinaryObject {
   void Script_LayoutPseudoModel_PageImp(CFXJSE_Arguments* pArguments,
                                         FX_BOOL bAbsPage);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h
index 118bd66bc1..60be763b47 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _SCRIPT_LOGPSEUDOMODEL_H_
-#define _SCRIPT_LOGPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
+
 class CScript_LogPseudoModel : public CXFA_OrdinaryObject {
  public:
   CScript_LogPseudoModel(CXFA_Document* pDocument);
@@ -17,4 +18,5 @@ class CScript_LogPseudoModel : public CXFA_OrdinaryObject {
   void Script_LogPseudoModel_TraceDeactivate(CFXJSE_Arguments* pArguments);
   void Script_LogPseudoModel_Trace(CFXJSE_Arguments* pArguments);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
index 6f9c5e468b..37a369170a 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_NODEHELPER_H_
-#define _XFA_NODEHELPER_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
+
 class CXFA_ScriptContext;
 enum XFA_LOGIC_TYPE {
   XFA_LOGIC_NoTransparent,
@@ -62,4 +63,5 @@ class CXFA_NodeHelper {
   int32_t m_iCurAllStart;
   CXFA_Node* m_pAllStartParent;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
index eb0d999d76..445982303a 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _XFA_RESOLVEPROCESSOR_H_
-#define _XFA_RESOLVEPROCESSOR_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
+
 class CXFA_NodeHelper;
 class CXFA_ScriptContext;
 class CXFA_ResolveNodesData {
@@ -76,4 +77,5 @@ class CXFA_ResolveProcessor {
  public:
   int32_t m_iCurStart;
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h
index c7bcbd838e..56ef052110 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _SCRIPT_SIGNATUREPSEUDOMODEL_H_
-#define _SCRIPT_SIGNATUREPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
+
 class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject {
  public:
   CScript_SignaturePseudoModel(CXFA_Document* pDocument);
@@ -15,4 +16,5 @@ class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject {
   void Script_SignaturePseudoModel_Enumerate(CFXJSE_Arguments* pArguments);
   void Script_SignaturePseudoModel_Clear(CFXJSE_Arguments* pArguments);
 };
-#endif
+
+#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
diff --git a/xfa/src/fxgraphics/src/fx_path_generator.h b/xfa/src/fxgraphics/src/fx_path_generator.h
index af6181683c..76e416fd55 100644
--- a/xfa/src/fxgraphics/src/fx_path_generator.h
+++ b/xfa/src/fxgraphics/src/fx_path_generator.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef __H_FX_PATH_GENERATOR__
-#define __H_FX_PATH_GENERATOR__
+#ifndef XFA_SRC_FXGRAPHICS_SRC_FX_PATH_GENERATOR_H_
+#define XFA_SRC_FXGRAPHICS_SRC_FX_PATH_GENERATOR_H_
 
 #include "core/include/fxge/fx_ge.h"
 
@@ -60,4 +60,5 @@ class CFX_PathGenerator {
  protected:
   CFX_PathData* m_pPathData;
 };
-#endif
+
+#endif  // XFA_SRC_FXGRAPHICS_SRC_FX_PATH_GENERATOR_H_
diff --git a/xfa/src/fxgraphics/src/pre.h b/xfa/src/fxgraphics/src/pre.h
index 3cd692e9e2..7341aa7e5c 100644
--- a/xfa/src/fxgraphics/src/pre.h
+++ b/xfa/src/fxgraphics/src/pre.h
@@ -4,6 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef XFA_SRC_FXGRAPHICS_SRC_PRE_H_
+#define XFA_SRC_FXGRAPHICS_SRC_PRE_H_
+
 #include "xfa/src/foxitlib.h"
 #ifndef FXSYS_Mul
 #define FXSYS_Mul(a, b) ((a) * (b))
@@ -583,3 +586,5 @@ static const FX_HATCHDATA hatchBitmapData[FX_HATCHSTYLE_Total] = {
   printf("duration is %f millisecond\n", duration * 1000);
 #else
 #endif
+
+#endif  // XFA_SRC_FXGRAPHICS_SRC_PRE_H_
diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/src/class.h
index d1c8852a74..763b3236ec 100644
--- a/xfa/src/fxjse/src/class.h
+++ b/xfa/src/fxjse/src/class.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_CLASS_H_
-#define FXJSE_CLASS_H_
+#ifndef XFA_SRC_FXJSE_SRC_CLASS_H_
+#define XFA_SRC_FXJSE_SRC_CLASS_H_
+
 class CFXJSE_Context;
 class CFXJSE_Value;
 class CFXJSE_Class {
@@ -43,4 +44,5 @@ struct CFXJSE_ArgumentsImpl {
   const v8::FunctionCallbackInfo<v8::Value>* m_pInfo;
   CFXJSE_Value* m_pRetValue;
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_CLASS_H_
diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/src/context.h
index d0267fc852..1b83ebb6d1 100644
--- a/xfa/src/fxjse/src/context.h
+++ b/xfa/src/fxjse/src/context.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_CONTEXT_H_
-#define FXJSE_CONTEXT_H_
+#ifndef XFA_SRC_FXJSE_SRC_CONTEXT_H_
+#define XFA_SRC_FXJSE_SRC_CONTEXT_H_
+
 class CFXJSE_Class;
 class CFXJSE_Value;
 class CFXJSE_Context {
@@ -38,4 +39,5 @@ class CFXJSE_Context {
 };
 v8::Local<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate,
                                               v8::TryCatch& trycatch);
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_CONTEXT_H_
diff --git a/xfa/src/fxjse/src/fxv8.h b/xfa/src/fxjse/src/fxv8.h
index 4cc7b3f406..433003c4b5 100644
--- a/xfa/src/fxjse/src/fxv8.h
+++ b/xfa/src/fxjse/src/fxv8.h
@@ -4,8 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_V8_H_
-#define _FX_V8_H_
+// TODO(thestig): Remove this file and do IWYU.
+
+#ifndef XFA_SRC_FXJSE_SRC_FXV8_H_
+#define XFA_SRC_FXJSE_SRC_FXV8_H_
+
 #include <v8.h>
 #include <libplatform/libplatform.h>
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_FXV8_H_
diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h
index 8c867ee328..64a3a9454f 100644
--- a/xfa/src/fxjse/src/runtime.h
+++ b/xfa/src/fxjse/src/runtime.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_RUNTIME_H_
-#define FXJSE_RUNTIME_H_
+#ifndef XFA_SRC_FXJSE_SRC_RUNTIME_H_
+#define XFA_SRC_FXJSE_SRC_RUNTIME_H_
+
 class CFXJSE_RuntimeList;
 class CFXJSE_RuntimeData {
  protected:
@@ -41,4 +42,5 @@ class CFXJSE_RuntimeList {
  protected:
   CFX_ArrayTemplate<v8::Isolate*> m_RuntimeList;
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_RUNTIME_H_
diff --git a/xfa/src/fxjse/src/scope_inline.h b/xfa/src/fxjse/src/scope_inline.h
index f7e1cdf146..fdce7b37b5 100644
--- a/xfa/src/fxjse/src/scope_inline.h
+++ b/xfa/src/fxjse/src/scope_inline.h
@@ -4,10 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_SCOPE_INLINE_H_
-#define FXJSE_SCOPE_INLINE_H_
+#ifndef XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_
+#define XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_
+
 #include "runtime.h"
 #include "context.h"
+
 class CFXJSE_ScopeUtil_IsolateHandle {
  protected:
   v8::Isolate* m_isolate;
@@ -102,4 +104,5 @@ class CFXJSE_ScopeUtil_IsolateHandleRootOrNormalContext {
   void* operator new(size_t size);
   void operator delete(void*, size_t);
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_
diff --git a/xfa/src/fxjse/src/util_inline.h b/xfa/src/fxjse/src/util_inline.h
index 3ab12c1ef4..b6d66ad4f2 100644
--- a/xfa/src/fxjse/src/util_inline.h
+++ b/xfa/src/fxjse/src/util_inline.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_UTIL_INLINE_H_
-#define FXJSE_UTIL_INLINE_H_
+#ifndef XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_
+#define XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_
+
 static V8_INLINE v8::Local<v8::Object> FXJSE_GetGlobalObjectFromContext(
     const v8::Local<v8::Context>& hContext) {
   return hContext->Global()->GetPrototype().As<v8::Object>();
@@ -44,4 +45,5 @@ static V8_INLINE void* FXJSE_RetrieveObjectBinding(
   }
   return hObject->GetAlignedPointerFromInternalField(0);
 }
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_
diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/src/value.h
index 856bd9c099..ad79e9f0c0 100644
--- a/xfa/src/fxjse/src/value.h
+++ b/xfa/src/fxjse/src/value.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_VALUE_H_
-#define FXJSE_VALUE_H_
+#ifndef XFA_SRC_FXJSE_SRC_VALUE_H_
+#define XFA_SRC_FXJSE_SRC_VALUE_H_
+
 #include "scope_inline.h"
+
 class CFXJSE_Value {
  public:
   CFXJSE_Value(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}
@@ -235,4 +237,5 @@ class CFXJSE_Value {
   friend class CFXJSE_Context;
   friend class CFXJSE_Class;
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_VALUE_H_
author	Dan Sinclair <dsinclair@chromium.org>	2016-02-18 15:02:55 -0500
committer	Dan Sinclair <dsinclair@chromium.org>	2016-02-18 15:02:55 -0500
commit	c7cd809fccd7c5f90c8a2db7ddec7289f9630f53 (patch)
tree	8ed5c89990a552395ac3943330eb6776dc1f41e5
parent	c5ac0202004cd38071a9f6f0d7f3e5d8669ccfbb (diff)
download	pdfium-c7cd809fccd7c5f90c8a2db7ddec7289f9630f53.tar.xz