10 files changed, 29 insertions, 37 deletions
diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index 1049e8abcd..ce0c0df287 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -7,6 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
 
+#include "xfa/include/fwl/core/fwl_error.h"
+
 class CFWL_Theme;
 class IFWL_App;
 
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h
index 04e27a12c9..2dec2a8806 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/basewidget/fwl_barcode.h"
+#include "xfa/include/fwl/core/fwl_error.h"
 #include "xfa/include/fwl/lightwidget/edit.h"
+#include "xfa/include/fxbarcode/BC_BarCode.h"
 
 class CFWL_Widget;
 class CFWL_WidgetProperties;
-class IFWL_BarcodeDP;
-class CFWL_BarcodeDP;
 
 class CFWL_Barcode : public CFWL_Edit {
  public:
diff --git a/xfa/include/fwl/lightwidget/caret.h b/xfa/include/fwl/lightwidget/caret.h
index db7e09d188..be11be1cf5 100644
--- a/xfa/include/fwl/lightwidget/caret.h
+++ b/xfa/include/fwl/lightwidget/caret.h
@@ -7,9 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class CFWL_Caret;
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_Caret : public CFWL_Widget {
  public:
   static CFWL_Caret* Create();
diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h
index c357de9f81..3780badce2 100644
--- a/xfa/include/fwl/lightwidget/checkbox.h
+++ b/xfa/include/fwl/lightwidget/checkbox.h
@@ -7,11 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class IFWL_CheckBoxDP;
-class CFWL_CheckBox;
-class CFWL_CheckBoxDP;
+#include "xfa/include/fwl/basewidget/fwl_checkbox.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_CheckBox : public CFWL_Widget {
  public:
   static CFWL_CheckBox* Create();
diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h
index e29e51879b..22048f37f6 100644
--- a/xfa/include/fwl/lightwidget/datetimepicker.h
+++ b/xfa/include/fwl/lightwidget/datetimepicker.h
@@ -7,11 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class IFWL_DateTimePickerDP;
-class CFWL_DateTimePicker;
-class CFWL_DateTimePickerDP;
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_DateTimePicker : public CFWL_Widget {
  public:
   static CFWL_DateTimePicker* Create();
diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index b30f0f6739..008f17055f 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -10,12 +10,11 @@
 #include <memory>
 #include <vector>
 
+#include "xfa/include/fwl/basewidget/fwl_listbox.h"
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
 #include "xfa/include/fwl/lightwidget/widget.h"
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class IFWL_ListBoxDP;
-class CFWL_ListBox;
 class CFWL_ListItem;
 
 class CFWL_ListBox : public CFWL_Widget {
diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h
index bd994ac1e8..5a21176241 100644
--- a/xfa/include/fwl/lightwidget/picturebox.h
+++ b/xfa/include/fwl/lightwidget/picturebox.h
@@ -7,11 +7,10 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class IFWL_PictureBoxDP;
-class CFWL_PictureBox;
-class CFWL_PictureBoxDP;
+#include "xfa/include/fwl/basewidget/fwl_picturebox.h"
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_PictureBox : public CFWL_Widget {
  public:
   static CFWL_PictureBox* Create();
diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h
index 709a52710a..d8f5760911 100644
--- a/xfa/include/fwl/lightwidget/pushbutton.h
+++ b/xfa/include/fwl/lightwidget/pushbutton.h
@@ -7,11 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class IFWL_PushButtonDP;
-class CFWL_PushButton;
-class CFWL_PushButtonDP;
+#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_PushButton : public CFWL_Widget {
  public:
   static CFWL_PushButton* Create();
diff --git a/xfa/include/fwl/lightwidget/scrollbar.h b/xfa/include/fwl/lightwidget/scrollbar.h
index e835bdeb5a..d78e8bec63 100644
--- a/xfa/include/fwl/lightwidget/scrollbar.h
+++ b/xfa/include/fwl/lightwidget/scrollbar.h
@@ -7,9 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class CFWL_ScrollBar;
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_ScrollBar : public CFWL_Widget {
  public:
   static CFWL_ScrollBar* Create();
diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h
index 9b92f35242..c446fe47aa 100644
--- a/xfa/include/fwl/lightwidget/tooltipctrl.h
+++ b/xfa/include/fwl/lightwidget/tooltipctrl.h
@@ -7,11 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_
 #define XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_
 
-class CFWL_Widget;
-class CFWL_WidgetProperties;
-class IFWL_ToolTipDP;
-class CFWL_ToolTip;
-class CFWL_ToolTipDP;
+#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
+
 class CFWL_ToolTip : public CFWL_Widget {
  public:
   static CFWL_ToolTip* Create();