13 files changed, 16 insertions, 16 deletions
diff --git a/xfa/fde/css/fde_csscache.cpp b/xfa/fde/css/fde_csscache.cpp
index aba863ea70..4b7dd4b302 100644
--- a/xfa/fde/css/fde_csscache.cpp
+++ b/xfa/fde/css/fde_csscache.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
 
 FDE_CSSCacheItem::FDE_CSSCacheItem(IFDE_CSSStyleSheet* p)
     : pStylesheet(p), dwActivity(0) {
diff --git a/xfa/fde/css/fde_cssdatatable.cpp b/xfa/fde/css/fde_cssdatatable.cpp
index 8f448d8536..e2dff57008 100644
--- a/xfa/fde/css/fde_cssdatatable.cpp
+++ b/xfa/fde/css/fde_cssdatatable.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fde/css/fde_cssdatatable.h"
 
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fgas/crt/fgas_algorithm.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/crt/fgas_system.h"
diff --git a/xfa/fde/css/fde_cssdatatable.h b/xfa/fde/css/fde_cssdatatable.h
index c96520a670..a44c24b614 100644
--- a/xfa/fde/css/fde_cssdatatable.h
+++ b/xfa/fde/css/fde_cssdatatable.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FDE_CSS_FDE_CSSDATATABLE_H_
 #define XFA_FDE_CSS_FDE_CSSDATATABLE_H_
 
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
 #include "xfa/fde/css/fde_css.h"
 #include "xfa/fgas/crt/fgas_memory.h"
 
diff --git a/xfa/fde/css/fde_cssdeclaration.cpp b/xfa/fde/css/fde_cssdeclaration.cpp
index decc397bdc..1340dae2c5 100644
--- a/xfa/fde/css/fde_cssdeclaration.cpp
+++ b/xfa/fde/css/fde_cssdeclaration.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fde/css/fde_cssdeclaration.h"
 
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fgas/crt/fgas_system.h"
 
 IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty,
diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h
index 5016e8f5cb..0584a2983f 100644
--- a/xfa/fde/css/fde_cssstyleselector.h
+++ b/xfa/fde/css/fde_cssstyleselector.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fde/css/fde_css.h"
 #include "xfa/fde/css/fde_csscache.h"
 #include "xfa/fde/css/fde_cssdeclaration.h"
diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h
index e6f4f2904d..882f80f366 100644
--- a/xfa/fde/css/fde_cssstylesheet.h
+++ b/xfa/fde/css/fde_cssstylesheet.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FDE_CSS_FDE_CSSSTYLESHEET_H_
 #define XFA_FDE_CSS_FDE_CSSSTYLESHEET_H_
 
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fde/css/fde_cssdeclaration.h"
 
 class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target {
diff --git a/xfa/fde/fde_brush.h b/xfa/fde/fde_brush.h
index 898ea01e46..cfa40a055f 100644
--- a/xfa/fde/fde_brush.h
+++ b/xfa/fde/fde_brush.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FDE_FDE_BRUSH_H_
 #define XFA_FDE_FDE_BRUSH_H_
 
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
 #include "core/include/fxge/fx_dib.h"
 
 class IFDE_Image;
diff --git a/xfa/fde/fde_path.h b/xfa/fde/fde_path.h
index 9ffba6c199..41d2a66e0a 100644
--- a/xfa/fde/fde_path.h
+++ b/xfa/fde/fde_path.h
@@ -7,8 +7,8 @@
 #ifndef XFA_FDE_FDE_PATH_H_
 #define XFA_FDE_FDE_PATH_H_
 
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
 
 class IFDE_Path {
  public:
diff --git a/xfa/fde/fde_render.h b/xfa/fde/fde_render.h
index 2cf7e5cf92..2b09ed67ac 100644
--- a/xfa/fde/fde_render.h
+++ b/xfa/fde/fde_render.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FDE_FDE_RENDER_H_
 #define XFA_FDE_FDE_RENDER_H_
 
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
 #include "xfa/fde/fde_visualset.h"
 
 class IFDE_RenderDevice;
diff --git a/xfa/fde/fde_renderdevice.h b/xfa/fde/fde_renderdevice.h
index a9e7190c54..58da7759fa 100644
--- a/xfa/fde/fde_renderdevice.h
+++ b/xfa/fde/fde_renderdevice.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FDE_FDE_RENDERDEVICE_H_
 #define XFA_FDE_FDE_RENDERDEVICE_H_
 
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
 #include "core/include/fxge/fx_font.h"
 #include "core/include/fxge/fx_ge.h"
 #include "xfa/fde/fde_path.h"
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h
index 5da21fb842..593d42de20 100644
--- a/xfa/fde/fde_visualset.h
+++ b/xfa/fde/fde_visualset.h
@@ -7,8 +7,8 @@
 #ifndef XFA_FDE_FDE_VISUALSET_H_
 #define XFA_FDE_FDE_VISUALSET_H_
 
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
 #include "core/include/fxge/fx_dib.h"
 #include "core/include/fxge/fx_ge.h"
 #include "xfa/fde/fde_brush.h"
diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/tto/fde_textout.cpp
index 2105cf09b0..a7b10749e6 100644
--- a/xfa/fde/tto/fde_textout.cpp
+++ b/xfa/fde/tto/fde_textout.cpp
@@ -8,8 +8,8 @@
 
 #include <algorithm>
 
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
 #include "xfa/fde/fde_brush.h"
 #include "xfa/fde/fde_pen.h"
 #include "xfa/fde/fde_renderdevice.h"
diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h
index 79d77d93eb..f30e12a7bb 100644
--- a/xfa/fde/xml/fde_xml_imp.h
+++ b/xfa/fde/xml/fde_xml_imp.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FDE_XML_FDE_XML_IMP_H_
 #define XFA_FDE_XML_FDE_XML_IMP_H_
 
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
 #include "xfa/fde/xml/fde_xml.h"
 #include "xfa/fgas/crt/fgas_memory.h"
 #include "xfa/fgas/crt/fgas_stream.h"