39 files changed, 88 insertions, 90 deletions
diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
index 6351d2c9bb..8d7fa4b322 100644
--- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
index 9647eeeb1d..8c60b3be9f 100644
--- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
index f726d50376..5336060dc4 100644
--- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
index e8a0071ddb..cc417bf00c 100644
--- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
index c85a7d9010..58a1c082bb 100644
--- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
@@ -7,7 +7,7 @@
 #include "core/fpdfapi/cmaps/cmap_int.h"
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 
 extern "C" {
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index cb21d2023a..e5bbd80a83 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
-#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/font_int.h"
+#include "core/fpdfapi/font/ttgsubtable.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h
index 3e8c042c75..0a6b3e7871 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h
+++ b/core/fpdfapi/font/cpdf_cidfont.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_CIDFONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_CIDFONT_H_
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -88,4 +88,4 @@ class CPDF_CIDFont : public CPDF_Font {
   std::unique_ptr<CFX_CTTGSUBTable> m_pTTGSUBTable;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_CIDFONT_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
index 96ebda740a..945681fc9d 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
-#include "core/fpdfapi/fpdf_font/cpdf_truetypefont.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_truetypefont.h"
+#include "core/fpdfapi/font/cpdf_type1font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h
index 0d2f50b61a..244ab72158 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.h
+++ b/core/fpdfapi/font/cpdf_font.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_FONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_FONT_H_
 
 #include <memory>
 #include <vector>
@@ -129,4 +129,4 @@ class CPDF_Font {
   int m_ItalicAngle;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_FONT_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp b/core/fpdfapi/font/cpdf_fontencoding.cpp
index e373e01233..f6c5186a63 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/font/cpdf_fontencoding.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h b/core/fpdfapi/font/cpdf_fontencoding.h
index f8db9e5ea7..a81035c825 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h
+++ b/core/fpdfapi/font/cpdf_fontencoding.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_FONTENCODING_H_
+#define CORE_FPDFAPI_FONT_CPDF_FONTENCODING_H_
 
 #include "core/fxcrt/cfx_string_pool_template.h"
 #include "core/fxcrt/cfx_weak_ptr.h"
@@ -58,4 +58,4 @@ class CPDF_FontEncoding {
   FX_WCHAR m_Unicodes[256];
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_FONTENCODING_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp b/core/fpdfapi/font/cpdf_simplefont.cpp
index 3bb3730fb5..b596cf0036 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
+++ b/core/fpdfapi/font/cpdf_simplefont.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fxge/fx_freetype.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.h b/core/fpdfapi/font/cpdf_simplefont.h
index f286c1a228..592290b99b 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.h
+++ b/core/fpdfapi/font/cpdf_simplefont.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_SIMPLEFONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_SIMPLEFONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_SIMPLEFONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_SIMPLEFONT_H_
 
 #include <vector>
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -46,4 +46,4 @@ class CPDF_SimpleFont : public CPDF_Font {
   bool m_bUseFontWidth;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_SIMPLEFONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_SIMPLEFONT_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp b/core/fpdfapi/font/cpdf_truetypefont.cpp
index 08c3e11974..f3b5f2507e 100644
--- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
+++ b/core/fpdfapi/font/cpdf_truetypefont.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_truetypefont.h"
+#include "core/fpdfapi/font/cpdf_truetypefont.h"
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fxge/fx_font.h"
 
diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h b/core/fpdfapi/font/cpdf_truetypefont.h
index 8711b8f53d..6a5e0fc83e 100644
--- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h
+++ b/core/fpdfapi/font/cpdf_truetypefont.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TRUETYPEFONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_TRUETYPEFONT_H_
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 #include "core/fxcrt/fx_system.h"
 
 class CPDF_TrueTypeFont : public CPDF_SimpleFont {
@@ -27,4 +27,4 @@ class CPDF_TrueTypeFont : public CPDF_SimpleFont {
   void LoadGlyphMap() override;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TRUETYPEFONT_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp b/core/fpdfapi/font/cpdf_type1font.cpp
index d80d59ae9d..7848af5dee 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
+++ b/core/fpdfapi/font/cpdf_type1font.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
+#include "core/fpdfapi/font/cpdf_type1font.h"
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fxge/cfx_gemodule.h"
 #include "core/fxge/fx_freetype.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.h b/core/fpdfapi/font/cpdf_type1font.h
index 3cc59aa85b..4dc5ea0917 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type1font.h
+++ b/core/fpdfapi/font/cpdf_type1font.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TYPE1FONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_TYPE1FONT_H_
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 #include "core/fxcrt/fx_system.h"
 
 class CPDF_Type1Font : public CPDF_SimpleFont {
@@ -32,4 +32,4 @@ class CPDF_Type1Font : public CPDF_SimpleFont {
   int m_Base14Font;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TYPE1FONT_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp b/core/fpdfapi/font/cpdf_type3char.cpp
index a11f319b78..2114486dec 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
+++ b/core/fpdfapi/font/cpdf_type3char.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_image.h"
@@ -15,8 +15,7 @@
 CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm)
     : m_pForm(pForm), m_bColored(FALSE) {}
 
-CPDF_Type3Char::~CPDF_Type3Char() {
-}
+CPDF_Type3Char::~CPDF_Type3Char() {}
 
 FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) {
   if (m_pBitmap || !m_pForm)
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.h b/core/fpdfapi/font/cpdf_type3char.h
index 325490678d..ebb5ed440c 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3char.h
+++ b/core/fpdfapi/font/cpdf_type3char.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3CHAR_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3CHAR_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TYPE3CHAR_H_
+#define CORE_FPDFAPI_FONT_CPDF_TYPE3CHAR_H_
 
 #include <memory>
 
@@ -32,4 +32,4 @@ class CPDF_Type3Char {
   FX_RECT m_BBox;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3CHAR_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TYPE3CHAR_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp
index e43ccda904..ae301c2e8c 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp
+++ b/core/fpdfapi/font/cpdf_type3font.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 
 #include <utility>
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.h b/core/fpdfapi/font/cpdf_type3font.h
index 03078298f1..0bae192d61 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3font.h
+++ b/core/fpdfapi/font/cpdf_type3font.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3FONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3FONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TYPE3FONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_TYPE3FONT_H_
 
 #include <map>
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -56,4 +56,4 @@ class CPDF_Type3Font : public CPDF_SimpleFont {
   int m_CharLoadingDepth;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3FONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TYPE3FONT_H_
diff --git a/core/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/font/font_int.h
index dce9e0c48f..10c2dcada4 100644
--- a/core/fpdfapi/fpdf_font/font_int.h
+++ b/core/fpdfapi/font/font_int.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
-#define CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#ifndef CORE_FPDFAPI_FONT_FONT_INT_H_
+#define CORE_FPDFAPI_FONT_FONT_INT_H_
 
 #include <map>
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
 #include "core/fxcrt/fx_basic.h"
 
 class CPDF_CID2UnicodeMap;
@@ -201,4 +201,4 @@ class CPDF_ToUnicodeMap {
   CFX_WideTextBuf m_MultiCharBuf;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#endif  // CORE_FPDFAPI_FONT_FONT_INT_H_
diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/font/fpdf_font.cpp
index 825cd61b52..4763fe5c44 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/font/fpdf_font.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/font/fpdf_font_cid.cpp
index 91117122aa..1d8052bc29 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/font/fpdf_font_cid.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
+#include "core/fpdfapi/font/ttgsubtable.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
@@ -21,7 +21,6 @@ namespace {
 const FX_CHAR* const g_CharsetNames[CIDSET_NUM_SETS] = {
     nullptr, "GB1", "CNS1", "Japan1", "Korea1", "UCS"};
 
-
 class CPDF_PredefinedCMap {
  public:
   const FX_CHAR* m_pName;
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp b/core/fpdfapi/font/fpdf_font_cid_unittest.cpp
index ec05df5226..53f5e47f92 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
+++ b/core/fpdfapi/font/fpdf_font_cid_unittest.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/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp b/core/fpdfapi/font/fpdf_font_unittest.cpp
index 0c5ad8a66a..977ae8a3bb 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
+++ b/core/fpdfapi/font/fpdf_font_unittest.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/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fpdf_font, StringToCode) {
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/font/ttgsubtable.cpp
index dde7793050..51f533d7d1 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/fpdfapi/font/ttgsubtable.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
+#include "core/fpdfapi/font/ttgsubtable.h"
 
 #include "core/fxge/fx_freetype.h"
 #include "third_party/base/stl_util.h"
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/font/ttgsubtable.h
index 492a6a21de..b3853912b2 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/fpdfapi/font/ttgsubtable.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
-#define CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#ifndef CORE_FPDFAPI_FONT_TTGSUBTABLE_H_
+#define CORE_FPDFAPI_FONT_TTGSUBTABLE_H_
 
 #include <stdint.h>
 
@@ -298,4 +298,4 @@ class CFX_CTTGSUBTable {
   TLookupList LookupList;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#endif  // CORE_FPDFAPI_FONT_TTGSUBTABLE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_pagemodule.h b/core/fpdfapi/fpdf_page/cpdf_pagemodule.h
index c1f0ede1ba..35316cd0bf 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pagemodule.h
+++ b/core/fpdfapi/fpdf_page/cpdf_pagemodule.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEMODULE_H_
 #define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEMODULE_H_
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
index 1119d2965f..97f6ad2bcd 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 
 CPDF_TextObject::CPDF_TextObject()
     : m_PosX(0),
diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
index 578624de0a..800af23861 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_textstate.h"
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 82cb405859..4b1eaa3064 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -11,8 +11,8 @@
 
 #include "core/fdrm/crypto/fx_crypt.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/cpdf_type1font.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_image.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index ccdc897e17..c0059b8a77 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "core/fpdfapi/edit/cpdf_creator.h"
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 3c7a301d29..3c3104b8ab 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -9,7 +9,7 @@
 #include <limits.h>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
 #include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index 75e6a84598..811f3a9f95 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
diff --git a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
index 6de46a6376..1891a8d2d0 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
+++ b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
@@ -9,8 +9,8 @@
 #include <map>
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_render/cpdf_type3glyphs.h"
 #include "core/fxge/fx_dib.h"
 #include "core/fxge/fx_font.h"
diff --git a/core/fpdfapi/fpdf_render/cpdf_type3cache.h b/core/fpdfapi/fpdf_render/cpdf_type3cache.h
index 199bc28987..ea4b5a1408 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3cache.h
+++ b/core/fpdfapi/fpdf_render/cpdf_type3cache.h
@@ -9,7 +9,7 @@
 
 #include <map>
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index a87a40afae..cb1b2042fb 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -9,8 +9,8 @@
 #include <memory>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
index 1ddf954d86..2554f645d4 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"