9 files changed, 30 insertions, 16 deletions
diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h
index 9bfb519d88..ca771432db 100644
--- a/xfa/include/fwl/core/fwl_app.h
+++ b/xfa/include/fwl/core/fwl_app.h
@@ -7,7 +7,9 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_APP_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_APP_H_
 
-class IFWL_NoteThread;
+#include "core/include/fxcrt/fx_string.h"
+#include "xfa/include/fwl/core/fwl_thread.h"
+
 class IFWL_AdapterNative;
 class IFWL_Widget;
 class IFWL_WidgetMgr;
diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h
index c665469aec..3ffb1a8dec 100644
--- a/xfa/include/fwl/core/fwl_content.h
+++ b/xfa/include/fwl/core/fwl_content.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
 
-class IFWL_Widget;
-class IFWL_Content;
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
 class IFWL_Content : public IFWL_Widget {
  public:
   static IFWL_Content* Create();
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index 9e17e2c846..c5b443b2b0 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -7,11 +7,14 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
 
+#include "xfa/include/fwl/core/fwl_content.h"
+
 class IFWL_Widget;
-class IFWL_Content;
+
 #define FWL_CLASS_Grid L"FWL_GRID"
 #define FWL_CLASSHASH_Grid 3150298670
 #define FWL_GRIDSTYLEEXT_ShowGridLines (1L << 0)
+
 struct FWL_LAYOUTDATA {
   FX_FLOAT fWidth;
   FX_FLOAT fHeight;
@@ -36,6 +39,7 @@ enum FWL_GRIDSIZE {
   FWL_GRIDSIZE_MaxWidth,
   FWL_GRIDSIZE_MaxHeight,
 };
+
 typedef struct FWL_HGRIDCOLROW_ { void* pData; } * FWL_HGRIDCOLROW;
 class IFWL_Grid : public IFWL_Content {
  public:
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index f06dd20e39..5d74c1e451 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -7,6 +7,7 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
 
+#include "xfa/include/fwl/core/fwl_error.h"
 #include "xfa/include/fxgraphics/fx_graphics.h"
 
 class IFWL_Target;
diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h
index 94e01bca60..51e3d4caaa 100644
--- a/xfa/include/fwl/core/fwl_panel.h
+++ b/xfa/include/fwl/core/fwl_panel.h
@@ -7,10 +7,10 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
 
-class IFWL_Widget;
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
 class IFWL_Content;
-class IFWL_Panel;
-class IFWL_CustomPanel;
+
 #define FWL_CLASS_Panel L"FWL_Panel"
 #define FWL_CLASSHASH_Panel 881567292
 
diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h
index 7eaf0b25f3..6572f8be33 100644
--- a/xfa/include/fwl/core/fwl_target.h
+++ b/xfa/include/fwl/core/fwl_target.h
@@ -8,6 +8,7 @@
 #define XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
 
 #include "core/include/fxcrt/fx_basic.h"
+#include "xfa/include/fwl/core/fwl_error.h"
 
 // FWL contains three parallel inheritance hierarchies, which reference each
 // other via pointers as follows:
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index 2700e3bd55..8f9f9a6c36 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -7,12 +7,11 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
 
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fxgraphics/fx_graphics.h"
+
 class IFWL_Widget;
-class CFWL_ThemePart;
-class CFWL_ThemeBackground;
-class CFWL_ThemeText;
-class CFWL_ThemeElement;
-class IFWL_ThemeProvider;
+
 #define FWL_WGTCAPACITY_CXBorder 1
 #define FWL_WGTCAPACITY_CYBorder 2
 #define FWL_WGTCAPACITY_ScrollBarWidth 3
@@ -27,6 +26,7 @@ class IFWL_ThemeProvider;
 #define FWL_WGTCAPACITY_UIMargin 12
 #define FWL_WGTCAPACITY_SpaceAboveBelow 13
 #define FWL_WGTCAPACITY_MAX 65535
+
 class CFWL_ThemePart {
  public:
   CFWL_ThemePart()
diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h
index d83c74f8c4..5b41c9cf8a 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -22,6 +22,8 @@
 //      CFWL_App --------------> IFWL_App                CFWL_AppImp
 //
 
+#include "xfa/include/fwl/core/fwl_error.h"
+
 class CFWL_ThreadImp;
 class IFWL_NoteDriver;
 
diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h
index 2420f6927f..9486af5ef7 100644
--- a/xfa/include/fwl/core/fwl_widgetmgr.h
+++ b/xfa/include/fwl/core/fwl_widgetmgr.h
@@ -7,9 +7,13 @@
 #ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
 #define XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
 
+#include "xfa/include/fwl/core/fwl_note.h"
+
 class IFWL_Widget;
-class IFWL_WidgetMgr;
-class IFWL_WidgetMgrDelegate;
+
+#define FWL_WGTMGR_DisableThread 0x00000001
+#define FWL_WGTMGR_DisableForm 0x00000002
+
 enum FWL_WGTRELATION {
   FWL_WGTRELATION_Parent = 0,
   FWL_WGTRELATION_Owner,
@@ -21,6 +25,7 @@ enum FWL_WGTRELATION {
   FWL_WGTRELATION_LastChild,
   FWL_WGTRELATION_SystemForm
 };
+
 class IFWL_WidgetMgr {
  public:
   virtual ~IFWL_WidgetMgr() {}
@@ -37,8 +42,7 @@ class IFWL_WidgetMgr {
 };
 IFWL_WidgetMgr* FWL_GetWidgetMgr();
 FX_BOOL FWL_WidgetIsChild(IFWL_Widget* parent, IFWL_Widget* find);
-#define FWL_WGTMGR_DisableThread 0x00000001
-#define FWL_WGTMGR_DisableForm 0x00000002
+
 class IFWL_WidgetMgrDelegate {
  public:
   virtual ~IFWL_WidgetMgrDelegate() {}