4 files changed, 28 insertions, 2 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
index 014743e108..45ef2b25c3 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
@@ -4,6 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
+
+#include "xfa/src/fdp/include/fde_rdr.h"
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
 #include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
@@ -11,7 +14,6 @@
 #include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
 #include "xfa/src/fxfa/src/app/xfa_fffield.h"
 #include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
 #include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
index a51017bce1..e35b14f88f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
@@ -4,8 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
+
 #include <algorithm>
 
+#include "xfa/src/fdp/include/fde_tto.h"
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
@@ -15,7 +18,6 @@
 #include "xfa/src/fxfa/src/app/xfa_fffield.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
 #include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
index fe4a2af9c9..2e95732da2 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
@@ -15,6 +15,7 @@
 #include "xfa/include/fwl/basewidget/fwl_picturebox.h"
 #include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
+#include "xfa/src/fdp/include/fde_tto.h"
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h
index fa32b70961..03939ec7a3 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/src/app/xfa_textlayout.h
@@ -7,8 +7,20 @@
 #ifndef XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
 #define XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
 
+#include "xfa/src/fdp/include/fde_brs.h"
+#include "xfa/src/fdp/include/fde_css.h"
+#include "xfa/src/fdp/include/fde_mem.h"
+#include "xfa/src/fdp/include/fde_rdv.h"
+#include "xfa/src/fgas/include/fx_rbk.h"
+#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
 #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001
+
+class CXFA_Para;
+class CXFA_Font;
 class CXFA_TextTabstopsContext;
+
 class IXFA_TextProvider {
  public:
   virtual ~IXFA_TextProvider() {}
@@ -22,6 +34,7 @@ class IXFA_TextProvider {
                                const CFX_WideString& wsAttr,
                                CFX_WideString& wsValue) = 0;
 };
+
 class CXFA_CSSTagProvider : public IFDE_CSSTagProvider {
  public:
   CXFA_CSSTagProvider() : m_bTagAviliable(FALSE), m_bContent(FALSE) {}
@@ -43,6 +56,7 @@ class CXFA_CSSTagProvider : public IFDE_CSSTagProvider {
   CFX_WideString m_wsTagName;
   CFX_MapPtrToPtr m_Attributes;
 };
+
 class CXFA_TextParseContext : public CFX_Target {
  public:
   CXFA_TextParseContext()
@@ -69,6 +83,7 @@ class CXFA_TextParseContext : public CFX_Target {
   FX_DWORD m_dwMatchedDecls : 28;
   FDE_CSSDISPLAY m_eDisplay : 4;
 };
+
 class CXFA_TextParser {
  public:
   CXFA_TextParser() : m_pAllocator(NULL), m_pSelector(NULL), m_pUASheet(NULL) {}
@@ -128,6 +143,7 @@ class CXFA_TextParser {
   CFX_MapPtrTemplate<IFDE_XMLNode*, CXFA_TextParseContext*>
       m_mapXMLNodeToParseContext;
 };
+
 class CXFA_LoaderContext {
  public:
   CXFA_LoaderContext()
@@ -157,6 +173,7 @@ class CXFA_LoaderContext {
   FX_DWORD m_dwFlags;
   CFX_FloatArray m_BlocksHeight;
 };
+
 class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target {
  public:
   CXFA_LinkUserData(IFX_MEMAllocator* pAllocator, FX_WCHAR* pszText)
@@ -181,6 +198,7 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target {
   FX_DWORD m_dwRefCount;
   CFX_WideString m_pszURLContent;
 };
+
 class CXFA_TextUserData : public IFX_Unknown, public CFX_Target {
  public:
   CXFA_TextUserData(IFX_MEMAllocator* pAllocator, IFDE_CSSComputedStyle* pStyle)
@@ -257,10 +275,12 @@ class CXFA_PieceLine : public CFX_Target {
   CFX_Int32Array m_charCounts;
 };
 typedef CFX_ArrayTemplate<CXFA_PieceLine*> CXFA_PieceLineArray;
+
 struct XFA_TABSTOPS {
   FX_DWORD dwAlign;
   FX_FLOAT fTabstops;
 };
+
 class CXFA_TextTabstopsContext {
  public:
   CXFA_TextTabstopsContext()
@@ -301,6 +321,7 @@ class CXFA_TextTabstopsContext {
   FX_FLOAT m_fTabWidth;
   FX_FLOAT m_fLeft;
 };
+
 class CXFA_TextLayout {
  public:
   CXFA_TextLayout(IXFA_TextProvider* pTextProvider);