9 files changed, 42 insertions, 22 deletions
diff --git a/core/src/fxge/android/fpf_skiafont.cpp b/core/src/fxge/android/fpf_skiafont.cpp
index 81d59a0707..ba0c40a4f4 100644
--- a/core/src/fxge/android/fpf_skiafont.cpp
+++ b/core/src/fxge/android/fpf_skiafont.cpp
@@ -4,14 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/android/fx_fpf.h"
+#include "core/include/fxcrt/fx_system.h"
+
+#if _FX_OS_ == _FX_ANDROID_
 
 #include <algorithm>
 
-#if _FX_OS_ == _FX_ANDROID_
+#include "core/include/fxge/fx_freetype.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),
       m_pFontDes(NULL),
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
index 12d5fa520b..c12ec43690 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/src/fxge/android/fpf_skiafont.h
@@ -7,9 +7,12 @@
 #ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
 #define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
 
+#include "core/include/fxcrt/fx_system.h"
+
 #if _FX_OS_ == _FX_ANDROID_
 
 #include "core/include/fxge/fpf.h"
+#include "core/include/fxge/fx_font.h"
 
 class CFPF_SkiaFontDescriptor;
 class CFPF_SkiaFontMgr;
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp
index b37343b9e5..5d075c6d08 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/src/fxge/android/fpf_skiafontmgr.cpp
@@ -4,16 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/src/fxge/android/fx_fpf.h"
+#include "core/include/fxcrt/fx_system.h"
 
 #if _FX_OS_ == _FX_ANDROID_
+
 #define FPF_SKIAMATCHWEIGHT_NAME1 62
 #define FPF_SKIAMATCHWEIGHT_NAME2 60
 #define FPF_SKIAMATCHWEIGHT_1 16
 #define FPF_SKIAMATCHWEIGHT_2 8
+
+#include "core/include/fxcrt/fx_ext.h"
+#include "core/include/fxge/fx_freetype.h"
 #include "core/src/fxge/android/fpf_skiafont.h"
 #include "core/src/fxge/android/fpf_skiafontmgr.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h
index f3ef9109f0..1a304e578a 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.h
+++ b/core/src/fxge/android/fpf_skiafontmgr.h
@@ -7,12 +7,15 @@
 #ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
 #define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
 
+#include "core/include/fxcrt/fx_system.h"
+
 #if _FX_OS_ == _FX_ANDROID_
 
 #include <map>
 #include <vector>
 
 #include "core/include/fxge/fpf.h"
+#include "core/include/fxge/fx_font.h"
 
 #define FPF_SKIAFONTTYPE_Unknown 0
 #define FPF_SKIAFONTTYPE_Path 1
diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp
index 116b65f7f0..76ee853602 100644
--- a/core/src/fxge/android/fpf_skiamodule.cpp
+++ b/core/src/fxge/android/fpf_skiamodule.cpp
@@ -4,10 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/android/fx_fpf.h"
+#include "core/include/fxcrt/fx_system.h"
+
 #if _FX_OS_ == _FX_ANDROID_
+
 #include "core/src/fxge/android/fpf_skiafontmgr.h"
 #include "core/src/fxge/android/fpf_skiamodule.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 653aa86853..f28bf286e5 100644
--- a/core/src/fxge/android/fx_android_font.cpp
+++ b/core/src/fxge/android/fx_android_font.cpp
@@ -4,8 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/android/fx_fpf.h"
+#include "core/include/fxcrt/fx_system.h"
+
 #if _FX_OS_ == _FX_ANDROID_
+
+#include "core/include/fxge/fpf.h"
+#include "core/src/fxge/android/fx_android_font.h"
+
 CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {}
 FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr* pFontMgr) {
   if (!pFontMgr) {
diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h
index 5675e1cdc2..0ebc97d096 100644
--- a/core/src/fxge/android/fx_android_font.h
+++ b/core/src/fxge/android/fx_android_font.h
@@ -7,8 +7,14 @@
 #ifndef CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
 #define CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
 
+#include "core/include/fxcrt/fx_system.h"
+
 #if _FX_OS_ == _FX_ANDROID_
+
+#include "core/include/fxge/fx_font.h"
+
 class IFPF_FontMgr;
+
 class CFX_AndroidFontInfo : public IFX_SystemFontInfo {
  public:
   CFX_AndroidFontInfo();
diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/src/fxge/android/fx_android_imp.cpp
index a933ba60dc..271e0012d8 100644
--- a/core/src/fxge/android/fx_android_imp.cpp
+++ b/core/src/fxge/android/fx_android_imp.cpp
@@ -4,8 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/android/fx_fpf.h"
+#include "core/include/fxcrt/fx_system.h"
+
 #if _FX_OS_ == _FX_ANDROID_
+
+#include "core/include/fxge/fpf.h"
+#include "core/include/fxge/fx_ge.h"
+#include "core/src/fxge/android/fx_android_font.h"
+
 void CFX_GEModule::InitPlatform() {
   IFPF_DeviceModule* pDeviceModule = FPF_GetDeviceModule();
   if (!pDeviceModule) {
@@ -24,4 +30,5 @@ void CFX_GEModule::DestroyPlatform() {
     ((IFPF_DeviceModule*)m_pPlatformData)->Destroy();
   }
 }
+
 #endif
diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h
deleted file mode 100644
index 7fb0ad7182..0000000000
--- a/core/src/fxge/android/fx_fpf.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef CORE_SRC_FXGE_ANDROID_FX_FPF_H_
-#define CORE_SRC_FXGE_ANDROID_FX_FPF_H_
-
-#include "core/include/fxge/fpf.h"
-#include "core/include/fxge/fx_freetype.h"
-#include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/android/fx_android_font.h"
-
-#endif  // CORE_SRC_FXGE_ANDROID_FX_FPF_H_