Move core/include/fxge to core/fxge/include.

This CL is a straight move of the fxge includes into core/fxge/include.

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

138 files changed, 205 insertions, 202 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 32d7886b98..711ab98e08 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -696,13 +696,13 @@ static_library("fxge") {
     "core/fxge/ge/fx_ge_ps.cpp",
     "core/fxge/ge/fx_ge_text.cpp",
     "core/fxge/ge/fx_text_int.h",
-    "core/include/fxge/fpf.h",
-    "core/include/fxge/fx_dib.h",
-    "core/include/fxge/fx_font.h",
-    "core/include/fxge/fx_freetype.h",
-    "core/include/fxge/fx_ge.h",
-    "core/include/fxge/fx_ge_apple.h",
-    "core/include/fxge/fx_ge_win32.h",
+    "core/fxge/include/fpf.h",
+    "core/fxge/include/fx_dib.h",
+    "core/fxge/include/fx_font.h",
+    "core/fxge/include/fx_freetype.h",
+    "core/fxge/include/fx_ge.h",
+    "core/fxge/include/fx_ge_apple.h",
+    "core/fxge/include/fx_ge_win32.h",
   ]
 
   configs += [
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp
index fd6a9c9814..7a6043ad87 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp
@@ -18,7 +18,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_name.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_freetype.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
index 3fc16a2c43..8a280e6ba0 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
@@ -6,12 +6,12 @@
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
 
-#include "core/fpdfapi/fpdf_parser/include/cpdf_name.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
-#include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_name.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
+#include "core/fxge/include/fx_freetype.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
index 53bbd93d6c..0b4199aac0 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
@@ -9,7 +9,7 @@
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_freetype.h"
 
 CPDF_SimpleFont::CPDF_SimpleFont()
     : m_pCharNames(nullptr), m_BaseEncoding(PDFFONT_ENCODING_BUILTIN) {
diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp b/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
index 032fa00e96..576b00550e 100644
--- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fx_font.h"
 
 CPDF_TrueTypeFont::CPDF_TrueTypeFont() {}
 
diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
index 5119624611..5fbc520ae5 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_freetype.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 #include "core/fxge/apple/apple_int.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp b/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
index c9d44435a3..44219ee02d 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
@@ -10,7 +10,7 @@
 #include "core/fpdfapi/fpdf_page/include/cpdf_image.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_imageobject.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm)
     : m_pForm(pForm), m_pBitmap(nullptr), m_bColored(FALSE) {}
diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp
index 9670aa8e7f..a3adecc764 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -17,7 +17,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
 #include "core/fxcrt/include/fx_ext.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_freetype.h"
 #include "third_party/base/stl_util.h"
 
 FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) {
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index fb3707f498..78c72a7fef 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -13,8 +13,8 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.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"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_font/include/cpdf_font.h b/core/fpdfapi/fpdf_font/include/cpdf_font.h
index 79456aa7a5..81518408e7 100644
--- a/core/fpdfapi/fpdf_font/include/cpdf_font.h
+++ b/core/fpdfapi/fpdf_font/include/cpdf_font.h
@@ -9,7 +9,7 @@
 
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fx_font.h"
 
 #define PDFFONT_FIXEDPITCH 1
 #define PDFFONT_SERIF 2
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/fpdf_font/ttgsubtable.cpp
index bb1a6f9f22..321419346d 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.cpp
@@ -8,8 +8,8 @@
 
 #include <memory>
 
-#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/base/stl_util.h"
 
 CFX_GlyphMap::CFX_GlyphMap() {}
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h
index 56f3fc01ea..7a6c66cc2a 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.h
@@ -12,8 +12,8 @@
 #include <map>
 
 #include "core/fxcrt/include/fx_basic.h"
-#include "core/include/fxge/fx_font.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_font.h"
+#include "core/fxge/include/fx_freetype.h"
 
 class CFX_GlyphMap {
  public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp
index 5c73b28e67..580b58a06a 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
 #include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 void CPDF_ColorState::SetFillColor(CPDF_ColorSpace* pCS,
                                    FX_FLOAT* pValue,
diff --git a/core/fpdfapi/fpdf_page/cpdf_graphstate.h b/core/fpdfapi/fpdf_page/cpdf_graphstate.h
index d44d32d31c..038ed15580 100644
--- a/core/fpdfapi/fpdf_page/cpdf_graphstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_graphstate.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHSTATE_H_
 #define CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHSTATE_H_
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 class CPDF_GraphState : public CFX_CountRef<CFX_GraphStateData> {};
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp
index d5c97807e9..2b662e1074 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp
@@ -6,17 +6,17 @@
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_image.h"
 
-#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
-#include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
-#include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxge/include/fx_dib.h"
+#include "core/include/fxcodec/fx_codec.h"
 
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc)
     : m_pDIBSource(nullptr),
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
index df7560289c..a4577a6cb0 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
@@ -10,7 +10,7 @@
 #include "core/fxcrt/include/fx_coordinates.h"
 #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"
 
 class CPDF_TransferFunc;
 class CPDF_Object;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h
index f13b2719b9..d9f3ead88c 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_path.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h
@@ -8,7 +8,7 @@
 #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_
 
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 class CPDF_Path : public CFX_CountRef<CFX_PathData> {
  public:
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h
index 0909125ab0..e6496cfd20 100644
--- a/core/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/fpdf_page/pageint.h
@@ -16,7 +16,7 @@
 #include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_parseoptions.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 class CPDF_AllStates;
 class CPDF_ColorSpace;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index 9058ed6767..d48edd056b 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
@@ -16,7 +16,7 @@
 #include "core/fpdfapi/fpdf_render/render_int.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
 #include "core/fpdfapi/ipdf_rendermodule.h"
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fx_font.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index 52f29477a9..066d4eb2a4 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -29,7 +29,7 @@
 #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
 #include "core/fpdfapi/ipdf_rendermodule.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc)
     : m_pPDFDoc(pPDFDoc), m_pFontCache(new CFX_FontCache) {}
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
index a2592004e7..d95edd7bb7 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
@@ -12,7 +12,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 struct CACHEINFO {
   uint32_t time;
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index ef2109a02f..167570ba92 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -25,8 +25,8 @@
 #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
 #include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_ge.h"
 
 FX_BOOL CPDF_RenderStatus::ProcessImage(const CPDF_ImageObject* pImageObj,
                                         const CFX_Matrix* pObj2Device) {
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index 7a4a36e1cf..61e47036fa 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -20,8 +20,8 @@
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
 #include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_ge.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
index d3081da26f..3f98279dbf 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
@@ -20,7 +20,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #define SHADING_STEPS 256
 static void DrawAxialShading(CFX_DIBitmap* pBitmap,
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
index 0165e8a7d7..264abe9a53 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -21,7 +21,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h b/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h
index a78838ac58..6935d695be 100644
--- a/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h
+++ b/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h
@@ -8,7 +8,7 @@
 #define CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDEROPTIONS_H_
 
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 class IPDF_OCContext;
 
diff --git a/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h b/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h
index 2d3ce44e46..d532196675 100644
--- a/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h
+++ b/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h
@@ -10,7 +10,7 @@
 #include "core/fxcrt/include/fx_coordinates.h"
 #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"
 
 class CFX_RenderDevice;
 class CFX_GraphStateData;
diff --git a/core/fpdfdoc/doc_annot.cpp b/core/fpdfdoc/doc_annot.cpp
index ca900acb9a..0e3d2a56bd 100644
--- a/core/fpdfdoc/doc_annot.cpp
+++ b/core/fpdfdoc/doc_annot.cpp
@@ -13,8 +13,8 @@
 #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
 #include "core/fpdfdoc/cpvt_generateap.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxge/fx_ge.h"
 
 CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage)
     : m_pDocument(pPage->m_pDocument) {
diff --git a/core/fpdfdoc/doc_utils.cpp b/core/fpdfdoc/doc_utils.cpp
index d3b3cac627..0d91b20e8a 100644
--- a/core/fpdfdoc/doc_utils.cpp
+++ b/core/fpdfdoc/doc_utils.cpp
@@ -12,8 +12,8 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
 #include "core/fpdfdoc/doc_utils.h"
+#include "core/fxge/include/fx_font.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxge/fx_font.h"
 
 namespace {
 
diff --git a/core/fpdfdoc/include/cpvt_wordprops.h b/core/fpdfdoc/include/cpvt_wordprops.h
index e091579239..690a5e1950 100644
--- a/core/fpdfdoc/include/cpvt_wordprops.h
+++ b/core/fpdfdoc/include/cpvt_wordprops.h
@@ -9,7 +9,7 @@
 
 #include "core/fpdfdoc/include/cpdf_variabletext.h"
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 struct CPVT_WordProps {
   CPVT_WordProps()
diff --git a/core/fxcodec/codec/fx_codec_bmp.cpp b/core/fxcodec/codec/fx_codec_bmp.cpp
index 31383774aa..2dc537161b 100644
--- a/core/fxcodec/codec/fx_codec_bmp.cpp
+++ b/core/fxcodec/codec/fx_codec_bmp.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fxcodec/codec/codec_int.h"
 #include "core/fxcodec/lbmp/fx_bmp.h"
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
 struct FXBMP_Context {
   bmp_decompress_struct_p bmp_ptr;
   void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_gif.cpp b/core/fxcodec/codec/fx_codec_gif.cpp
index 1657d7257e..e1806a4001 100644
--- a/core/fxcodec/codec/fx_codec_gif.cpp
+++ b/core/fxcodec/codec/fx_codec_gif.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fxcodec/codec/codec_int.h"
 #include "core/fxcodec/lgif/fx_gif.h"
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
 struct FXGIF_Context {
   gif_decompress_struct_p gif_ptr;
   void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index 553e237b32..ce39038438 100644
--- a/core/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -8,8 +8,8 @@
 
 #include "core/fxcodec/codec/codec_int.h"
 #include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/fxcodec/codec/fx_codec_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp
index f8621001b6..e625737e34 100644
--- a/core/fxcodec/codec/fx_codec_png.cpp
+++ b/core/fxcodec/codec/fx_codec_png.cpp
@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index 9e113c695c..ebd69ae1e3 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fxcodec/codec/fx_codec_progress.h"
 
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
 
 void CFXCODEC_WeightTable::Calc(int dest_len,
                                 int dest_min,
diff --git a/core/fxcodec/codec/fx_codec_progress.h b/core/fxcodec/codec/fx_codec_progress.h
index ccd52a95b1..2b2ba28e16 100644
--- a/core/fxcodec/codec/fx_codec_progress.h
+++ b/core/fxcodec/codec/fx_codec_progress.h
@@ -9,8 +9,8 @@
 
 #include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_system.h"
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
 
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA 2.2
diff --git a/core/fxcodec/codec/fx_codec_tiff.cpp b/core/fxcodec/codec/fx_codec_tiff.cpp
index 96249f9d14..d445769714 100644
--- a/core/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/fxcodec/codec/fx_codec_tiff.cpp
@@ -5,8 +5,8 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
 
 extern "C" {
 #include "third_party/libtiff/tiffiop.h"
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 8bda709c26..62fb539239 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -10,8 +10,8 @@
 
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_ge.h"
 #include "third_party/agg23/agg_conv_dash.h"
 #include "third_party/agg23/agg_conv_stroke.h"
 #include "third_party/agg23/agg_curves.h"
diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index 5bc9283b03..18f8d348ce 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FXGE_AGG_FX_AGG_DRIVER_H_
 #define CORE_FXGE_AGG_FX_AGG_DRIVER_H_
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "third_party/agg23/agg_clip_liang_barsky.h"
 #include "third_party/agg23/agg_path_storage.h"
 #include "third_party/agg23/agg_rasterizer_scanline_aa.h"
diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp
index bd9b549e99..0d2069cd99 100644
--- a/core/fxge/android/fpf_skiafont.cpp
+++ b/core/fxge/android/fpf_skiafont.cpp
@@ -12,7 +12,7 @@
 
 #include "core/fxge/android/fpf_skiafont.h"
 #include "core/fxge/android/fpf_skiafontmgr.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_freetype.h"
 
 #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
 
diff --git a/core/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h
index 9e35c942d3..c21bdeadc4 100644
--- a/core/fxge/android/fpf_skiafont.h
+++ b/core/fxge/android/fpf_skiafont.h
@@ -11,8 +11,8 @@
 
 #if _FX_OS_ == _FX_ANDROID_
 
-#include "core/include/fxge/fpf.h"
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fpf.h"
+#include "core/fxge/include/fx_font.h"
 
 class CFPF_SkiaFontDescriptor;
 class CFPF_SkiaFontMgr;
diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp
index 7d0d2de9e2..b7bc27acdf 100644
--- a/core/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/fxge/android/fpf_skiafontmgr.cpp
@@ -16,7 +16,7 @@
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/fxge/android/fpf_skiafont.h"
 #include "core/fxge/android/fpf_skiafontmgr.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_freetype.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h
index 5ed409cccc..e939a55cb9 100644
--- a/core/fxge/android/fpf_skiafontmgr.h
+++ b/core/fxge/android/fpf_skiafontmgr.h
@@ -14,8 +14,8 @@
 #include <map>
 #include <vector>
 
-#include "core/include/fxge/fpf.h"
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fpf.h"
+#include "core/fxge/include/fx_font.h"
 
 #define FPF_SKIAFONTTYPE_Unknown 0
 #define FPF_SKIAFONTTYPE_Path 1
diff --git a/core/fxge/android/fpf_skiamodule.h b/core/fxge/android/fpf_skiamodule.h
index a95c974b5d..95748493c7 100644
--- a/core/fxge/android/fpf_skiamodule.h
+++ b/core/fxge/android/fpf_skiamodule.h
@@ -9,7 +9,7 @@
 
 #if _FX_OS_ == _FX_ANDROID_
 
-#include "core/include/fxge/fpf.h"
+#include "core/fxge/include/fpf.h"
 
 class CFPF_SkiaFontMgr;
 
diff --git a/core/fxge/android/fx_android_font.cpp b/core/fxge/android/fx_android_font.cpp
index d663ac0f4f..6554c66a13 100644
--- a/core/fxge/android/fx_android_font.cpp
+++ b/core/fxge/android/fx_android_font.cpp
@@ -9,7 +9,7 @@
 #if _FX_OS_ == _FX_ANDROID_
 
 #include "core/fxge/android/fx_android_font.h"
-#include "core/include/fxge/fpf.h"
+#include "core/fxge/include/fpf.h"
 
 CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {}
 FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr* pFontMgr) {
diff --git a/core/fxge/android/fx_android_font.h b/core/fxge/android/fx_android_font.h
index ee8859185e..6268c3ed7b 100644
--- a/core/fxge/android/fx_android_font.h
+++ b/core/fxge/android/fx_android_font.h
@@ -11,7 +11,7 @@
 
 #if _FX_OS_ == _FX_ANDROID_
 
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fx_font.h"
 
 class IFPF_FontMgr;
 
diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp
index 3fac3706cf..e508183fd8 100644
--- a/core/fxge/android/fx_android_imp.cpp
+++ b/core/fxge/android/fx_android_imp.cpp
@@ -9,8 +9,8 @@
 #if _FX_OS_ == _FX_ANDROID_
 
 #include "core/fxge/android/fx_android_font.h"
-#include "core/include/fxge/fpf.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fpf.h"
+#include "core/fxge/include/fx_ge.h"
 
 void CFX_GEModule::InitPlatform() {
   IFPF_DeviceModule* pDeviceModule = FPF_GetDeviceModule();
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h
index c6c8f6ac92..02754cc309 100644
--- a/core/fxge/apple/apple_int.h
+++ b/core/fxge/apple/apple_int.h
@@ -11,7 +11,7 @@
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_MACOSX_
 #include <Carbon/Carbon.h>
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp
index b68d50eab3..e45b238cb5 100644
--- a/core/fxge/apple/fx_apple_platform.cpp
+++ b/core/fxge/apple/fx_apple_platform.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
@@ -13,8 +13,8 @@
 #include "core/fxge/apple/apple_int.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/fx_text_int.h"
-#include "core/include/fxge/fx_freetype.h"
-#include "core/include/fxge/fx_ge_apple.h"
+#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/include/fx_ge_apple.h"
 
 void CFX_AggDeviceDriver::InitPlatform() {
   CQuartz2D& quartz2d =
diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp
index db9f802d64..aae3f71b39 100644
--- a/core/fxge/apple/fx_mac_imp.cpp
+++ b/core/fxge/apple/fx_mac_imp.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/apple/apple_int.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_MACOSX_
 static const struct {
diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp
index 5386aba2d8..f3a4428ecc 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -8,12 +8,12 @@
 #include "core/fxge/agg/fx_agg_driver.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/fx_text_int.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"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 #include "core/fxge/apple/apple_int.h"
-#include "core/include/fxge/fx_ge_apple.h"
+#include "core/fxge/include/fx_ge_apple.h"
 #ifndef CGFLOAT_IS_DOUBLE
 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
 #endif
diff --git a/core/fxge/dib/dib_int.h b/core/fxge/dib/dib_int.h
index 1d2193e9bb..23dd0babba 100644
--- a/core/fxge/dib/dib_int.h
+++ b/core/fxge/dib/dib_int.h
@@ -10,7 +10,7 @@
 #include <stdint.h>
 
 #include "core/fxcrt/include/fx_coordinates.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 class IFX_ScanlineComposer;
 
diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp
index b10180deae..8b0b97c049 100644
--- a/core/fxge/dib/fx_dib_composite.cpp
+++ b/core/fxge/dib/fx_dib_composite.cpp
@@ -5,8 +5,8 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/dib/dib_int.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_ge.h"
 
 const uint8_t _color_sqrt[256] = {
     0x00, 0x03, 0x07, 0x0B, 0x0F, 0x12, 0x16, 0x19, 0x1D, 0x20, 0x23, 0x26,
diff --git a/core/fxge/dib/fx_dib_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp
index d9d5a3b0c0..5ed655afe2 100644
--- a/core/fxge/dib/fx_dib_convert.cpp
+++ b/core/fxge/dib/fx_dib_convert.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
-#include "core/include/fxge/fx_ge.h"
 
 class CFX_Palette {
  public:
diff --git a/core/fxge/dib/fx_dib_engine.cpp b/core/fxge/dib/fx_dib_engine.cpp
index a68583b346..349213e421 100644
--- a/core/fxge/dib/fx_dib_engine.cpp
+++ b/core/fxge/dib/fx_dib_engine.cpp
@@ -7,8 +7,8 @@
 #include <limits.h>
 
 #include "core/fxge/dib/dib_int.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"
 
 void CWeightTable::Calc(int dest_len,
                         int dest_min,
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 3772459eca..3c500ecb53 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 #include <limits.h>
 
 #include "core/fxge/dib/dib_int.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_ge.h"
 
 FX_BOOL ConvertBuffer(FXDIB_Format dest_format,
                       uint8_t* dest_buf,
diff --git a/core/fxge/dib/fx_dib_transform.cpp b/core/fxge/dib/fx_dib_transform.cpp
index 91c65fbbc8..18adcea5d2 100644
--- a/core/fxge/dib/fx_dib_transform.cpp
+++ b/core/fxge/dib/fx_dib_transform.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fxge/dib/dib_int.h"
 
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 namespace {
 
diff --git a/core/fxge/freetype/fx_freetype.cpp b/core/fxge/freetype/fx_freetype.cpp
index 2fc60e913e..f60d0c64d0 100644
--- a/core/fxge/freetype/fx_freetype.cpp
+++ b/core/fxge/freetype/fx_freetype.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_freetype.h"
 
 #include "third_party/freetype/src/psnames/pstables.h"
 
diff --git a/core/fxge/ge/fx_ge.cpp b/core/fxge/ge/fx_ge.cpp
index 7ae9942dec..9e45dc7434 100644
--- a/core/fxge/ge/fx_ge.cpp
+++ b/core/fxge/ge/fx_ge.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #include "core/fxge/ge/fx_text_int.h"
 
diff --git a/core/fxge/ge/fx_ge_device.cpp b/core/fxge/ge/fx_ge_device.cpp
index d791859b03..0d6addab75 100644
--- a/core/fxge/ge/fx_ge_device.cpp
+++ b/core/fxge/ge/fx_ge_device.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 CFX_RenderDevice::CFX_RenderDevice() {
   m_pDeviceDriver = NULL;
diff --git a/core/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp
index fab5ea28a9..144228ff28 100644
--- a/core/fxge/ge/fx_ge_font.cpp
+++ b/core/fxge/ge/fx_ge_font.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fxge/ge/fx_text_int.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"
 
 #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
 
diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp
index c6b208c624..e3a6d68d0d 100644
--- a/core/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/fxge/ge/fx_ge_fontmap.cpp
@@ -10,8 +10,8 @@
 
 #include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 #include "core/fxge/ge/fx_text_int.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/base/stl_util.h"
 
 #define GET_TT_SHORT(w) (uint16_t)(((w)[0] << 8) | (w)[1])
diff --git a/core/fxge/ge/fx_ge_linux.cpp b/core/fxge/ge/fx_ge_linux.cpp
index af731f78da..0bd67b01be 100644
--- a/core/fxge/ge/fx_ge_linux.cpp
+++ b/core/fxge/ge/fx_ge_linux.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fxge/agg/fx_agg_driver.h"
 #include "core/fxge/ge/fx_text_int.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
 class CFX_LinuxFontInfo : public CFX_FolderFontInfo {
diff --git a/core/fxge/ge/fx_ge_path.cpp b/core/fxge/ge/fx_ge_path.cpp
index 90793c4746..baa391fef2 100644
--- a/core/fxge/ge/fx_ge_path.cpp
+++ b/core/fxge/ge/fx_ge_path.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "third_party/base/numerics/safe_math.h"
 
 CFX_ClipRgn::CFX_ClipRgn(int width, int height) {
diff --git a/core/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp
index ec8f18e774..0d8ccbf566 100644
--- a/core/fxge/ge/fx_ge_ps.cpp
+++ b/core/fxge/ge/fx_ge_ps.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxcodec/fx_codec.h"
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 0815bfaa67..78d1c15687 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -5,9 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/include/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_freetype.h"
-#include "core/include/fxge/fx_ge.h"
 
 #ifdef _SKIA_SUPPORT_
 #include "third_party/skia/include/core/SkStream.h"
diff --git a/core/fxge/ge/fx_text_int.h b/core/fxge/ge/fx_text_int.h
index 04587c37cb..c3e9cd7679 100644
--- a/core/fxge/ge/fx_text_int.h
+++ b/core/fxge/ge/fx_text_int.h
@@ -9,8 +9,8 @@
 
 #include <map>
 
-#include "core/include/fxge/fx_font.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_font.h"
+#include "core/fxge/include/fx_freetype.h"
 
 struct _CFX_UniqueKeyGen {
   void Generate(int count, ...);
diff --git a/core/include/fxge/fpf.h b/core/fxge/include/fpf.h
index bc42a2dd95..2d43e8da6f 100644
--- a/core/include/fxge/fpf.h
+++ b/core/fxge/include/fpf.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXGE_FPF_H_
-#define CORE_INCLUDE_FXGE_FPF_H_
+#ifndef CORE_FXGE_INCLUDE_FPF_H_
+#define CORE_FXGE_INCLUDE_FPF_H_
 
 #include "core/fxcrt/include/fx_coordinates.h"
 
@@ -67,4 +67,4 @@ class IFPF_FontMgr {
                                 uint32_t dwMatch = 0) = 0;
 };
 
-#endif  // CORE_INCLUDE_FXGE_FPF_H_
+#endif  // CORE_FXGE_INCLUDE_FPF_H_
diff --git a/core/include/fxge/fx_dib.h b/core/fxge/include/fx_dib.h
index 59a494182c..4a9b29533a 100644
--- a/core/include/fxge/fx_dib.h
+++ b/core/fxge/include/fx_dib.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXGE_FX_DIB_H_
-#define CORE_INCLUDE_FXGE_FX_DIB_H_
+#ifndef CORE_FXGE_INCLUDE_FX_DIB_H_
+#define CORE_FXGE_INCLUDE_FX_DIB_H_
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
@@ -666,4 +666,4 @@ class CFX_ImageRenderer {
   int m_BlendType;
 };
 
-#endif  // CORE_INCLUDE_FXGE_FX_DIB_H_
+#endif  // CORE_FXGE_INCLUDE_FX_DIB_H_
diff --git a/core/include/fxge/fx_font.h b/core/fxge/include/fx_font.h
index 4e2b97e677..aa59e0a5d4 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/fxge/include/fx_font.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXGE_FX_FONT_H_
-#define CORE_INCLUDE_FXGE_FX_FONT_H_
+#ifndef CORE_FXGE_INCLUDE_FX_FONT_H_
+#define CORE_FXGE_INCLUDE_FX_FONT_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxge/fx_dib.h"
-#include "core/include/fxge/fx_freetype.h"
+#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/include/fx_freetype.h"
 
 typedef struct FT_FaceRec_* FXFT_Face;
 typedef void* FXFT_Library;
@@ -563,4 +563,4 @@ CFX_ByteString GetNameFromTT(const uint8_t* name_table,
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
-#endif  // CORE_INCLUDE_FXGE_FX_FONT_H_
+#endif  // CORE_FXGE_INCLUDE_FX_FONT_H_
diff --git a/core/include/fxge/fx_freetype.h b/core/fxge/include/fx_freetype.h
index 6920d86aca..533974dc2e 100644
--- a/core/include/fxge/fx_freetype.h
+++ b/core/fxge/include/fx_freetype.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXGE_FX_FREETYPE_H_
-#define CORE_INCLUDE_FXGE_FX_FREETYPE_H_
+#ifndef CORE_FXGE_INCLUDE_FX_FREETYPE_H_
+#define CORE_FXGE_INCLUDE_FX_FREETYPE_H_
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -177,4 +177,4 @@ void FXFT_adobe_name_from_unicode(char* name, wchar_t unicode);
 };
 #endif
 
-#endif  // CORE_INCLUDE_FXGE_FX_FREETYPE_H_
+#endif  // CORE_FXGE_INCLUDE_FX_FREETYPE_H_
diff --git a/core/include/fxge/fx_ge.h b/core/fxge/include/fx_ge.h
index 3eb9303a80..4530677119 100644
--- a/core/include/fxge/fx_ge.h
+++ b/core/fxge/include/fx_ge.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXGE_FX_GE_H_
-#define CORE_INCLUDE_FXGE_FX_GE_H_
+#ifndef CORE_FXGE_INCLUDE_FX_GE_H_
+#define CORE_FXGE_INCLUDE_FX_GE_H_
 
-#include "core/include/fxge/fx_dib.h"
-#include "core/include/fxge/fx_font.h"
+#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/include/fx_font.h"
 
 class CFX_Font;
 class CFX_FontMgr;
@@ -730,4 +730,4 @@ class CFX_PSRenderer {
   void WritePSBinary(const uint8_t* data, int len);
 };
 
-#endif  // CORE_INCLUDE_FXGE_FX_GE_H_
+#endif  // CORE_FXGE_INCLUDE_FX_GE_H_
diff --git a/core/include/fxge/fx_ge_apple.h b/core/fxge/include/fx_ge_apple.h
index 16298581b3..57acef653c 100644
--- a/core/include/fxge/fx_ge_apple.h
+++ b/core/fxge/include/fx_ge_apple.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXGE_FX_GE_APPLE_H_
-#define CORE_INCLUDE_FXGE_FX_GE_APPLE_H_
+#ifndef CORE_FXGE_INCLUDE_FX_GE_APPLE_H_
+#define CORE_FXGE_INCLUDE_FX_GE_APPLE_H_
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 class CFX_QuartzDevice : public CFX_RenderDevice {
@@ -24,4 +24,4 @@ class CFX_QuartzDevice : public CFX_RenderDevice {
 };
 #endif
 
-#endif  // CORE_INCLUDE_FXGE_FX_GE_APPLE_H_
+#endif  // CORE_FXGE_INCLUDE_FX_GE_APPLE_H_
diff --git a/core/include/fxge/fx_ge_win32.h b/core/fxge/include/fx_ge_win32.h
index f1864590c5..b4337c117c 100644
--- a/core/include/fxge/fx_ge_win32.h
+++ b/core/fxge/include/fx_ge_win32.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
-#define CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
+#ifndef CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
+#define CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
 
 #ifdef _WIN32
 #ifndef _WINDOWS_
@@ -95,4 +95,4 @@ class CFX_WinBitmapDevice : public CFX_RenderDevice {
 };
 #endif
 
-#endif  // CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
+#endif  // CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 4405ba9274..1f8f086b2b 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if defined(_SKIA_SUPPORT_)
 #include "core/include/fxcodec/fx_codec.h"
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index ed57a02c23..bfcda1547c 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <crtdbg.h>
@@ -12,11 +12,11 @@
 #include "core/fxge/agg/fx_agg_driver.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/include/fx_ge_win32.h"
 #include "core/fxge/win32/dwrite_int.h"
 #include "core/fxge/win32/win32_int.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_freetype.h"
-#include "core/include/fxge/fx_ge_win32.h"
 #include "third_party/base/stl_util.h"
 
 class CFX_Win32FallbackFontInfo final : public CFX_FolderFontInfo {
diff --git a/core/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/fx_win32_dib.cpp
index cc627dbab0..eefa991eeb 100644
--- a/core/fxge/win32/fx_win32_dib.cpp
+++ b/core/fxge/win32/fx_win32_dib.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <windows.h>
 
+#include "core/fxge/include/fx_ge_win32.h"
 #include "core/fxge/win32/win32_int.h"
-#include "core/include/fxge/fx_ge_win32.h"
 
 CFX_ByteString CFX_WindowsDIB::GetBitmapInfo(const CFX_DIBitmap* pBitmap) {
   CFX_ByteString result;
diff --git a/core/fxge/win32/fx_win32_dwrite.cpp b/core/fxge/win32/fx_win32_dwrite.cpp
index f95b5eb4a3..aa6ba9c8b9 100644
--- a/core/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/fxge/win32/fx_win32_dwrite.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <dwrite.h>
 
+#include "core/fxge/include/fx_ge_win32.h"
 #include "core/fxge/win32/dwrite_int.h"
-#include "core/include/fxge/fx_ge_win32.h"
 
 typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)(
     __in DWRITE_FACTORY_TYPE,
diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp
index b9c2190041..4e52a8941a 100644
--- a/core/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <windows.h>
@@ -17,8 +17,8 @@ using std::max;
 
 #include <gdiplus.h>
 
+#include "core/fxge/include/fx_ge_win32.h"
 #include "core/fxge/win32/win32_int.h"
-#include "core/include/fxge/fx_ge_win32.h"
 
 using namespace Gdiplus;              // NOLINT
 using namespace Gdiplus::DllExports;  // NOLINT
diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index cb5ce771a3..d0359138de 100644
--- a/core/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 
@@ -12,9 +12,9 @@
 
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/include/fx_ge_win32.h"
 #include "core/fxge/win32/win32_int.h"
-#include "core/include/fxge/fx_freetype.h"
-#include "core/include/fxge/fx_ge_win32.h"
 
 #define SIZETHRESHOLD 1000
 #define OUTPUTPSLEN 4096
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index 18996afc5c..7916690817 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -7,8 +7,8 @@
 #ifndef CORE_FXGE_WIN32_WIN32_INT_H_
 #define CORE_FXGE_WIN32_WIN32_INT_H_
 
+#include "core/fxge/include/fx_ge.h"
 #include "core/fxge/win32/dwrite_int.h"
-#include "core/include/fxge/fx_ge.h"
 
 struct WINDIB_Open_Args_;
 class CGdiplusExt {
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index f7788b7c9e..9cd6d1c408 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -14,7 +14,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
 #include "core/fpdfapi/fpdf_parser/ipdf_occontext.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 class CFDF_Document;
 class CFieldTree;
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h
index d17b724d53..46d9fe2137 100644
--- a/core/include/fpdfdoc/fpdf_tagged.h
+++ b/core/include/fpdfdoc/fpdf_tagged.h
@@ -7,7 +7,7 @@
 #ifndef CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
 
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 class CPDF_Document;
 class CPDF_StructElement;
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index 1383f25c35..99e35b4151 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -7,6 +7,7 @@ include_rules = [
   '+core/fpdfapi/fpdf_parser/include',
   '+core/fpdfapi/fpdf_render/include',
   '+core/fxcrt/include',
+  '+core/fxge/include',
   '+public',
   '+v8',
   '+xfa/include',
diff --git a/fpdfsdk/fxedit/fxet_pageobjs.cpp b/fpdfsdk/fxedit/fxet_pageobjs.cpp
index 1fe40d98c1..41252277ac 100644
--- a/fpdfsdk/fxedit/fxet_pageobjs.cpp
+++ b/fpdfsdk/fxedit/fxet_pageobjs.cpp
@@ -12,7 +12,7 @@
 #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h"
 #include "core/fpdfdoc/include/cpvt_word.h"
 #include "core/fpdfdoc/include/ipvt_fontmap.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/include/fx_systemhandler.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
 #include "fpdfsdk/include/fxedit/fxet_edit.h"
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index 06f0666c81..2ee130feb3 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "core/fxcrt/include/fx_basic.h"
+#include "core/fxge/include/fx_dib.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxge/fx_dib.h"
 #include "fpdfsdk/include/fsdk_baseannot.h"
 
 #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 9d81737f62..9882888ed9 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -8,9 +8,9 @@
 #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h"
+#include "core/fxge/include/fx_ge.h"
+#include "core/fxge/include/fx_ge_win32.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxge/fx_ge.h"
-#include "core/include/fxge/fx_ge_win32.h"
 #include "public/fpdfview.h"
 
 #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index 532e96d97f..46896457af 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -9,7 +9,7 @@
 
 #include "core/fpdfdoc/include/cpdf_variabletext.h"
 #include "core/fxcrt/include/fx_basic.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 class CPDF_Font;
 class CPDF_PageObjectHolder;
diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp
index aa6f0182e2..e49471a0d2 100644
--- a/fpdfsdk/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/pdfwindow/PWL_Caret.h"
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
index c07233f499..aa0db4b291 100644
--- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/pdfwindow/PWL_ComboBox.h"
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/pdfwindow/PWL_Edit.h"
 #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
 #include "fpdfsdk/pdfwindow/PWL_ListBox.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index b5e2093483..e193d0f469 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -12,7 +12,7 @@
 #include "core/fpdfdoc/include/cpvt_word.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxcrt/include/fx_xml.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/pdfwindow/PWL_Caret.h"
 #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
 #include "fpdfsdk/pdfwindow/PWL_FontMap.h"
diff --git a/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
index 60bd40a258..8067907978 100644
--- a/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/pdfwindow/PWL_ListCtrl.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
diff --git a/fpdfsdk/pdfwindow/PWL_Note.cpp b/fpdfsdk/pdfwindow/PWL_Note.cpp
index db7d1a5670..e0f9132b18 100644
--- a/fpdfsdk/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Note.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/pdfwindow/PWL_Note.h"
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/pdfwindow/PWL_Button.h"
 #include "fpdfsdk/pdfwindow/PWL_Caret.h"
 #include "fpdfsdk/pdfwindow/PWL_Edit.h"
diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
index a96cf5f2a5..2dfa6cfe6a 100644
--- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
diff --git a/fpdfsdk/pdfwindow/PWL_Signature.cpp b/fpdfsdk/pdfwindow/PWL_Signature.cpp
index 221922972f..6dd2ea1b30 100644
--- a/fpdfsdk/pdfwindow/PWL_Signature.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Signature.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/pdfwindow/PWL_Signature.h"
 
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/pdfwindow/PWL_Icon.h"
 #include "fpdfsdk/pdfwindow/PWL_Label.h"
 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp
index acd362a29c..6a872bd4df 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 
 #include "core/fpdfdoc/include/cpvt_word.h"
-#include "core/include/fxge/fx_ge.h"
+#include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_Icon.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
diff --git a/pdfium.gyp b/pdfium.gyp
index dd864e91da..2a22944543 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -669,13 +669,6 @@
         'third_party/third_party.gyp:fx_agg',
       ],
       'sources': [
-        'core/include/fxge/fpf.h',
-        'core/include/fxge/fx_dib.h',
-        'core/include/fxge/fx_font.h',
-        'core/include/fxge/fx_freetype.h',
-        'core/include/fxge/fx_ge.h',
-        'core/include/fxge/fx_ge_apple.h',
-        'core/include/fxge/fx_ge_win32.h',
         'core/fxge/agg/fx_agg_driver.h',
         'core/fxge/agg/fx_agg_driver.cpp',
         'core/fxge/android/fpf_skiafont.cpp',
@@ -724,6 +717,13 @@
         'core/fxge/ge/fx_ge_ps.cpp',
         'core/fxge/ge/fx_ge_text.cpp',
         'core/fxge/ge/fx_text_int.h',
+        'core/fxge/include/fpf.h',
+        'core/fxge/include/fx_dib.h',
+        'core/fxge/include/fx_font.h',
+        'core/fxge/include/fx_freetype.h',
+        'core/fxge/include/fx_ge.h',
+        'core/fxge/include/fx_ge_apple.h',
+        'core/fxge/include/fx_ge_win32.h',
       ],
       'variables': {
         'clang_warning_flags': [
diff --git a/testing/DEPS b/testing/DEPS
index 99f34dc190..e261291c0c 100644
--- a/testing/DEPS
+++ b/testing/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   '+core/include',
   '+core/fxcodec',
   '+core/fxcrt/include',
+  '+core/fxge/include',
   '+fpdfsdk/include',
   '+public',
   '+v8',
diff --git a/testing/libfuzzer/pdf_jpx_fuzzer.cc b/testing/libfuzzer/pdf_jpx_fuzzer.cc
index 12d2061445..7af5d13fc1 100644
--- a/testing/libfuzzer/pdf_jpx_fuzzer.cc
+++ b/testing/libfuzzer/pdf_jpx_fuzzer.cc
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxge/fx_dib.h"
+#include "core/fxge/include/fx_dib.h"
 
 CCodec_JpxModule g_module;
 
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"