5 files changed, 6 insertions, 8 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
index ec86a60d6f..52b79b0c1a 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "font_int.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 #include "core/src/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/fpdf_module.h"
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index 37647c8ef0..34877a866a 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "font_int.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ -13,6 +13,7 @@
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/src/fpdfapi/fpdf_font/ttgsubtable.h"
 
 namespace {
 
@@ -1037,7 +1038,6 @@ void CPDF_CID2UnicodeMap::Load(CPDF_CMapManager* pMgr,
   FPDFAPI_LoadCID2UnicodeMap(charset, m_pEmbeddedMap, m_EmbeddedCount);
 }
 
-#include "ttgsubtable.h"
 CPDF_CIDFont::CPDF_CIDFont() : CPDF_Font(PDFFONT_CIDFONT) {
   m_pCMap = NULL;
   m_pAllocatedCMap = NULL;
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
index 0a8086a193..61961c95e6 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "font_int.h"
-
 namespace {
 
 bool uint_ranges_equal(uint8_t* a, uint8_t* b, size_t count) {
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
index 9cc529c3df..7ea17408ee 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "font_int.h"
-
 TEST(fpdf_font, StringToCode) {
   EXPECT_EQ(0, CPDF_ToUnicodeMap::StringToCode(""));
   EXPECT_EQ(194, CPDF_ToUnicodeMap::StringToCode("<c2"));
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
index 09930bee2d..03a0028e10 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "ttgsubtable.h"
+#include "core/src/fpdfapi/fpdf_font/ttgsubtable.h"
 
 #include <memory>