8 files changed, 42 insertions, 28 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_caret.h b/xfa/include/fwl/basewidget/fwl_caret.h
index 7b022e7816..d6144ae1e8 100644
--- a/xfa/include/fwl/basewidget/fwl_caret.h
+++ b/xfa/include/fwl/basewidget/fwl_caret.h
@@ -7,9 +7,8 @@
 #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;
+#include "xfa/include/fwl/core/fwl_widget.h"
+
 #define FWL_CLASS_Caret L"FWL_CARET"
 #define FWL_CLASSHASH_Caret 671181879
 #define FWL_STATE_CAT_HightLight 1
diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h
index 616fef5397..6979a1de38 100644
--- a/xfa/include/fwl/basewidget/fwl_checkbox.h
+++ b/xfa/include/fwl/basewidget/fwl_checkbox.h
@@ -7,10 +7,9 @@
 #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;
-class IFWL_CheckBox;
+#include "xfa/include/fwl/core/fwl_note.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+
 #define FWL_CLASS_CheckBox L"FWL_CHECKBOX"
 #define FWL_CLASSHASH_CheckBox 4107183823
 #define FWL_STYLEEXT_CKB_Left (0L << 0)
@@ -60,6 +59,7 @@ class IFWL_CheckBox;
 #define FWL_PARTSTATE_CKB_Mask2 (3L << 2)
 #define FWL_EVT_CKB_CheckStateChanged L"FWL_EVENT_CKB_CheckStateChanged"
 #define FWL_EVTHASH_CKB_CheckStateChanged 2503252963
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCkbCheckStateChanged,
                     FWL_EVTHASH_CKB_CheckStateChanged)
 END_FWL_EVENT_DEF
diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h
index 5932991f6f..7cce00eadd 100644
--- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h
+++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h
@@ -7,10 +7,9 @@
 #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;
-class IFWL_DateTimePicker;
+#include "xfa/include/fwl/core/fwl_note.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+
 #define FWL_CLASS_DateTimePicker L"FWL_DATETIMEPICKER"
 #define FWL_CLASSHASH_DateTimePicker 3851176257
 #define FWL_STYLEEXT_DTP_AllowEdit (1L << 0)
@@ -47,21 +46,27 @@ class IFWL_DateTimePicker;
 #define FWL_EVTHASH_DTP_HoverChanged 686674750
 #define FWL_EVT_DTP_SelectChanged L"FWL_EVENT_DTP_SelectChanged"
 #define FWL_EVTHASH_DTP_SelectChanged 1589616858
+
 BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpDropDown, FWL_EVTHASH_DTP_DropDown)
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpCloseUp, FWL_EVTHASH_DTP_CloseUp)
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpEditChanged, FWL_EVTHASH_DTP_EditChanged)
 CFX_WideString m_wsText;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpHoverChanged, FWL_EVTHASH_DTP_HoverChanged)
 int32_t hoverday;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpSelectChanged, FWL_EVTHASH_DTP_SelectChanged)
 int32_t iYear;
 int32_t iMonth;
 int32_t iDay;
 END_FWL_EVENT_DEF
+
 class IFWL_DateTimePickerDP : public IFWL_DataProvider {
  public:
   virtual FWL_ERR GetToday(IFWL_Widget* pWidget,
diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h
index 7645c2526b..4cf5c654d4 100644
--- a/xfa/include/fwl/basewidget/fwl_listbox.h
+++ b/xfa/include/fwl/basewidget/fwl_listbox.h
@@ -7,10 +7,11 @@
 #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
 #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
 
-class CFWL_WidgetImpProperties;
-class IFWL_Widget;
+#include "xfa/include/fwl/core/fwl_note.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+
 class IFWL_ListBoxDP;
-class IFWL_ListBox;
+
 #define FWL_CLASS_ListBox L"FWL_LISTBOX"
 #define FWL_CLASSHASH_ListBox 1777358317
 #define FWL_STYLEEXT_LTB_MultiSelection (1L << 0)
@@ -49,20 +50,24 @@ class IFWL_ListBox;
 #define FWL_EVT_LTB_DrawItem L"FWL_EVENT_LTB_DrawItem"
 #define FWL_EVTHASH_LTB_SelChanged 1701781688
 #define FWL_EVTHASH_LTB_DrawItem 1050853991
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtLtbSelChanged, FWL_EVTHASH_LTB_SelChanged)
 CFX_Int32Array iarraySels;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtLtbDrawItem, FWL_EVTHASH_LTB_DrawItem)
 CFX_Graphics* m_pGraphics;
 CFX_Matrix m_matrix;
 int32_t m_index;
 CFX_RectF m_rect;
 END_FWL_EVENT_DEF
+
 typedef struct FWL_HLISTITEM_ { void* pData; } * FWL_HLISTITEM;
 struct FWL_ListBoxItemData {
   IFWL_ListBoxDP* pDataProvider;
   int32_t iIndex;
 };
+
 class IFWL_ListBoxDP : public IFWL_DataProvider {
  public:
   virtual int32_t CountItems(IFWL_Widget* pWidget) = 0;
diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h
index 3053947180..a57b8151c2 100644
--- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h
+++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h
@@ -7,8 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_
 #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_
 
-class IFWL_MonthCalendarDP;
-class IFWL_MonthCalendar;
+#include "xfa/include/fwl/core/fwl_note.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+
 #define FWL_CLASS_MonthCalendar L"FWL_MONTHCALENDAR"
 #define FWL_CLASSHASH_MonthCalendar 2733931374
 #define FWL_STYLEEXT_MCD_MultiSelect (1L << 0)
@@ -97,22 +98,26 @@ class IFWL_MonthCalendar;
 #define FWL_EVT_MCD_DateChanged L"FWL_EVENT_MCD_DateChanged"
 #define FWL_NOTEHASH_MCD_DATASELECTED 1085596932
 #define FWL_EVTHASH_MCD_DateChanged 54212227
+
 BEGIN_FWL_EVENT_DEF(CFWL_Event_McdDateSelected, FWL_NOTEHASH_MCD_DATASELECTED)
 int32_t m_iStartDay;
 int32_t m_iEndDay;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EventMcdDateChanged, FWL_EVTHASH_MCD_DateChanged)
 int32_t m_iOldYear;
 int32_t m_iOldMonth;
 int32_t m_iStartDay;
 int32_t m_iEndDay;
 END_FWL_EVENT_DEF
+
 class IFWL_MonthCalendarDP : public IFWL_DataProvider {
  public:
   virtual int32_t GetCurDay(IFWL_Widget* pWidget) = 0;
   virtual int32_t GetCurMonth(IFWL_Widget* pWidget) = 0;
   virtual int32_t GetCurYear(IFWL_Widget* pWidget) = 0;
 };
+
 class IFWL_MonthCalendar : public IFWL_Widget {
  public:
   static IFWL_MonthCalendar* Create(const CFWL_WidgetImpProperties& properties,
diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h
index 0b206c2d04..2a27da4912 100644
--- a/xfa/include/fwl/basewidget/fwl_picturebox.h
+++ b/xfa/include/fwl/basewidget/fwl_picturebox.h
@@ -7,10 +7,8 @@
 #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;
-class IFWL_PictureBox;
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
 #define FWL_CLASS_PictureBox L"FWL_PICTUREBOX"
 #define FWL_CLASSHASH_PictureBox 2974721741
 #define FWL_STYLEEXT_PTB_Left 0L << 0
@@ -32,6 +30,7 @@ class IFWL_PictureBox;
 #define FWL_PART_PTB_Image 3
 #define FWL_PARTSTATE_PTB_Normal (0L << 0)
 #define FWL_PARTSTATE_PTB_Disabled (1L << 0)
+
 class IFWL_PictureBoxDP : public IFWL_DataProvider {
  public:
   virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) = 0;
diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h
index 500cc0dcc1..3e5acd11b0 100644
--- a/xfa/include/fwl/basewidget/fwl_pushbutton.h
+++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h
@@ -7,10 +7,9 @@
 #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;
-class IFWL_PushButton;
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
 #define FWL_CLASS_PushButton L"FWL_PUSHBUTTON"
 #define FWL_CLASSHASH_PushButton 3521614244
 #define FWL_STYLEEXT_PSB_Left (0L << 0)
@@ -40,6 +39,7 @@ class IFWL_PushButton;
 #define FWL_PARTSTATE_PSB_Disabled (4L << 0)
 #define FWL_PARTSTATE_PSB_Focused (1L << 3)
 #define FWL_PARTSTATE_PSB_Mask (7L << 0)
+
 class IFWL_PushButtonDP : public IFWL_DataProvider {
  public:
   virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) = 0;
diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h
index 691ec8826c..6a6df77087 100644
--- a/xfa/include/fwl/basewidget/fwl_scrollbar.h
+++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h
@@ -7,10 +7,8 @@
 #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;
-class IFWL_ScrollBar;
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
 #define FWL_CLASS_ScrollBar L"FWL_SCROLLBAR"
 #define FWL_CLASSHASH_ScrollBar 2826584844
 #define FWL_STYLEEXT_SCB_Horz (0L << 0)
@@ -33,6 +31,7 @@ class IFWL_ScrollBar;
 #define FWL_WGTHITTEST_SCB_UpperTrack FWL_WGTHITTEST_MAX + 4
 #define FWL_WGTHITTEST_SCB_Thumb FWL_WGTHITTEST_MAX + 5
 #define FWL_CAPACITY_SCB_Size FWL_WGTCAPACITY_MAX
+
 enum FWL_SCBCODE {
   FWL_SCBCODE_None = 1,
   FWL_SCBCODE_Min,
@@ -45,7 +44,9 @@ enum FWL_SCBCODE {
   FWL_SCBCODE_TrackPos,
   FWL_SCBCODE_EndScroll,
 };
+
 class IFWL_ScrollBarDP : public IFWL_DataProvider {};
+
 class IFWL_ScrollBar : public IFWL_Widget {
  public:
   static IFWL_ScrollBar* Create(const CFWL_WidgetImpProperties& properties,