Cleanup the xfa/src/fdp directory.

This CL renames xfa/src/fdp to xfa/src/fde to better match all of the content
(nothing mentions fdp other then the directory name). The inner src/ and
include/ folders are collapsed up a level and xfa/src/fdp/src/fde is moved
up to xfa/src/fde.

Some of the header moves conflicted with existing headers. In that case, the
existing header had the content moved into the .cpp file and we replaced the
existing header with the one from include/.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1784543002 .

62 files changed, 362 insertions, 421 deletions

diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fde/css/fde_css.h
index b139855613..1e62b66c9a 100644
--- a/xfa/src/fdp/include/fde_css.h
+++ b/xfa/src/fde/css/fde_css.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
+#ifndef XFA_SRC_FDE_CSS_FDE_CSS_H_
+#define XFA_SRC_FDE_CSS_FDE_CSS_H_
 
 #include "core/include/fxge/fx_dib.h"
 #include "xfa/src/fgas/font/fgas_font.h"
@@ -1079,4 +1079,4 @@ class IFDE_CSSStyleSelector {
                             IFDE_CSSComputedStyle* pDestStyle) = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_CSS_H_
+#endif  // XFA_SRC_FDE_CSS_FDE_CSS_H_
diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fde/css/fde_csscache.cpp
index 4a9fb754d3..3fee9f862f 100644
--- a/xfa/src/fdp/src/css/fde_csscache.cpp
+++ b/xfa/src/fde/css/fde_csscache.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/css/fde_csscache.h"
+#include "xfa/src/fde/css/fde_csscache.h"
 
 #include <algorithm>
 
diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fde/css/fde_csscache.h
index f7e7eb3aa7..ac3d68c071 100644
--- a/xfa/src/fdp/src/css/fde_csscache.h
+++ b/xfa/src/fde/css/fde_csscache.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_
-#define XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_
+#ifndef XFA_SRC_FDE_CSS_FDE_CSSCACHE_H_
+#define XFA_SRC_FDE_CSS_FDE_CSSCACHE_H_
 
 #include <map>
 
-#include "xfa/src/fdp/include/fde_css.h"
+#include "xfa/src/fde/css/fde_css.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 
 struct FDE_CSSCACHEITEM : public CFX_Target {
@@ -81,4 +81,4 @@ class CFDE_CSSAccelerator : public IFDE_CSSAccelerator, public CFX_Target {
   CFDE_CSSTagStack m_Stack;
 };
 
-#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_
+#endif  // XFA_SRC_FDE_CSS_FDE_CSSCACHE_H_
diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fde/css/fde_cssdatatable.cpp
index 6f074c09b4..5ad83e7b25 100644
--- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp
+++ b/xfa/src/fde/css/fde_cssdatatable.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/css/fde_cssdatatable.h"
+#include "xfa/src/fde/css/fde_cssdatatable.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/crt/fgas_algorithm.h"
diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fde/css/fde_cssdatatable.h
index 512d94f3ee..950b8d358d 100644
--- a/xfa/src/fdp/src/css/fde_cssdatatable.h
+++ b/xfa/src/fde/css/fde_cssdatatable.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_
-#define XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_
+#ifndef XFA_SRC_FDE_CSS_FDE_CSSDATATABLE_H_
+#define XFA_SRC_FDE_CSS_FDE_CSSDATATABLE_H_
 
 #include "core/include/fxcrt/fx_system.h"
-#include "xfa/src/fdp/include/fde_css.h"
+#include "xfa/src/fde/css/fde_css.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 
 class CFDE_CSSFunction : public CFX_Target {
@@ -197,4 +197,4 @@ FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue,
                         int32_t& iOffset,
                         int32_t& iLength);
 
-#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_
+#endif  // XFA_SRC_FDE_CSS_FDE_CSSDATATABLE_H_
diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fde/css/fde_cssdeclaration.cpp
index f63a1bef95..1a43b8beb2 100644
--- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
+++ b/xfa/src/fde/css/fde_cssdeclaration.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
+#include "xfa/src/fde/css/fde_cssdeclaration.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/crt/fgas_system.h"
diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.h b/xfa/src/fde/css/fde_cssdeclaration.h
index bcc6609f3b..42aee9ea13 100644
--- a/xfa/src/fdp/src/css/fde_cssdeclaration.h
+++ b/xfa/src/fde/css/fde_cssdeclaration.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_
-#define XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_
+#ifndef XFA_SRC_FDE_CSS_FDE_CSSDECLARATION_H_
+#define XFA_SRC_FDE_CSS_FDE_CSSDECLARATION_H_
 
-#include "xfa/src/fdp/src/css/fde_cssdatatable.h"
+#include "xfa/src/fde/css/fde_cssdatatable.h"
 
 struct FDE_CSSPROPERTYHOLDER : public CFX_Target {
   int16_t eProperty;
@@ -153,4 +153,4 @@ class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target {
   FDE_CSSCUSTOMPROPERTY* m_pLastCustom;
 };
 
-#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_
+#endif  // XFA_SRC_FDE_CSS_FDE_CSSDECLARATION_H_
diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fde/css/fde_cssstyleselector.cpp
index 7fd9dee835..ae9a7a5d39 100644
--- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp
+++ b/xfa/src/fde/css/fde_cssstyleselector.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/css/fde_cssstyleselector.h"
+#include "xfa/src/fde/css/fde_cssstyleselector.h"
 
 #include <algorithm>
 
-#include "xfa/src/fdp/src/css/fde_csscache.h"
-#include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
+#include "xfa/src/fde/css/fde_csscache.h"
+#include "xfa/src/fde/css/fde_cssdeclaration.h"
 
 int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) {
   int32_t iCount = m_arrCounterData.GetSize();
diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fde/css/fde_cssstyleselector.h
index 23e6616792..6ac3f0b7c5 100644
--- a/xfa/src/fdp/src/css/fde_cssstyleselector.h
+++ b/xfa/src/fde/css/fde_cssstyleselector.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_
-#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_
+#ifndef XFA_SRC_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
+#define XFA_SRC_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
 
 #include <vector>
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fdp/include/fde_css.h"
-#include "xfa/src/fdp/src/css/fde_csscache.h"
-#include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
+#include "xfa/src/fde/css/fde_css.h"
+#include "xfa/src/fde/css/fde_csscache.h"
+#include "xfa/src/fde/css/fde_cssdeclaration.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 #include "xfa/src/fgas/crt/fgas_system.h"
 
@@ -898,4 +898,4 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
   CFX_WideStringArray m_CustomProperties;
 };
 
-#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_
+#endif  // XFA_SRC_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fde/css/fde_cssstylesheet.cpp
index 8afdc1c9a9..9b18dd2552 100644
--- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp
+++ b/xfa/src/fde/css/fde_cssstylesheet.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/css/fde_cssstylesheet.h"
+#include "xfa/src/fde/css/fde_cssstylesheet.h"
 
-#include "xfa/src/fdp/src/css/fde_cssdatatable.h"
-#include "xfa/src/fdp/src/css/fde_csssyntax.h"
+#include "xfa/src/fde/css/fde_cssdatatable.h"
+#include "xfa/src/fde/css/fde_csssyntax.h"
 #include "xfa/src/fgas/crt/fgas_codepage.h"
 
 IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() {
diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.h b/xfa/src/fde/css/fde_cssstylesheet.h
index e8b6146e92..5e11c74b4e 100644
--- a/xfa/src/fdp/src/css/fde_cssstylesheet.h
+++ b/xfa/src/fde/css/fde_cssstylesheet.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_
-#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_
+#ifndef XFA_SRC_FDE_CSS_FDE_CSSSTYLESHEET_H_
+#define XFA_SRC_FDE_CSS_FDE_CSSSTYLESHEET_H_
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
+#include "xfa/src/fde/css/fde_cssdeclaration.h"
 
 class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target {
  public:
@@ -138,4 +138,4 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target {
   CFX_MapPtrToPtr m_StringCache;
 };
 
-#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_
+#endif  // XFA_SRC_FDE_CSS_FDE_CSSSTYLESHEET_H_
diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fde/css/fde_csssyntax.cpp
index 30705d4960..5fe502e8b9 100644
--- a/xfa/src/fdp/src/css/fde_csssyntax.cpp
+++ b/xfa/src/fde/css/fde_csssyntax.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/css/fde_csssyntax.h"
+#include "xfa/src/fde/css/fde_csssyntax.h"
 
-#include "xfa/src/fdp/src/css/fde_cssdatatable.h"
+#include "xfa/src/fde/css/fde_cssdatatable.h"
 #include "xfa/src/fgas/crt/fgas_codepage.h"
 
 #ifdef _cplusplus
diff --git a/xfa/src/fdp/src/css/fde_csssyntax.h b/xfa/src/fde/css/fde_csssyntax.h
index 28e3ea366f..dc7acdb3d5 100644
--- a/xfa/src/fdp/src/css/fde_csssyntax.h
+++ b/xfa/src/fde/css/fde_csssyntax.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
-#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
+#ifndef XFA_SRC_FDE_CSS_FDE_CSSSYNTAX_H_
+#define XFA_SRC_FDE_CSS_FDE_CSSSYNTAX_H_
 
-#include "xfa/src/fdp/include/fde_css.h"
+#include "xfa/src/fde/css/fde_css.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 #include "xfa/src/fgas/crt/fgas_stream.h"
 
@@ -116,4 +116,4 @@ class CFDE_CSSSyntaxParser : public IFDE_CSSSyntaxParser, public CFX_Target {
   CFX_StackTemplate<FDE_CSSSYNTAXMODE> m_ModeStack;
 };
 
-#endif  // XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
+#endif  // XFA_SRC_FDE_CSS_FDE_CSSSYNTAX_H_
diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fde/fde_brush.h
index 7cae2f0e2d..00edeebe73 100644
--- a/xfa/src/fdp/include/fde_brs.h
+++ b/xfa/src/fde/fde_brush.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_BRS_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_BRS_H_
+#ifndef XFA_SRC_FDE_FDE_BRUSH_H_
+#define XFA_SRC_FDE_FDE_BRUSH_H_
 
 #include "core/include/fxcrt/fx_system.h"
 #include "core/include/fxge/fx_dib.h"
@@ -147,4 +147,4 @@ class IFDE_LinearGradientBrush : public IFDE_Brush {
   virtual void SetWrapMode(int32_t iWrapMode) = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_BRS_H_
+#endif  // XFA_SRC_FDE_FDE_BRUSH_H_
diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fde/fde_devbasic.cpp
index fea0d6a4d1..c119110846 100644
--- a/xfa/src/fdp/src/fde/fde_devbasic.cpp
+++ b/xfa/src/fde/fde_devbasic.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/fde/fde_devbasic.h"
+#include "xfa/src/fde/fde_devbasic.h"
 
 #include <cstdint>
 
-#include "xfa/src/fdp/include/fde_brs.h"
+#include "xfa/src/fde/fde_brush.h"
 
 static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = {
     {16,
diff --git a/xfa/src/fdp/src/fde/fde_devbasic.h b/xfa/src/fde/fde_devbasic.h
index 62846ca8b7..6b27bebb0c 100644
--- a/xfa/src/fdp/src/fde/fde_devbasic.h
+++ b/xfa/src/fde/fde_devbasic.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_
-#define XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_
+#ifndef XFA_SRC_FDE_FDE_DEVBASIC_H_
+#define XFA_SRC_FDE_FDE_DEVBASIC_H_
 
 #include <cstdint>
 
@@ -17,4 +17,4 @@ struct FDE_HATCHDATA {
 typedef FDE_HATCHDATA const* FDE_LPCHATCHDATA;
 FDE_LPCHATCHDATA FDE_DEVGetHatchData(int32_t iHatchStyle);
 
-#endif  // XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_
+#endif  // XFA_SRC_FDE_FDE_DEVBASIC_H_
diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fde/fde_gedevice.cpp
index c0d665d6a5..13ae1bb330 100644
--- a/xfa/src/fdp/src/fde/fde_gedevice.cpp
+++ b/xfa/src/fde/fde_gedevice.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/fde/fde_gedevice.h"
+#include "xfa/src/fde/fde_gedevice.h"
 
 #include <algorithm>
 
-#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/src/fde/fde_devbasic.h"
-#include "xfa/src/fdp/src/fde/fde_geobject.h"
+#include "xfa/src/fde/fde_brush.h"
+#include "xfa/src/fde/fde_devbasic.h"
+#include "xfa/src/fde/fde_geobject.h"
+#include "xfa/src/fde/fde_image.h"
+#include "xfa/src/fde/fde_pen.h"
 
 FX_BOOL FDE_GetStockHatchMask(int32_t iHatchStyle, CFX_DIBitmap& hatchMask) {
   FDE_LPCHATCHDATA pData = FDE_DEVGetHatchData(iHatchStyle);
diff --git a/xfa/src/fdp/src/fde/fde_gedevice.h b/xfa/src/fde/fde_gedevice.h
index 56f0a0a379..fa91ab151a 100644
--- a/xfa/src/fdp/src/fde/fde_gedevice.h
+++ b/xfa/src/fde/fde_gedevice.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_
-#define XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_
+#ifndef XFA_SRC_FDE_FDE_GEDEVICE_H_
+#define XFA_SRC_FDE_FDE_GEDEVICE_H_
 
-#include "xfa/src/fdp/include/fde_rdv.h"
+#include "xfa/src/fde/fde_renderdevice.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 
 class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target {
@@ -133,4 +133,4 @@ class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target {
   int32_t m_iCharCount;
 };
 
-#endif  // XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_
+#endif  // XFA_SRC_FDE_FDE_GEDEVICE_H_
diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fde/fde_geobject.cpp
index 7e22691c5b..3170692fe7 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.cpp
+++ b/xfa/src/fde/fde_geobject.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/fde/fde_geobject.h"
+#include "xfa/src/fde/fde_geobject.h"
 
-#include "xfa/src/fdp/src/fde/fde_object.h"
+#include "xfa/src/fde/fde_object.h"
 
 IFDE_Path* IFDE_Path::Create() {
   return new CFDE_Path;
diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fde/fde_geobject.h
index a2d5fd4bad..1f5cc4d056 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.h
+++ b/xfa/src/fde/fde_geobject.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
-#define XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
+#ifndef XFA_SRC_FDE_FDE_GEOBJECT_H_
+#define XFA_SRC_FDE_FDE_GEOBJECT_H_
 
 #include "core/include/fxge/fx_ge.h"
-#include "xfa/src/fdp/include/fde_pth.h"
+#include "xfa/src/fde/fde_path.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 
 class CFDE_Path : public IFDE_Path, public CFX_Target {
@@ -54,4 +54,4 @@ class CFDE_Path : public IFDE_Path, public CFX_Target {
   CFX_PathData m_Path;
 };
 
-#endif  // XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
+#endif  // XFA_SRC_FDE_FDE_GEOBJECT_H_
diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fde/fde_image.h
index fb7cd23fe6..a9f16dee6f 100644
--- a/xfa/src/fdp/include/fde_img.h
+++ b/xfa/src/fde/fde_image.h
@@ -4,26 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
+#ifndef XFA_SRC_FDE_FDE_IMAGE_H_
+#define XFA_SRC_FDE_FDE_IMAGE_H_
 
 #include "xfa/src/fgas/crt/fgas_memory.h"
 #include "xfa/src/fgas/crt/fgas_stream.h"
 #include "xfa/src/fgas/crt/fgas_utils.h"
 
-#define FDE_IMAGEFORMAT_Unknown -1
-#define FDE_IMAGEFORMAT_BMP 0
-#define FDE_IMAGEFORMAT_GIF 1
-#define FDE_IMAGEFORMAT_JPEG 2
-#define FDE_IMAGEFORMAT_PNG 3
-#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,
-                            int32_t iFormat = FDE_IMAGEFORMAT_Unknown);
   virtual ~IFDE_Image() {}
   virtual void Release() = 0;
   virtual FX_BOOL LoadImage() = 0;
@@ -50,43 +39,4 @@ class IFDE_Image {
   virtual void StopLoadImage() = 0;
 };
 
-#define FDE_IMAGEFILTER_Unknown -1
-#define FDE_IMAGEFILTER_Opacity 0
-#define FDE_IMAGEFILTER_GrayScale 1
-#define FDE_IMAGEFILTER_BlackWhite 2
-#define FDE_IMAGEFILTER_InvertColor 3
-#define FDE_IMAGEFILTER_TransparentColor 4
-#define FDE_IMAGEFILTER_MaskColor 5
-#define FDE_IMAGEFILTER_Brightness 6
-#define FDE_IMAGEFILTER_Contrast 7
-
-struct FDE_IMAGEFILTERPARAMS : public CFX_Target {
-  int32_t iFilterType;
-};
-
-struct FDE_OPACITYPARAMS : public FDE_IMAGEFILTERPARAMS {
-  int32_t iOpacity;
-};
-
-struct FDE_BLACKWHITEPARAMS : public FDE_IMAGEFILTERPARAMS {
-  FX_ARGB dwBlackColor;
-  FX_ARGB dwWhiteColor;
-};
-
-struct FDE_TRANSPARENTPARAMS : public FDE_IMAGEFILTERPARAMS {
-  FX_ARGB color;
-};
-
-struct FDE_MASKCOLORPARAMS : public FDE_IMAGEFILTERPARAMS {
-  FX_ARGB color;
-};
-
-struct FDE_BRIGHTNESSPARAMS : public FDE_IMAGEFILTERPARAMS {
-  int32_t iBrightness;
-};
-
-struct FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS {
-  int32_t iContrast;
-};
-
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
+#endif  // XFA_SRC_FDE_FDE_IMAGE_H_
diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fde/fde_iterator.cpp
index 4a286ec721..71be02ea9d 100644
--- a/xfa/src/fdp/src/fde/fde_iterator.cpp
+++ b/xfa/src/fde/fde_iterator.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/fde/fde_iterator.h"
+#include "xfa/src/fde/fde_iterator.h"
 
 #include "xfa/src/fgas/crt/fgas_utils.h"
 
diff --git a/xfa/src/fdp/src/fde/fde_iterator.h b/xfa/src/fde/fde_iterator.h
index a8594af696..eadff97508 100644
--- a/xfa/src/fdp/src/fde/fde_iterator.h
+++ b/xfa/src/fde/fde_iterator.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_
-#define XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_
+#ifndef XFA_SRC_FDE_FDE_ITERATOR_H_
+#define XFA_SRC_FDE_FDE_ITERATOR_H_
 
-#include "xfa/src/fdp/include/fde_psr.h"
+#include "xfa/src/fde/fde_visualset.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 
 struct FDE_CANVASITEM : public CFX_Target {
@@ -36,4 +36,4 @@ class CFDE_VisualSetIterator : public IFDE_VisualSetIterator,
   CFX_StackTemplate<FDE_CANVASITEM> m_CanvasStack;
 };
 
-#endif  // XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_
+#endif  // XFA_SRC_FDE_FDE_ITERATOR_H_
diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fde/fde_object.cpp
index fc2de2091e..1350ae9e9b 100644
--- a/xfa/src/fdp/src/fde/fde_object.cpp
+++ b/xfa/src/fde/fde_object.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/fde/fde_object.h"
+#include "xfa/src/fde/fde_object.h"
 
 IFDE_Pen* IFDE_Pen::Create() {
   return new CFDE_Pen();
diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fde/fde_object.h
index 22c1fe30ca..d9e5737fa0 100644
--- a/xfa/src/fdp/src/fde/fde_object.h
+++ b/xfa/src/fde/fde_object.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_
-#define XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_
+#ifndef XFA_SRC_FDE_FDE_OBJECT_H_
+#define XFA_SRC_FDE_FDE_OBJECT_H_
 
 #include <cstdint>
 
 #include "core/include/fxge/fx_dib.h"
-#include "xfa/src/fdp/include/fde_brs.h"
-#include "xfa/src/fdp/include/fde_pen.h"
+#include "xfa/src/fde/fde_brush.h"
+#include "xfa/src/fde/fde_pen.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 
 class CFDE_Pen : public IFDE_Pen, public CFX_Target {
@@ -243,4 +243,4 @@ class CFDE_LinearBrush : public IFDE_LinearGradientBrush, public CFX_Target {
   CFX_Matrix m_Matrix;
 };
 
-#endif  // XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_
+#endif  // XFA_SRC_FDE_FDE_OBJECT_H_
diff --git a/xfa/src/fdp/include/fde_pth.h b/xfa/src/fde/fde_path.h
index 8f4cc9aeed..a6a8d674d6 100644
--- a/xfa/src/fdp/include/fde_pth.h
+++ b/xfa/src/fde/fde_path.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
+#ifndef XFA_SRC_FDE_FDE_PATH_H_
+#define XFA_SRC_FDE_FDE_PATH_H_
 
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -34,4 +34,4 @@ class IFDE_Path {
                        FX_FLOAT fMiterLimit) const = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
+#endif  // XFA_SRC_FDE_FDE_PATH_H_
diff --git a/xfa/src/fdp/include/fde_pen.h b/xfa/src/fde/fde_pen.h
index 904d7215ea..adaa2da256 100644
--- a/xfa/src/fdp/include/fde_pen.h
+++ b/xfa/src/fde/fde_pen.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_PEN_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_PEN_H_
+#ifndef XFA_SRC_FDE_FDE_PEN_H_
+#define XFA_SRC_FDE_FDE_PEN_H_
 
 class IFDE_Pen;
 
@@ -67,4 +67,4 @@ class IFDE_Pen {
       const CFDE_CompoundPatterns& compoundPatterns) = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_PEN_H_
+#endif  // XFA_SRC_FDE_FDE_PEN_H_
diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fde/fde_render.cpp
index 58c84b7d2e..b4330cc084 100644
--- a/xfa/src/fdp/src/fde/fde_render.cpp
+++ b/xfa/src/fde/fde_render.cpp
@@ -4,7 +4,46 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/fde/fde_render.h"
+#include "xfa/src/fde/fde_render.h"
+
+#include "xfa/src/fde/fde_renderdevice.h"
+#include "xfa/src/fgas/crt/fgas_memory.h"
+
+#define FDE_PATHRENDER_Stroke 1
+#define FDE_PATHRENDER_Fill 2
+
+namespace {
+
+class CFDE_RenderContext : public IFDE_RenderContext,
+                           public CFX_Target {
+ public:
+  CFDE_RenderContext();
+  virtual ~CFDE_RenderContext();
+  virtual void Release() { delete this; }
+  virtual FX_BOOL StartRender(IFDE_RenderDevice* pRenderDevice,
+                              IFDE_CanvasSet* pCanvasSet,
+                              const CFX_Matrix& tmDoc2Device);
+  virtual FDE_RENDERSTATUS GetStatus() const { return m_eStatus; }
+  virtual FDE_RENDERSTATUS DoRender(IFX_Pause* pPause = NULL);
+  virtual void StopRender();
+  void RenderPath(IFDE_PathSet* pPathSet, FDE_HVISUALOBJ hPath);
+  void RenderText(IFDE_TextSet* pTextSet, FDE_HVISUALOBJ hText);
+  FX_BOOL ApplyClip(IFDE_VisualSet* pVisualSet,
+                    FDE_HVISUALOBJ hObj,
+                    FDE_HDEVICESTATE& hState);
+  void RestoreClip(FDE_HDEVICESTATE hState);
+
+ protected:
+  FDE_RENDERSTATUS m_eStatus;
+  IFDE_RenderDevice* m_pRenderDevice;
+  IFDE_SolidBrush* m_pSolidBrush;
+  CFX_Matrix m_Transform;
+  FXTEXT_CHARPOS* m_pCharPos;
+  int32_t m_iCharPosCount;
+  IFDE_VisualSetIterator* m_pIterator;
+};
+
+}  // namespace
 
 void FDE_GetPageMatrix(CFX_Matrix& pageMatrix,
                        const CFX_RectF& docPageRect,
diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fde/fde_render.h
index 48101a9b4e..2995d10aae 100644
--- a/xfa/src/fdp/include/fde_rdr.h
+++ b/xfa/src/fde/fde_render.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
+#ifndef XFA_SRC_FDE_FDE_RENDER_H_
+#define XFA_SRC_FDE_FDE_RENDER_H_
 
 #include "core/include/fxcrt/fx_coordinates.h"
-#include "xfa/src/fdp/include/fde_psr.h"
+#include "xfa/src/fde/fde_visualset.h"
 
 class IFDE_RenderDevice;
 
@@ -37,4 +37,4 @@ class IFDE_RenderContext {
   virtual void StopRender() = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_RDR_H_
+#endif  // XFA_SRC_FDE_FDE_RENDER_H_
diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fde/fde_renderdevice.h
index d475a87ef0..63a36642d9 100644
--- a/xfa/src/fdp/include/fde_rdv.h
+++ b/xfa/src/fde/fde_renderdevice.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
+#ifndef XFA_SRC_FDE_FDE_RENDERDEVICE_H_
+#define XFA_SRC_FDE_FDE_RENDERDEVICE_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/fde/fde_path.h"
 #include "xfa/src/fgas/font/fgas_font.h"
 
 class IFDE_Pen;
@@ -107,4 +107,4 @@ class IFDE_RenderDevice {
                                 const CFX_Matrix* pMatrix = NULL) = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_RDV_H_
+#endif  // XFA_SRC_FDE_FDE_RENDERDEVICE_H_
diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fde/fde_visualset.h
index 84140419b8..71c431f1fc 100644
--- a/xfa/src/fdp/include/fde_psr.h
+++ b/xfa/src/fde/fde_visualset.h
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
+#ifndef XFA_SRC_FDE_FDE_VISUALSET_H_
+#define XFA_SRC_FDE_FDE_VISUALSET_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/fde/fde_brush.h"
+#include "xfa/src/fde/fde_image.h"
+#include "xfa/src/fde/fde_path.h"
+#include "xfa/src/fde/fde_pen.h"
 #include "xfa/src/fgas/font/fgas_font.h"
 
 enum FDE_VISUALOBJTYPE {
@@ -46,6 +46,7 @@ class IFDE_CanvasSet : public IFDE_VisualSet {
   virtual FDE_HVISUALOBJ GetParentCanvas(FDE_HVISUALOBJ hCanvas,
                                          IFDE_VisualSet*& pVisualSet) = 0;
 };
+
 class IFDE_TextSet : public IFDE_VisualSet {
  public:
   virtual int32_t GetString(FDE_HVISUALOBJ hText, CFX_WideString& wsText) = 0;
@@ -59,6 +60,11 @@ class IFDE_TextSet : public IFDE_VisualSet {
   virtual int32_t GetCharRects(FDE_HVISUALOBJ hText,
                                CFX_RectFArray& rtArray) = 0;
 };
+
+struct FDE_IMAGEFILTERPARAMS : public CFX_Target {
+  int32_t iFilterType;
+};
+
 class IFDE_ImageSet : public IFDE_VisualSet {
  public:
   virtual IFDE_Image* GetImage(FDE_HVISUALOBJ hImage) = 0;
@@ -66,11 +72,7 @@ class IFDE_ImageSet : public IFDE_VisualSet {
   virtual const FDE_IMAGEFILTERPARAMS* GetNextFilter(FDE_HVISUALOBJ hImage,
                                                      FX_POSITION& pos) = 0;
 };
-#define FDE_FILLMODE_Alternate 1
-#define FDE_FILLMODE_Winding 2
-#define FDE_PATHRENDER_Stroke 1
-#define FDE_PATHRENDER_Fill 2
-#define FDE_PATHRENDER_FillStroke 3
+
 class IFDE_PathSet : public IFDE_VisualSet {
  public:
   virtual IFDE_Path* GetPath(FDE_HVISUALOBJ hPath) = 0;
@@ -80,14 +82,14 @@ class IFDE_PathSet : public IFDE_VisualSet {
   virtual FX_FLOAT GetPenWidth(FDE_HVISUALOBJ hPath) = 0;
   virtual IFDE_Brush* GetBrush(FDE_HVISUALOBJ hPath) = 0;
 };
+
 enum FDE_WIDGETOBJ {
   FDE_WIDGETOBJ_Unknown = 0x0000,
   FDE_WIDGETOBJ_Anchor = 0x0100,
   FDE_WIDGETOBJ_NamedDest = 0x0200,
   FDE_WIDGETOBJ_HyperLink = 0x0400,
 };
-#define FDE_WIDGETPARAM_Uri 1
-#define FDE_WIDGETPARAM_Rects 2
+
 class IFDE_WidgetSet : public IFDE_VisualSet {
  public:
   virtual FDE_WIDGETOBJ GetWidgetType(FDE_HVISUALOBJ hWidget) = 0;
@@ -104,6 +106,7 @@ class IFDE_WidgetSet : public IFDE_VisualSet {
                            int32_t iParameter,
                            CFX_RectFArray& rects) = 0;
 };
+
 class IFDE_VisualSetIterator {
  public:
   static IFDE_VisualSetIterator* Create();
@@ -117,4 +120,4 @@ class IFDE_VisualSetIterator {
                                  IFDE_CanvasSet** ppCanvasSet = NULL) = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_PSR_H_
+#endif  // XFA_SRC_FDE_FDE_VISUALSET_H_
diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fde/tto/fde_textout.cpp
index 913e3f020c..fc3e4ab24b 100644
--- a/xfa/src/fdp/src/tto/fde_textout.cpp
+++ b/xfa/src/fde/tto/fde_textout.cpp
@@ -4,10 +4,184 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/tto/fde_textout.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 #include <algorithm>
 
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/src/fde/fde_brush.h"
+#include "xfa/src/fde/fde_pen.h"
+#include "xfa/src/fde/fde_renderdevice.h"
+#include "xfa/src/fgas/crt/fgas_memory.h"
+#include "xfa/src/fgas/crt/fgas_utils.h"
+#include "xfa/src/fgas/layout/fgas_textbreak.h"
+
+namespace {
+
+struct FDE_TTOPIECE {
+ public:
+  int32_t iStartChar;
+  int32_t iChars;
+  FX_DWORD dwCharStyles;
+  CFX_RectF rtPiece;
+};
+typedef FDE_TTOPIECE* FDE_LPTTOPIECE;
+typedef CFX_MassArrayTemplate<FDE_TTOPIECE> CFDE_TTOPieceArray;
+
+class CFDE_TTOLine : public CFX_Target {
+ public:
+  CFDE_TTOLine();
+  CFDE_TTOLine(const CFDE_TTOLine& ttoLine);
+  ~CFDE_TTOLine();
+  int32_t AddPiece(int32_t index, const FDE_TTOPIECE& ttoPiece);
+  int32_t GetSize() const;
+  FDE_LPTTOPIECE GetPtrAt(int32_t index);
+  void RemoveLast(int32_t iCount);
+  void RemoveAll(FX_BOOL bLeaveMemory);
+  FX_BOOL m_bNewReload;
+  CFDE_TTOPieceArray m_pieces;
+
+ protected:
+  int32_t m_iPieceCount;
+};
+typedef CFX_ObjectMassArrayTemplate<CFDE_TTOLine> CFDE_TTOLineArray;
+
+class CFDE_TextOut : public IFDE_TextOut, public CFX_Target {
+ public:
+  CFDE_TextOut();
+  ~CFDE_TextOut();
+  virtual void Release() { delete this; }
+  virtual void SetFont(IFX_Font* pFont);
+  virtual void SetFontSize(FX_FLOAT fFontSize);
+  virtual void SetTextColor(FX_ARGB color);
+  virtual void SetStyles(FX_DWORD dwStyles);
+  virtual void SetTabWidth(FX_FLOAT fTabWidth);
+  virtual void SetEllipsisString(const CFX_WideString& wsEllipsis);
+  virtual void SetParagraphBreakChar(FX_WCHAR wch);
+  virtual void SetAlignment(int32_t iAlignment);
+  virtual void SetLineSpace(FX_FLOAT fLineSpace);
+  virtual void SetDIBitmap(CFX_DIBitmap* pDIB);
+  virtual void SetRenderDevice(CFX_RenderDevice* pDevice);
+  virtual void SetClipRect(const CFX_Rect& rtClip);
+  virtual void SetClipRect(const CFX_RectF& rtClip);
+  virtual void SetMatrix(const CFX_Matrix& matrix);
+  virtual void SetLineBreakTolerance(FX_FLOAT fTolerance);
+  virtual void CalcSize(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        CFX_Size& size);
+  virtual void CalcSize(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        CFX_SizeF& size);
+  virtual void CalcSize(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        CFX_Rect& rect);
+  virtual void CalcSize(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        CFX_RectF& rect);
+
+  virtual void DrawText(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        int32_t x,
+                        int32_t y);
+  virtual void DrawText(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        FX_FLOAT x,
+                        FX_FLOAT y);
+  virtual void DrawText(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        const CFX_Rect& rect);
+  virtual void DrawText(const FX_WCHAR* pwsStr,
+                        int32_t iLength,
+                        const CFX_RectF& rect);
+
+  virtual void SetLogicClipRect(const CFX_RectF& rtClip);
+  virtual void CalcLogicSize(const FX_WCHAR* pwsStr,
+                             int32_t iLength,
+                             CFX_SizeF& size);
+  virtual void CalcLogicSize(const FX_WCHAR* pwsStr,
+                             int32_t iLength,
+                             CFX_RectF& rect);
+  virtual void DrawLogicText(const FX_WCHAR* pwsStr,
+                             int32_t iLength,
+                             FX_FLOAT x,
+                             FX_FLOAT y);
+  virtual void DrawLogicText(const FX_WCHAR* pwsStr,
+                             int32_t iLength,
+                             const CFX_RectF& rect);
+  virtual int32_t GetTotalLines();
+
+ protected:
+  void CalcTextSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF& rect);
+  FX_BOOL RetrieveLineWidth(FX_DWORD dwBreakStatus,
+                            FX_FLOAT& fStartPos,
+                            FX_FLOAT& fWidth,
+                            FX_FLOAT& fHeight);
+  void SetLineWidth(CFX_RectF& rect);
+  void DrawText(const FX_WCHAR* pwsStr,
+                int32_t iLength,
+                const CFX_RectF& rect,
+                const CFX_RectF& rtClip);
+  void LoadText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF& rect);
+  void LoadEllipsis();
+  void ExpandBuffer(int32_t iSize, int32_t iType);
+  void RetrieveEllPieces(int32_t*& pCharWidths);
+
+  void Reload(const CFX_RectF& rect);
+  void ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect);
+  FX_BOOL RetriecePieces(FX_DWORD dwBreakStatus,
+                         int32_t& iStartChar,
+                         int32_t& iPieceWidths,
+                         FX_BOOL bReload,
+                         const CFX_RectF& rect);
+  void AppendPiece(const FDE_TTOPIECE& ttoPiece,
+                   FX_BOOL bNeedReload,
+                   FX_BOOL bEnd);
+  void ReplaceWidthEllipsis();
+  void DoAlignment(const CFX_RectF& rect);
+  void OnDraw(const CFX_RectF& rtClip);
+  int32_t GetDisplayPos(FDE_LPTTOPIECE pPiece);
+  int32_t GetCharRects(FDE_LPTTOPIECE pPiece);
+
+  void ToTextRun(const FDE_LPTTOPIECE pPiece, FX_TXTRUN& tr);
+  void DrawLine(const FDE_LPTTOPIECE pPiece, IFDE_Pen*& pPen);
+
+  IFX_TxtBreak* m_pTxtBreak;
+  IFX_Font* m_pFont;
+  FX_FLOAT m_fFontSize;
+  FX_FLOAT m_fLineSpace;
+  FX_FLOAT m_fLinePos;
+  FX_FLOAT m_fTolerance;
+  int32_t m_iAlignment;
+  int32_t m_iTxtBkAlignment;
+  int32_t* m_pCharWidths;
+  int32_t m_iChars;
+  int32_t* m_pEllCharWidths;
+  int32_t m_iEllChars;
+  FX_WCHAR m_wParagraphBkChar;
+  FX_ARGB m_TxtColor;
+  FX_DWORD m_dwStyles;
+  FX_DWORD m_dwTxtBkStyles;
+  CFX_WideString m_wsEllipsis;
+  FX_BOOL m_bElliChanged;
+  int32_t m_iEllipsisWidth;
+  CFX_WideString m_wsText;
+  CFX_RectF m_rtClip;
+  CFX_RectF m_rtLogicClip;
+  CFX_Matrix m_Matrix;
+  CFDE_TTOLineArray m_ttoLines;
+  int32_t m_iCurLine;
+  int32_t m_iCurPiece;
+  int32_t m_iTotalLines;
+  FXTEXT_CHARPOS* m_pCharPos;
+  int32_t m_iCharPosSize;
+  IFDE_RenderDevice* m_pRenderDevice;
+  CFX_Int32Array m_hotKeys;
+  CFX_RectFArray m_rectArray;
+};
+
+}  // namespace
+
 IFDE_TextOut* IFDE_TextOut::Create() {
   return new CFDE_TextOut;
 }
diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fde/tto/fde_textout.h
index 78ac4d0c85..0b8074bad7 100644
--- a/xfa/src/fdp/include/fde_tto.h
+++ b/xfa/src/fde/tto/fde_textout.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
+#ifndef XFA_SRC_FDE_TTO_FDE_TEXTOUT_H_
+#define XFA_SRC_FDE_TTO_FDE_TEXTOUT_H_
 
 #include "core/include/fxge/fx_dib.h"
 #include "core/include/fxge/fx_ge.h"
@@ -99,4 +99,4 @@ class IFDE_TextOut {
   virtual int32_t GetTotalLines() = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_TTO_H_
+#endif  // XFA_SRC_FDE_TTO_FDE_TEXTOUT_H_
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fde/xml/fde_xml.h
index f9eff3d251..03e2a60806 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fde/xml/fde_xml.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_INCLUDE_FDE_XML_H_
-#define XFA_SRC_FDP_INCLUDE_FDE_XML_H_
+#ifndef XFA_SRC_FDE_XML_FDE_XML_H_
+#define XFA_SRC_FDE_XML_FDE_XML_H_
 
 #include "xfa/src/fgas/crt/fgas_stream.h"
 #include "xfa/src/fgas/crt/fgas_utils.h"
@@ -223,4 +223,4 @@ class IFDE_XMLSyntaxParser {
   virtual void GetTargetData(CFX_WideString& wsData) const = 0;
 };
 
-#endif  // XFA_SRC_FDP_INCLUDE_FDE_XML_H_
+#endif  // XFA_SRC_FDE_XML_FDE_XML_H_
diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fde/xml/fde_xml_imp.cpp
index 0071b78135..94e5de6b93 100644
--- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp
+++ b/xfa/src/fde/xml/fde_xml_imp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fdp/src/xml/fde_xml_imp.h"
+#include "xfa/src/fde/xml/fde_xml_imp.h"
 
 #include <algorithm>
 
diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.h b/xfa/src/fde/xml/fde_xml_imp.h
index 32c3de5c21..815d746d31 100644
--- a/xfa/src/fdp/src/xml/fde_xml_imp.h
+++ b/xfa/src/fde/xml/fde_xml_imp.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_
-#define XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_
+#ifndef XFA_SRC_FDE_XML_FDE_XML_IMP_H_
+#define XFA_SRC_FDE_XML_FDE_XML_IMP_H_
 
 #include "core/include/fxcrt/fx_system.h"
-#include "xfa/src/fdp/include/fde_xml.h"
+#include "xfa/src/fde/xml/fde_xml.h"
 #include "xfa/src/fgas/crt/fgas_memory.h"
 #include "xfa/src/fgas/crt/fgas_stream.h"
 
@@ -351,4 +351,4 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target {
   inline void ParseTextChar(FX_WCHAR ch);
 };
 
-#endif  // XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_
+#endif  // XFA_SRC_FDE_XML_FDE_XML_IMP_H_
diff --git a/xfa/src/fdp/src/fde/fde_render.h b/xfa/src/fdp/src/fde/fde_render.h
deleted file mode 100644
index 389c00e63b..0000000000
--- a/xfa/src/fdp/src/fde/fde_render.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_
-#define XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_
-
-#include "xfa/src/fdp/include/fde_psr.h"
-#include "xfa/src/fdp/include/fde_rdr.h"
-#include "xfa/src/fdp/include/fde_rdv.h"
-#include "xfa/src/fgas/crt/fgas_memory.h"
-
-class CFDE_RenderContext : public IFDE_RenderContext,
-                           public CFX_Target {
- public:
-  CFDE_RenderContext();
-  virtual ~CFDE_RenderContext();
-  virtual void Release() { delete this; }
-  virtual FX_BOOL StartRender(IFDE_RenderDevice* pRenderDevice,
-                              IFDE_CanvasSet* pCanvasSet,
-                              const CFX_Matrix& tmDoc2Device);
-  virtual FDE_RENDERSTATUS GetStatus() const { return m_eStatus; }
-  virtual FDE_RENDERSTATUS DoRender(IFX_Pause* pPause = NULL);
-  virtual void StopRender();
-  void RenderPath(IFDE_PathSet* pPathSet, FDE_HVISUALOBJ hPath);
-  void RenderText(IFDE_TextSet* pTextSet, FDE_HVISUALOBJ hText);
-  FX_BOOL ApplyClip(IFDE_VisualSet* pVisualSet,
-                    FDE_HVISUALOBJ hObj,
-                    FDE_HDEVICESTATE& hState);
-  void RestoreClip(FDE_HDEVICESTATE hState);
-
- protected:
-  FDE_RENDERSTATUS m_eStatus;
-  IFDE_RenderDevice* m_pRenderDevice;
-  IFDE_SolidBrush* m_pSolidBrush;
-  CFX_Matrix m_Transform;
-  FXTEXT_CHARPOS* m_pCharPos;
-  int32_t m_iCharPosCount;
-  IFDE_VisualSetIterator* m_pIterator;
-};
-
-#endif  // XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_
diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h
deleted file mode 100644
index 29c326fc1c..0000000000
--- a/xfa/src/fdp/src/tto/fde_textout.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_
-#define XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_
-
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
-#include "xfa/src/fdp/include/fde_brs.h"
-#include "xfa/src/fdp/include/fde_pen.h"
-#include "xfa/src/fdp/include/fde_rdv.h"
-#include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fgas/font/fgas_font.h"
-#include "xfa/src/fgas/crt/fgas_memory.h"
-#include "xfa/src/fgas/crt/fgas_utils.h"
-#include "xfa/src/fgas/layout/fgas_textbreak.h"
-
-struct FDE_TTOPIECE {
- public:
-  int32_t iStartChar;
-  int32_t iChars;
-  FX_DWORD dwCharStyles;
-  CFX_RectF rtPiece;
-};
-typedef FDE_TTOPIECE* FDE_LPTTOPIECE;
-typedef CFX_MassArrayTemplate<FDE_TTOPIECE> CFDE_TTOPieceArray;
-class CFDE_TTOLine : public CFX_Target {
- public:
-  CFDE_TTOLine();
-  CFDE_TTOLine(const CFDE_TTOLine& ttoLine);
-  ~CFDE_TTOLine();
-  int32_t AddPiece(int32_t index, const FDE_TTOPIECE& ttoPiece);
-  int32_t GetSize() const;
-  FDE_LPTTOPIECE GetPtrAt(int32_t index);
-  void RemoveLast(int32_t iCount);
-  void RemoveAll(FX_BOOL bLeaveMemory);
-  FX_BOOL m_bNewReload;
-  CFDE_TTOPieceArray m_pieces;
-
- protected:
-  int32_t m_iPieceCount;
-};
-typedef CFX_ObjectMassArrayTemplate<CFDE_TTOLine> CFDE_TTOLineArray;
-class CFDE_TextOut : public IFDE_TextOut, public CFX_Target {
- public:
-  CFDE_TextOut();
-  ~CFDE_TextOut();
-  virtual void Release() { delete this; }
-  virtual void SetFont(IFX_Font* pFont);
-  virtual void SetFontSize(FX_FLOAT fFontSize);
-  virtual void SetTextColor(FX_ARGB color);
-  virtual void SetStyles(FX_DWORD dwStyles);
-  virtual void SetTabWidth(FX_FLOAT fTabWidth);
-  virtual void SetEllipsisString(const CFX_WideString& wsEllipsis);
-  virtual void SetParagraphBreakChar(FX_WCHAR wch);
-  virtual void SetAlignment(int32_t iAlignment);
-  virtual void SetLineSpace(FX_FLOAT fLineSpace);
-  virtual void SetDIBitmap(CFX_DIBitmap* pDIB);
-  virtual void SetRenderDevice(CFX_RenderDevice* pDevice);
-  virtual void SetClipRect(const CFX_Rect& rtClip);
-  virtual void SetClipRect(const CFX_RectF& rtClip);
-  virtual void SetMatrix(const CFX_Matrix& matrix);
-  virtual void SetLineBreakTolerance(FX_FLOAT fTolerance);
-  virtual void CalcSize(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        CFX_Size& size);
-  virtual void CalcSize(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        CFX_SizeF& size);
-  virtual void CalcSize(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        CFX_Rect& rect);
-  virtual void CalcSize(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        CFX_RectF& rect);
-
-  virtual void DrawText(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        int32_t x,
-                        int32_t y);
-  virtual void DrawText(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        FX_FLOAT x,
-                        FX_FLOAT y);
-  virtual void DrawText(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        const CFX_Rect& rect);
-  virtual void DrawText(const FX_WCHAR* pwsStr,
-                        int32_t iLength,
-                        const CFX_RectF& rect);
-
-  virtual void SetLogicClipRect(const CFX_RectF& rtClip);
-  virtual void CalcLogicSize(const FX_WCHAR* pwsStr,
-                             int32_t iLength,
-                             CFX_SizeF& size);
-  virtual void CalcLogicSize(const FX_WCHAR* pwsStr,
-                             int32_t iLength,
-                             CFX_RectF& rect);
-  virtual void DrawLogicText(const FX_WCHAR* pwsStr,
-                             int32_t iLength,
-                             FX_FLOAT x,
-                             FX_FLOAT y);
-  virtual void DrawLogicText(const FX_WCHAR* pwsStr,
-                             int32_t iLength,
-                             const CFX_RectF& rect);
-  virtual int32_t GetTotalLines();
-
- protected:
-  void CalcTextSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF& rect);
-  FX_BOOL RetrieveLineWidth(FX_DWORD dwBreakStatus,
-                            FX_FLOAT& fStartPos,
-                            FX_FLOAT& fWidth,
-                            FX_FLOAT& fHeight);
-  void SetLineWidth(CFX_RectF& rect);
-  void DrawText(const FX_WCHAR* pwsStr,
-                int32_t iLength,
-                const CFX_RectF& rect,
-                const CFX_RectF& rtClip);
-  void LoadText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF& rect);
-  void LoadEllipsis();
-  void ExpandBuffer(int32_t iSize, int32_t iType);
-  void RetrieveEllPieces(int32_t*& pCharWidths);
-
-  void Reload(const CFX_RectF& rect);
-  void ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect);
-  FX_BOOL RetriecePieces(FX_DWORD dwBreakStatus,
-                         int32_t& iStartChar,
-                         int32_t& iPieceWidths,
-                         FX_BOOL bReload,
-                         const CFX_RectF& rect);
-  void AppendPiece(const FDE_TTOPIECE& ttoPiece,
-                   FX_BOOL bNeedReload,
-                   FX_BOOL bEnd);
-  void ReplaceWidthEllipsis();
-  void DoAlignment(const CFX_RectF& rect);
-  void OnDraw(const CFX_RectF& rtClip);
-  int32_t GetDisplayPos(FDE_LPTTOPIECE pPiece);
-  int32_t GetCharRects(FDE_LPTTOPIECE pPiece);
-
-  void ToTextRun(const FDE_LPTTOPIECE pPiece, FX_TXTRUN& tr);
-  void DrawLine(const FDE_LPTTOPIECE pPiece, IFDE_Pen*& pPen);
-
-  IFX_TxtBreak* m_pTxtBreak;
-  IFX_Font* m_pFont;
-  FX_FLOAT m_fFontSize;
-  FX_FLOAT m_fLineSpace;
-  FX_FLOAT m_fLinePos;
-  FX_FLOAT m_fTolerance;
-  int32_t m_iAlignment;
-  int32_t m_iTxtBkAlignment;
-  int32_t* m_pCharWidths;
-  int32_t m_iChars;
-  int32_t* m_pEllCharWidths;
-  int32_t m_iEllChars;
-  FX_WCHAR m_wParagraphBkChar;
-  FX_ARGB m_TxtColor;
-  FX_DWORD m_dwStyles;
-  FX_DWORD m_dwTxtBkStyles;
-  CFX_WideString m_wsEllipsis;
-  FX_BOOL m_bElliChanged;
-  int32_t m_iEllipsisWidth;
-  CFX_WideString m_wsText;
-  CFX_RectF m_rtClip;
-  CFX_RectF m_rtLogicClip;
-  CFX_Matrix m_Matrix;
-  CFDE_TTOLineArray m_ttoLines;
-  int32_t m_iCurLine;
-  int32_t m_iCurPiece;
-  int32_t m_iTotalLines;
-  FXTEXT_CHARPOS* m_pCharPos;
-  int32_t m_iCharPosSize;
-  IFDE_RenderDevice* m_pRenderDevice;
-  CFX_Int32Array m_hotKeys;
-  CFX_RectFArray m_rectArray;
-};
-
-#endif  // XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_
diff --git a/xfa/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/fde_txtedtengine.cpp
index 2430bc0256..9f8fe5b4e6 100644
--- a/xfa/src/fee/fde_txtedtengine.cpp
+++ b/xfa/src/fee/fde_txtedtengine.cpp
@@ -8,12 +8,12 @@
 
 #include <algorithm>
 
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fee/fde_txtedtbuf.h"
 #include "xfa/src/fee/fde_txtedtparag.h"
 #include "xfa/src/fee/ifde_txtedtbuf.h"
 #include "xfa/src/fee/ifde_txtedtengine.h"
 #include "xfa/src/fee/ifde_txtedtpage.h"
-#include "xfa/src/fdp/include/fde_tto.h"
 
 #define FDE_PAGEWIDTH_MAX 0xFFFF
 #define FDE_TXTPLATESIZE (1024 * 12)
diff --git a/xfa/src/fee/fde_txtedtpage.h b/xfa/src/fee/fde_txtedtpage.h
index 520ecb727f..2ea0725de5 100644
--- a/xfa/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/fde_txtedtpage.h
@@ -9,7 +9,7 @@
 
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_string.h"
-#include "xfa/src/fdp/include/fde_psr.h"
+#include "xfa/src/fde/fde_visualset.h"
 #include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fgas/crt/fgas_utils.h"
 
diff --git a/xfa/src/fee/ifde_txtedtpage.h b/xfa/src/fee/ifde_txtedtpage.h
index 1a4a2fe82f..f76498d7ed 100644
--- a/xfa/src/fee/ifde_txtedtpage.h
+++ b/xfa/src/fee/ifde_txtedtpage.h
@@ -8,7 +8,7 @@
 #define XFA_SRC_FEE_IFDE_TXTEDTPAGE_H_
 
 #include "core/include/fxge/fx_ge.h"
-#include "xfa/src/fdp/include/fde_psr.h"
+#include "xfa/src/fde/fde_visualset.h"
 #include "xfa/src/fgas/layout/fgas_textbreak.h"
 
 class IFDE_TxtEdtEngine;
diff --git a/xfa/src/fwl/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
index ba9f0fedc3..16cc8f7080 100644
--- a/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
@@ -10,7 +10,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_checkbox.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
 #include "xfa/src/fwl/core/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
index 842ab8aaa9..5eef96eebf 100644
--- a/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
@@ -7,7 +7,7 @@
 #include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/basewidget/fwl_editimp.h"
 #include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
 #include "xfa/src/fwl/basewidget/fwl_listboximp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_editimp.cpp b/xfa/src/fwl/basewidget/fwl_editimp.cpp
index 6c802ff24f..662fa91ec1 100644
--- a/xfa/src/fwl/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_editimp.cpp
@@ -12,8 +12,8 @@
 #include "xfa/include/fwl/basewidget/fwl_caret.h"
 #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_rdr.h"
-#include "xfa/src/fdp/include/fde_rdv.h"
+#include "xfa/src/fde/fde_render.h"
+#include "xfa/src/fde/fde_renderdevice.h"
 #include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fwl/basewidget/fwl_caretimp.h"
 #include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/basewidget/fwl_listboximp.cpp
index 26b27e8637..aac2d27bdf 100644
--- a/xfa/src/fwl/basewidget/fwl_listboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_listboximp.cpp
@@ -7,7 +7,7 @@
 #include "xfa/src/fwl/basewidget/fwl_listboximp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
 #include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
index 102f225a1d..8bea9f1a11 100644
--- a/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
@@ -10,7 +10,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
 #include "xfa/src/fwl/core/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
index 2325217dc2..4ed0e3bfec 100644
--- a/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
@@ -7,7 +7,7 @@
 #include "xfa/src/fwl/basewidget/fwl_pushbuttonimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
 #include "xfa/src/fwl/core/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
index 63966ba4c8..696a2e2b39 100644
--- a/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_formimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_panelimp.h"
diff --git a/xfa/src/fwl/core/fwl_formimp.cpp b/xfa/src/fwl/core/fwl_formimp.cpp
index 426c1faa63..558ee00f9c 100644
--- a/xfa/src/fwl/core/fwl_formimp.cpp
+++ b/xfa/src/fwl/core/fwl_formimp.cpp
@@ -10,7 +10,7 @@
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_content.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
 #include "xfa/src/fwl/core/fwl_appimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
diff --git a/xfa/src/fwl/core/fwl_widgetimp.cpp b/xfa/src/fwl/core/fwl_widgetimp.cpp
index 1e788260c2..32d80d1fb3 100644
--- a/xfa/src/fwl/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/core/fwl_widgetimp.cpp
@@ -18,7 +18,7 @@
 #include "xfa/include/fwl/core/fwl_content.h"
 #include "xfa/include/fwl/core/fwl_form.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_appimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
diff --git a/xfa/src/fwl/lightwidget/widget.cpp b/xfa/src/fwl/lightwidget/widget.cpp
index dc7de101bd..58fb2a71d1 100644
--- a/xfa/src/fwl/lightwidget/widget.cpp
+++ b/xfa/src/fwl/lightwidget/widget.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/include/fwl/core/fwl_thread.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
diff --git a/xfa/src/fwl/theme/checkboxtp.cpp b/xfa/src/fwl/theme/checkboxtp.cpp
index a33291472a..ccad2bc733 100644
--- a/xfa/src/fwl/theme/checkboxtp.cpp
+++ b/xfa/src/fwl/theme/checkboxtp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_checkbox.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 #define CHECKBOX_SIZE_SIGNMARGIN 3
 #define CHECKBOX_SIZE_SIGNBORDER 2
diff --git a/xfa/src/fwl/theme/formtp.cpp b/xfa/src/fwl/theme/formtp.cpp
index 1d6dcd1c17..e8f3b6addc 100644
--- a/xfa/src/fwl/theme/formtp.cpp
+++ b/xfa/src/fwl/theme/formtp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/core/fwl_form.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 #define FWLTHEME_CAPACITY_CXFormBorder 3
 #define FWLTHEME_CAPACITY_CYFormBorder 3
diff --git a/xfa/src/fwl/theme/monthcalendartp.cpp b/xfa/src/fwl/theme/monthcalendartp.cpp
index 47384b979f..0dea73f675 100644
--- a/xfa/src/fwl/theme/monthcalendartp.cpp
+++ b/xfa/src/fwl/theme/monthcalendartp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 #define FWL_THEMECAPACITY_MC_HEADER_WIDTH 200
 #define FWL_THEMECAPACITY_MC_HEADER_HEIGHT 30
diff --git a/xfa/src/fwl/theme/widgettp.cpp b/xfa/src/fwl/theme/widgettp.cpp
index 7fa7812092..c26a62c561 100644
--- a/xfa/src/fwl/theme/widgettp.cpp
+++ b/xfa/src/fwl/theme/widgettp.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) {
   IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr();
diff --git a/xfa/src/fxfa/app/xfa_ffpageview.cpp b/xfa/src/fxfa/app/xfa_ffpageview.cpp
index 3b0f63f4d9..ba4c9709eb 100644
--- a/xfa/src/fxfa/app/xfa_ffpageview.cpp
+++ b/xfa/src/fxfa/app/xfa_ffpageview.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/src/fxfa/app/xfa_ffpageview.h"
 
-#include "xfa/src/fdp/include/fde_rdr.h"
+#include "xfa/src/fde/fde_render.h"
 #include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
 #include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
 #include "xfa/src/fxfa/app/xfa_ffdoc.h"
diff --git a/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
index 313f946a0f..10aaad0dc5 100644
--- a/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fxfa/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
 #include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
diff --git a/xfa/src/fxfa/app/xfa_fwltheme.cpp b/xfa/src/fxfa/app/xfa_fwltheme.cpp
index a56aa60628..e13917bf7b 100644
--- a/xfa/src/fxfa/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/app/xfa_fwltheme.cpp
@@ -17,7 +17,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/fde/tto/fde_textout.h"
 #include "xfa/src/fgas/crt/fgas_codepage.h"
 #include "xfa/src/fxfa/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/app/xfa_textlayout.cpp b/xfa/src/fxfa/app/xfa_textlayout.cpp
index b59e8aac82..e8a23b1523 100644
--- a/xfa/src/fxfa/app/xfa_textlayout.cpp
+++ b/xfa/src/fxfa/app/xfa_textlayout.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fdp/include/fde_pen.h"
+#include "xfa/src/fde/fde_pen.h"
 #include "xfa/src/fgas/crt/fgas_algorithm.h"
 #include "xfa/src/fgas/crt/fgas_codepage.h"
 #include "xfa/src/fxfa/app/xfa_ffapp.h"
diff --git a/xfa/src/fxfa/app/xfa_textlayout.h b/xfa/src/fxfa/app/xfa_textlayout.h
index 90d33737eb..bcace9d9d6 100644
--- a/xfa/src/fxfa/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/app/xfa_textlayout.h
@@ -7,9 +7,9 @@
 #ifndef XFA_SRC_FXFA_APP_XFA_TEXTLAYOUT_H_
 #define XFA_SRC_FXFA_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_rdv.h"
+#include "xfa/src/fde/css/fde_css.h"
+#include "xfa/src/fde/fde_brush.h"
+#include "xfa/src/fde/fde_renderdevice.h"
 #include "xfa/src/fgas/layout/fgas_rtfbreak.h"
 #include "xfa/src/fxfa/app/xfa_ffdoc.h"
 #include "xfa/src/fxfa/parser/xfa_object.h"
diff --git a/xfa/src/fxfa/parser/xfa_object.h b/xfa/src/fxfa/parser/xfa_object.h
index 745108a81b..949ca8739f 100644
--- a/xfa/src/fxfa/parser/xfa_object.h
+++ b/xfa/src/fxfa/parser/xfa_object.h
@@ -7,7 +7,7 @@
 #ifndef XFA_SRC_FXFA_PARSER_XFA_OBJECT_H_
 #define XFA_SRC_FXFA_PARSER_XFA_OBJECT_H_
 
-#include "xfa/src/fdp/include/fde_xml.h"
+#include "xfa/src/fde/xml/fde_xml.h"
 #include "xfa/src/fxfa/parser/xfa_utils.h"
 
 class CXFA_Document;
diff --git a/xfa/src/fxfa/parser/xfa_utils.h b/xfa/src/fxfa/parser/xfa_utils.h
index d0e70fb955..497cb29cc4 100644
--- a/xfa/src/fxfa/parser/xfa_utils.h
+++ b/xfa/src/fxfa/parser/xfa_utils.h
@@ -8,7 +8,7 @@
 #define XFA_SRC_FXFA_PARSER_XFA_UTILS_H_
 
 #include "xfa/include/fxfa/fxfa_basic.h"
-#include "xfa/src/fdp/include/fde_xml.h"
+#include "xfa/src/fde/xml/fde_xml.h"
 
 class CXFA_LocaleValue;