From c7cd809fccd7c5f90c8a2db7ddec7289f9630f53 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 18 Feb 2016 15:02:55 -0500
Subject: 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 .
---
 xfa/include/foxitxfa.h                          | 8 +++++---
 xfa/include/fwl/adapter/fwl_adapternative.h     | 6 +++---
 xfa/include/fwl/adapter/fwl_adapterthreadmgr.h  | 6 +++---
 xfa/include/fwl/adapter/fwl_adaptertimermgr.h   | 7 ++++---
 xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h  | 8 +++++---
 xfa/include/fwl/adapter/fwl_sdadapterimp.h      | 8 +++++---
 xfa/include/fwl/basewidget/fwl_barcode.h        | 9 ++++++---
 xfa/include/fwl/basewidget/fwl_caret.h          | 8 +++++---
 xfa/include/fwl/basewidget/fwl_checkbox.h       | 7 ++++---
 xfa/include/fwl/basewidget/fwl_combobox.h       | 8 +++++---
 xfa/include/fwl/basewidget/fwl_datetimepicker.h | 8 +++++---
 xfa/include/fwl/basewidget/fwl_edit.h           | 6 +++---
 xfa/include/fwl/basewidget/fwl_listbox.h        | 8 +++++---
 xfa/include/fwl/basewidget/fwl_menu.h           | 8 +++++---
 xfa/include/fwl/basewidget/fwl_monthcalendar.h  | 8 +++++---
 xfa/include/fwl/basewidget/fwl_picturebox.h     | 8 +++++---
 xfa/include/fwl/basewidget/fwl_pushbutton.h     | 8 +++++---
 xfa/include/fwl/basewidget/fwl_scrollbar.h      | 8 +++++---
 xfa/include/fwl/basewidget/fwl_spinbutton.h     | 8 +++++---
 xfa/include/fwl/basewidget/fwl_tooltipctrl.h    | 8 +++++---
 xfa/include/fwl/basewidget/fxmath_barcode.h     | 8 +++++---
 xfa/include/fwl/core/fwl_app.h                  | 8 +++++---
 xfa/include/fwl/core/fwl_content.h              | 8 +++++---
 xfa/include/fwl/core/fwl_form.h                 | 8 +++++---
 xfa/include/fwl/core/fwl_grid.h                 | 8 +++++---
 xfa/include/fwl/core/fwl_note.h                 | 8 +++++---
 xfa/include/fwl/core/fwl_panel.h                | 8 +++++---
 xfa/include/fwl/core/fwl_target.h               | 6 +++---
 xfa/include/fwl/core/fwl_theme.h                | 8 +++++---
 xfa/include/fwl/core/fwl_thread.h               | 6 +++---
 xfa/include/fwl/core/fwl_widget.h               | 8 +++++---
 xfa/include/fwl/core/fwl_widgetdef.h            | 8 +++++---
 xfa/include/fwl/core/fwl_widgetmgr.h            | 8 +++++---
 xfa/include/fwl/fwl.h                           | 8 +++++---
 xfa/include/fwl/lightwidget/app.h               | 7 ++++---
 xfa/include/fwl/lightwidget/barcode.h           | 8 +++++---
 xfa/include/fwl/lightwidget/caret.h             | 8 +++++---
 xfa/include/fwl/lightwidget/checkbox.h          | 8 +++++---
 xfa/include/fwl/lightwidget/datetimepicker.h    | 8 +++++---
 xfa/include/fwl/lightwidget/edit.h              | 6 +++---
 xfa/include/fwl/lightwidget/picturebox.h        | 8 +++++---
 xfa/include/fwl/lightwidget/pushbutton.h        | 8 +++++---
 xfa/include/fwl/lightwidget/scrollbar.h         | 8 +++++---
 xfa/include/fwl/lightwidget/tooltipctrl.h       | 8 +++++---
 xfa/include/fwl/lightwidget/widget.h            | 7 ++++---
 xfa/include/fwl/theme/barcodetp.h               | 8 +++++---
 xfa/include/fwl/theme/carettp.h                 | 8 +++++---
 xfa/include/fwl/theme/checkboxtp.h              | 8 +++++---
 xfa/include/fwl/theme/comboboxtp.h              | 8 +++++---
 xfa/include/fwl/theme/datetimepickertp.h        | 8 +++++---
 xfa/include/fwl/theme/edittp.h                  | 8 +++++---
 xfa/include/fwl/theme/formtp.h                  | 8 +++++---
 xfa/include/fwl/theme/listboxtp.h               | 8 +++++---
 xfa/include/fwl/theme/monthcalendartp.h         | 8 +++++---
 xfa/include/fwl/theme/pictureboxtp.h            | 8 +++++---
 xfa/include/fwl/theme/pushbuttontp.h            | 8 +++++---
 xfa/include/fwl/theme/scrollbartp.h             | 8 +++++---
 xfa/include/fwl/theme/utils.h                   | 7 ++++---
 xfa/include/fxfa/fxfa.h                         | 6 +++---
 xfa/include/fxfa/fxfa_basic.h                   | 7 ++++---
 xfa/include/fxfa/fxfa_objectacc.h               | 6 +++---
 xfa/include/fxfa/fxfa_widget.h                  | 8 +++++---
 62 files changed, 289 insertions(+), 186 deletions(-)

(limited to 'xfa/include')

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_
-- 
cgit v1.2.3