20 files changed, 90 insertions, 73 deletions
diff --git a/xfa/include/foxitxfa.h b/xfa/include/foxitxfa.h
index dad9aac645..8236a273a2 100644
--- a/xfa/include/foxitxfa.h
+++ b/xfa/include/foxitxfa.h
@@ -9,15 +9,15 @@
 #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"
 #include "core/include/fdrm/fx_crypt.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fxcodec/fx_codec.h"
+#include "core/include/fxcrt/fx_ext.h"
+#include "core/include/fxge/fx_ge.h"
+#include "xfa/include/fwl/fwl.h"
 #include "xfa/include/fxbarcode/BC_BarCode.h"
+#include "xfa/include/fxfa/fxfa.h"
 #include "xfa/include/fxgraphics/fx_graphics.h"
-#include "xfa/include/fwl/fwl.h"
 #include "xfa/include/fxjse/fxjse.h"
-#include "xfa/include/fxfa/fxfa.h"
 
 #endif  // XFA_INCLUDE_FOXITXFA_H_
diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
index 1bb9c9e72f..edd6158fd1 100644
--- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
@@ -7,7 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_
 #define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_
 
-class IFWL_Thread;
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/core/fwl_thread.h"
 
 class IFWL_AdapterThreadMgr {
  public:
diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h
index b6452f31eb..b7d3cecb60 100644
--- a/xfa/include/fwl/basewidget/fwl_barcode.h
+++ b/xfa/include/fwl/basewidget/fwl_barcode.h
@@ -8,6 +8,7 @@
 #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_
 
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fxbarcode/BC_BarCode.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h
index 624061f387..c28a6582aa 100644
--- a/xfa/include/fwl/basewidget/fwl_combobox.h
+++ b/xfa/include/fwl/basewidget/fwl_combobox.h
@@ -7,11 +7,12 @@
 #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
 #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
 
+#include "xfa/include/fwl/basewidget/fwl_listbox.h"
+
 class CFWL_WidgetImpProperties;
-class IFWL_Widget;
-class IFWL_ListBox;
 class IFWL_ComboBoxDP;
 class IFWL_ComboBox;
+
 #define FWL_CLASS_ComboBox L"FWL_COMBOBOX"
 #define FWL_CLASSHASH_ComboBox 602353697
 #define FWL_STYLEEXT_CMB_DropList (0L << 0)
diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h
index a501cea864..4d27fb4827 100644
--- a/xfa/include/fwl/basewidget/fwl_spinbutton.h
+++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h
@@ -7,9 +7,8 @@
 #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;
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
 #define FWL_CLASS_SpinButton L"FWL_SPINBUTTON"
 #define FWL_CLASSHASH_SpinButton 3793043646
 #define FWL_STYLEEXE_SPB_Vert (1L << 0)
diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
index 9fcec86ea4..7963e64aaa 100644
--- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
+++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
@@ -7,10 +7,12 @@
 #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_
 #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_
 
+#include "xfa/include/fwl/core/fwl_form.h"
+
 class CFWL_WidgetImpProperties;
-class IFWL_Form;
 class IFWL_ToolTipDP;
 class IFWL_ToolTip;
+
 #define FWL_CLASS_ToolTip L"FWL_TOOLTIP"
 #define FWL_CLASSHASH_ToolTip 1111984755
 #define FWL_STYLEEXT_TTP_Rectangle (0L << 3)
@@ -21,6 +23,7 @@ class IFWL_ToolTip;
 #define FWL_PART_TTP_Border 1
 #define FWL_PART_TTP_Background 2
 #define FWL_PART_TTP_Caption 3
+
 class IFWL_ToolTipDP : public IFWL_DataProvider {
  public:
   virtual FWL_ERR GetCaption(IFWL_Widget* pWidget,
diff --git a/xfa/include/fwl/core/fwl_form.h b/xfa/include/fwl/core/fwl_form.h
index e79d88da5a..1fc39958f3 100644
--- a/xfa/include/fwl/core/fwl_form.h
+++ b/xfa/include/fwl/core/fwl_form.h
@@ -7,9 +7,11 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
 
+#include "xfa/include/fwl/core/fwl_panel.h"
+
 class IFWL_Widget;
-class IFWL_Panel;
 class IFWL_Form;
+
 #define FWL_CLASS_Form L"FWL_FORM"
 #define FWL_CLASSHASH_Form 881567292
 #define FWL_CLASS_FormProxy L"FWL_FORMPROXY"
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index 5277af3f11..341d5bda7a 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -7,6 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
 
+#include "xfa/include/fxgraphics/fx_graphics.h"
+
 class IFWL_Target;
 class IFWL_Widget;
 class IFWL_NoteThread;
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index 2cec462535..01022ee762 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -7,7 +7,11 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
 
-class IFWL_Target;
+#include "xfa/include/fwl/core/fwl_note.h"
+#include "xfa/include/fwl/core/fwl_target.h"
+#include "xfa/include/fwl/core/fwl_widgetdef.h"
+#include "xfa/include/fxgraphics/fx_graphics.h"
+
 class IFWL_ThemeProvider;
 class CFWL_WidgetImpProperties;
 class IFWL_DataProvider;
diff --git a/xfa/include/fwl/fwl.h b/xfa/include/fwl/fwl.h
index 6ba115f0c9..32048ce86f 100644
--- a/xfa/include/fwl/fwl.h
+++ b/xfa/include/fwl/fwl.h
@@ -9,52 +9,57 @@
 #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"
-#include "xfa/include/fwl/core/fwl_note.h"
-#include "xfa/include/fwl/core/fwl_widgetdef.h"
-#include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/include/fwl/core/fwl_content.h"
-#include "xfa/include/fwl/core/fwl_panel.h"
-#include "xfa/include/fwl/core/fwl_form.h"
-#include "xfa/include/fwl/core/fwl_widgetmgr.h"
-#include "xfa/include/fwl/core/fwl_timer.h"
-#include "xfa/include/fwl/core/fwl_app.h"
-#include "xfa/include/fwl/core/fwl_grid.h"
-#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
+#include "xfa/include/fwl/adapter/fwl_adapternative.h"
+#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"
+#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
+#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
+#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
+#include "xfa/include/fwl/basewidget/fwl_barcode.h"
+#include "xfa/include/fwl/basewidget/fwl_caret.h"
 #include "xfa/include/fwl/basewidget/fwl_checkbox.h"
-#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
-#include "xfa/include/fwl/basewidget/fwl_listbox.h"
-#include "xfa/include/fwl/basewidget/fwl_edit.h"
-#include "xfa/include/fwl/basewidget/fwl_picturebox.h"
 #include "xfa/include/fwl/basewidget/fwl_combobox.h"
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/basewidget/fwl_listbox.h"
 #include "xfa/include/fwl/basewidget/fwl_menu.h"
 #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
-#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/basewidget/fwl_picturebox.h"
+#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
 #include "xfa/include/fwl/basewidget/fwl_spinbutton.h"
-#include "xfa/include/fwl/basewidget/fwl_barcode.h"
-#include "xfa/include/fwl/basewidget/fxmath_barcode.h"
 #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
-#include "xfa/include/fwl/basewidget/fwl_caret.h"
+#include "xfa/include/fwl/basewidget/fxmath_barcode.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_content.h"
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/core/fwl_form.h"
+#include "xfa/include/fwl/core/fwl_grid.h"
+#include "xfa/include/fwl/core/fwl_note.h"
+#include "xfa/include/fwl/core/fwl_panel.h"
+#include "xfa/include/fwl/core/fwl_target.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/include/fwl/core/fwl_thread.h"
+#include "xfa/include/fwl/core/fwl_timer.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+#include "xfa/include/fwl/core/fwl_widgetdef.h"
+#include "xfa/include/fwl/core/fwl_widgetmgr.h"
 #include "xfa/include/fwl/lightwidget/app.h"
-#include "xfa/include/fwl/lightwidget/widget.h"
-#include "xfa/include/fwl/lightwidget/pushbutton.h"
+#include "xfa/include/fwl/lightwidget/barcode.h"
+#include "xfa/include/fwl/lightwidget/caret.h"
 #include "xfa/include/fwl/lightwidget/checkbox.h"
-#include "xfa/include/fwl/lightwidget/scrollbar.h"
-#include "xfa/include/fwl/lightwidget/listbox.h"
-#include "xfa/include/fwl/lightwidget/picturebox.h"
-#include "xfa/include/fwl/lightwidget/edit.h"
 #include "xfa/include/fwl/lightwidget/combobox.h"
 #include "xfa/include/fwl/lightwidget/datetimepicker.h"
-#include "xfa/include/fwl/lightwidget/barcode.h"
+#include "xfa/include/fwl/lightwidget/edit.h"
+#include "xfa/include/fwl/lightwidget/listbox.h"
+#include "xfa/include/fwl/lightwidget/picturebox.h"
+#include "xfa/include/fwl/lightwidget/pushbutton.h"
+#include "xfa/include/fwl/lightwidget/scrollbar.h"
 #include "xfa/include/fwl/lightwidget/theme.h"
 #include "xfa/include/fwl/lightwidget/tooltipctrl.h"
-#include "xfa/include/fwl/lightwidget/caret.h"
-#include "xfa/include/fwl/theme/utils.h"
-#include "xfa/include/fwl/theme/widgettp.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+#include "xfa/include/fwl/theme/barcodetp.h"
 #include "xfa/include/fwl/theme/barcodetp.h"
+#include "xfa/include/fwl/theme/carettp.h"
 #include "xfa/include/fwl/theme/checkboxtp.h"
 #include "xfa/include/fwl/theme/comboboxtp.h"
 #include "xfa/include/fwl/theme/datetimepickertp.h"
@@ -65,13 +70,8 @@
 #include "xfa/include/fwl/theme/pictureboxtp.h"
 #include "xfa/include/fwl/theme/pushbuttontp.h"
 #include "xfa/include/fwl/theme/scrollbartp.h"
+#include "xfa/include/fwl/theme/utils.h"
+#include "xfa/include/fwl/theme/widgettp.h"
 #include "xfa/include/fwl/theme/widgettp.h"
-#include "xfa/include/fwl/theme/barcodetp.h"
-#include "xfa/include/fwl/theme/carettp.h"
-#include "xfa/include/fwl/adapter/fwl_adapternative.h"
-#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"
-#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  // XFA_INCLUDE_FWL_FWL_H_
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h
index 32505f16d5..04e27a12c9 100644
--- a/xfa/include/fwl/lightwidget/barcode.h
+++ b/xfa/include/fwl/lightwidget/barcode.h
@@ -7,12 +7,13 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
 
+#include "xfa/include/fwl/lightwidget/edit.h"
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_BarcodeDP;
-class CFWL_Edit;
-class CFWL_Barcode;
 class CFWL_BarcodeDP;
+
 class CFWL_Barcode : public CFWL_Edit {
  public:
   static CFWL_Barcode* Create();
diff --git a/xfa/include/fwl/theme/barcodetp.h b/xfa/include/fwl/theme/barcodetp.h
index 8ae47979d6..89c9a679f3 100644
--- a/xfa/include/fwl/theme/barcodetp.h
+++ b/xfa/include/fwl/theme/barcodetp.h
@@ -7,8 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_THEME_BARCODETP_H_
 #define XFA_INCLUDE_FWL_THEME_BARCODETP_H_
 
-class CFWL_WidgetTP;
-class CFWL_BarcodeTP;
+#include "xfa/include/fwl/theme/utils.h"
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_BarcodeTP : public CFWL_WidgetTP {
  public:
   CFWL_BarcodeTP();
diff --git a/xfa/include/fwl/theme/carettp.h b/xfa/include/fwl/theme/carettp.h
index 0ce0c641dd..d99f92a5f3 100644
--- a/xfa/include/fwl/theme/carettp.h
+++ b/xfa/include/fwl/theme/carettp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_CARETTP_H_
 #define XFA_INCLUDE_FWL_THEME_CARETTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_CaretTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_CaretTP : public CFWL_WidgetTP {
  public:
   CFWL_CaretTP();
diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h
index 5b25379dc6..6db6f561a1 100644
--- a/xfa/include/fwl/theme/checkboxtp.h
+++ b/xfa/include/fwl/theme/checkboxtp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
 #define XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_CheckBoxTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_CheckBoxTP : public CFWL_WidgetTP {
  public:
   CFWL_CheckBoxTP();
diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h
index 8b6a221920..0cf13a4c1d 100644
--- a/xfa/include/fwl/theme/comboboxtp.h
+++ b/xfa/include/fwl/theme/comboboxtp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
 #define XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_ComboBoxTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_ComboBoxTP : public CFWL_WidgetTP {
  public:
   CFWL_ComboBoxTP();
diff --git a/xfa/include/fwl/theme/datetimepickertp.h b/xfa/include/fwl/theme/datetimepickertp.h
index 400795da6e..de2f8304f0 100644
--- a/xfa/include/fwl/theme/datetimepickertp.h
+++ b/xfa/include/fwl/theme/datetimepickertp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
 #define XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_DateTimePickerTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_DateTimePickerTP : public CFWL_WidgetTP {
  public:
   CFWL_DateTimePickerTP();
diff --git a/xfa/include/fwl/theme/edittp.h b/xfa/include/fwl/theme/edittp.h
index 681e579a70..d03fbe60eb 100644
--- a/xfa/include/fwl/theme/edittp.h
+++ b/xfa/include/fwl/theme/edittp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_EDITTP_H_
 #define XFA_INCLUDE_FWL_THEME_EDITTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_EditTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_EditTP : public CFWL_WidgetTP {
  public:
   CFWL_EditTP();
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index 61a7b24ab9..d0c885bf66 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -7,8 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_THEME_FORMTP_H_
 #define XFA_INCLUDE_FWL_THEME_FORMTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_FormTP;
+#include "xfa/include/fwl/theme/utils.h"
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_FormTP : public CFWL_WidgetTP {
  public:
   CFWL_FormTP();
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index 3c2b54877a..0a9de02aa4 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -9,6 +9,9 @@
 
 #include <vector>
 
+#include "xfa/include/fxfa/fxfa_basic.h"
+#include "xfa/include/fxfa/fxfa_widget.h"
+
 class CFX_Graphics;
 class CPDF_Document;
 class CXFA_Node;
@@ -47,8 +50,6 @@ class IXFA_Widget {
   IXFA_Widget() {}
 };
 
-#include "xfa/include/fxfa/fxfa_basic.h"
-#include "xfa/include/fxfa/fxfa_widget.h"
 #define XFA_MBICON_Error 0
 #define XFA_MBICON_Warning 1
 #define XFA_MBICON_Question 2
diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h
index 00fe369c4b..74a611d74b 100644
--- a/xfa/include/fxfa/fxfa_widget.h
+++ b/xfa/include/fxfa/fxfa_widget.h
@@ -20,7 +20,7 @@ class CXFA_TextLayout;
 class CXFA_TextProvider;
 class CXFA_WidgetLayoutData;
 class IFX_Font;
-class CXFA_WidgetAcc;
+class IXFA_AppProvider;
 
 class CXFA_WidgetAcc : public CXFA_WidgetData {
  public: