4 files changed, 10 insertions, 6 deletions
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,