Move core/fpdfapi/fpdf_cmaps to core/fpdfapi/cmaps

BUG=pdfium:603

Review-Url: https://codereview.chromium.org/2391013002

70 files changed, 146 insertions, 146 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 37185549d4..9579f7477c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -327,73 +327,73 @@ static_library("fpdfdoc") {
 
 static_library("fpdfapi") {
   sources = [
+    "core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp",
+    "core/fpdfapi/cmaps/CNS1/B5pc-H_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/B5pc-V_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/ETen-B5-H_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/ETen-B5-V_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5.cpp",
+    "core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5.cpp",
+    "core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3.cpp",
+    "core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3.cpp",
+    "core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0.cpp",
+    "core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp",
+    "core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5.cpp",
+    "core/fpdfapi/cmaps/GB1/GB-EUC-H_0.cpp",
+    "core/fpdfapi/cmaps/GB1/GB-EUC-V_0.cpp",
+    "core/fpdfapi/cmaps/GB1/GBK-EUC-H_2.cpp",
+    "core/fpdfapi/cmaps/GB1/GBK-EUC-V_2.cpp",
+    "core/fpdfapi/cmaps/GB1/GBK2K-H_5.cpp",
+    "core/fpdfapi/cmaps/GB1/GBK2K-V_5.cpp",
+    "core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2.cpp",
+    "core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2.cpp",
+    "core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0.cpp",
+    "core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0.cpp",
+    "core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4.cpp",
+    "core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4.cpp",
+    "core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp",
+    "core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2.cpp",
+    "core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2.cpp",
+    "core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2.cpp",
+    "core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2.cpp",
+    "core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp",
+    "core/fpdfapi/cmaps/Japan1/EUC-H_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/EUC-V_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2.cpp",
+    "core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2.cpp",
+    "core/fpdfapi/cmaps/Japan1/H_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp",
+    "core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp",
+    "core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4.cpp",
+    "core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4.cpp",
+    "core/fpdfapi/cmaps/Japan1/V_1.cpp",
+    "core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp",
+    "core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp",
+    "core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0.cpp",
+    "core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0.cpp",
+    "core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1.cpp",
+    "core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1.cpp",
+    "core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1.cpp",
+    "core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1.cpp",
+    "core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0.cpp",
+    "core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1.cpp",
+    "core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1.cpp",
+    "core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0.cpp",
+    "core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp",
+    "core/fpdfapi/cmaps/cmap_int.h",
+    "core/fpdfapi/cmaps/fpdf_cmaps.cpp",
     "core/fpdfapi/cpdf_modulemgr.cpp",
     "core/fpdfapi/cpdf_modulemgr.h",
     "core/fpdfapi/cpdf_pagerendercontext.cpp",
     "core/fpdfapi/cpdf_pagerendercontext.h",
-    "core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp",
-    "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp",
-    "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp",
-    "core/fpdfapi/fpdf_cmaps/cmap_int.h",
-    "core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp",
     "core/fpdfapi/fpdf_edit/cpdf_creator.h",
     "core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp",
     "core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h",
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp b/core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
index 30968a5bea..c9042399c4 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
+++ b/core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_CNS1CID2Unicode_5[19088] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp b/core/fpdfapi/cmaps/CNS1/B5pc-H_0.cpp
index 1b19edc3c4..0c9606513a 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/B5pc-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_B5pc_H_0[247 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x003D, 0x00FD, 0x00FF, 0x0060,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp b/core/fpdfapi/cmaps/CNS1/B5pc-V_0.cpp
index b872a69ab5..88768d6921 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/B5pc-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_B5pc_V_0[12 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp b/core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0.cpp
index ab893832bb..efbe352257 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_CNS_EUC_H_0[157 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1FE, 0x0063, 0xA2A1, 0xA2FE, 0x00C1,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp b/core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0.cpp
index e3137ad6eb..2090969e79 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_CNS_EUC_V_0[180 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1AB, 0x0063, 0xA1AC, 0xA1AC, 0x354E,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp b/core/fpdfapi/cmaps/CNS1/ETen-B5-H_0.cpp
index 291ab2627c..3138ae99f4 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/ETen-B5-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_ETen_B5_H_0[254 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA140, 0xA158, 0x0063, 0xA159, 0xA15C, 0x35AF,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp b/core/fpdfapi/cmaps/CNS1/ETen-B5-V_0.cpp
index dfbc1e35ba..622f2ff255 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/ETen-B5-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_ETen_B5_V_0[13 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp b/core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0.cpp
index 40fae5086a..e02f9ed800 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_ETenms_B5_H_0[1 * 3] = {
     0x0020, 0x007E, 0x0001,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp b/core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0.cpp
index b7f79e44bb..de922490ca 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_ETenms_B5_V_0[18 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA14C, 0xA14C, 0x006D, 0xA156, 0xA156, 0x0138,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp b/core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5.cpp
index 170c33052b..47f7d6ac84 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp
+++ b/core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_HKscs_B5_H_5[1210 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8740, 0x8765, 0x4A15, 0x8767, 0x8779, 0x4A3B,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp b/core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5.cpp
index cfb1817c0d..a833497f6a 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp
+++ b/core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_HKscs_B5_V_5[13 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3.cpp
index 64e52de650..bfe6a34254 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp
+++ b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_UniCNS_UCS2_H_3[16418 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A2, 0x00A3, 0x0106, 0x00A5, 0x00A5, 0x0104,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3.cpp
index e1bb27c2f5..dfa7b879df 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp
+++ b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_UniCNS_UCS2_V_3[13 * 3] = {
     0x2013, 0x2013, 0x0078, 0x2014, 0x2014, 0x007A, 0x2025, 0x2025,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp b/core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0.cpp
index 5cee7b2f8c..a033c13dcc 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp
+++ b/core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
 const uint16_t g_FXCMAP_UniCNS_UTF16_H_0[14557 * 2] = {
     0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
index ca9976db9a..6351d2c9bb 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h"
 
+#include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h
index bef9f6c04d..a87a47fca3 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
+++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
-#define CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
+#ifndef CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_
+#define CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_
 
 #include <stdint.h>
 
@@ -26,4 +26,4 @@ extern const uint16_t g_FXCMAP_UniCNS_UCS2_V_3[];
 extern const uint16_t g_FXCMAP_UniCNS_UTF16_H_0[];
 extern const uint16_t g_FXCMAP_CNS1CID2Unicode_5[];
 
-#endif  // CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
+#endif  // CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp b/core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5.cpp
index a7468964f9..5a5ae048ab 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp
+++ b/core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GB1CID2Unicode_5[30284] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp b/core/fpdfapi/cmaps/GB1/GB-EUC-H_0.cpp
index bf4f12f04b..9bbfe32ec0 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp
+++ b/core/fpdfapi/cmaps/GB1/GB-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GB_EUC_H_0[90 * 3] = {
     0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0xA1A1, 0xA1FE, 0x0060,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp b/core/fpdfapi/cmaps/GB1/GB-EUC-V_0.cpp
index dd4e0b8742..19bd4182fb 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp
+++ b/core/fpdfapi/cmaps/GB1/GB-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GB_EUC_V_0[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp b/core/fpdfapi/cmaps/GB1/GBK-EUC-H_2.cpp
index ed68358705..617f020b84 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBK-EUC-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBK_EUC_H_2[4071 * 3] = {
     0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0x8140, 0x8178, 0x2758,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp b/core/fpdfapi/cmaps/GB1/GBK-EUC-V_2.cpp
index 5c993f8b4d..87e53a7b70 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBK-EUC-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBK_EUC_V_2[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp b/core/fpdfapi/cmaps/GB1/GBK2K-H_5.cpp
index 7ad5864c9d..37b8803cc2 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBK2K-H_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBK2K_H_5[4071 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp b/core/fpdfapi/cmaps/GB1/GBK2K-V_5.cpp
index 0445263e02..8efedd063c 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBK2K-V_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBK2K_V_5[41 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp b/core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2.cpp
index 44a5b7f8a1..3145980b3a 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBKp_EUC_H_2[4070 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp b/core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2.cpp
index c9aac3d3ff..014ae70a1c 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBKp_EUC_V_2[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp b/core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0.cpp
index 4553f7ca1e..ff437d7255 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBpc_EUC_H_0[91 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x1E20, 0x00FD, 0x00FF, 0x1E21,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp b/core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0.cpp
index 70cacb5546..a35858f21b 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp
+++ b/core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_GBpc_EUC_V_0[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4.cpp
index e01692f36a..e135f40da7 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp
+++ b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_UniGB_UCS2_H_4[13825 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A4, 0x00A4, 0x00A7, 0x00A5, 0x00A5, 0x5752,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4.cpp
index 1889171420..4ec5405a36 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp
+++ b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
 const uint16_t g_FXCMAP_UniGB_UCS2_V_4[24 * 3] = {
     0x2014, 0x2014, 0x0256, 0x2026, 0x2026, 0x0257, 0x2225, 0x2225, 0x1E1C,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
index 971a5c8512..9647eeeb1d 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h"
 
+#include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h b/core/fpdfapi/cmaps/GB1/cmaps_gb1.h
index e80809897d..0b8a3505f3 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h
+++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
-#define CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
+#ifndef CORE_FPDFAPI_CMAPS_GB1_CMAPS_GB1_H_
+#define CORE_FPDFAPI_CMAPS_GB1_CMAPS_GB1_H_
 
 #include <stdint.h>
 
@@ -24,4 +24,4 @@ extern const uint16_t g_FXCMAP_UniGB_UCS2_H_4[];
 extern const uint16_t g_FXCMAP_UniGB_UCS2_V_4[];
 extern const uint16_t g_FXCMAP_GB1CID2Unicode_5[];
 
-#endif  // CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
+#endif  // CORE_FPDFAPI_CMAPS_GB1_CMAPS_GB1_H_
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp b/core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1.cpp
index e3ac795e98..b3447af96f 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_83pv_RKSJ_H_1[222 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2.cpp
index 485b6a8500..d5d29d6ed8 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp
+++ b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_90ms_RKSJ_H_2[171 * 3] = {
     0x0020, 0x007D, 0x00E7, 0x007E, 0x007E, 0x0277, 0x00A0, 0x00DF, 0x0146,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2.cpp
index 19716da07d..1fb0c33024 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp
+++ b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_90ms_RKSJ_V_2[78 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2.cpp
index 471a0ef776..65081c8253 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp
+++ b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_90msp_RKSJ_H_2[170 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2.cpp
index 4aff86612c..5a5e457d65 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp
+++ b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_90msp_RKSJ_V_2[78 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp b/core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1.cpp
index 61890ad2d7..e41b839188 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_90pv_RKSJ_H_1[263 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1.cpp
index 1034dd9713..53dc7548af 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_Add_RKSJ_H_1[635 * 3] = {
     0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1.cpp
index 8c3eee5843..47be9311e7 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_Add_RKSJ_V_1[57 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp b/core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp
index 2f127aa9f1..fbef3f1405 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp
+++ b/core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_Japan1CID2Unicode_4[15444] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp b/core/fpdfapi/cmaps/Japan1/EUC-H_1.cpp
index fc8c7913d8..ddb1bcf4c6 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/EUC-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_EUC_H_1[120 * 3] = {
     0x0020, 0x007E, 0x00E7, 0x8EA0, 0x8EDF, 0x0146, 0xA1A1, 0xA1FE, 0x0279,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp b/core/fpdfapi/cmaps/Japan1/EUC-V_1.cpp
index b5b72fedde..d5a70c6ac6 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/EUC-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_EUC_V_1[27 * 3] = {
     0xA1A2, 0xA1A3, 0x1ECF, 0xA1B1, 0xA1B2, 0x1ED1, 0xA1BC, 0xA1BE, 0x1ED3,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2.cpp
index aed4cd992b..b251c5dc82 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp
+++ b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_Ext_RKSJ_H_2[665 * 3] = {
     0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2.cpp
index 06cc2fecc1..b62e5a5dea 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp
+++ b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_Ext_RKSJ_V_2[39 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp b/core/fpdfapi/cmaps/Japan1/H_1.cpp
index 082c1fadf1..be32b5cb72 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_H_1[118 * 3] = {
     0x2121, 0x217E, 0x0279, 0x2221, 0x222E, 0x02D7, 0x223A, 0x2241, 0x02E5,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp
index 9137660760..e03c13963a 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp
+++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_UniJIS_UCS2_HW_H_4[4 * 3] = {
     0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp
index 0df6fb3019..3f3a2a4b43 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp
+++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_UniJIS_UCS2_HW_V_4[199 * 3] = {
     0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F, 0x005D, 0x007E, 0x0124,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4.cpp
index 03af2e8aee..a8c846111f 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp
+++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_UniJIS_UCS2_H_4[9772 * 2] = {
     0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4.cpp
index 715ceb09c0..0e6b215648 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp
+++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_UniJIS_UCS2_V_4[251 * 2] = {
     0x00B0, 0x204D, 0x2010, 0x1ED5, 0x2015, 0x1ED4, 0x2016, 0x1ED7, 0x2018,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp b/core/fpdfapi/cmaps/Japan1/V_1.cpp
index 85adc38cbb..645e1effca 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
 const uint16_t g_FXCMAP_V_1[27 * 3] = {
     0x2122, 0x2123, 0x1ECF, 0x2131, 0x2132, 0x1ED1, 0x213C, 0x213E, 0x1ED3,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
index aaa969193a..f726d50376 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h"
 
+#include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h
index d871735942..27777f2dec 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
-#define CORE_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
+#ifndef CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
+#define CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
 
 #include <stdint.h>
 
@@ -32,4 +32,4 @@ extern const uint16_t g_FXCMAP_UniJIS_UTF16_H_0_DWord[];
 extern const uint16_t g_FXCMAP_UniJIS_UTF16_V_0[];
 extern const uint16_t g_FXCMAP_Japan1CID2Unicode_4[];
 
-#endif  // CORE_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
+#endif  // CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp b/core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp
index 80c6caacc4..3f81ff9447 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp
+++ b/core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_Korea1CID2Unicode_2[18352] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp b/core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0.cpp
index 6c63a89263..cce7899a84 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp
+++ b/core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_KSC_EUC_H_0[467 * 3] = {
     0x0020, 0x007E, 0x1F9E, 0xA1A1, 0xA1FE, 0x0065, 0xA2A1, 0xA2E5, 0x00C3,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp b/core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0.cpp
index 64d8bb2649..7408f9e59d 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp
+++ b/core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_KSC_EUC_V_0[16 * 3] = {
     0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1.cpp
index f4c0d0a1a2..fbbdee806c 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_KSCms_UHC_HW_H_1[675 * 3] = {
     0x0020, 0x007E, 0x1F9E, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1.cpp
index a6e284125c..16ddafa2bb 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_KSCms_UHC_HW_V_1[16 * 3] = {
     0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1.cpp
index 1bec769eeb..986c879222 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_KSCms_UHC_H_1[675 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1.cpp
index ce17fec819..e040444564 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_KSCms_UHC_V_1[16 * 3] = {
     0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp b/core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0.cpp
index 4639797059..12fa16ddd8 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp
+++ b/core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_KSCpc_EUC_H_0[509 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0081, 0x0083, 0x0060, 0x00FE, 0x00FF, 0x0063,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1.cpp
index 9080deacd1..8ed9fbe3f2 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_UniKS_UCS2_H_1[8394 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A1, 0x00A1, 0x00D0, 0x00A4, 0x00A4, 0x00D6,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1.cpp
index 3eefc131e0..46759c51a4 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_UniKS_UCS2_V_1[18 * 3] = {
     0x2013, 0x2014, 0x1F7B, 0x2016, 0x2016, 0x1F7D, 0x2025, 0x2025, 0x1F7A,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp b/core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0.cpp
index 537eab0a42..21018059f7 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp
+++ b/core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
 const uint16_t g_FXCMAP_UniKS_UTF16_H_0[158 * 2] = {
     0x00A9, 0x0062, 0x2010, 0x0061, 0x20A9, 0x0060, 0x2F00, 0x193C, 0x2F04,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
index 62f4a6ecfb..e8a0071ddb 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
 
+#include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h
index cca9a59905..5005ff2dea 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h
+++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
-#define CORE_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
+#ifndef CORE_FPDFAPI_CMAPS_KOREA1_CMAPS_KOREA1_H_
+#define CORE_FPDFAPI_CMAPS_KOREA1_CMAPS_KOREA1_H_
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ extern const uint16_t g_FXCMAP_UniKS_UCS2_V_1[];
 extern const uint16_t g_FXCMAP_UniKS_UTF16_H_0[];
 extern const uint16_t g_FXCMAP_Korea1CID2Unicode_2[];
 
-#endif  // CORE_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
+#endif  // CORE_FPDFAPI_CMAPS_KOREA1_CMAPS_KOREA1_H_
diff --git a/core/fpdfapi/fpdf_cmaps/cmap_int.h b/core/fpdfapi/cmaps/cmap_int.h
index 40fea04953..e84dc11e5a 100644
--- a/core/fpdfapi/fpdf_cmaps/cmap_int.h
+++ b/core/fpdfapi/cmaps/cmap_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
-#define CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
+#ifndef CORE_FPDFAPI_CMAPS_CMAP_INT_H_
+#define CORE_FPDFAPI_CMAPS_CMAP_INT_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -30,4 +30,4 @@ void FPDFAPI_FindEmbeddedCMap(const CFX_ByteString& name,
 uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode);
 uint32_t FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid);
 
-#endif  // CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
+#endif  // CORE_FPDFAPI_CMAPS_CMAP_INT_H_
diff --git a/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
index 2af78102ba..c85a7d9010 100644
--- a/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/cmaps/cmap_int.h"
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/fpdf_font/font_int.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
index 45db54fa67..cb21d2023a 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
@@ -9,8 +9,8 @@
 #include <algorithm>
 #include <vector>
 
+#include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_font/ttgsubtable.h"
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index abedcf0708..91117122aa 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fpdfapi/fpdf_font/font_int.h"
 
+#include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/ttgsubtable.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"