38 files changed, 70 insertions, 72 deletions
diff --git a/BUILD.gn b/BUILD.gn
index e99cc86841..fff58b3afd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -930,19 +930,37 @@ static_library("fxge") {
     "core/fxge/android/cfx_androidfontinfo.cpp",
     "core/fxge/android/cfx_androidfontinfo.h",
     "core/fxge/android/fx_android_imp.cpp",
+    "core/fxge/cfx_cliprgn.cpp",
+    "core/fxge/cfx_cliprgn.h",
     "core/fxge/cfx_defaultrenderdevice.h",
+    "core/fxge/cfx_facecache.cpp",
     "core/fxge/cfx_facecache.h",
+    "core/fxge/cfx_folderfontinfo.cpp",
+    "core/fxge/cfx_folderfontinfo.h",
+    "core/fxge/cfx_font.cpp",
+    "core/fxge/cfx_fontcache.cpp",
     "core/fxge/cfx_fontcache.h",
+    "core/fxge/cfx_fontmapper.cpp",
     "core/fxge/cfx_fontmapper.h",
+    "core/fxge/cfx_fontmgr.cpp",
     "core/fxge/cfx_fontmgr.h",
+    "core/fxge/cfx_gemodule.cpp",
     "core/fxge/cfx_gemodule.h",
+    "core/fxge/cfx_graphstate.cpp",
     "core/fxge/cfx_graphstate.h",
+    "core/fxge/cfx_graphstatedata.cpp",
     "core/fxge/cfx_graphstatedata.h",
+    "core/fxge/cfx_pathdata.cpp",
     "core/fxge/cfx_pathdata.h",
+    "core/fxge/cfx_renderdevice.cpp",
     "core/fxge/cfx_renderdevice.h",
+    "core/fxge/cfx_substfont.cpp",
     "core/fxge/cfx_substfont.h",
+    "core/fxge/cfx_unicodeencoding.cpp",
     "core/fxge/cfx_unicodeencoding.h",
     "core/fxge/cfx_windowsrenderdevice.h",
+    "core/fxge/cttfontdesc.cpp",
+    "core/fxge/cttfontdesc.h",
     "core/fxge/dib/cfx_bitmapcomposer.cpp",
     "core/fxge/dib/cfx_bitmapcomposer.h",
     "core/fxge/dib/cfx_bitmapstorer.cpp",
@@ -988,28 +1006,10 @@ static_library("fxge") {
     "core/fxge/fx_dib.h",
     "core/fxge/fx_font.h",
     "core/fxge/fx_freetype.h",
-    "core/fxge/ge/cfx_cliprgn.cpp",
-    "core/fxge/ge/cfx_cliprgn.h",
-    "core/fxge/ge/cfx_facecache.cpp",
-    "core/fxge/ge/cfx_folderfontinfo.cpp",
-    "core/fxge/ge/cfx_folderfontinfo.h",
-    "core/fxge/ge/cfx_font.cpp",
-    "core/fxge/ge/cfx_fontcache.cpp",
-    "core/fxge/ge/cfx_fontmapper.cpp",
-    "core/fxge/ge/cfx_fontmgr.cpp",
-    "core/fxge/ge/cfx_gemodule.cpp",
-    "core/fxge/ge/cfx_graphstate.cpp",
-    "core/fxge/ge/cfx_graphstatedata.cpp",
-    "core/fxge/ge/cfx_pathdata.cpp",
-    "core/fxge/ge/cfx_renderdevice.cpp",
-    "core/fxge/ge/cfx_substfont.cpp",
-    "core/fxge/ge/cfx_unicodeencoding.cpp",
-    "core/fxge/ge/cttfontdesc.cpp",
-    "core/fxge/ge/cttfontdesc.h",
-    "core/fxge/ge/fx_ge_fontmap.cpp",
-    "core/fxge/ge/fx_ge_linux.cpp",
-    "core/fxge/ge/fx_ge_text.cpp",
-    "core/fxge/ge/fx_text_int.h",
+    "core/fxge/fx_ge_fontmap.cpp",
+    "core/fxge/fx_ge_linux.cpp",
+    "core/fxge/fx_ge_text.cpp",
+    "core/fxge/fx_text_int.h",
     "core/fxge/ifx_renderdevicedriver.cpp",
     "core/fxge/ifx_renderdevicedriver.h",
     "core/fxge/ifx_systemfontinfo.h",
@@ -1029,8 +1029,8 @@ static_library("fxge") {
 
   if (pdf_enable_xfa) {
     sources += [
+      "core/fxge/cfx_unicodeencodingex.cpp",
       "core/fxge/cfx_unicodeencodingex.h",
-      "core/fxge/ge/cfx_unicodeencodingex.cpp",
     ]
   }
 
@@ -2000,7 +2000,7 @@ test("pdfium_embeddertests") {
     "core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp",
     "core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp",
     "core/fxcodec/codec/fx_codec_embeddertest.cpp",
-    "core/fxge/ge/fx_ge_text_embeddertest.cpp",
+    "core/fxge/fx_ge_text_embeddertest.cpp",
     "fpdfsdk/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/fpdf_flatten_embeddertest.cpp",
     "fpdfsdk/fpdf_structtree_embeddertest.cpp",
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 855ea2a04c..846920240e 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -10,12 +10,12 @@
 #include <utility>
 
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/cfx_imagestretcher.h"
-#include "core/fxge/ge/cfx_cliprgn.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/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp
index 1a56b183cf..56b15b35d0 100644
--- a/core/fxge/apple/fx_apple_platform.cpp
+++ b/core/fxge/apple/fx_apple_platform.cpp
@@ -13,12 +13,12 @@
 #endif
 
 #include "core/fxge/apple/apple_int.h"
+#include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/cfx_facecache.h"
 #include "core/fxge/cfx_gemodule.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/fx_freetype.h"
-#include "core/fxge/ge/cfx_cliprgn.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 
 #ifndef _SKIA_SUPPORT_
 
diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp
index ced08d2776..78fe16459c 100644
--- a/core/fxge/apple/fx_mac_imp.cpp
+++ b/core/fxge/apple/fx_mac_imp.cpp
@@ -9,8 +9,8 @@
 
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxge/apple/apple_int.h"
+#include "core/fxge/cfx_folderfontinfo.h"
 #include "core/fxge/cfx_gemodule.h"
-#include "core/fxge/ge/cfx_folderfontinfo.h"
 #include "core/fxge/ifx_systemfontinfo.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp
index ad09f91f61..f92db2b30b 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -15,7 +15,7 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/fx_freetype.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "third_party/base/ptr_util.h"
 
 #include "core/fxge/apple/apple_int.h"
diff --git a/core/fxge/ge/cfx_cliprgn.cpp b/core/fxge/cfx_cliprgn.cpp
index e00cb7c3ad..087c11089a 100644
--- a/core/fxge/ge/cfx_cliprgn.cpp
+++ b/core/fxge/cfx_cliprgn.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxge/ge/cfx_cliprgn.h"
+#include "core/fxge/cfx_cliprgn.h"
 
 #include <utility>
 
diff --git a/core/fxge/ge/cfx_cliprgn.h b/core/fxge/cfx_cliprgn.h
index 800e6ddbee..866af9b205 100644
--- a/core/fxge/ge/cfx_cliprgn.h
+++ b/core/fxge/cfx_cliprgn.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXGE_GE_CFX_CLIPRGN_H_
-#define CORE_FXGE_GE_CFX_CLIPRGN_H_
+#ifndef CORE_FXGE_CFX_CLIPRGN_H_
+#define CORE_FXGE_CFX_CLIPRGN_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 
@@ -39,4 +39,4 @@ class CFX_ClipRgn {
   CFX_RetainPtr<CFX_DIBitmap> m_Mask;
 };
 
-#endif  // CORE_FXGE_GE_CFX_CLIPRGN_H_
+#endif  // CORE_FXGE_CFX_CLIPRGN_H_
diff --git a/core/fxge/ge/cfx_facecache.cpp b/core/fxge/cfx_facecache.cpp
index e675e11510..eac28074fc 100644
--- a/core/fxge/ge/cfx_facecache.cpp
+++ b/core/fxge/cfx_facecache.cpp
@@ -17,7 +17,7 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_substfont.h"
 #include "core/fxge/fx_freetype.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "third_party/base/numerics/safe_math.h"
 #include "third_party/base/ptr_util.h"
 
@@ -88,8 +88,7 @@ CFX_FaceCache::CFX_FaceCache(FXFT_Face face)
 {
 }
 
-CFX_FaceCache::~CFX_FaceCache() {
-}
+CFX_FaceCache::~CFX_FaceCache() {}
 
 std::unique_ptr<CFX_GlyphBitmap> CFX_FaceCache::RenderGlyph(
     const CFX_Font* pFont,
diff --git a/core/fxge/ge/cfx_folderfontinfo.cpp b/core/fxge/cfx_folderfontinfo.cpp
index a13af068e8..12e7dd25fc 100644
--- a/core/fxge/ge/cfx_folderfontinfo.cpp
+++ b/core/fxge/cfx_folderfontinfo.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxge/ge/cfx_folderfontinfo.h"
+#include "core/fxge/cfx_folderfontinfo.h"
 
 #include <limits>
 #include <utility>
diff --git a/core/fxge/ge/cfx_folderfontinfo.h b/core/fxge/cfx_folderfontinfo.h
index ad363b5f0d..82ed902b22 100644
--- a/core/fxge/ge/cfx_folderfontinfo.h
+++ b/core/fxge/cfx_folderfontinfo.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXGE_GE_CFX_FOLDERFONTINFO_H_
-#define CORE_FXGE_GE_CFX_FOLDERFONTINFO_H_
+#ifndef CORE_FXGE_CFX_FOLDERFONTINFO_H_
+#define CORE_FXGE_CFX_FOLDERFONTINFO_H_
 
 #include <map>
 #include <memory>
@@ -66,4 +66,4 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
   CFX_UnownedPtr<CFX_FontMapper> m_pMapper;
 };
 
-#endif  // CORE_FXGE_GE_CFX_FOLDERFONTINFO_H_
+#endif  // CORE_FXGE_CFX_FOLDERFONTINFO_H_
diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/cfx_font.cpp
index 144675cdbd..a8e271dd9a 100644
--- a/core/fxge/ge/cfx_font.cpp
+++ b/core/fxge/cfx_font.cpp
@@ -21,7 +21,7 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_substfont.h"
 #include "core/fxge/fx_freetype.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "third_party/base/ptr_util.h"
 
 #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
@@ -560,9 +560,8 @@ void CFX_Font::AdjustMMParams(int glyph_index,
       FXFT_Free(m_Face, pMasters);
       return;
     }
-    int param = min_param +
-                (max_param - min_param) * (dest_width - min_width) /
-                    (max_width - min_width);
+    int param = min_param + (max_param - min_param) * (dest_width - min_width) /
+                                (max_width - min_width);
     coords[1] = param;
   }
   FXFT_Free(m_Face, pMasters);
diff --git a/core/fxge/ge/cfx_fontcache.cpp b/core/fxge/cfx_fontcache.cpp
index 5ccac8cfbc..5ccac8cfbc 100644
--- a/core/fxge/ge/cfx_fontcache.cpp
+++ b/core/fxge/cfx_fontcache.cpp
diff --git a/core/fxge/ge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp
index 5b4ceaac59..5b4ceaac59 100644
--- a/core/fxge/ge/cfx_fontmapper.cpp
+++ b/core/fxge/cfx_fontmapper.cpp
diff --git a/core/fxge/ge/cfx_fontmgr.cpp b/core/fxge/cfx_fontmgr.cpp
index ec184ae266..c8beb515f0 100644
--- a/core/fxge/ge/cfx_fontmgr.cpp
+++ b/core/fxge/cfx_fontmgr.cpp
@@ -11,9 +11,9 @@
 
 #include "core/fxge/cfx_fontmapper.h"
 #include "core/fxge/cfx_substfont.h"
+#include "core/fxge/cttfontdesc.h"
 #include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 #include "core/fxge/fx_font.h"
-#include "core/fxge/ge/cttfontdesc.h"
 #include "core/fxge/ifx_systemfontinfo.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/core/fxge/ge/cfx_gemodule.cpp b/core/fxge/cfx_gemodule.cpp
index 4516d61e27..a28a88243a 100644
--- a/core/fxge/ge/cfx_gemodule.cpp
+++ b/core/fxge/cfx_gemodule.cpp
@@ -6,10 +6,10 @@
 
 #include "core/fxge/cfx_gemodule.h"
 
+#include "core/fxge/cfx_folderfontinfo.h"
 #include "core/fxge/cfx_fontcache.h"
 #include "core/fxge/cfx_fontmgr.h"
-#include "core/fxge/ge/cfx_folderfontinfo.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
diff --git a/core/fxge/ge/cfx_graphstate.cpp b/core/fxge/cfx_graphstate.cpp
index ad6b5fc6c7..ad6b5fc6c7 100644
--- a/core/fxge/ge/cfx_graphstate.cpp
+++ b/core/fxge/cfx_graphstate.cpp
diff --git a/core/fxge/ge/cfx_graphstatedata.cpp b/core/fxge/cfx_graphstatedata.cpp
index 82fede176a..82fede176a 100644
--- a/core/fxge/ge/cfx_graphstatedata.cpp
+++ b/core/fxge/cfx_graphstatedata.cpp
diff --git a/core/fxge/ge/cfx_pathdata.cpp b/core/fxge/cfx_pathdata.cpp
index fe3c6778d5..fe3c6778d5 100644
--- a/core/fxge/ge/cfx_pathdata.cpp
+++ b/core/fxge/cfx_pathdata.cpp
diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index 34c974439a..266ae50e78 100644
--- a/core/fxge/ge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -427,16 +427,16 @@ bool CFX_RenderDevice::CreateCompatibleBitmap(
     int width,
     int height) const {
   if (m_RenderCaps & FXRC_CMYK_OUTPUT) {
-    return pDIB->Create(width, height, m_RenderCaps & FXRC_ALPHA_OUTPUT
-                                           ? FXDIB_Cmyka
-                                           : FXDIB_Cmyk);
+    return pDIB->Create(
+        width, height,
+        m_RenderCaps & FXRC_ALPHA_OUTPUT ? FXDIB_Cmyka : FXDIB_Cmyk);
   }
   if (m_RenderCaps & FXRC_BYTEMASK_OUTPUT)
     return pDIB->Create(width, height, FXDIB_8bppMask);
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || defined _SKIA_SUPPORT_PATHS_
-  return pDIB->Create(width, height, m_RenderCaps & FXRC_ALPHA_OUTPUT
-                                         ? FXDIB_Argb
-                                         : FXDIB_Rgb32);
+  return pDIB->Create(
+      width, height,
+      m_RenderCaps & FXRC_ALPHA_OUTPUT ? FXDIB_Argb : FXDIB_Rgb32);
 #else
   return pDIB->Create(
       width, height, m_RenderCaps & FXRC_ALPHA_OUTPUT ? FXDIB_Argb : FXDIB_Rgb);
diff --git a/core/fxge/ge/cfx_substfont.cpp b/core/fxge/cfx_substfont.cpp
index 27d3bc3059..27d3bc3059 100644
--- a/core/fxge/ge/cfx_substfont.cpp
+++ b/core/fxge/cfx_substfont.cpp
diff --git a/core/fxge/ge/cfx_unicodeencoding.cpp b/core/fxge/cfx_unicodeencoding.cpp
index 494ae33bb0..494ae33bb0 100644
--- a/core/fxge/ge/cfx_unicodeencoding.cpp
+++ b/core/fxge/cfx_unicodeencoding.cpp
diff --git a/core/fxge/ge/cfx_unicodeencodingex.cpp b/core/fxge/cfx_unicodeencodingex.cpp
index 3f28d4295e..3f28d4295e 100644
--- a/core/fxge/ge/cfx_unicodeencodingex.cpp
+++ b/core/fxge/cfx_unicodeencodingex.cpp
diff --git a/core/fxge/ge/cttfontdesc.cpp b/core/fxge/cttfontdesc.cpp
index f75039567f..cf900a8b95 100644
--- a/core/fxge/ge/cttfontdesc.cpp
+++ b/core/fxge/cttfontdesc.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxge/ge/cttfontdesc.h"
+#include "core/fxge/cttfontdesc.h"
 
 #include "core/fxge/fx_freetype.h"
 
diff --git a/core/fxge/ge/cttfontdesc.h b/core/fxge/cttfontdesc.h
index d756cb947a..6eb36360c0 100644
--- a/core/fxge/ge/cttfontdesc.h
+++ b/core/fxge/cttfontdesc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXGE_GE_CTTFONTDESC_H_
-#define CORE_FXGE_GE_CTTFONTDESC_H_
+#ifndef CORE_FXGE_CTTFONTDESC_H_
+#define CORE_FXGE_CTTFONTDESC_H_
 
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_font.h"
@@ -37,4 +37,4 @@ class CTTFontDesc {
   int m_RefCount;
 };
 
-#endif  // CORE_FXGE_GE_CTTFONTDESC_H_
+#endif  // CORE_FXGE_CTTFONTDESC_H_
diff --git a/core/fxge/dib/cfx_bitmapcomposer.cpp b/core/fxge/dib/cfx_bitmapcomposer.cpp
index 3f75fae1b6..8664606645 100644
--- a/core/fxge/dib/cfx_bitmapcomposer.cpp
+++ b/core/fxge/dib/cfx_bitmapcomposer.cpp
@@ -7,8 +7,8 @@
 #include "core/fxge/dib/cfx_bitmapcomposer.h"
 
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/ge/cfx_cliprgn.h"
 
 CFX_BitmapComposer::CFX_BitmapComposer()
     : m_bRgbByteOrder(false), m_BlendType(FXDIB_BLEND_NORMAL) {}
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index 43b0da0edf..02c3543c85 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -11,8 +11,8 @@
 #include <utility>
 
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/dib/cfx_scanlinecompositor.h"
-#include "core/fxge/ge/cfx_cliprgn.h"
 #include "third_party/base/ptr_util.h"
 
 #define MAX_OOM_LIMIT 12000000
diff --git a/core/fxge/dib/cfx_dibsource.cpp b/core/fxge/dib/cfx_dibsource.cpp
index 458baa56ca..e19619df1d 100644
--- a/core/fxge/dib/cfx_dibsource.cpp
+++ b/core/fxge/dib/cfx_dibsource.cpp
@@ -12,11 +12,11 @@
 #include <vector>
 
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/dib/cfx_bitmapstorer.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
 #include "core/fxge/dib/cfx_imagestretcher.h"
 #include "core/fxge/dib/cfx_imagetransformer.h"
-#include "core/fxge/ge/cfx_cliprgn.h"
 #include "third_party/base/logging.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index db3fe02bd5..6448014ba5 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -8,9 +8,9 @@
 
 #include <memory>
 
+#include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/dib/cfx_imagestretcher.h"
 #include "core/fxge/dib/cfx_imagetransformer.h"
-#include "core/fxge/ge/cfx_cliprgn.h"
 #include "third_party/base/ptr_util.h"
 
 CFX_ImageRenderer::CFX_ImageRenderer(
diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/fx_ge_fontmap.cpp
index 7ac4fada5c..7ac4fada5c 100644
--- a/core/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/fxge/fx_ge_fontmap.cpp
diff --git a/core/fxge/ge/fx_ge_linux.cpp b/core/fxge/fx_ge_linux.cpp
index 4e4b2050e9..d9fac3f54c 100644
--- a/core/fxge/ge/fx_ge_linux.cpp
+++ b/core/fxge/fx_ge_linux.cpp
@@ -8,8 +8,8 @@
 #include <utility>
 
 #include "core/fxcrt/fx_codepage.h"
+#include "core/fxge/cfx_folderfontinfo.h"
 #include "core/fxge/cfx_gemodule.h"
-#include "core/fxge/ge/cfx_folderfontinfo.h"
 #include "core/fxge/ifx_systemfontinfo.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/fx_ge_text.cpp
index 8024452265..0832f7a020 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/fx_ge_text.cpp
@@ -12,7 +12,7 @@
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/fx_freetype.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "core/fxge/ifx_renderdevicedriver.h"
 
 namespace {
diff --git a/core/fxge/ge/fx_ge_text_embeddertest.cpp b/core/fxge/fx_ge_text_embeddertest.cpp
index 045b6dc869..045b6dc869 100644
--- a/core/fxge/ge/fx_ge_text_embeddertest.cpp
+++ b/core/fxge/fx_ge_text_embeddertest.cpp
diff --git a/core/fxge/ge/fx_text_int.h b/core/fxge/fx_text_int.h
index dcd54cead0..6af8eb9165 100644
--- a/core/fxge/ge/fx_text_int.h
+++ b/core/fxge/fx_text_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXGE_GE_FX_TEXT_INT_H_
-#define CORE_FXGE_GE_FX_TEXT_INT_H_
+#ifndef CORE_FXGE_FX_TEXT_INT_H_
+#define CORE_FXGE_FX_TEXT_INT_H_
 
 #include <map>
 #include <memory>
@@ -28,4 +28,4 @@ class CFX_SizeGlyphCache {
   std::map<uint32_t, std::unique_ptr<CFX_GlyphBitmap>> m_GlyphMap;
 };
 
-#endif  // CORE_FXGE_GE_FX_TEXT_INT_H_
+#endif  // CORE_FXGE_FX_TEXT_INT_H_
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index d56ac113b9..40b1ccb665 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -40,7 +40,7 @@
 #include "third_party/skia/include/pathops/SkPathOps.h"
 
 #ifdef _SKIA_SUPPORT_PATHS_
-#include "core/fxge/ge/cfx_cliprgn.h"
+#include "core/fxge/cfx_cliprgn.h"
 #endif  // _SKIA_SUPPORT_PATHS_
 
 #ifdef _SKIA_SUPPORT_
diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp
index b5260c1073..c936553598 100644
--- a/core/fxge/win32/cfx_psrenderer.cpp
+++ b/core/fxge/win32/cfx_psrenderer.cpp
@@ -17,7 +17,7 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/dib/cfx_dibextractor.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "core/fxge/win32/cpsoutput.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index f6481187b3..ef3a7f2f8e 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -15,6 +15,7 @@
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxcrt/fx_memory.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxge/cfx_folderfontinfo.h"
 #include "core/fxge/cfx_gemodule.h"
 #include "core/fxge/cfx_windowsrenderdevice.h"
 #include "core/fxge/dib/cfx_dibextractor.h"
@@ -22,8 +23,7 @@
 #include "core/fxge/dib/cstretchengine.h"
 #include "core/fxge/fx_font.h"
 #include "core/fxge/fx_freetype.h"
-#include "core/fxge/ge/cfx_folderfontinfo.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "core/fxge/ifx_systemfontinfo.h"
 #include "core/fxge/win32/cfx_windowsdib.h"
 #include "core/fxge/win32/dwrite_int.h"
diff --git a/core/fxge/win32/fx_win32_dwrite.cpp b/core/fxge/win32/fx_win32_dwrite.cpp
index 91fb465af4..8b1786a088 100644
--- a/core/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/fxge/win32/fx_win32_dwrite.cpp
@@ -7,7 +7,7 @@
 #include <dwrite.h>
 
 #include "core/fxcrt/fx_system.h"
-#include "core/fxge/ge/cfx_cliprgn.h"
+#include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/win32/dwrite_int.h"
 
 typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)(
diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index 8f7cbf5be0..d7444f43a1 100644
--- a/core/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -16,7 +16,7 @@
 #include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/cstretchengine.h"
 #include "core/fxge/fx_freetype.h"
-#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/fx_text_int.h"
 #include "core/fxge/win32/cpsoutput.h"
 #include "core/fxge/win32/win32_int.h"
 #include "third_party/base/ptr_util.h"