Fixing include guards, and presubmit.

This update fixes all include guards so cpplint build/header_guard completes
without error.

A presubmit check is added to make sure the guards stay clean.

BUG=pdfium:65
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1719083002 .

34 files changed, 104 insertions, 97 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 1ad3a5ea3e..6f19e24a46 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -8,7 +8,14 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 
+LINT_FILTERS = [
+  '-',
+  '+build/header_guard',
+]
+
 def CheckChangeOnUpload(input_api, output_api):
   results = []
   results += input_api.canned_checks.CheckPatchFormatted(input_api, output_api)
+  results += input_api.canned_checks.CheckChangeLintsClean(
+      input_api, output_api, None, LINT_FILTERS)
   return results
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
index 2354a34b18..2e3c51cbd0 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 FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGEVIEW_H_
-#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGEVIEW_H_
+#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_
+#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_
 
 class CPDFXFA_Page {
  public:
@@ -63,4 +63,4 @@ class CPDFXFA_Page {
   int m_iRef;
 };
 
-#endif  // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGEVIEW_H_
+#endif  // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_
diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
index 751ab36970..97125e5431 100644
--- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h
+++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_SDAPATERIMP_H_
-#define XFA_INCLUDE_FWL_ADAPTER_FWL_SDAPATERIMP_H_
+#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_SDADAPTERIMP_H_
+#define XFA_INCLUDE_FWL_ADAPTER_FWL_SDADAPTERIMP_H_
 
 class IFWL_AdapterNative;
 class IFWL_AdapterWidgetMgr;
@@ -90,4 +90,4 @@ class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr {
   virtual IFWL_Thread* GetCurrentThread();
 };
 
-#endif  // XFA_INCLUDE_FWL_ADAPTER_FWL_SDAPATERIMP_H_
+#endif  // XFA_INCLUDE_FWL_ADAPTER_FWL_SDADAPTERIMP_H_
diff --git a/xfa/include/fwl/basewidget/fwl_menu.h b/xfa/include/fwl/basewidget/fwl_menu.h
index 9b6f321d94..d8ab0d9292 100644
--- a/xfa/include/fwl/basewidget/fwl_menu.h
+++ b/xfa/include/fwl/basewidget/fwl_menu.h
@@ -14,4 +14,4 @@
 #define FWL_STYLEEXT_MNU_Dock (1L << 1)
 #define FWL_STYLEEXT_MNU_OwnerDraw (1L << 2)
 
-#endif  // XFA_INCLUDE_FWL_BASEWIDGET_
+#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_MENU_H_
diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h
index fb82548ca0..9b92f35242 100644
--- a/xfa/include/fwl/lightwidget/tooltipctrl.h
+++ b/xfa/include/fwl/lightwidget/tooltipctrl.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
-#define XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_
 
 class CFWL_Widget;
 class CFWL_WidgetProperties;
@@ -52,4 +52,4 @@ class CFWL_ToolTip : public CFWL_Widget {
   CFWL_ToolTipDP m_tooltipData;
 };
 
-#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_
diff --git a/xfa/src/fgas/src/fgas_base.h b/xfa/src/fgas/src/fgas_base.h
index 1f5f7797ef..32ef9aff1f 100644
--- a/xfa/src/fgas/src/fgas_base.h
+++ b/xfa/src/fgas/src/fgas_base.h
@@ -6,11 +6,11 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef XFA_SRC_FGAS_SRC_FXGAS_BASE_H_
-#define XFA_SRC_FGAS_SRC_FXGAS_BASE_H_
+#ifndef XFA_SRC_FGAS_SRC_FGAS_BASE_H_
+#define XFA_SRC_FGAS_SRC_FGAS_BASE_H_
 
 #include "xfa/src/foxitlib.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "xfa/src/fgas/include/fgas.h"
 
-#endif  // XFA_SRC_FGAS_SRC_FXGAS_BASE_H_
+#endif  // XFA_SRC_FGAS_SRC_FGAS_BASE_H_
diff --git a/xfa/src/foxitlib.h b/xfa/src/foxitlib.h
index ef8250f6b9..285aa0ee6b 100644
--- a/xfa/src/foxitlib.h
+++ b/xfa/src/foxitlib.h
@@ -6,8 +6,8 @@
 
 // TODO(thestig): Remove this file and do IWYU.
 
-#ifndef XFA_SRC_FXJSE_FOXITLIB_H_
-#define XFA_SRC_FXJSE_FOXITLIB_H_
+#ifndef XFA_SRC_FOXITLIB_H_
+#define XFA_SRC_FOXITLIB_H_
 
 #include "xfa/include/foxitxfa.h"
 #include "xfa/src/fgas/include/fgas.h"
@@ -16,4 +16,4 @@
 #include "xfa/src/fee/include/ifde_txtedtpage.h"
 #include "xfa/src/fee/include/fx_wordbreak.h"
 
-#endif  // XFA_SRC_FXJSE_FOXITLIB_H_
+#endif  // XFA_SRC_FOXITLIB_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
index ffbcfc0db9..d56c2217d8 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 XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H
-#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_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"
 
@@ -65,4 +65,4 @@ class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_CaretImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
index 8961954d77..d08d920856 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 XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
 
 #include <memory>
 #include <vector>
@@ -207,4 +207,4 @@ class CFWL_EditImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_EditImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 1921bd7540..b5b345f2df 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -39,4 +39,4 @@ class CFWL_FormProxyImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_FormProxyImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 2f91cbcbcb..6f557a1ba0 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 XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
 
 #include <memory>
 
@@ -117,4 +117,4 @@ class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_ListBoxImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 fa7a73ff3e..ed3f40ef11 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -247,4 +247,4 @@ class CFWL_MonthCalendarImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_MonthCalendarImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 1df9b8ae01..bf4f512b13 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -50,4 +50,4 @@ class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_PictureBoxImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 669bb17026..115758feae 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -62,4 +62,4 @@ class CFWL_PushButtonImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_PushButtonImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 a48f077325..0861b76313 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -137,4 +137,4 @@ class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_ScrollBarImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 0d8dbbe14a..6ab937f782 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -67,4 +67,4 @@ class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_SpinButtonImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
+#endif  // XFA_SRC_FWL_SRC_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 25796f60a5..ae8f461270 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_TOOLTIP_CTRLIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_TOOLTIP_CTRLIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -82,4 +82,4 @@ class CFWL_ToolTipImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_ToolTipImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FWL_TOOLTIP_CTRLIMP_H_
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
index ae39b8b3cf..c93b2a72c8 100644
--- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
-#define XFA_SRC_FWL_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
+#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
+#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
 
 class CFX_Barcode : public IFX_Barcode {
  public:
@@ -51,4 +51,4 @@ class CFX_Barcode : public IFX_Barcode {
   CBC_CodeBase* m_pBCEngine;
 };
 
-#endif  // XFA_SRC_FWL_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
+#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
index e5f296c1af..32ae819a3f 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANLEDETECTOR_H_
-#define XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANLEDETECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
+#define XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
 
 class CBC_CommonBitMatrix;
 class CBC_ResultPoint;
@@ -47,4 +47,4 @@ class CBC_WhiteRectangleDetector {
   int32_t m_upInit;
 };
 
-#endif  // XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANLEDETECTOR_H_
+#endif  // XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 1976cdad2b..339f40ae84 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMON_H_
-#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMON_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
+#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
 
 class CBC_ReedSolomonGF256;
 class CBC_ReedSolomonGF256Poly;
@@ -23,4 +23,4 @@ class CBC_ReedSolomonEncoder {
   virtual void Init();
 };
 
-#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMON_H_
+#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index e427215cca..8f2642dd87 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMONGF256POLY_H_
-#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMONGF256POLY_H_
+#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
+#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
 
 class CBC_ReedSolomonGF256;
 class CBC_ReedSolomonGF256Poly {
@@ -37,4 +37,4 @@ class CBC_ReedSolomonGF256Poly {
   CFX_Int32Array m_coefficients;
 };
 
-#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_READSOLOMONGF256POLY_H_
+#endif  // XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
index 17433a169a..658bc4eb68 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
-#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
 
 class CBC_SymbolShapeHint;
 class CBC_HighLevelEncoder;
@@ -72,4 +72,4 @@ class CBC_HighLevelEncoder : public CBC_SymbolShapeHint {
   static FX_BOOL isSpecialB256(FX_WCHAR ch);
 };
 
-#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVALENCODER_H_
+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
index 592df3a02d..a688d1a65a 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
-#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE128READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE128READER_H_
 
 class CBC_OneDReader;
 class CBC_CommonBitArray;
@@ -45,4 +45,4 @@ class CBC_OnedCode128Reader : public CBC_OneDReader {
                      int32_t& e);
 };
 
-#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE128READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
index b53cc95820..d31cc00af1 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
-#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
 
 class CBC_OneDimWriter;
 class CBC_OnedCoda128Writer;
@@ -47,4 +47,4 @@ class CBC_OnedCode128Writer : public CBC_OneDimWriter {
   const static int32_t CODE_STOP;
 };
 
-#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
index c1a70b8318..424cbe52d6 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
-#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
 
 class CBC_OneDReader;
 class CBC_CommonBitArray;
@@ -34,4 +34,4 @@ class CBC_OnedCode39Reader : public CBC_OneDReader {
   CFX_ByteString DecodeExtended(CFX_ByteString& encoded, int32_t& e);
 };
 
-#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
index 1e422827d5..f984b9bc0b 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
-#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
 
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
@@ -51,4 +51,4 @@ class CBC_OnedCode39Writer : public CBC_OneDimWriter {
   FX_BOOL m_extendedMode;
 };
 
-#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index 045f89f318..84ace71811 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_PDF417_BC_BOUNDINGBOX_H_
-#define XFA_SRC_FXBARCODE_PDF417_BC_BOUNDINGBOX_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
 
 class CBC_CommonBitMatrix;
 class CBC_ResultPoint;
@@ -55,4 +55,4 @@ class CBC_BoundingBox {
   void calculateMinMaxValues();
 };
 
-#endif  // XFA_SRC_FXBARCODE_PDF417_BC_BOUNDINGBOX_H_
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
index 0ff5ceb5ee..93ac84d384 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_PDF417_BC_CODEWORD_H_
-#define XFA_SRC_FXBARCODE_PDF417_BC_CODEWORD_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORD_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORD_H_
 
 class CBC_Codeword {
  public:
@@ -32,4 +32,4 @@ class CBC_Codeword {
   int32_t m_rowNumber;
 };
 
-#endif  // XFA_SRC_FXBARCODE_PDF417_BC_CODEWORD_H_
+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORD_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 3ad6fb2c27..0142f8209f 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRABITMATRIXPARSER_H_
-#define XFA_SRC_FXBARCODE_QRCODE_BC_QRABITMATRIXPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
 
 class CBC_CommonBitMatrix;
 class CBC_QRCoderVersion;
@@ -29,4 +29,4 @@ class CBC_QRBitMatrixParser {
   virtual void Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e);
 };
 
-#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRABITMATRIXPARSER_H_
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
index bd7bc59656..acae014158 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERWRITER_H_
-#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERWRITER_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
 
 #include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
 
@@ -40,4 +40,4 @@ class CBC_QRCodeWriter : public CBC_TwoDimWriter {
   int32_t m_iVersion;
 };
 
-#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERWRITER_H_
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
index b6b4a48588..5613de1f89 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRECODERBITVECTOR_H_
-#define XFA_SRC_FXBARCODE_QRCODE_BC_QRECODERBITVECTOR_H_
+#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
+#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
 
 class CBC_QRCoderBitVector {
  private:
@@ -30,4 +30,4 @@ class CBC_QRCoderBitVector {
   virtual void Init();
 };
 
-#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRECODERBITVECTOR_H_
+#endif  // XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/src/common/fxfa_localevalue.h
index 1157e9970d..39660ff665 100644
--- a/xfa/src/fxfa/src/common/fxfa_localevalue.h
+++ b/xfa/src/fxfa/src/common/fxfa_localevalue.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_
-#define XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_
+#ifndef XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
+#define XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
 
 class IFX_Locale;
 class CFX_Unitime;
@@ -105,4 +105,4 @@ class CXFA_LocaleValue {
   FX_BOOL m_bValid;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_
+#endif  // XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
diff --git a/xfa/src/fxfa/src/common/xfa_parser.h b/xfa/src/fxfa/src/common/xfa_parser.h
index 80cae0065b..3fbd62e44e 100644
--- a/xfa/src/fxfa/src/common/xfa_parser.h
+++ b/xfa/src/fxfa/src/common/xfa_parser.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H
-#define XFA_SRC_FXFA_SRC_COMMON_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 {
@@ -34,4 +34,4 @@ class IXFA_DocParser : public IXFA_Parser {
   virtual IXFA_Notify* GetNotify() const = 0;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H
+#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 630a4fd329..0a859476c1 100644
--- a/xfa/src/fxfa/src/common/xfa_script.h
+++ b/xfa/src/fxfa/src/common/xfa_script.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_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
@@ -108,4 +108,4 @@ class IXFA_ScriptContext {
 };
 IXFA_ScriptContext* XFA_ScriptContext_Create(CXFA_Document* pDocument);
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H
+#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_