7 files changed, 20 insertions, 13 deletions
diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h
index 6db6f561a1..4208897db6 100644
--- a/xfa/include/fwl/theme/checkboxtp.h
+++ b/xfa/include/fwl/theme/checkboxtp.h
@@ -7,6 +7,7 @@
 #ifndef XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
 #define XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
 
+#include "xfa/include/fwl/theme/utils.h"
 #include "xfa/include/fwl/theme/widgettp.h"
 
 class CFWL_CheckBoxTP : public CFWL_WidgetTP {
diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h
index efab981a0d..8b689814ff 100644
--- a/xfa/include/fwl/theme/listboxtp.h
+++ b/xfa/include/fwl/theme/listboxtp.h
@@ -7,9 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
 #define XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_ScrollBarTP;
-class CFWL_ListBoxTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_ListBoxTP : public CFWL_WidgetTP {
  public:
   CFWL_ListBoxTP();
diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h
index da9fadbcaf..cf7f1e70b1 100644
--- a/xfa/include/fwl/theme/monthcalendartp.h
+++ b/xfa/include/fwl/theme/monthcalendartp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
 #define XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_MonthCalendarTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_MonthCalendarTP : public CFWL_WidgetTP {
  public:
   CFWL_MonthCalendarTP();
diff --git a/xfa/include/fwl/theme/pictureboxtp.h b/xfa/include/fwl/theme/pictureboxtp.h
index 7621d3b8f8..8879890649 100644
--- a/xfa/include/fwl/theme/pictureboxtp.h
+++ b/xfa/include/fwl/theme/pictureboxtp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
 #define XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_PictureBoxTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_PictureBoxTP : public CFWL_WidgetTP {
  public:
   CFWL_PictureBoxTP();
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index 43fcca7073..0b8cc4acf2 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
 #define XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_PushButtonTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_PushButtonTP : public CFWL_WidgetTP {
  public:
   CFWL_PushButtonTP();
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h
index e9bd200827..5cfcaea95d 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/include/fwl/theme/scrollbartp.h
@@ -7,8 +7,8 @@
 #ifndef XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
 #define XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
 
-class CFWL_WidgetTP;
-class CFWL_ScrollBarTP;
+#include "xfa/include/fwl/theme/widgettp.h"
+
 class CFWL_ScrollBarTP : public CFWL_WidgetTP {
  public:
   CFWL_ScrollBarTP();
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 404ca51547..e7dee4d8be 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -10,16 +10,23 @@
 #include <memory>
 #include <vector>
 
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+#include "xfa/include/fwl/theme/utils.h"
+
 class IFWL_ThemeProvider;
 class IFWL_Widget;
 class IFDE_TextOut;
 class IFX_Font;
 class IFX_FontMgr;
+class CFWL_ArrowData;
+
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
 class IFX_FontSourceEnum;
 #endif
-class CFWL_WidgetTP;
-class CFWL_ArrowData;
 
 class CFWL_WidgetTP {
  public: