Expand all paths to be based off pdfium/ directory

This CL runs a script over the source and updates the include files to be
a full path from the pdfium/ directory.

BUG=pdfium:65
R=tsepez@chromium.org

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

36 files changed, 42 insertions, 42 deletions

diff --git a/core/src/fxge/android/fpf_skiafont.cpp b/core/src/fxge/android/fpf_skiafont.cpp
index 222b28ee8f..81d59a0707 100644
--- a/core/src/fxge/android/fpf_skiafont.cpp
+++ b/core/src/fxge/android/fpf_skiafont.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fx_fpf.h"
+#include "core/src/fxge/android/fx_fpf.h"
 
 #include <algorithm>
 
 #if _FX_OS_ == _FX_ANDROID_
-#include "fpf_skiafont.h"
-#include "fpf_skiafontmgr.h"
+#include "core/src/fxge/android/fpf_skiafont.h"
+#include "core/src/fxge/android/fpf_skiafontmgr.h"
 #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
 CFPF_SkiaFont::CFPF_SkiaFont()
     : m_pFontMgr(NULL),
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp
index 2b33228dd6..2c13a594e0 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/src/fxge/android/fpf_skiafontmgr.cpp
@@ -12,8 +12,8 @@
 #define FPF_SKIAMATCHWEIGHT_NAME2 60
 #define FPF_SKIAMATCHWEIGHT_1 16
 #define FPF_SKIAMATCHWEIGHT_2 8
-#include "fpf_skiafontmgr.h"
-#include "fpf_skiafont.h"
+#include "core/src/fxge/android/fpf_skiafontmgr.h"
+#include "core/src/fxge/android/fpf_skiafont.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp
index fdc3398d30..2cae2c89d1 100644
--- a/core/src/fxge/android/fpf_skiamodule.cpp
+++ b/core/src/fxge/android/fpf_skiamodule.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fx_fpf.h"
+#include "core/src/fxge/android/fx_fpf.h"
 #if _FX_OS_ == _FX_ANDROID_
-#include "fpf_skiamodule.h"
-#include "fpf_skiafontmgr.h"
+#include "core/src/fxge/android/fpf_skiamodule.h"
+#include "core/src/fxge/android/fpf_skiafontmgr.h"
 static IFPF_DeviceModule* gs_pPFModule = NULL;
 IFPF_DeviceModule* FPF_GetDeviceModule() {
   if (!gs_pPFModule) {
diff --git a/core/src/fxge/android/fx_android_font.cpp b/core/src/fxge/android/fx_android_font.cpp
index f4dfc290a3..653aa86853 100644
--- a/core/src/fxge/android/fx_android_font.cpp
+++ b/core/src/fxge/android/fx_android_font.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fx_fpf.h"
+#include "core/src/fxge/android/fx_fpf.h"
 #if _FX_OS_ == _FX_ANDROID_
 CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {}
 FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr* pFontMgr) {
diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/src/fxge/android/fx_android_imp.cpp
index 073a665560..a933ba60dc 100644
--- a/core/src/fxge/android/fx_android_imp.cpp
+++ b/core/src/fxge/android/fx_android_imp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fx_fpf.h"
+#include "core/src/fxge/android/fx_fpf.h"
 #if _FX_OS_ == _FX_ANDROID_
 void CFX_GEModule::InitPlatform() {
   IFPF_DeviceModule* pDeviceModule = FPF_GetDeviceModule();
diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h
index 6096884ca9..7fb0ad7182 100644
--- a/core/src/fxge/android/fx_fpf.h
+++ b/core/src/fxge/android/fx_fpf.h
@@ -10,6 +10,6 @@
 #include "core/include/fxge/fpf.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
-#include "fx_android_font.h"
+#include "core/src/fxge/android/fx_android_font.h"
 
 #endif  // CORE_SRC_FXGE_ANDROID_FX_FPF_H_
diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp
index a448ae5050..470b19c084 100644
--- a/core/src/fxge/apple/fx_apple_platform.cpp
+++ b/core/src/fxge/apple/fx_apple_platform.cpp
@@ -9,7 +9,7 @@
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
-#include "apple_int.h"
+#include "core/src/fxge/apple/apple_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_apple.h"
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp
index 166d3b46f9..1d2f68645d 100644
--- a/core/src/fxge/apple/fx_mac_imp.cpp
+++ b/core/src/fxge/apple/fx_mac_imp.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxge/fx_ge.h"
-#include "apple_int.h"
+#include "core/src/fxge/apple/apple_int.h"
 
 #if _FX_OS_ == _FX_MACOSX_
 static const struct {
diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp
index a7b0a9e082..c6c382ca28 100644
--- a/core/src/fxge/apple/fx_quartz_device.cpp
+++ b/core/src/fxge/apple/fx_quartz_device.cpp
@@ -12,7 +12,7 @@
 #include "core/src/fxge/ge/fx_text_int.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "apple_int.h"
+#include "core/src/fxge/apple/apple_int.h"
 #include "core/include/fxge/fx_ge_apple.h"
 #ifndef CGFLOAT_IS_DOUBLE
 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp
index e284f62050..56bde94223 100644
--- a/core/src/fxge/dib/fx_dib_composite.cpp
+++ b/core/src/fxge/dib/fx_dib_composite.cpp
@@ -6,7 +6,7 @@
 
 #include "core/include/fxge/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "dib_int.h"
+#include "core/src/fxge/dib/dib_int.h"
 
 const uint8_t _color_sqrt[256] = {
     0x00, 0x03, 0x07, 0x0B, 0x0F, 0x12, 0x16, 0x19, 0x1D, 0x20, 0x23, 0x26,
diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp
index 16772ed003..de56567c51 100644
--- a/core/src/fxge/dib/fx_dib_engine.cpp
+++ b/core/src/fxge/dib/fx_dib_engine.cpp
@@ -8,7 +8,7 @@
 
 #include "core/include/fxge/fx_dib.h"
 #include "core/include/fxge/fx_ge.h"
-#include "dib_int.h"
+#include "core/src/fxge/dib/dib_int.h"
 
 void CWeightTable::Calc(int dest_len,
                         int dest_min,
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp
index 87c113d4ae..484797d3cf 100644
--- a/core/src/fxge/dib/fx_dib_main.cpp
+++ b/core/src/fxge/dib/fx_dib_main.cpp
@@ -10,7 +10,7 @@
 
 #include "core/include/fxge/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "dib_int.h"
+#include "core/src/fxge/dib/dib_int.h"
 
 FX_BOOL ConvertBuffer(FXDIB_Format dest_format,
                       uint8_t* dest_buf,
diff --git a/core/src/fxge/dib/fx_dib_transform.cpp b/core/src/fxge/dib/fx_dib_transform.cpp
index d9740e0111..01c37d207e 100644
--- a/core/src/fxge/dib/fx_dib_transform.cpp
+++ b/core/src/fxge/dib/fx_dib_transform.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "dib_int.h"
+#include "core/src/fxge/dib/dib_int.h"
 
 #include "core/include/fxge/fx_dib.h"
 
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c b/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c
index a653a097fa..ba763aa19d 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitDingbatsFontData [29513] = {0x1,
                                                        0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x11,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c
index af224b448f..d0e6064b77 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedFontData [17597] = {0x1,
                                                     0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xe,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c
index e4de5f59fa..d3e782c39d 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedBoldFontData [18055] = {0x1,
                                                         0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x13,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c
index 8a90043b40..16d6a7b25b 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedBoldItalicFontData [19151] = {0x1,
                                                               0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x19,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c
index 87d7da09f6..2570b97cc2 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedItalicFontData [18746] = {0x1,
                                                           0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x15,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSans.c b/core/src/fxge/fontdata/chromefontdata/FoxitSans.c
index 48465fc6c5..d5ce0620e3 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSans.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSans.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansFontData [15025] = {0x1,
                                                    0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xd,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c
index 81507983a5..9ce9f3060a 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansBoldFontData [16344] = {0x1,
                                                        0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x12,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c
index 91200e1026..b118b6a83f 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansBoldItalicFontData [16418] = {0x1,
                                                              0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x17,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c
index ce6454e885..6612376490 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansItalicFontData [16339] = {0x1,
                                                          0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x14,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c
index dd138281c7..b2cfea9364 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansMMFontData [66919] = {
     0x80, 0x01, 0xD2, 0x29, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2D, 0x41, 0x64, 0x6F, 0x62, 0x65,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c
index 6f0c242351..225c68dff2 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifFontData [19469] = {0x1,
                                                     0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xe,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c
index 5f8a3739ad..98d68f0f79 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifBoldFontData [19395] = {0x1,
                                                         0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x13,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c
index 162bf496c2..5850a31da0 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifBoldItalicFontData [20733] = {0x1,
                                                               0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x19,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c
index ff353f7a8c..5f2b269412 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifItalicFontData [21227] = {0x1,
                                                           0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x15,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c
index 49478b65d7..c287d686c1 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifMMFontData [113417] = {
     0x80, 0x01, 0xD6, 0x29, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2D, 0x41, 0x64, 0x6F, 0x62, 0x65,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c b/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c
index 465a2361ed..13092bc004 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c
+++ b/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c
@@ -4,7 +4,7 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "chromefontdata.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSymbolFontData [16729] = {0x1,
                                                      0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xf,
diff --git a/core/src/fxge/skia/fx_skia_blitter_new.cpp b/core/src/fxge/skia/fx_skia_blitter_new.cpp
index 85391cb77a..f80ca9684d 100644
--- a/core/src/fxge/skia/fx_skia_blitter_new.cpp
+++ b/core/src/fxge/skia/fx_skia_blitter_new.cpp
@@ -8,7 +8,7 @@
 #if defined(_SKIA_SUPPORT_)
 #include "SkBlitter.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "fx_skia_blitter_new.h"
+#include "core/src/fxge/skia/fx_skia_blitter_new.h"
 
 // We use our own renderer here to make it simple
 void CFX_SkiaRenderer::blitAntiH(int x,
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp
index 2e0371f312..1bcbc53e9f 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/src/fxge/skia/fx_skia_device.cpp
@@ -14,8 +14,8 @@
 #include "SkStroke.h"
 
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
-#include "fx_skia_blitter_new.h"
-#include "fx_skia_device.h"
+#include "core/src/fxge/skia/fx_skia_blitter_new.h"
+#include "core/src/fxge/skia/fx_skia_device.h"
 
 extern "C" {
 extern void FX_OUTPUT_LOG_FUNC(const char*, ...);
diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp
index 1fdf3ae9b1..d3f8b60c08 100644
--- a/core/src/fxge/win32/fx_win32_dib.cpp
+++ b/core/src/fxge/win32/fx_win32_dib.cpp
@@ -10,7 +10,7 @@
 #include <windows.h>
 
 #include "core/include/fxge/fx_ge_win32.h"
-#include "win32_int.h"
+#include "core/src/fxge/win32/win32_int.h"
 
 CFX_ByteString CFX_WindowsDIB::GetBitmapInfo(const CFX_DIBitmap* pBitmap) {
   CFX_ByteString result;
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp
index 9e56ee7672..55b9bff2d1 100644
--- a/core/src/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/src/fxge/win32/fx_win32_dwrite.cpp
@@ -10,7 +10,7 @@
 #include <dwrite.h>
 
 #include "core/include/fxge/fx_ge_win32.h"
-#include "dwrite_int.h"
+#include "core/src/fxge/win32/dwrite_int.h"
 
 typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)(
     __in DWRITE_FACTORY_TYPE,
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index 2d37865437..aaf7c36919 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/src/fxge/win32/fx_win32_gdipext.cpp
@@ -17,7 +17,7 @@ using std::max;
 
 #include <gdiplus.h>
 #include "core/include/fxge/fx_ge_win32.h"
-#include "win32_int.h"
+#include "core/src/fxge/win32/win32_int.h"
 
 using namespace Gdiplus;
 using namespace Gdiplus::DllExports;
diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp
index fc7cd790a7..4816c03e2c 100644
--- a/core/src/fxge/win32/fx_win32_print.cpp
+++ b/core/src/fxge/win32/fx_win32_print.cpp
@@ -14,7 +14,7 @@
 #include "core/include/fxge/fx_ge_win32.h"
 #include "core/src/fxge/dib/dib_int.h"
 #include "core/src/fxge/ge/fx_text_int.h"
-#include "win32_int.h"
+#include "core/src/fxge/win32/win32_int.h"
 
 #define SIZETHRESHOLD 1000
 #define OUTPUTPSLEN 4096
diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h
index 0616476676..97da0ac15c 100644
--- a/core/src/fxge/win32/win32_int.h
+++ b/core/src/fxge/win32/win32_int.h
@@ -8,6 +8,7 @@
 #define CORE_SRC_FXGE_WIN32_WIN32_INT_H_
 
 #include "core/include/fxge/fx_ge.h"
+#include "core/src/fxge/win32/dwrite_int.h"
 
 struct WINDIB_Open_Args_;
 class CGdiplusExt {
@@ -97,7 +98,6 @@ class CGdiplusExt {
   HMODULE m_hModule;
   HMODULE m_GdiModule;
 };
-#include "dwrite_int.h"
 class CWin32Platform {
  public:
   FX_BOOL m_bHalfTone;