8 files changed, 48 insertions, 9 deletions
diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h
index 2ec103fe25..9a6a663d10 100644
--- a/xfa/src/fdp/include/fde.h
+++ b/xfa/src/fdp/include/fde.h
@@ -9,16 +9,16 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_H_
 
-#include "xfa/src/fdp/include/fde_mem.h"
-#include "xfa/src/fdp/include/fde_xml.h"
-#include "xfa/src/fdp/include/fde_img.h"
 #include "xfa/src/fdp/include/fde_brs.h"
+#include "xfa/src/fdp/include/fde_css.h"
+#include "xfa/src/fdp/include/fde_img.h"
+#include "xfa/src/fdp/include/fde_mem.h"
 #include "xfa/src/fdp/include/fde_pen.h"
-#include "xfa/src/fdp/include/fde_pth.h"
-#include "xfa/src/fdp/include/fde_tto.h"
 #include "xfa/src/fdp/include/fde_psr.h"
-#include "xfa/src/fdp/include/fde_css.h"
-#include "xfa/src/fdp/include/fde_rdv.h"
+#include "xfa/src/fdp/include/fde_pth.h"
 #include "xfa/src/fdp/include/fde_rdr.h"
+#include "xfa/src/fdp/include/fde_rdv.h"
+#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fdp/include/fde_xml.h"
 
 #endif  // XFA_SRC_FDP_INCLUDE_FDE_H_
diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h
index 5e4da8fe35..825a2a65f7 100644
--- a/xfa/src/fdp/include/fde_css.h
+++ b/xfa/src/fdp/include/fde_css.h
@@ -7,6 +7,11 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
 
+#include "core/include/fxge/fx_dib.h"
+#include "xfa/src/fgas/include/fx_fnt.h"
+#include "xfa/src/fgas/include/fx_stm.h"
+#include "xfa/src/fgas/include/fx_utl.h"
+
 class IFDE_HTMNotify;
 class IFDE_CSSValue;
 class IFDE_CSSPrimitiveValue;
@@ -41,6 +46,7 @@ class IFDE_CSSQuoteContext;
 class IFDE_CSSContentContext;
 class IFDE_CSSMultiColumnContext;
 class IFDE_CSSFloatContext;
+
 enum FDE_CSSVALUETYPE {
   FDE_CSSVALUETYPE_Primitive = 1,
   FDE_CSSVALUETYPE_List = 2,
diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h
index 4388bbfae5..b1612cb91f 100644
--- a/xfa/src/fdp/include/fde_img.h
+++ b/xfa/src/fdp/include/fde_img.h
@@ -7,7 +7,10 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
 
-class IFDE_Image;
+#include "xfa/src/fgas/include/fx_mem.h"
+#include "xfa/src/fgas/include/fx_stm.h"
+#include "xfa/src/fgas/include/fx_utl.h"
+
 #define FDE_IMAGEFORMAT_Unknown -1
 #define FDE_IMAGEFORMAT_BMP 0
 #define FDE_IMAGEFORMAT_GIF 1
@@ -16,6 +19,7 @@ class IFDE_Image;
 #define FDE_IMAGEFORMAT_TIFF 4
 #define FDE_IMAGEFORMAT_JPEG2000 5
 #define FDE_IMAGEFORMAT_JBig2 6
+
 class IFDE_Image {
  public:
   static IFDE_Image* Create(IFX_Stream* pStream,
diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h
index 5f3e93d93c..253eb8d903 100644
--- a/xfa/src/fdp/include/fde_psr.h
+++ b/xfa/src/fdp/include/fde_psr.h
@@ -7,6 +7,16 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
 
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "core/include/fxge/fx_dib.h"
+#include "core/include/fxge/fx_ge.h"
+#include "xfa/src/fdp/include/fde_brs.h"
+#include "xfa/src/fdp/include/fde_img.h"
+#include "xfa/src/fdp/include/fde_pen.h"
+#include "xfa/src/fdp/include/fde_pth.h"
+#include "xfa/src/fgas/include/fx_fnt.h"
+
 enum FDE_VISUALOBJTYPE {
   FDE_VISUALOBJ_Canvas = 0x00,
   FDE_VISUALOBJ_Text = 0x01,
@@ -14,7 +24,9 @@ enum FDE_VISUALOBJTYPE {
   FDE_VISUALOBJ_Path = 0x04,
   FDE_VISUALOBJ_Widget = 0x08,
 };
+
 typedef struct _FDE_HVISUALOBJ { void* pData; } const* FDE_HVISUALOBJ;
+
 class IFDE_VisualSet {
  public:
   virtual ~IFDE_VisualSet() {}
@@ -24,6 +36,7 @@ class IFDE_VisualSet {
   virtual FX_BOOL GetRect(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) = 0;
   virtual FX_BOOL GetClip(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) = 0;
 };
+
 class IFDE_CanvasSet : public IFDE_VisualSet {
  public:
   virtual FX_POSITION GetFirstPosition(FDE_HVISUALOBJ hCanvas) = 0;
diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h
index 8aca67361b..085a78e4c1 100644
--- a/xfa/src/fdp/include/fde_rdr.h
+++ b/xfa/src/fdp/include/fde_rdr.h
@@ -7,6 +7,9 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
 
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "xfa/src/fdp/include/fde_psr.h"
+
 class IFDE_Page;
 class IFDE_RenderDevice;
 
diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h
index 2d9e3800ef..88e7dd4507 100644
--- a/xfa/src/fdp/include/fde_rdv.h
+++ b/xfa/src/fdp/include/fde_rdv.h
@@ -7,6 +7,12 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
 
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxge/fx_font.h"
+#include "core/include/fxge/fx_ge.h"
+#include "xfa/src/fdp/include/fde_pth.h"
+#include "xfa/src/fgas/include/fx_fnt.h"
+
 class IFDE_Pen;
 class IFDE_Brush;
 class IFDE_Image;
diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h
index 3e7fcf9f38..dbfa64775c 100644
--- a/xfa/src/fdp/include/fde_tto.h
+++ b/xfa/src/fdp/include/fde_tto.h
@@ -7,7 +7,10 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
 
-class IFDE_TextOut;
+#include "core/include/fxge/fx_dib.h"
+#include "core/include/fxge/fx_ge.h"
+#include "xfa/src/fgas/include/fx_fnt.h"
+
 #define FDE_TTOSTYLE_Underline 0x0001
 #define FDE_TTOSTYLE_Strikeout 0x0002
 #define FDE_TTOSTYLE_VerticalLayout 0x0004
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index 40b0480e8c..a83e27e66c 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -7,6 +7,9 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_XML_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_XML_H_
 
+#include "xfa/src/fgas/include/fx_stm.h"
+#include "xfa/src/fgas/include/fx_utl.h"
+
 class IFDE_XMLNode;
 class IFDE_XMLInstruction;
 class IFDE_XMLDeclaration;
@@ -22,6 +25,7 @@ class IFDE_XMLText;
 class IFDE_XMLDoc;
 class IFDE_XMLParser;
 class IFDE_XMLSyntaxParser;
+
 #ifdef __cplusplus
 extern "C" {
 #endif