7 files changed, 9 insertions, 9 deletions
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;