3 files changed, 10 insertions, 2 deletions
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;