5 files changed, 10 insertions, 3 deletions
diff --git a/xfa/fde/cfde_path.h b/xfa/fde/cfde_path.h
index fcf35cd5dd..54bebf3bc8 100644
--- a/xfa/fde/cfde_path.h
+++ b/xfa/fde/cfde_path.h
@@ -8,7 +8,7 @@
 #define XFA_FDE_CFDE_PATH_H_
 
 #include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/fx_ge.h"
+#include "core/fxge/include/cfx_renderdevice.h"
 #include "xfa/fgas/crt/fgas_memory.h"
 
 class CFDE_Path : public CFX_Target {
diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp
index 6161bbc9e8..2579365245 100644
--- a/xfa/fde/fde_gedevice.cpp
+++ b/xfa/fde/fde_gedevice.cpp
@@ -9,6 +9,8 @@
 #include <algorithm>
 
 #include "core/fxge/include/cfx_gemodule.h"
+#include "core/fxge/include/cfx_graphstatedata.h"
+#include "core/fxge/include/cfx_renderdevice.h"
 #include "xfa/fde/cfde_path.h"
 #include "xfa/fde/fde_object.h"
 #include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/fde_gedevice.h
index bb06cf6b53..e3b9208d93 100644
--- a/xfa/fde/fde_gedevice.h
+++ b/xfa/fde/fde_gedevice.h
@@ -7,13 +7,14 @@
 #ifndef XFA_FDE_FDE_GEDEVICE_H_
 #define XFA_FDE_FDE_GEDEVICE_H_
 
-#include "core/fxge/include/fx_ge.h"
+#include "core/fxge/include/cfx_renderdevice.h"
 #include "xfa/fgas/crt/fgas_memory.h"
 
 class CFDE_Brush;
 class CFDE_Path;
 class CFDE_Pen;
 class CFGAS_GEFont;
+class CFX_GraphStateData;
 
 class CFDE_RenderDevice : public CFX_Target {
  public:
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h
index 2005f73f84..4ad24d7630 100644
--- a/xfa/fde/fde_visualset.h
+++ b/xfa/fde/fde_visualset.h
@@ -15,6 +15,8 @@
 #include "xfa/fgas/crt/fgas_memory.h"
 #include "xfa/fgas/font/fgas_font.h"
 
+struct FXTEXT_CHARPOS;
+
 enum FDE_VISUALOBJTYPE {
   FDE_VISUALOBJ_Canvas = 0x00,
   FDE_VISUALOBJ_Text = 0x01
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h
index 8d2c0fe8a0..6ce32d2fe8 100644
--- a/xfa/fde/tto/fde_textout.h
+++ b/xfa/fde/tto/fde_textout.h
@@ -10,8 +10,9 @@
 #include <memory>
 #include <vector>
 
+#include "core/fxge/include/cfx_fxgedevice.h"
+#include "core/fxge/include/cfx_renderdevice.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/fxge/include/fx_ge.h"
 #include "xfa/fde/fde_object.h"
 #include "xfa/fgas/crt/fgas_utils.h"
 #include "xfa/fgas/font/fgas_font.h"
@@ -42,6 +43,7 @@
 #define FDE_TTOALIGNMENT_BottomAuto 11
 
 class CFDE_RenderDevice;
+class CFX_RenderDevice;
 class CFX_TxtBreak;
 struct FX_TXTRUN;