summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/DEPS1
-rw-r--r--xfa/fde/css/fde_css.h2
-rw-r--r--xfa/fde/fde_brush.h2
-rw-r--r--xfa/fde/fde_geobject.h2
-rw-r--r--xfa/fde/fde_object.h2
-rw-r--r--xfa/fde/fde_renderdevice.h4
-rw-r--r--xfa/fde/fde_visualset.h4
-rw-r--r--xfa/fde/tto/fde_textout.h4
-rw-r--r--xfa/fee/ifde_txtedtengine.h2
-rw-r--r--xfa/fee/ifde_txtedtpage.h2
-rw-r--r--xfa/fgas/font/fgas_font.h2
-rw-r--r--xfa/fgas/font/fgas_stdfontmgr.h4
-rw-r--r--xfa/fgas/layout/fgas_rtfbreak.h2
-rw-r--r--xfa/fgas/layout/fgas_textbreak.h2
-rw-r--r--xfa/fwl/basewidget/ifx_barcode.h2
-rw-r--r--xfa/fwl/core/cfwl_themebackground.h2
-rw-r--r--xfa/fwl/lightwidget/cfwl_theme.h2
-rw-r--r--xfa/fxbarcode/BC_BufferedImageLuminanceSource.h2
-rw-r--r--xfa/fxbarcode/BC_TwoDimWriter.h2
-rw-r--r--xfa/fxbarcode/BC_Writer.h2
-rw-r--r--xfa/fxbarcode/cbc_codabar.h2
-rw-r--r--xfa/fxbarcode/cbc_code128.h2
-rw-r--r--xfa/fxbarcode/cbc_code39.h2
-rw-r--r--xfa/fxbarcode/cbc_codebase.h2
-rw-r--r--xfa/fxbarcode/cbc_datamatrix.h2
-rw-r--r--xfa/fxbarcode/cbc_ean13.h2
-rw-r--r--xfa/fxbarcode/cbc_ean8.h2
-rw-r--r--xfa/fxbarcode/cbc_pdf417i.h2
-rw-r--r--xfa/fxbarcode/cbc_qrcode.h2
-rw-r--r--xfa/fxbarcode/cbc_upca.h2
-rw-r--r--xfa/fxbarcode/oned/BC_OneDimWriter.h2
-rw-r--r--xfa/fxfa/parser/xfa_localemgr.cpp2
-rw-r--r--xfa/fxgraphics/cagg_graphics.h2
-rw-r--r--xfa/fxgraphics/cfx_color.h2
-rw-r--r--xfa/fxgraphics/cfx_path_generator.h2
-rw-r--r--xfa/fxgraphics/cfx_shading.h2
-rw-r--r--xfa/fxgraphics/include/cfx_graphics.h4
-rw-r--r--xfa/include/fxfa/fxfa_objectacc.h2
-rw-r--r--xfa/include/fxfa/xfa_ffwidget.h2
39 files changed, 44 insertions, 43 deletions
diff --git a/xfa/DEPS b/xfa/DEPS
index ef5e5b9d06..f106513e9c 100644
--- a/xfa/DEPS
+++ b/xfa/DEPS
@@ -2,5 +2,6 @@ include_rules = [
'+core/include',
'+core/fxcrt/include',
'+core/fpdfapi/fpdf_parser/include',
+ '+core/fxge/include',
'+third_party/bigint'
]
diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h
index 6a1b0d6543..0856accca6 100644
--- a/xfa/fde/css/fde_css.h
+++ b/xfa/fde/css/fde_css.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_CSS_FDE_CSS_H_
#define XFA_FDE_CSS_FDE_CSS_H_
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fgas/crt/fgas_stream.h"
#include "xfa/fgas/crt/fgas_utils.h"
#include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fde/fde_brush.h b/xfa/fde/fde_brush.h
index cfa40a055f..924ef62c12 100644
--- a/xfa/fde/fde_brush.h
+++ b/xfa/fde/fde_brush.h
@@ -8,7 +8,7 @@
#define XFA_FDE_FDE_BRUSH_H_
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
class IFDE_Image;
diff --git a/xfa/fde/fde_geobject.h b/xfa/fde/fde_geobject.h
index 11819154ab..debec6ab2e 100644
--- a/xfa/fde/fde_geobject.h
+++ b/xfa/fde/fde_geobject.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_FDE_GEOBJECT_H_
#define XFA_FDE_FDE_GEOBJECT_H_
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fde/fde_path.h"
#include "xfa/fgas/crt/fgas_memory.h"
diff --git a/xfa/fde/fde_object.h b/xfa/fde/fde_object.h
index ae7b95aa32..e222b1a562 100644
--- a/xfa/fde/fde_object.h
+++ b/xfa/fde/fde_object.h
@@ -9,7 +9,7 @@
#include <cstdint>
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fde/fde_brush.h"
#include "xfa/fde/fde_pen.h"
#include "xfa/fgas/crt/fgas_memory.h"
diff --git a/xfa/fde/fde_renderdevice.h b/xfa/fde/fde_renderdevice.h
index 58da7759fa..55f6524cff 100644
--- a/xfa/fde/fde_renderdevice.h
+++ b/xfa/fde/fde_renderdevice.h
@@ -8,8 +8,8 @@
#define XFA_FDE_FDE_RENDERDEVICE_H_
#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/include/fxge/fx_font.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_font.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fde/fde_path.h"
#include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h
index 5dc7f84cb7..6dcb42c296 100644
--- a/xfa/fde/fde_visualset.h
+++ b/xfa/fde/fde_visualset.h
@@ -9,8 +9,8 @@
#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 "core/fxge/include/fx_dib.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fde/fde_brush.h"
#include "xfa/fde/fde_image.h"
#include "xfa/fde/fde_path.h"
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h
index 159850e0f2..e20c00a2e0 100644
--- a/xfa/fde/tto/fde_textout.h
+++ b/xfa/fde/tto/fde_textout.h
@@ -7,8 +7,8 @@
#ifndef XFA_FDE_TTO_FDE_TEXTOUT_H_
#define XFA_FDE_TTO_FDE_TEXTOUT_H_
-#include "core/include/fxge/fx_dib.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fgas/font/fgas_font.h"
#define FDE_TTOSTYLE_Underline 0x0001
diff --git a/xfa/fee/ifde_txtedtengine.h b/xfa/fee/ifde_txtedtengine.h
index 047bf50b4e..6a31af6bd8 100644
--- a/xfa/fee/ifde_txtedtengine.h
+++ b/xfa/fee/ifde_txtedtengine.h
@@ -7,7 +7,7 @@
#ifndef XFA_FEE_IFDE_TXTEDTENGINE_H_
#define XFA_FEE_IFDE_TXTEDTENGINE_H_
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fgas/font/fgas_font.h"
class IFDE_TxtEdtPage;
diff --git a/xfa/fee/ifde_txtedtpage.h b/xfa/fee/ifde_txtedtpage.h
index ec5912d0f1..094568834a 100644
--- a/xfa/fee/ifde_txtedtpage.h
+++ b/xfa/fee/ifde_txtedtpage.h
@@ -7,7 +7,7 @@
#ifndef XFA_FEE_IFDE_TXTEDTPAGE_H_
#define XFA_FEE_IFDE_TXTEDTPAGE_H_
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fde/fde_visualset.h"
#include "xfa/fgas/layout/fgas_textbreak.h"
diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h
index 8b1091ff50..56ddb7129f 100644
--- a/xfa/fgas/font/fgas_font.h
+++ b/xfa/fgas/font/fgas_font.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_FONT_FGAS_FONT_H_
#define XFA_FGAS_FONT_FGAS_FONT_H_
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fx_font.h"
#include "xfa/fgas/crt/fgas_stream.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h
index 433f2df276..88e0e8e897 100644
--- a/xfa/fgas/font/fgas_stdfontmgr.h
+++ b/xfa/fgas/font/fgas_stdfontmgr.h
@@ -8,8 +8,8 @@
#define XFA_FGAS_FONT_FGAS_STDFONTMGR_H_
#include "core/fxcrt/include/fx_ext.h"
-#include "core/include/fxge/fx_freetype.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/include/fx_ge.h"
#include "third_party/freetype/include/freetype/fttypes.h"
#include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h
index dd791c24df..83310e9d82 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.h
+++ b/xfa/fgas/layout/fgas_rtfbreak.h
@@ -8,7 +8,7 @@
#define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
#include "core/fxcrt/include/fx_ucd.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fgas/crt/fgas_memory.h"
#include "xfa/fgas/crt/fgas_utils.h"
#include "xfa/fgas/layout/fgas_textbreak.h"
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h
index add156e971..af817547d3 100644
--- a/xfa/fgas/layout/fgas_textbreak.h
+++ b/xfa/fgas/layout/fgas_textbreak.h
@@ -8,7 +8,7 @@
#define XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_
#include "core/fxcrt/include/fx_ucd.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fgas/crt/fgas_utils.h"
#include "xfa/fgas/layout/fgas_unicode.h"
diff --git a/xfa/fwl/basewidget/ifx_barcode.h b/xfa/fwl/basewidget/ifx_barcode.h
index a44a01ba8d..2cad68cbeb 100644
--- a/xfa/fwl/basewidget/ifx_barcode.h
+++ b/xfa/fwl/basewidget/ifx_barcode.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/include/BC_Library.h"
class CFX_Font;
diff --git a/xfa/fwl/core/cfwl_themebackground.h b/xfa/fwl/core/cfwl_themebackground.h
index cdab5b2729..6cecbbf26a 100644
--- a/xfa/fwl/core/cfwl_themebackground.h
+++ b/xfa/fwl/core/cfwl_themebackground.h
@@ -7,7 +7,7 @@
#ifndef XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_
#define XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fwl/core/cfwl_themepart.h"
class CFX_DIBitmpa;
diff --git a/xfa/fwl/lightwidget/cfwl_theme.h b/xfa/fwl/lightwidget/cfwl_theme.h
index fa62e092fb..925cdb780a 100644
--- a/xfa/fwl/lightwidget/cfwl_theme.h
+++ b/xfa/fwl/lightwidget/cfwl_theme.h
@@ -12,7 +12,7 @@
#include "core/fxcrt/include/fx_coordinates.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fwl/core/ifwl_themeprovider.h"
class CFWL_WidgetTP;
diff --git a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
index e27dd1df3d..ca3aafb27d 100644
--- a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
+++ b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_basic.h"
#include "core/fxcrt/include/fx_string.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/BC_LuminanceSource.h"
class CBC_BufferedImageLuminanceSource : public CBC_LuminanceSource {
diff --git a/xfa/fxbarcode/BC_TwoDimWriter.h b/xfa/fxbarcode/BC_TwoDimWriter.h
index f5dcd61ff8..ba94c3269f 100644
--- a/xfa/fxbarcode/BC_TwoDimWriter.h
+++ b/xfa/fxbarcode/BC_TwoDimWriter.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_BC_TWODIMWRITER_H_
#define XFA_FXBARCODE_BC_TWODIMWRITER_H_
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fxbarcode/BC_Writer.h"
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/BC_Writer.h b/xfa/fxbarcode/BC_Writer.h
index 0b7719a541..9b5d037335 100644
--- a/xfa/fxbarcode/BC_Writer.h
+++ b/xfa/fxbarcode/BC_Writer.h
@@ -8,7 +8,7 @@
#define XFA_FXBARCODE_BC_WRITER_H_
#include "core/fxcrt/include/fx_string.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/utils.h"
class CBC_Writer {
diff --git a/xfa/fxbarcode/cbc_codabar.h b/xfa/fxbarcode/cbc_codabar.h
index bab39a8496..c375cccfb0 100644
--- a/xfa/fxbarcode/cbc_codabar.h
+++ b/xfa/fxbarcode/cbc_codabar.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_coordinates.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
class CBC_Codabar : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_code128.h b/xfa/fxbarcode/cbc_code128.h
index 33005b1dd3..d351a9af33 100644
--- a/xfa/fxbarcode/cbc_code128.h
+++ b/xfa/fxbarcode/cbc_code128.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_coordinates.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
class CBC_Code128 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_code39.h b/xfa/fxbarcode/cbc_code39.h
index c93b7d7d7c..3853da18d7 100644
--- a/xfa/fxbarcode/cbc_code39.h
+++ b/xfa/fxbarcode/cbc_code39.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
class CBC_Code39 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_codebase.h b/xfa/fxbarcode/cbc_codebase.h
index 145b929c00..317e0ecef7 100644
--- a/xfa/fxbarcode/cbc_codebase.h
+++ b/xfa/fxbarcode/cbc_codebase.h
@@ -8,7 +8,7 @@
#define XFA_FXBARCODE_CBC_CODEBASE_H_
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/include/BC_Library.h"
class CBC_Writer;
diff --git a/xfa/fxbarcode/cbc_datamatrix.h b/xfa/fxbarcode/cbc_datamatrix.h
index ea1e136477..496df6ecaa 100644
--- a/xfa/fxbarcode/cbc_datamatrix.h
+++ b/xfa/fxbarcode/cbc_datamatrix.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_codebase.h"
class CBC_DataMatrix : public CBC_CodeBase {
diff --git a/xfa/fxbarcode/cbc_ean13.h b/xfa/fxbarcode/cbc_ean13.h
index eaf95fe8ab..7c33f512a9 100644
--- a/xfa/fxbarcode/cbc_ean13.h
+++ b/xfa/fxbarcode/cbc_ean13.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
class CBC_EAN13 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_ean8.h b/xfa/fxbarcode/cbc_ean8.h
index fd582deb13..82fe0c167d 100644
--- a/xfa/fxbarcode/cbc_ean8.h
+++ b/xfa/fxbarcode/cbc_ean8.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
class CBC_EAN8 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_pdf417i.h b/xfa/fxbarcode/cbc_pdf417i.h
index 9ad387cada..f38b416170 100644
--- a/xfa/fxbarcode/cbc_pdf417i.h
+++ b/xfa/fxbarcode/cbc_pdf417i.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_codebase.h"
class CBC_PDF417I : public CBC_CodeBase {
diff --git a/xfa/fxbarcode/cbc_qrcode.h b/xfa/fxbarcode/cbc_qrcode.h
index ccf7d13beb..d77a23d4ab 100644
--- a/xfa/fxbarcode/cbc_qrcode.h
+++ b/xfa/fxbarcode/cbc_qrcode.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_codebase.h"
class CBC_QRCode : public CBC_CodeBase {
diff --git a/xfa/fxbarcode/cbc_upca.h b/xfa/fxbarcode/cbc_upca.h
index 1a94cfac0e..3e0d24a934 100644
--- a/xfa/fxbarcode/cbc_upca.h
+++ b/xfa/fxbarcode/cbc_upca.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
class CBC_UPCA : public CBC_OneCode {
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/xfa/fxbarcode/oned/BC_OneDimWriter.h
index e504f0bacb..15a1a1a6c7 100644
--- a/xfa/fxbarcode/oned/BC_OneDimWriter.h
+++ b/xfa/fxbarcode/oned/BC_OneDimWriter.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDIMWRITER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDIMWRITER_H_
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
#include "xfa/fxbarcode/BC_Writer.h"
#include "xfa/fxbarcode/include/BC_Library.h"
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
index 0c09830094..d040e0dd2b 100644
--- a/xfa/fxfa/parser/xfa_localemgr.cpp
+++ b/xfa/fxfa/parser/xfa_localemgr.cpp
@@ -7,8 +7,8 @@
#include "xfa/fxfa/parser/xfa_localemgr.h"
#include "core/fxcrt/include/fx_xml.h"
+#include "core/fxge/include/fx_ge.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_ge.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/fxgraphics/cagg_graphics.h b/xfa/fxgraphics/cagg_graphics.h
index d19773a42b..bac9c19167 100644
--- a/xfa/fxgraphics/cagg_graphics.h
+++ b/xfa/fxgraphics/cagg_graphics.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXGRAPHICS_CAGG_GRAPHICS_H_
#define XFA_FXGRAPHICS_CAGG_GRAPHICS_H_
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxgraphics/include/cfx_graphics.h"
class CFX_Graphics;
diff --git a/xfa/fxgraphics/cfx_color.h b/xfa/fxgraphics/cfx_color.h
index 5ab99d8d87..3f6684dc63 100644
--- a/xfa/fxgraphics/cfx_color.h
+++ b/xfa/fxgraphics/cfx_color.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXGRAPHICS_CFX_COLOR_H_
#define XFA_FXGRAPHICS_CFX_COLOR_H_
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxgraphics/include/cfx_graphics.h"
class CFX_Pattern;
diff --git a/xfa/fxgraphics/cfx_path_generator.h b/xfa/fxgraphics/cfx_path_generator.h
index efe316697d..02aa4230d5 100644
--- a/xfa/fxgraphics/cfx_path_generator.h
+++ b/xfa/fxgraphics/cfx_path_generator.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXGRAPHICS_CFX_PATH_GENERATOR_H_
#define XFA_FXGRAPHICS_CFX_PATH_GENERATOR_H_
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
class CFX_PathGenerator {
public:
diff --git a/xfa/fxgraphics/cfx_shading.h b/xfa/fxgraphics/cfx_shading.h
index 8bfd3ca9d4..302aa65be5 100644
--- a/xfa/fxgraphics/cfx_shading.h
+++ b/xfa/fxgraphics/cfx_shading.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/include/fx_coordinates.h"
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#define FX_SHADING_Steps 256
diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h
index be9176ebc2..1438acb7f4 100644
--- a/xfa/fxgraphics/include/cfx_graphics.h
+++ b/xfa/fxgraphics/include/cfx_graphics.h
@@ -8,8 +8,8 @@
#define XFA_FXGRAPHICS_INCLUDE_CFX_GRAPHICS_H_
#include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/include/fx_ge.h"
class CFX_Color;
class CFX_Path;
diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index 782b62f9d1..f6f48e96d4 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -7,7 +7,7 @@
#ifndef XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_
#define XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
#include "xfa/fxfa/parser/xfa_object.h"
class CXFA_Node;
diff --git a/xfa/include/fxfa/xfa_ffwidget.h b/xfa/include/fxfa/xfa_ffwidget.h
index f82bf2faf7..0690b7f3a1 100644
--- a/xfa/include/fxfa/xfa_ffwidget.h
+++ b/xfa/include/fxfa/xfa_ffwidget.h
@@ -9,8 +9,8 @@
#include <vector>
+#include "core/fxge/include/fx_ge.h"
#include "core/include/fxcodec/fx_codec_def.h"
-#include "core/include/fxge/fx_ge.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
#include "xfa/include/fxfa/fxfa.h"