Move core/src/ up to core/.

This CL moves the core/src/ files up to core/ and fixes up the include guards,
includes and build files.

R=tsepez@chromium.org

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

323 files changed, 1413 insertions, 1659 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 402fe2352a..4116132034 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -198,45 +198,166 @@ visibility = [
 
 static_library("fdrm") {
   sources = [
+    "core/fdrm/crypto/fx_crypt.cpp",
+    "core/fdrm/crypto/fx_crypt_aes.cpp",
+    "core/fdrm/crypto/fx_crypt_sha.cpp",
     "core/include/fdrm/fx_crypt.h",
-    "core/src/fdrm/crypto/fx_crypt.cpp",
-    "core/src/fdrm/crypto/fx_crypt_aes.cpp",
-    "core/src/fdrm/crypto/fx_crypt_sha.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdfdoc") {
   sources = [
+    "core/fpdfdoc/doc_action.cpp",
+    "core/fpdfdoc/doc_annot.cpp",
+    "core/fpdfdoc/doc_ap.cpp",
+    "core/fpdfdoc/doc_basic.cpp",
+    "core/fpdfdoc/doc_bookmark.cpp",
+    "core/fpdfdoc/doc_form.cpp",
+    "core/fpdfdoc/doc_formcontrol.cpp",
+    "core/fpdfdoc/doc_formfield.cpp",
+    "core/fpdfdoc/doc_link.cpp",
+    "core/fpdfdoc/doc_metadata.cpp",
+    "core/fpdfdoc/doc_ocg.cpp",
+    "core/fpdfdoc/doc_tagged.cpp",
+    "core/fpdfdoc/doc_utils.cpp",
+    "core/fpdfdoc/doc_utils.h",
+    "core/fpdfdoc/doc_viewerPreferences.cpp",
+    "core/fpdfdoc/doc_vt.cpp",
+    "core/fpdfdoc/doc_vtmodule.cpp",
+    "core/fpdfdoc/pdf_vt.h",
+    "core/fpdfdoc/tagged_int.h",
     "core/include/fpdfdoc/fpdf_ap.h",
     "core/include/fpdfdoc/fpdf_doc.h",
     "core/include/fpdfdoc/fpdf_tagged.h",
     "core/include/fpdfdoc/fpdf_vt.h",
-    "core/src/fpdfdoc/doc_action.cpp",
-    "core/src/fpdfdoc/doc_annot.cpp",
-    "core/src/fpdfdoc/doc_ap.cpp",
-    "core/src/fpdfdoc/doc_basic.cpp",
-    "core/src/fpdfdoc/doc_bookmark.cpp",
-    "core/src/fpdfdoc/doc_form.cpp",
-    "core/src/fpdfdoc/doc_formcontrol.cpp",
-    "core/src/fpdfdoc/doc_formfield.cpp",
-    "core/src/fpdfdoc/doc_link.cpp",
-    "core/src/fpdfdoc/doc_metadata.cpp",
-    "core/src/fpdfdoc/doc_ocg.cpp",
-    "core/src/fpdfdoc/doc_tagged.cpp",
-    "core/src/fpdfdoc/doc_utils.cpp",
-    "core/src/fpdfdoc/doc_utils.h",
-    "core/src/fpdfdoc/doc_viewerPreferences.cpp",
-    "core/src/fpdfdoc/doc_vt.cpp",
-    "core/src/fpdfdoc/doc_vtmodule.cpp",
-    "core/src/fpdfdoc/pdf_vt.h",
-    "core/src/fpdfdoc/tagged_int.h",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdfapi") {
   sources = [
+    "core/fpdfapi/fpdf_basic_module.cpp",
+    "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/editint.h",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_content.cpp",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_image.cpp",
+    "core/fpdfapi/fpdf_font/font_int.h",
+    "core/fpdfapi/fpdf_font/fpdf_font.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_charset.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_cid.cpp",
+    "core/fpdfapi/fpdf_font/ttgsubtable.cpp",
+    "core/fpdfapi/fpdf_font/ttgsubtable.h",
+    "core/fpdfapi/fpdf_page/fpdf_page.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_colors.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_doc.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_func.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_image.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_parser.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_path.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_pattern.cpp",
+    "core/fpdfapi/fpdf_page/pageint.h",
+    "core/fpdfapi/fpdf_parser/cfdf_document.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_array.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_boolean.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_data_avail.h",
+    "core/fpdfapi/fpdf_parser/cpdf_dictionary.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_document.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_hint_tables.h",
+    "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_name.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_null.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_number.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_object.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_parser.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_reference.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h",
+    "core/fpdfapi/fpdf_parser/cpdf_stream.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_string.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h",
+    "core/fpdfapi/fpdf_render/fpdf_render.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_cache.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_image.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_text.cpp",
+    "core/fpdfapi/fpdf_render/render_int.h",
     "core/include/fpdfapi/cfdf_document.h",
     "core/include/fpdfapi/cpdf_array.h",
     "core/include/fpdfapi/cpdf_boolean.h",
@@ -262,139 +383,18 @@ static_library("fpdfapi") {
     "core/include/fpdfapi/ipdf_crypto_handler.h",
     "core/include/fpdfapi/ipdf_data_avail.h",
     "core/include/fpdfapi/ipdf_security_handler.h",
-    "core/src/fpdfapi/fpdf_basic_module.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/cmap_int.h",
-    "core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp",
-    "core/src/fpdfapi/fpdf_edit/editint.h",
-    "core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp",
-    "core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp",
-    "core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp",
-    "core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp",
-    "core/src/fpdfapi/fpdf_font/font_int.h",
-    "core/src/fpdfapi/fpdf_font/fpdf_font.cpp",
-    "core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp",
-    "core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp",
-    "core/src/fpdfapi/fpdf_font/ttgsubtable.cpp",
-    "core/src/fpdfapi/fpdf_font/ttgsubtable.h",
-    "core/src/fpdfapi/fpdf_page/fpdf_page.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp",
-    "core/src/fpdfapi/fpdf_page/pageint.h",
-    "core/src/fpdfapi/fpdf_parser/cfdf_document.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_array.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_boolean.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_data_avail.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_data_avail.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_dictionary.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_document.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_name.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_null.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_number.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_object.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_reference.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_stream.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_string.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h",
-    "core/src/fpdfapi/fpdf_render/fpdf_render.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp",
-    "core/src/fpdfapi/fpdf_render/render_int.h",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdftext") {
   sources = [
+    "core/fpdftext/fpdf_text_int.cpp",
+    "core/fpdftext/text_int.h",
+    "core/fpdftext/unicodenormalization.cpp",
+    "core/fpdftext/unicodenormalizationdata.cpp",
+    "core/fpdftext/unicodenormalizationdata.h",
     "core/include/fpdftext/fpdf_text.h",
-    "core/src/fpdftext/fpdf_text_int.cpp",
-    "core/src/fpdftext/text_int.h",
-    "core/src/fpdftext/unicodenormalization.cpp",
-    "core/src/fpdftext/unicodenormalizationdata.cpp",
-    "core/src/fpdftext/unicodenormalizationdata.h",
   ]
   configs += [ ":pdfium_config" ]
 }
@@ -409,69 +409,69 @@ static_library("fxcodec") {
     "//third_party:jpeg",
   ]
   sources = [
+    "core/fxcodec/codec/codec_int.h",
+    "core/fxcodec/codec/fx_codec.cpp",
+    "core/fxcodec/codec/fx_codec_fax.cpp",
+    "core/fxcodec/codec/fx_codec_flate.cpp",
+    "core/fxcodec/codec/fx_codec_icc.cpp",
+    "core/fxcodec/codec/fx_codec_jbig.cpp",
+    "core/fxcodec/codec/fx_codec_jpeg.cpp",
+    "core/fxcodec/codec/fx_codec_jpx_opj.cpp",
+    "core/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
+    "core/fxcodec/jbig2/JBig2_ArithDecoder.h",
+    "core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
+    "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h",
+    "core/fxcodec/jbig2/JBig2_BitStream.cpp",
+    "core/fxcodec/jbig2/JBig2_BitStream.h",
+    "core/fxcodec/jbig2/JBig2_Context.cpp",
+    "core/fxcodec/jbig2/JBig2_Context.h",
+    "core/fxcodec/jbig2/JBig2_Define.h",
+    "core/fxcodec/jbig2/JBig2_GrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_GrdProc.h",
+    "core/fxcodec/jbig2/JBig2_GrrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_GrrdProc.h",
+    "core/fxcodec/jbig2/JBig2_GsidProc.cpp",
+    "core/fxcodec/jbig2/JBig2_GsidProc.h",
+    "core/fxcodec/jbig2/JBig2_HtrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_HtrdProc.h",
+    "core/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp",
+    "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h",
+    "core/fxcodec/jbig2/JBig2_HuffmanTable.cpp",
+    "core/fxcodec/jbig2/JBig2_HuffmanTable.h",
+    "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h",
+    "core/fxcodec/jbig2/JBig2_Image.cpp",
+    "core/fxcodec/jbig2/JBig2_Image.h",
+    "core/fxcodec/jbig2/JBig2_List.h",
+    "core/fxcodec/jbig2/JBig2_Page.h",
+    "core/fxcodec/jbig2/JBig2_PatternDict.cpp",
+    "core/fxcodec/jbig2/JBig2_PatternDict.h",
+    "core/fxcodec/jbig2/JBig2_PddProc.cpp",
+    "core/fxcodec/jbig2/JBig2_PddProc.h",
+    "core/fxcodec/jbig2/JBig2_SddProc.cpp",
+    "core/fxcodec/jbig2/JBig2_SddProc.h",
+    "core/fxcodec/jbig2/JBig2_Segment.cpp",
+    "core/fxcodec/jbig2/JBig2_Segment.h",
+    "core/fxcodec/jbig2/JBig2_SymbolDict.cpp",
+    "core/fxcodec/jbig2/JBig2_SymbolDict.h",
+    "core/fxcodec/jbig2/JBig2_TrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_TrdProc.h",
     "core/include/fxcodec/fx_codec.h",
     "core/include/fxcodec/fx_codec_def.h",
     "core/include/fxcodec/fx_codec_flate.h",
-    "core/src/fxcodec/codec/codec_int.h",
-    "core/src/fxcodec/codec/fx_codec.cpp",
-    "core/src/fxcodec/codec/fx_codec_fax.cpp",
-    "core/src/fxcodec/codec/fx_codec_flate.cpp",
-    "core/src/fxcodec/codec/fx_codec_icc.cpp",
-    "core/src/fxcodec/codec/fx_codec_jbig.cpp",
-    "core/src/fxcodec/codec/fx_codec_jpeg.cpp",
-    "core/src/fxcodec/codec/fx_codec_jpx_opj.cpp",
-    "core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
-    "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h",
-    "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
-    "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h",
-    "core/src/fxcodec/jbig2/JBig2_BitStream.cpp",
-    "core/src/fxcodec/jbig2/JBig2_BitStream.h",
-    "core/src/fxcodec/jbig2/JBig2_Context.cpp",
-    "core/src/fxcodec/jbig2/JBig2_Context.h",
-    "core/src/fxcodec/jbig2/JBig2_Define.h",
-    "core/src/fxcodec/jbig2/JBig2_GrdProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_GrdProc.h",
-    "core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_GrrdProc.h",
-    "core/src/fxcodec/jbig2/JBig2_GsidProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_GsidProc.h",
-    "core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_HtrdProc.h",
-    "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp",
-    "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h",
-    "core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp",
-    "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h",
-    "core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h",
-    "core/src/fxcodec/jbig2/JBig2_Image.cpp",
-    "core/src/fxcodec/jbig2/JBig2_Image.h",
-    "core/src/fxcodec/jbig2/JBig2_List.h",
-    "core/src/fxcodec/jbig2/JBig2_Page.h",
-    "core/src/fxcodec/jbig2/JBig2_PatternDict.cpp",
-    "core/src/fxcodec/jbig2/JBig2_PatternDict.h",
-    "core/src/fxcodec/jbig2/JBig2_PddProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_PddProc.h",
-    "core/src/fxcodec/jbig2/JBig2_SddProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_SddProc.h",
-    "core/src/fxcodec/jbig2/JBig2_Segment.cpp",
-    "core/src/fxcodec/jbig2/JBig2_Segment.h",
-    "core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp",
-    "core/src/fxcodec/jbig2/JBig2_SymbolDict.h",
-    "core/src/fxcodec/jbig2/JBig2_TrdProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_TrdProc.h",
   ]
   include_dirs = []
   if (pdf_enable_xfa) {
     sources += [
-      "core/src/fxcodec/codec/fx_codec_bmp.cpp",
-      "core/src/fxcodec/codec/fx_codec_gif.cpp",
-      "core/src/fxcodec/codec/fx_codec_png.cpp",
-      "core/src/fxcodec/codec/fx_codec_progress.cpp",
-      "core/src/fxcodec/codec/fx_codec_progress.h",
-      "core/src/fxcodec/codec/fx_codec_tiff.cpp",
-      "core/src/fxcodec/lbmp/fx_bmp.cpp",
-      "core/src/fxcodec/lbmp/fx_bmp.h",
-      "core/src/fxcodec/lgif/fx_gif.cpp",
-      "core/src/fxcodec/lgif/fx_gif.h",
+      "core/fxcodec/codec/fx_codec_bmp.cpp",
+      "core/fxcodec/codec/fx_codec_gif.cpp",
+      "core/fxcodec/codec/fx_codec_png.cpp",
+      "core/fxcodec/codec/fx_codec_progress.cpp",
+      "core/fxcodec/codec/fx_codec_progress.h",
+      "core/fxcodec/codec/fx_codec_tiff.cpp",
+      "core/fxcodec/lbmp/fx_bmp.cpp",
+      "core/fxcodec/lbmp/fx_bmp.h",
+      "core/fxcodec/lgif/fx_gif.cpp",
+      "core/fxcodec/lgif/fx_gif.h",
     ]
     deps += [
       "third_party:fx_lpng",
@@ -479,7 +479,7 @@ static_library("fxcodec") {
     ]
   }
   if (is_posix) {
-    # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
+    # core/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
     # conversion to check that an address is 16-bit aligned (benign).
     cflags_c = [ "-Wno-pointer-to-int-cast" ]
   }
@@ -497,6 +497,33 @@ config("fxge_warnings") {
 
 static_library("fxcrt") {
   sources = [
+    "core/fxcrt/extension.h",
+    "core/fxcrt/fx_basic_array.cpp",
+    "core/fxcrt/fx_basic_bstring.cpp",
+    "core/fxcrt/fx_basic_buffer.cpp",
+    "core/fxcrt/fx_basic_coords.cpp",
+    "core/fxcrt/fx_basic_gcc.cpp",
+    "core/fxcrt/fx_basic_list.cpp",
+    "core/fxcrt/fx_basic_memmgr.cpp",
+    "core/fxcrt/fx_basic_plex.cpp",
+    "core/fxcrt/fx_basic_utf.cpp",
+    "core/fxcrt/fx_basic_util.cpp",
+    "core/fxcrt/fx_basic_wstring.cpp",
+    "core/fxcrt/fx_bidi.cpp",
+    "core/fxcrt/fx_extension.cpp",
+    "core/fxcrt/fx_ucddata.cpp",
+    "core/fxcrt/fx_unicode.cpp",
+    "core/fxcrt/fx_xml_composer.cpp",
+    "core/fxcrt/fx_xml_parser.cpp",
+    "core/fxcrt/fxcrt_platforms.cpp",
+    "core/fxcrt/fxcrt_platforms.h",
+    "core/fxcrt/fxcrt_posix.cpp",
+    "core/fxcrt/fxcrt_posix.h",
+    "core/fxcrt/fxcrt_stream.cpp",
+    "core/fxcrt/fxcrt_windows.cpp",
+    "core/fxcrt/fxcrt_windows.h",
+    "core/fxcrt/plex.h",
+    "core/fxcrt/xml_int.h",
     "core/include/fxcrt/fx_basic.h",
     "core/include/fxcrt/fx_bidi.h",
     "core/include/fxcrt/fx_coordinates.h",
@@ -508,40 +535,13 @@ static_library("fxcrt") {
     "core/include/fxcrt/fx_system.h",
     "core/include/fxcrt/fx_ucd.h",
     "core/include/fxcrt/fx_xml.h",
-    "core/src/fxcrt/extension.h",
-    "core/src/fxcrt/fx_basic_array.cpp",
-    "core/src/fxcrt/fx_basic_bstring.cpp",
-    "core/src/fxcrt/fx_basic_buffer.cpp",
-    "core/src/fxcrt/fx_basic_coords.cpp",
-    "core/src/fxcrt/fx_basic_gcc.cpp",
-    "core/src/fxcrt/fx_basic_list.cpp",
-    "core/src/fxcrt/fx_basic_memmgr.cpp",
-    "core/src/fxcrt/fx_basic_plex.cpp",
-    "core/src/fxcrt/fx_basic_utf.cpp",
-    "core/src/fxcrt/fx_basic_util.cpp",
-    "core/src/fxcrt/fx_basic_wstring.cpp",
-    "core/src/fxcrt/fx_bidi.cpp",
-    "core/src/fxcrt/fx_extension.cpp",
-    "core/src/fxcrt/fx_ucddata.cpp",
-    "core/src/fxcrt/fx_unicode.cpp",
-    "core/src/fxcrt/fx_xml_composer.cpp",
-    "core/src/fxcrt/fx_xml_parser.cpp",
-    "core/src/fxcrt/fxcrt_platforms.cpp",
-    "core/src/fxcrt/fxcrt_platforms.h",
-    "core/src/fxcrt/fxcrt_posix.cpp",
-    "core/src/fxcrt/fxcrt_posix.h",
-    "core/src/fxcrt/fxcrt_stream.cpp",
-    "core/src/fxcrt/fxcrt_windows.cpp",
-    "core/src/fxcrt/fxcrt_windows.h",
-    "core/src/fxcrt/plex.h",
-    "core/src/fxcrt/xml_int.h",
   ]
   if (pdf_enable_xfa) {
     sources += [
+      "core/fxcrt/fx_arabic.cpp",
+      "core/fxcrt/fx_arabic.h",
+      "core/fxcrt/fx_basic_maps.cpp",
       "core/include/fxcrt/fx_arb.h",
-      "core/src/fxcrt/fx_arabic.cpp",
-      "core/src/fxcrt/fx_arabic.h",
-      "core/src/fxcrt/fx_basic_maps.cpp",
     ]
   }
   configs += [ ":pdfium_config" ]
@@ -552,6 +552,54 @@ static_library("fxge") {
     "third_party:fx_agg",
   ]
   sources = [
+    "core/fxge/agg/fx_agg_driver.cpp",
+    "core/fxge/agg/fx_agg_driver.h",
+    "core/fxge/android/fpf_skiafont.cpp",
+    "core/fxge/android/fpf_skiafont.h",
+    "core/fxge/android/fpf_skiafontmgr.cpp",
+    "core/fxge/android/fpf_skiafontmgr.h",
+    "core/fxge/android/fpf_skiamodule.cpp",
+    "core/fxge/android/fpf_skiamodule.h",
+    "core/fxge/android/fx_android_font.cpp",
+    "core/fxge/android/fx_android_font.h",
+    "core/fxge/android/fx_android_imp.cpp",
+    "core/fxge/apple/apple_int.h",
+    "core/fxge/apple/fx_apple_platform.cpp",
+    "core/fxge/apple/fx_mac_imp.cpp",
+    "core/fxge/apple/fx_quartz_device.cpp",
+    "core/fxge/dib/dib_int.h",
+    "core/fxge/dib/fx_dib_composite.cpp",
+    "core/fxge/dib/fx_dib_convert.cpp",
+    "core/fxge/dib/fx_dib_engine.cpp",
+    "core/fxge/dib/fx_dib_main.cpp",
+    "core/fxge/dib/fx_dib_transform.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitDingbats.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixed.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSans.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansBold.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansMM.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerif.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp",
+    "core/fxge/fontdata/chromefontdata/chromefontdata.h",
+    "core/fxge/freetype/fx_freetype.cpp",
+    "core/fxge/ge/fx_ge.cpp",
+    "core/fxge/ge/fx_ge_device.cpp",
+    "core/fxge/ge/fx_ge_font.cpp",
+    "core/fxge/ge/fx_ge_fontmap.cpp",
+    "core/fxge/ge/fx_ge_linux.cpp",
+    "core/fxge/ge/fx_ge_path.cpp",
+    "core/fxge/ge/fx_ge_ps.cpp",
+    "core/fxge/ge/fx_ge_text.cpp",
+    "core/fxge/ge/fx_text_int.h",
     "core/include/fxge/fpf.h",
     "core/include/fxge/fx_dib.h",
     "core/include/fxge/fx_font.h",
@@ -559,54 +607,6 @@ static_library("fxge") {
     "core/include/fxge/fx_ge.h",
     "core/include/fxge/fx_ge_apple.h",
     "core/include/fxge/fx_ge_win32.h",
-    "core/src/fxge/agg/fx_agg_driver.cpp",
-    "core/src/fxge/agg/fx_agg_driver.h",
-    "core/src/fxge/android/fpf_skiafont.cpp",
-    "core/src/fxge/android/fpf_skiafont.h",
-    "core/src/fxge/android/fpf_skiafontmgr.cpp",
-    "core/src/fxge/android/fpf_skiafontmgr.h",
-    "core/src/fxge/android/fpf_skiamodule.cpp",
-    "core/src/fxge/android/fpf_skiamodule.h",
-    "core/src/fxge/android/fx_android_font.cpp",
-    "core/src/fxge/android/fx_android_font.h",
-    "core/src/fxge/android/fx_android_imp.cpp",
-    "core/src/fxge/apple/apple_int.h",
-    "core/src/fxge/apple/fx_apple_platform.cpp",
-    "core/src/fxge/apple/fx_mac_imp.cpp",
-    "core/src/fxge/apple/fx_quartz_device.cpp",
-    "core/src/fxge/dib/dib_int.h",
-    "core/src/fxge/dib/fx_dib_composite.cpp",
-    "core/src/fxge/dib/fx_dib_convert.cpp",
-    "core/src/fxge/dib/fx_dib_engine.cpp",
-    "core/src/fxge/dib/fx_dib_main.cpp",
-    "core/src/fxge/dib/fx_dib_transform.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitDingbats.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixed.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSans.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansBold.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansMM.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerif.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSymbol.cpp",
-    "core/src/fxge/fontdata/chromefontdata/chromefontdata.h",
-    "core/src/fxge/freetype/fx_freetype.cpp",
-    "core/src/fxge/ge/fx_ge.cpp",
-    "core/src/fxge/ge/fx_ge_device.cpp",
-    "core/src/fxge/ge/fx_ge_font.cpp",
-    "core/src/fxge/ge/fx_ge_fontmap.cpp",
-    "core/src/fxge/ge/fx_ge_linux.cpp",
-    "core/src/fxge/ge/fx_ge_path.cpp",
-    "core/src/fxge/ge/fx_ge_ps.cpp",
-    "core/src/fxge/ge/fx_ge_text.cpp",
-    "core/src/fxge/ge/fx_text_int.h",
   ]
 
   configs += [
@@ -616,7 +616,7 @@ static_library("fxge") {
 
   if (pdf_use_skia) {
     sources = [
-      "core/src/fxge/skia/fx_skia_device.cpp",
+      "core/fxge/skia/fx_skia_device.cpp",
     ]
     deps = [
       "//skia",
@@ -625,13 +625,13 @@ static_library("fxge") {
 
   if (is_win) {
     sources += [
-      "core/src/fxge/win32/dwrite_int.h",
-      "core/src/fxge/win32/fx_win32_device.cpp",
-      "core/src/fxge/win32/fx_win32_dib.cpp",
-      "core/src/fxge/win32/fx_win32_dwrite.cpp",
-      "core/src/fxge/win32/fx_win32_gdipext.cpp",
-      "core/src/fxge/win32/fx_win32_print.cpp",
-      "core/src/fxge/win32/win32_int.h",
+      "core/fxge/win32/dwrite_int.h",
+      "core/fxge/win32/fx_win32_device.cpp",
+      "core/fxge/win32/fx_win32_dib.cpp",
+      "core/fxge/win32/fx_win32_dwrite.cpp",
+      "core/fxge/win32/fx_win32_gdipext.cpp",
+      "core/fxge/win32/fx_win32_print.cpp",
+      "core/fxge/win32/win32_int.h",
     ]
     configs -= [ "//build/config/win:lean_and_mean" ]
   }
@@ -1445,24 +1445,24 @@ if (pdf_enable_xfa) {
 
 test("pdfium_unittests") {
   sources = [
-    "core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp",
-    "core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp",
-    "core/src/fpdfdoc/doc_basic_unittest.cpp",
-    "core/src/fpdftext/fpdf_text_int_unittest.cpp",
-    "core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp",
-    "core/src/fxcrt/fx_basic_bstring_unittest.cpp",
-    "core/src/fxcrt/fx_basic_gcc_unittest.cpp",
-    "core/src/fxcrt/fx_basic_memmgr_unittest.cpp",
-    "core/src/fxcrt/fx_basic_wstring_unittest.cpp",
-    "core/src/fxcrt/fx_bidi_unittest.cpp",
-    "core/src/fxcrt/fx_extension_unittest.cpp",
-    "core/src/fxcrt/fx_system_unittest.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp",
+    "core/fpdfdoc/doc_basic_unittest.cpp",
+    "core/fpdftext/fpdf_text_int_unittest.cpp",
+    "core/fxcodec/codec/fx_codec_jpx_unittest.cpp",
+    "core/fxcrt/fx_basic_bstring_unittest.cpp",
+    "core/fxcrt/fx_basic_gcc_unittest.cpp",
+    "core/fxcrt/fx_basic_memmgr_unittest.cpp",
+    "core/fxcrt/fx_basic_wstring_unittest.cpp",
+    "core/fxcrt/fx_bidi_unittest.cpp",
+    "core/fxcrt/fx_extension_unittest.cpp",
+    "core/fxcrt/fx_system_unittest.cpp",
     "fpdfsdk/src/fpdfdoc_unittest.cpp",
   ]
   deps = [
@@ -1482,11 +1482,11 @@ test("pdfium_unittests") {
 
 test("pdfium_embeddertests") {
   sources = [
-    "core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
     "fpdfsdk/src/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/src/fpdfdoc_embeddertest.cpp",
     "fpdfsdk/src/fpdfedit_embeddertest.cpp",
diff --git a/core/src/fdrm/crypto/fx_crypt.cpp b/core/fdrm/crypto/fx_crypt.cpp
index c1016cdcd9..c1016cdcd9 100644
--- a/core/src/fdrm/crypto/fx_crypt.cpp
+++ b/core/fdrm/crypto/fx_crypt.cpp
diff --git a/core/src/fdrm/crypto/fx_crypt_aes.cpp b/core/fdrm/crypto/fx_crypt_aes.cpp
index d27783f820..d27783f820 100644
--- a/core/src/fdrm/crypto/fx_crypt_aes.cpp
+++ b/core/fdrm/crypto/fx_crypt_aes.cpp
diff --git a/core/src/fdrm/crypto/fx_crypt_sha.cpp b/core/fdrm/crypto/fx_crypt_sha.cpp
index c7d171098b..c7d171098b 100644
--- a/core/src/fdrm/crypto/fx_crypt_sha.cpp
+++ b/core/fdrm/crypto/fx_crypt_sha.cpp
diff --git a/core/src/fpdfapi/fpdf_basic_module.cpp b/core/fpdfapi/fpdf_basic_module.cpp
index cf843cc4d9..cf843cc4d9 100644
--- a/core/src/fpdfapi/fpdf_basic_module.cpp
+++ b/core/fpdfapi/fpdf_basic_module.cpp
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
index 2d50c5f00f..5a45d0aa39 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_CNS1CID2Unicode_5[19088] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp
index 6d85584629..532ecd1013 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_B5pc_H_0[247 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x003D, 0x00FD, 0x00FF, 0x0060,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp
index a7173980da..482c4db05f 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_B5pc_V_0[12 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp
index f8ce91983d..3d61451403 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_CNS_EUC_H_0[157 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1FE, 0x0063, 0xA2A1, 0xA2FE, 0x00C1,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp
index 94106cc77b..5348785d10 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_CNS_EUC_V_0[180 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1AB, 0x0063, 0xA1AC, 0xA1AC, 0x354E,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp
index 23a9e055e6..5f7ccd42ab 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_ETen_B5_H_0[254 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA140, 0xA158, 0x0063, 0xA159, 0xA15C, 0x35AF,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp
index 61114e5b53..3de105a413 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_ETen_B5_V_0[13 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp
index f13970edba..267fee6af8 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_ETenms_B5_H_0[1 * 3] = {
     0x0020, 0x007E, 0x0001,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp
index 029d00030c..4f555fadba 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_ETenms_B5_V_0[18 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA14C, 0xA14C, 0x006D, 0xA156, 0xA156, 0x0138,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp
index 85871b99d6..67459a505f 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_HKscs_B5_H_5[1210 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8740, 0x8765, 0x4A15, 0x8767, 0x8779, 0x4A3B,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp
index 564c3ad861..d9cbab8826 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_HKscs_B5_V_5[13 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp
index 611739e296..f02c9dc655 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_UniCNS_UCS2_H_3[16418 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A2, 0x00A3, 0x0106, 0x00A5, 0x00A5, 0x0104,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp
index d01fb73ce1..b77835c3f3 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_UniCNS_UCS2_V_3[13 * 3] = {
     0x2013, 0x2013, 0x0078, 0x2014, 0x2014, 0x007A, 0x2025, 0x2025,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp
index 4ad544034a..c30dc46568 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
 const FX_WORD g_FXCMAP_UniCNS_UTF16_H_0[14557 * 2] = {
     0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
index b28c6bc13d..a7d1b17986 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
+#include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
+#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
-#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = {
     {"B5pc-H", FXCMAP_CMap::Range, g_FXCMAP_B5pc_H_0, 247, FXCMAP_CMap::None,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
index 8edd85c633..249d529b91 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
-#define CORE_SRC_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
+#ifndef CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
+#define CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
 
 #include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
@@ -26,4 +26,4 @@ extern const FX_WORD g_FXCMAP_UniCNS_UCS2_V_3[];
 extern const FX_WORD g_FXCMAP_UniCNS_UTF16_H_0[];
 extern const FX_WORD g_FXCMAP_CNS1CID2Unicode_5[];
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
+#endif  // CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp b/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp
index c078ea8b2e..c6e5752ede 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GB1CID2Unicode_5[30284] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp
index 047b87a1b0..0485aee635 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GB_EUC_H_0[90 * 3] = {
     0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0xA1A1, 0xA1FE, 0x0060,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp
index 4502b66f62..274d0d2fd2 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GB_EUC_V_0[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp
index cd737d2e15..7f668947b5 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBK_EUC_H_2[4071 * 3] = {
     0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0x8140, 0x8178, 0x2758,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp
index 262c9db221..ec35055da5 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBK_EUC_V_2[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp
index adca3b7b35..bd0b1be516 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBK2K_H_5[4071 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp
index 5ea2722f4f..5e66e43b7e 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBK2K_V_5[41 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp
index f0a8afe863..540e7b6c2a 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBKp_EUC_H_2[4070 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp
index 094d72be05..8c8b3d5c92 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBKp_EUC_V_2[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp
index 48af788ceb..0fab35577c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBpc_EUC_H_0[91 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x1E20, 0x00FD, 0x00FF, 0x1E21,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp
index de80fe7a2d..c07c8a18c0 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_GBpc_EUC_V_0[20 * 3] = {
     0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp
index 04423f1262..60e109f864 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_UniGB_UCS2_H_4[13825 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A4, 0x00A4, 0x00A7, 0x00A5, 0x00A5, 0x5752,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp
index 496f7ee1be..5d53067e26 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
 const FX_WORD g_FXCMAP_UniGB_UCS2_V_4[24 * 3] = {
     0x2014, 0x2014, 0x0256, 0x2026, 0x2026, 0x0257, 0x2225, 0x2225, 0x1E1C,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
index 234f990821..4b34235a64 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
+#include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h"
 
+#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
-#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = {
     {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h
index beae68d382..348783de9d 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h
+++ b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
-#define CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
+#ifndef CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
+#define CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
 
 #include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
@@ -24,4 +24,4 @@ extern const FX_WORD g_FXCMAP_UniGB_UCS2_H_4[];
 extern const FX_WORD g_FXCMAP_UniGB_UCS2_V_4[];
 extern const FX_WORD g_FXCMAP_GB1CID2Unicode_5[];
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
+#endif  // CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp
index 09778bc6cb..19b3976a07 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_83pv_RKSJ_H_1[222 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp
index 8cf3f0122d..d38111784e 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_90ms_RKSJ_H_2[171 * 3] = {
     0x0020, 0x007D, 0x00E7, 0x007E, 0x007E, 0x0277, 0x00A0, 0x00DF, 0x0146,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp
index ea8ebbf0e0..31a9ae55e2 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_90ms_RKSJ_V_2[78 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp
index 99a6ae790d..dd930ea66d 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_90msp_RKSJ_H_2[170 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp
index f9872f88d6..a9731c4f8a 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_90msp_RKSJ_V_2[78 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp
index b00779d4c4..331e75614c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_90pv_RKSJ_H_1[263 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp
index ddfad18b86..ee3027a526 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_Add_RKSJ_H_1[635 * 3] = {
     0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp
index e99b1dee2f..b23057f738 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_Add_RKSJ_V_1[57 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp
index 997d0018f4..6be7bbfe5c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_Japan1CID2Unicode_4[15444] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp
index 7544e4e4ad..e729ebf90c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_EUC_H_1[120 * 3] = {
     0x0020, 0x007E, 0x00E7, 0x8EA0, 0x8EDF, 0x0146, 0xA1A1, 0xA1FE, 0x0279,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp
index ce4fa25811..af095bc570 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_EUC_V_1[27 * 3] = {
     0xA1A2, 0xA1A3, 0x1ECF, 0xA1B1, 0xA1B2, 0x1ED1, 0xA1BC, 0xA1BE, 0x1ED3,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp
index 506c9ecc8b..f4399cbdea 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_Ext_RKSJ_H_2[665 * 3] = {
     0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp
index 6bbd237ecd..f3dbea981c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_Ext_RKSJ_V_2[39 * 3] = {
     0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp
index 6bfca50662..2905a5896b 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_H_1[118 * 3] = {
     0x2121, 0x217E, 0x0279, 0x2221, 0x222E, 0x02D7, 0x223A, 0x2241, 0x02E5,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp
index 4b11e5eb17..ac3ae2f82c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp
+++ b/core/fpdfapi/fpdf_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/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_UniJIS_UCS2_HW_H_4[4 * 3] = {
     0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp
index 30e2858ac4..2753934fc2 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp
+++ b/core/fpdfapi/fpdf_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/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_UniJIS_UCS2_HW_V_4[199 * 3] = {
     0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F, 0x005D, 0x007E, 0x0124,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp
index f6ae452b2a..9c1387a185 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_UniJIS_UCS2_H_4[9772 * 2] = {
     0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp
index bc6190bfb6..fc0375cb20 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_UniJIS_UCS2_V_4[251 * 2] = {
     0x00B0, 0x204D, 0x2010, 0x1ED5, 0x2015, 0x1ED4, 0x2016, 0x1ED7, 0x2018,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp
index 4f38da8d46..1c5663e3d9 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
 const FX_WORD g_FXCMAP_V_1[27 * 3] = {
     0x2122, 0x2123, 0x1ECF, 0x2131, 0x2132, 0x1ED1, 0x213C, 0x213E, 0x1ED3,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
index 233c12c7ac..93c9be6d55 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
+#include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
 
+#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
-#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
     {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h
index 471dd36065..851dbde44e 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
-#define CORE_SRC_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
+#ifndef CORE_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
+#define CORE_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
 
 #include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
@@ -32,4 +32,4 @@ extern const FX_WORD g_FXCMAP_UniJIS_UTF16_H_0_DWord[];
 extern const FX_WORD g_FXCMAP_UniJIS_UTF16_V_0[];
 extern const FX_WORD g_FXCMAP_Japan1CID2Unicode_4[];
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
+#endif  // CORE_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp
index 47f7313004..71c065375e 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_Korea1CID2Unicode_2[18352] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp
index 17d1d2a042..93349291d7 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_KSC_EUC_H_0[467 * 3] = {
     0x0020, 0x007E, 0x1F9E, 0xA1A1, 0xA1FE, 0x0065, 0xA2A1, 0xA2E5, 0x00C3,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp
index 211de4bc05..843ab7c0d1 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_KSC_EUC_V_0[16 * 3] = {
     0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp
index fffb3c64b5..4476c3c169 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp
+++ b/core/fpdfapi/fpdf_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/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_KSCms_UHC_HW_H_1[675 * 3] = {
     0x0020, 0x007E, 0x1F9E, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp
index 37690536e6..1ebcdd34be 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp
+++ b/core/fpdfapi/fpdf_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/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_KSCms_UHC_HW_V_1[16 * 3] = {
     0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp
index d14aabba28..865b7c6c79 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_KSCms_UHC_H_1[675 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp
index c0991de205..ed55f14c12 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_KSCms_UHC_V_1[16 * 3] = {
     0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp
index 9a58d7a4c8..2fcebc1fb1 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_KSCpc_EUC_H_0[509 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0081, 0x0083, 0x0060, 0x00FE, 0x00FF, 0x0063,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp
index 99aae1196b..8bab432fcd 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_UniKS_UCS2_H_1[8394 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A1, 0x00A1, 0x00D0, 0x00A4, 0x00A4, 0x00D6,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp
index 19638f68bf..834594d007 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_UniKS_UCS2_V_1[18 * 3] = {
     0x2013, 0x2014, 0x1F7B, 0x2016, 0x2016, 0x1F7D, 0x2025, 0x2025, 0x1F7A,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp
index 23aba2f2bd..81f0c6ea7e 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
 const FX_WORD g_FXCMAP_UniKS_UTF16_H_0[158 * 2] = {
     0x00A9, 0x0062, 0x2010, 0x0061, 0x20A9, 0x0060, 0x2F00, 0x193C, 0x2F04,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
index 9ae97e0b50..e5072104d6 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
+#include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h"
 
+#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
-#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = {
     {"KSC-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_H_0, 467,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h
index 646a9b9cf1..0180658422 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
-#define CORE_SRC_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
+#ifndef CORE_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
+#define CORE_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
 
 #include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
@@ -21,4 +21,4 @@ extern const FX_WORD g_FXCMAP_UniKS_UCS2_V_1[];
 extern const FX_WORD g_FXCMAP_UniKS_UTF16_H_0[];
 extern const FX_WORD g_FXCMAP_Korea1CID2Unicode_2[];
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
+#endif  // CORE_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
diff --git a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h b/core/fpdfapi/fpdf_cmaps/cmap_int.h
index a486ac3d4a..a812d84f33 100644
--- a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h
+++ b/core/fpdfapi/fpdf_cmaps/cmap_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
-#define CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
+#ifndef CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
+#define CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
 
 #include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
@@ -29,4 +29,4 @@ void FPDFAPI_FindEmbeddedCMap(const char* name,
 FX_WORD FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode);
 FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid);
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
+#endif  // CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
diff --git a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
index 4964f41f18..eed376db71 100644
--- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 void FPDFAPI_FindEmbeddedCMap(const char* name,
                               int charset,
diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/fpdfapi/fpdf_edit/editint.h
index 411de0f0fb..2e4b0cc067 100644
--- a/core/src/fpdfapi/fpdf_edit/editint.h
+++ b/core/fpdfapi/fpdf_edit/editint.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_
-#define CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_
+#ifndef CORE_FPDFAPI_FPDF_EDIT_EDITINT_H_
+#define CORE_FPDFAPI_FPDF_EDIT_EDITINT_H_
 
 #include <vector>
 
@@ -71,4 +71,4 @@ class CPDF_XRefStream {
   CFX_ByteTextBuf m_Buffer;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_
+#endif  // CORE_FPDFAPI_FPDF_EDIT_EDITINT_H_
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
index a8fddf6cfc..ad77455949 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
@@ -4,6 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
@@ -11,7 +12,6 @@
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_parser_decode.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& ar, CFX_Matrix& matrix) {
   ar << matrix.a << " " << matrix.b << " " << matrix.c << " " << matrix.d << " "
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index f3797c2532..2dc2e3eb8e 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -4,22 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_edit/editint.h"
+#include "core/fpdfapi/fpdf_edit/editint.h"
 
 #include <vector>
 
+#include "core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/cpdf_parser.h"
-#include "core/include/fpdfapi/cpdf_string.h"
 #include "core/include/fpdfapi/cpdf_reference.h"
+#include "core/include/fpdfapi/cpdf_string.h"
 #include "core/include/fpdfapi/fpdf_parser_decode.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
 #include "core/include/fpdfapi/ipdf_crypto_handler.h"
 #include "core/include/fxcrt/fx_ext.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h"
 #include "third_party/base/stl_util.h"
 
 #define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024)
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
index 1d21727f72..48e42e2a1f 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
@@ -6,13 +6,13 @@
 
 #include <limits.h>
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/cpdf_reference.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 CPDF_Document::CPDF_Document() : CPDF_IndirectObjectHolder(NULL) {
   m_pRootDict = NULL;
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_image.cpp
index 47e8367420..f3e6a439c2 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_image.cpp
@@ -4,6 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_boolean.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
@@ -13,8 +15,6 @@
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
 
 CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size) {
   int32_t width;
diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/fpdf_font/font_int.h
index dc28010de3..8ceefe353e 100644
--- a/core/src/fpdfapi/fpdf_font/font_int.h
+++ b/core/fpdfapi/fpdf_font/font_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
-#define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#ifndef CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#define CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
 #include <map>
 #include <memory>
@@ -200,4 +200,4 @@ void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset,
                                 const FX_WORD*& pMap,
                                 FX_DWORD& count);
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#endif  // CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp
index ae6ebdd9f8..98411ef0f1 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
@@ -18,11 +19,10 @@
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxge/fx_freetype.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 #include "third_party/base/stl_util.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "core/src/fxge/apple/apple_int.h"
+#include "core/fxge/apple/apple_int.h"
 #endif
 
 namespace {
@@ -138,8 +138,7 @@ CPDF_FontGlobals::CPDF_FontGlobals() {
   FXSYS_memset(m_EmbeddedToUnicodes, 0, sizeof(m_EmbeddedToUnicodes));
 }
 
-CPDF_FontGlobals::~CPDF_FontGlobals() {
-}
+CPDF_FontGlobals::~CPDF_FontGlobals() {}
 
 CPDF_Font* CPDF_FontGlobals::Find(CPDF_Document* pDoc, int index) {
   auto it = m_StockMap.find(pDoc);
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp b/core/fpdfapi/fpdf_font/fpdf_font_charset.cpp
index a4167914d1..a4167914d1 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font_charset.cpp
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index b86c2778db..91fb9fc2ae 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -4,8 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 
+#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_simple_parser.h"
@@ -15,13 +17,11 @@
 #include "core/include/fxcrt/fx_ext.h"
 #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 {
 
-const FX_CHAR* const g_CharsetNames[CIDSET_NUM_SETS] =
-    {nullptr, "GB1", "CNS1", "Japan1", "Korea1", "UCS"};
+const FX_CHAR* const g_CharsetNames[CIDSET_NUM_SETS] = {
+    nullptr, "GB1", "CNS1", "Japan1", "Korea1", "UCS"};
 
 const int g_CharsetCPs[CIDSET_NUM_SETS] = {0, 936, 950, 932, 949, 1200};
 
@@ -376,160 +376,83 @@ const struct CIDTransform {
   FX_WORD CID;
   uint8_t a, b, c, d, e, f;
 } g_Japan1_VertCIDs[] = {
-    {97, 129, 0, 0, 127, 55, 0},
-    {7887, 127, 0, 0, 127, 76, 89},
-    {7888, 127, 0, 0, 127, 79, 94},
-    {7889, 0, 129, 127, 0, 17, 127},
-    {7890, 0, 129, 127, 0, 17, 127},
-    {7891, 0, 129, 127, 0, 17, 127},
-    {7892, 0, 129, 127, 0, 17, 127},
-    {7893, 0, 129, 127, 0, 17, 127},
-    {7894, 0, 129, 127, 0, 17, 127},
-    {7895, 0, 129, 127, 0, 17, 127},
-    {7896, 0, 129, 127, 0, 17, 127},
-    {7897, 0, 129, 127, 0, 17, 127},
-    {7898, 0, 129, 127, 0, 17, 127},
-    {7899, 0, 129, 127, 0, 17, 104},
-    {7900, 0, 129, 127, 0, 17, 127},
-    {7901, 0, 129, 127, 0, 17, 104},
-    {7902, 0, 129, 127, 0, 17, 127},
-    {7903, 0, 129, 127, 0, 17, 127},
-    {7904, 0, 129, 127, 0, 17, 127},
-    {7905, 0, 129, 127, 0, 17, 114},
-    {7906, 0, 129, 127, 0, 17, 127},
-    {7907, 0, 129, 127, 0, 17, 127},
-    {7908, 0, 129, 127, 0, 17, 127},
-    {7909, 0, 129, 127, 0, 17, 127},
-    {7910, 0, 129, 127, 0, 17, 127},
-    {7911, 0, 129, 127, 0, 17, 127},
-    {7912, 0, 129, 127, 0, 17, 127},
-    {7913, 0, 129, 127, 0, 17, 127},
-    {7914, 0, 129, 127, 0, 17, 127},
-    {7915, 0, 129, 127, 0, 17, 114},
-    {7916, 0, 129, 127, 0, 17, 127},
-    {7917, 0, 129, 127, 0, 17, 127},
-    {7918, 127, 0, 0, 127, 18, 25},
-    {7919, 127, 0, 0, 127, 18, 25},
-    {7920, 127, 0, 0, 127, 18, 25},
-    {7921, 127, 0, 0, 127, 18, 25},
-    {7922, 127, 0, 0, 127, 18, 25},
-    {7923, 127, 0, 0, 127, 18, 25},
-    {7924, 127, 0, 0, 127, 18, 25},
-    {7925, 127, 0, 0, 127, 18, 25},
-    {7926, 127, 0, 0, 127, 18, 25},
-    {7927, 127, 0, 0, 127, 18, 25},
-    {7928, 127, 0, 0, 127, 18, 25},
-    {7929, 127, 0, 0, 127, 18, 25},
-    {7930, 127, 0, 0, 127, 18, 25},
-    {7931, 127, 0, 0, 127, 18, 25},
-    {7932, 127, 0, 0, 127, 18, 25},
-    {7933, 127, 0, 0, 127, 18, 25},
-    {7934, 127, 0, 0, 127, 18, 25},
-    {7935, 127, 0, 0, 127, 18, 25},
-    {7936, 127, 0, 0, 127, 18, 25},
-    {7937, 127, 0, 0, 127, 18, 25},
-    {7938, 127, 0, 0, 127, 18, 25},
-    {7939, 127, 0, 0, 127, 18, 25},
-    {8720, 0, 129, 127, 0, 19, 102},
-    {8721, 0, 129, 127, 0, 13, 127},
-    {8722, 0, 129, 127, 0, 19, 108},
-    {8723, 0, 129, 127, 0, 19, 102},
-    {8724, 0, 129, 127, 0, 19, 102},
-    {8725, 0, 129, 127, 0, 19, 102},
-    {8726, 0, 129, 127, 0, 19, 102},
-    {8727, 0, 129, 127, 0, 19, 102},
-    {8728, 0, 129, 127, 0, 19, 114},
-    {8729, 0, 129, 127, 0, 19, 114},
-    {8730, 0, 129, 127, 0, 38, 108},
-    {8731, 0, 129, 127, 0, 13, 108},
-    {8732, 0, 129, 127, 0, 19, 108},
-    {8733, 0, 129, 127, 0, 19, 108},
-    {8734, 0, 129, 127, 0, 19, 108},
-    {8735, 0, 129, 127, 0, 19, 108},
-    {8736, 0, 129, 127, 0, 19, 102},
-    {8737, 0, 129, 127, 0, 19, 102},
-    {8738, 0, 129, 127, 0, 19, 102},
-    {8739, 0, 129, 127, 0, 19, 102},
-    {8740, 0, 129, 127, 0, 19, 102},
-    {8741, 0, 129, 127, 0, 19, 102},
-    {8742, 0, 129, 127, 0, 19, 102},
-    {8743, 0, 129, 127, 0, 19, 102},
-    {8744, 0, 129, 127, 0, 19, 102},
-    {8745, 0, 129, 127, 0, 19, 102},
-    {8746, 0, 129, 127, 0, 19, 114},
-    {8747, 0, 129, 127, 0, 19, 114},
-    {8748, 0, 129, 127, 0, 19, 102},
-    {8749, 0, 129, 127, 0, 19, 102},
-    {8750, 0, 129, 127, 0, 19, 102},
-    {8751, 0, 129, 127, 0, 19, 102},
-    {8752, 0, 129, 127, 0, 19, 102},
-    {8753, 0, 129, 127, 0, 19, 102},
-    {8754, 0, 129, 127, 0, 19, 102},
-    {8755, 0, 129, 127, 0, 19, 102},
-    {8756, 0, 129, 127, 0, 19, 102},
-    {8757, 0, 129, 127, 0, 19, 102},
-    {8758, 0, 129, 127, 0, 19, 102},
-    {8759, 0, 129, 127, 0, 19, 102},
-    {8760, 0, 129, 127, 0, 19, 102},
-    {8761, 0, 129, 127, 0, 19, 102},
-    {8762, 0, 129, 127, 0, 19, 102},
-    {8763, 0, 129, 127, 0, 19, 102},
-    {8764, 0, 129, 127, 0, 19, 102},
-    {8765, 0, 129, 127, 0, 19, 102},
-    {8766, 0, 129, 127, 0, 19, 102},
-    {8767, 0, 129, 127, 0, 19, 102},
-    {8768, 0, 129, 127, 0, 19, 102},
-    {8769, 0, 129, 127, 0, 19, 102},
-    {8770, 0, 129, 127, 0, 19, 102},
-    {8771, 0, 129, 127, 0, 19, 102},
-    {8772, 0, 129, 127, 0, 19, 102},
-    {8773, 0, 129, 127, 0, 19, 102},
-    {8774, 0, 129, 127, 0, 19, 102},
-    {8775, 0, 129, 127, 0, 19, 102},
-    {8776, 0, 129, 127, 0, 19, 102},
-    {8777, 0, 129, 127, 0, 19, 102},
-    {8778, 0, 129, 127, 0, 19, 102},
-    {8779, 0, 129, 127, 0, 19, 114},
-    {8780, 0, 129, 127, 0, 19, 108},
-    {8781, 0, 129, 127, 0, 19, 114},
-    {8782, 0, 129, 127, 0, 13, 114},
-    {8783, 0, 129, 127, 0, 19, 108},
-    {8784, 0, 129, 127, 0, 13, 114},
-    {8785, 0, 129, 127, 0, 19, 108},
-    {8786, 0, 129, 127, 0, 19, 108},
-    {8787, 0, 129, 127, 0, 19, 108},
-    {8788, 0, 129, 127, 0, 19, 108},
-    {8789, 0, 129, 127, 0, 19, 108},
-    {8790, 0, 129, 127, 0, 19, 108},
-    {8791, 0, 129, 127, 0, 19, 108},
-    {8792, 0, 129, 127, 0, 19, 108},
-    {8793, 0, 129, 127, 0, 19, 108},
-    {8794, 0, 129, 127, 0, 19, 108},
-    {8795, 0, 129, 127, 0, 19, 108},
-    {8796, 0, 129, 127, 0, 19, 108},
-    {8797, 0, 129, 127, 0, 19, 108},
-    {8798, 0, 129, 127, 0, 19, 108},
-    {8799, 0, 129, 127, 0, 19, 108},
-    {8800, 0, 129, 127, 0, 19, 108},
-    {8801, 0, 129, 127, 0, 19, 108},
-    {8802, 0, 129, 127, 0, 19, 108},
-    {8803, 0, 129, 127, 0, 19, 108},
-    {8804, 0, 129, 127, 0, 19, 108},
-    {8805, 0, 129, 127, 0, 19, 108},
-    {8806, 0, 129, 127, 0, 19, 108},
-    {8807, 0, 129, 127, 0, 19, 108},
-    {8808, 0, 129, 127, 0, 19, 108},
-    {8809, 0, 129, 127, 0, 19, 108},
-    {8810, 0, 129, 127, 0, 19, 108},
-    {8811, 0, 129, 127, 0, 19, 114},
-    {8812, 0, 129, 127, 0, 19, 102},
-    {8813, 0, 129, 127, 0, 19, 114},
-    {8814, 0, 129, 127, 0, 76, 102},
-    {8815, 0, 129, 127, 0, 13, 121},
-    {8816, 0, 129, 127, 0, 19, 114},
-    {8817, 0, 129, 127, 0, 19, 127},
-    {8818, 0, 129, 127, 0, 19, 114},
-    {8819, 0, 129, 127, 0, 218, 108},
+    {97, 129, 0, 0, 127, 55, 0},     {7887, 127, 0, 0, 127, 76, 89},
+    {7888, 127, 0, 0, 127, 79, 94},  {7889, 0, 129, 127, 0, 17, 127},
+    {7890, 0, 129, 127, 0, 17, 127}, {7891, 0, 129, 127, 0, 17, 127},
+    {7892, 0, 129, 127, 0, 17, 127}, {7893, 0, 129, 127, 0, 17, 127},
+    {7894, 0, 129, 127, 0, 17, 127}, {7895, 0, 129, 127, 0, 17, 127},
+    {7896, 0, 129, 127, 0, 17, 127}, {7897, 0, 129, 127, 0, 17, 127},
+    {7898, 0, 129, 127, 0, 17, 127}, {7899, 0, 129, 127, 0, 17, 104},
+    {7900, 0, 129, 127, 0, 17, 127}, {7901, 0, 129, 127, 0, 17, 104},
+    {7902, 0, 129, 127, 0, 17, 127}, {7903, 0, 129, 127, 0, 17, 127},
+    {7904, 0, 129, 127, 0, 17, 127}, {7905, 0, 129, 127, 0, 17, 114},
+    {7906, 0, 129, 127, 0, 17, 127}, {7907, 0, 129, 127, 0, 17, 127},
+    {7908, 0, 129, 127, 0, 17, 127}, {7909, 0, 129, 127, 0, 17, 127},
+    {7910, 0, 129, 127, 0, 17, 127}, {7911, 0, 129, 127, 0, 17, 127},
+    {7912, 0, 129, 127, 0, 17, 127}, {7913, 0, 129, 127, 0, 17, 127},
+    {7914, 0, 129, 127, 0, 17, 127}, {7915, 0, 129, 127, 0, 17, 114},
+    {7916, 0, 129, 127, 0, 17, 127}, {7917, 0, 129, 127, 0, 17, 127},
+    {7918, 127, 0, 0, 127, 18, 25},  {7919, 127, 0, 0, 127, 18, 25},
+    {7920, 127, 0, 0, 127, 18, 25},  {7921, 127, 0, 0, 127, 18, 25},
+    {7922, 127, 0, 0, 127, 18, 25},  {7923, 127, 0, 0, 127, 18, 25},
+    {7924, 127, 0, 0, 127, 18, 25},  {7925, 127, 0, 0, 127, 18, 25},
+    {7926, 127, 0, 0, 127, 18, 25},  {7927, 127, 0, 0, 127, 18, 25},
+    {7928, 127, 0, 0, 127, 18, 25},  {7929, 127, 0, 0, 127, 18, 25},
+    {7930, 127, 0, 0, 127, 18, 25},  {7931, 127, 0, 0, 127, 18, 25},
+    {7932, 127, 0, 0, 127, 18, 25},  {7933, 127, 0, 0, 127, 18, 25},
+    {7934, 127, 0, 0, 127, 18, 25},  {7935, 127, 0, 0, 127, 18, 25},
+    {7936, 127, 0, 0, 127, 18, 25},  {7937, 127, 0, 0, 127, 18, 25},
+    {7938, 127, 0, 0, 127, 18, 25},  {7939, 127, 0, 0, 127, 18, 25},
+    {8720, 0, 129, 127, 0, 19, 102}, {8721, 0, 129, 127, 0, 13, 127},
+    {8722, 0, 129, 127, 0, 19, 108}, {8723, 0, 129, 127, 0, 19, 102},
+    {8724, 0, 129, 127, 0, 19, 102}, {8725, 0, 129, 127, 0, 19, 102},
+    {8726, 0, 129, 127, 0, 19, 102}, {8727, 0, 129, 127, 0, 19, 102},
+    {8728, 0, 129, 127, 0, 19, 114}, {8729, 0, 129, 127, 0, 19, 114},
+    {8730, 0, 129, 127, 0, 38, 108}, {8731, 0, 129, 127, 0, 13, 108},
+    {8732, 0, 129, 127, 0, 19, 108}, {8733, 0, 129, 127, 0, 19, 108},
+    {8734, 0, 129, 127, 0, 19, 108}, {8735, 0, 129, 127, 0, 19, 108},
+    {8736, 0, 129, 127, 0, 19, 102}, {8737, 0, 129, 127, 0, 19, 102},
+    {8738, 0, 129, 127, 0, 19, 102}, {8739, 0, 129, 127, 0, 19, 102},
+    {8740, 0, 129, 127, 0, 19, 102}, {8741, 0, 129, 127, 0, 19, 102},
+    {8742, 0, 129, 127, 0, 19, 102}, {8743, 0, 129, 127, 0, 19, 102},
+    {8744, 0, 129, 127, 0, 19, 102}, {8745, 0, 129, 127, 0, 19, 102},
+    {8746, 0, 129, 127, 0, 19, 114}, {8747, 0, 129, 127, 0, 19, 114},
+    {8748, 0, 129, 127, 0, 19, 102}, {8749, 0, 129, 127, 0, 19, 102},
+    {8750, 0, 129, 127, 0, 19, 102}, {8751, 0, 129, 127, 0, 19, 102},
+    {8752, 0, 129, 127, 0, 19, 102}, {8753, 0, 129, 127, 0, 19, 102},
+    {8754, 0, 129, 127, 0, 19, 102}, {8755, 0, 129, 127, 0, 19, 102},
+    {8756, 0, 129, 127, 0, 19, 102}, {8757, 0, 129, 127, 0, 19, 102},
+    {8758, 0, 129, 127, 0, 19, 102}, {8759, 0, 129, 127, 0, 19, 102},
+    {8760, 0, 129, 127, 0, 19, 102}, {8761, 0, 129, 127, 0, 19, 102},
+    {8762, 0, 129, 127, 0, 19, 102}, {8763, 0, 129, 127, 0, 19, 102},
+    {8764, 0, 129, 127, 0, 19, 102}, {8765, 0, 129, 127, 0, 19, 102},
+    {8766, 0, 129, 127, 0, 19, 102}, {8767, 0, 129, 127, 0, 19, 102},
+    {8768, 0, 129, 127, 0, 19, 102}, {8769, 0, 129, 127, 0, 19, 102},
+    {8770, 0, 129, 127, 0, 19, 102}, {8771, 0, 129, 127, 0, 19, 102},
+    {8772, 0, 129, 127, 0, 19, 102}, {8773, 0, 129, 127, 0, 19, 102},
+    {8774, 0, 129, 127, 0, 19, 102}, {8775, 0, 129, 127, 0, 19, 102},
+    {8776, 0, 129, 127, 0, 19, 102}, {8777, 0, 129, 127, 0, 19, 102},
+    {8778, 0, 129, 127, 0, 19, 102}, {8779, 0, 129, 127, 0, 19, 114},
+    {8780, 0, 129, 127, 0, 19, 108}, {8781, 0, 129, 127, 0, 19, 114},
+    {8782, 0, 129, 127, 0, 13, 114}, {8783, 0, 129, 127, 0, 19, 108},
+    {8784, 0, 129, 127, 0, 13, 114}, {8785, 0, 129, 127, 0, 19, 108},
+    {8786, 0, 129, 127, 0, 19, 108}, {8787, 0, 129, 127, 0, 19, 108},
+    {8788, 0, 129, 127, 0, 19, 108}, {8789, 0, 129, 127, 0, 19, 108},
+    {8790, 0, 129, 127, 0, 19, 108}, {8791, 0, 129, 127, 0, 19, 108},
+    {8792, 0, 129, 127, 0, 19, 108}, {8793, 0, 129, 127, 0, 19, 108},
+    {8794, 0, 129, 127, 0, 19, 108}, {8795, 0, 129, 127, 0, 19, 108},
+    {8796, 0, 129, 127, 0, 19, 108}, {8797, 0, 129, 127, 0, 19, 108},
+    {8798, 0, 129, 127, 0, 19, 108}, {8799, 0, 129, 127, 0, 19, 108},
+    {8800, 0, 129, 127, 0, 19, 108}, {8801, 0, 129, 127, 0, 19, 108},
+    {8802, 0, 129, 127, 0, 19, 108}, {8803, 0, 129, 127, 0, 19, 108},
+    {8804, 0, 129, 127, 0, 19, 108}, {8805, 0, 129, 127, 0, 19, 108},
+    {8806, 0, 129, 127, 0, 19, 108}, {8807, 0, 129, 127, 0, 19, 108},
+    {8808, 0, 129, 127, 0, 19, 108}, {8809, 0, 129, 127, 0, 19, 108},
+    {8810, 0, 129, 127, 0, 19, 108}, {8811, 0, 129, 127, 0, 19, 114},
+    {8812, 0, 129, 127, 0, 19, 102}, {8813, 0, 129, 127, 0, 19, 114},
+    {8814, 0, 129, 127, 0, 76, 102}, {8815, 0, 129, 127, 0, 13, 121},
+    {8816, 0, 129, 127, 0, 19, 114}, {8817, 0, 129, 127, 0, 19, 127},
+    {8818, 0, 129, 127, 0, 19, 114}, {8819, 0, 129, 127, 0, 218, 108},
 };
 
 int CompareCIDTransform(const void* key, const void* element) {
@@ -1059,8 +982,7 @@ CPDF_CIDFont::CPDF_CIDFont()
       m_bCIDIsGID(FALSE),
       m_pAnsiWidths(nullptr),
       m_bAdobeCourierStd(FALSE),
-      m_pTTGSUBTable(nullptr) {
-}
+      m_pTTGSUBTable(nullptr) {}
 
 CPDF_CIDFont::~CPDF_CIDFont() {
   if (m_pAnsiWidths) {
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
index 61961c95e6..c12b9c5eee 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
+++ b/core/fpdfapi/fpdf_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/src/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp b/core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
index 7ea17408ee..dd2119e0cf 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
+++ b/core/fpdfapi/fpdf_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/src/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fpdf_font, StringToCode) {
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/fpdf_font/ttgsubtable.cpp
index 03a0028e10..24825ec14e 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_font/ttgsubtable.h"
+#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
 
 #include <memory>
 
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h
index 605d25fd57..47ae5a1fa4 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
-#define CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#ifndef CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#define CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
 
 #include <stdint.h>
 
@@ -360,4 +360,4 @@ class CFX_GSUBTable final : public IFX_GSUBTable {
   CFX_CTTGSUBTable m_GsubImp;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#endif  // CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/fpdfapi/fpdf_page/fpdf_page.cpp
index c7ebc67452..5d4a584349 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <algorithm>
 
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
index 9a4c41017d..f557669a77 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <limits.h>
 
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 7c5a0eab42..1a31364b1c 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
+#include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/include/fdrm/fx_crypt.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
-#include "core/src/fpdfapi/fpdf_font/font_int.h"
 
 class CPDF_PageModule : public IPDF_PageModule {
  public:
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
index 1d7bf64903..fd37e1d3e4 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <limits.h>
 
@@ -714,8 +714,8 @@ CPDF_ExpIntFunc::CPDF_ExpIntFunc() {
   m_pEndValues = NULL;
 }
 CPDF_ExpIntFunc::~CPDF_ExpIntFunc() {
-    FX_Free(m_pBeginValues);
-    FX_Free(m_pEndValues);
+  FX_Free(m_pBeginValues);
+  FX_Free(m_pEndValues);
 }
 FX_BOOL CPDF_ExpIntFunc::v_Init(CPDF_Object* pObj) {
   CPDF_Dictionary* pDict = pObj->GetDict();
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp b/core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp
index 2892036882..2892036882 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp
index 1659cacc33..76753d2965 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp
@@ -4,10 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <algorithm>
 
+#include "core/fpdfapi/fpdf_render/render_int.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
@@ -15,7 +16,6 @@
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp b/core/fpdfapi/fpdf_page/fpdf_page_image.cpp
index b7e3e5e116..a88d2b30bd 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_image.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 1b6e5ac965..e4cdaba9d0 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <vector>
 
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index feb2cde346..13c56b4718 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -4,10 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <limits.h>
 
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_boolean.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
@@ -22,7 +23,6 @@
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_safe_types.h"
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 
 CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize) {
   m_pBuf = pData;
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp
index 846166521d..f4c33d2811 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old_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/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fpdf_page_parser_old, ReadHexString) {
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp b/core/fpdfapi/fpdf_page/fpdf_page_path.cpp
index 75d7d2a362..c2b6f13ca0 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_path.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/fpdfapi/fpdf_page/fpdf_page_pattern.cpp
index 0db1c403a4..6bb64292a3 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_pattern.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <algorithm>
 
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h
index 517c0a4055..8818bc9af0 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/fpdf_page/pageint.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
-#define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
+#ifndef CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
+#define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
 #include <memory>
@@ -456,4 +456,4 @@ class CPDF_PatternCS : public CPDF_ColorSpace {
 void PDF_ReplaceAbbr(CPDF_Object* pObj);
 bool IsPathOperator(const uint8_t* buf, size_t len);
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
+#endif  // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
diff --git a/core/src/fpdfapi/fpdf_parser/cfdf_document.cpp b/core/fpdfapi/fpdf_parser/cfdf_document.cpp
index 2d1a04f081..fd144a10a9 100644
--- a/core/src/fpdfapi/fpdf_parser/cfdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cfdf_document.cpp
@@ -6,9 +6,9 @@
 
 #include "core/include/fpdfapi/cfdf_document.h"
 
+#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 
 CFDF_Document::CFDF_Document() : CPDF_IndirectObjectHolder(NULL) {
   m_pRootDict = NULL;
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_array.cpp b/core/fpdfapi/fpdf_parser/cpdf_array.cpp
index 3b21a45ae2..3b21a45ae2 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_array.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_array.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_boolean.cpp b/core/fpdfapi/fpdf_parser/cpdf_boolean.cpp
index 75f2203954..75f2203954 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_boolean.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_boolean.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_data_avail.cpp b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
index 5ab15a3b76..93916cba8b 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
@@ -4,6 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdfapi/fpdf_parser/cpdf_data_avail.h"
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
@@ -13,8 +15,6 @@
 #include "core/include/fpdfapi/cpdf_stream.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_safe_types.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_data_avail.h"
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "third_party/base/stl_util.h"
 
 IPDF_DataAvail::IPDF_DataAvail(IPDF_DataAvail::FileAvail* pFileAvail,
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_data_avail.h b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
index 3fc26c368a..2a6995914c 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_data_avail.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_DATA_AVAIL_H_
-#define CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_DATA_AVAIL_H_
+#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_DATA_AVAIL_H_
+#define CORE_FPDFAPI_FPDF_PARSER_CPDF_DATA_AVAIL_H_
 
+#include "core/fpdfapi/fpdf_parser/cpdf_hint_tables.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 #include "core/include/fpdfapi/cpdf_parser.h"
 #include "core/include/fpdfapi/ipdf_data_avail.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 
 class CPDF_Dictionary;
 class CPDF_IndirectObjectHolder;
@@ -214,4 +214,4 @@ class CPDF_DataAvail final : public IPDF_DataAvail {
   FX_BOOL m_bSupportHintTable;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_DATA_AVAIL_H_
+#endif  // CORE_FPDFAPI_FPDF_PARSER_CPDF_DATA_AVAIL_H_
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_dictionary.cpp b/core/fpdfapi/fpdf_parser/cpdf_dictionary.cpp
index 864cd59744..864cd59744 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_dictionary.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_dictionary.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index b5789410e5..c6bdcddfbe 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
@@ -8,13 +8,13 @@
 
 #include <set>
 
+#include "core/fpdfapi/fpdf_render/render_int.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_parser.h"
 #include "core/include/fpdfapi/cpdf_reference.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fxge/fx_font.h"
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
index 84464fcff2..012b152498 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_hint_tables.h"
 
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_data_avail.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_stream.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_data_avail.h"
+#include "core/include/fxcrt/fx_safe_types.h"
 
 namespace {
 
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.h b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
index 2ddad2f655..a9a89b48bf 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_HINT_TABLES_H_
-#define CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_HINT_TABLES_H_
+#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_HINT_TABLES_H_
+#define CORE_FPDFAPI_FPDF_PARSER_CPDF_HINT_TABLES_H_
 
 #include <vector>
 
@@ -59,4 +59,4 @@ class CPDF_HintTables {
   std::vector<FX_FILESIZE> m_szSharedObjOffsetArray;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_HINT_TABLES_H_
+#endif  // CORE_FPDFAPI_FPDF_PARSER_CPDF_HINT_TABLES_H_
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp
index b1606f9857..b1606f9857 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_name.cpp b/core/fpdfapi/fpdf_parser/cpdf_name.cpp
index 03d523db19..03d523db19 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_name.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_name.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_null.cpp b/core/fpdfapi/fpdf_parser/cpdf_null.cpp
index c18449d08f..c18449d08f 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_null.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_null.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_number.cpp b/core/fpdfapi/fpdf_parser/cpdf_number.cpp
index ddc7aa11a2..ddc7aa11a2 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_number.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_number.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_object.cpp b/core/fpdfapi/fpdf_parser/cpdf_object.cpp
index 208bca8e6c..208bca8e6c 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_object.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_object.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp
index 87ef34fd6a..971bdaf20e 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp
@@ -9,8 +9,8 @@
 #include "core/include/fpdfapi/cpdf_null.h"
 #include "core/include/fpdfapi/cpdf_number.h"
 #include "core/include/fpdfapi/cpdf_reference.h"
-#include "core/include/fpdfapi/cpdf_string.h"
 #include "core/include/fpdfapi/cpdf_stream.h"
+#include "core/include/fpdfapi/cpdf_string.h"
 
 #include <memory>
 #include <string>
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
index e9332901c0..a39dbc031b 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
@@ -8,18 +8,18 @@
 
 #include <vector>
 
+#include "core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/cpdf_number.h"
-#include "core/include/fpdfapi/cpdf_stream.h"
 #include "core/include/fpdfapi/cpdf_reference.h"
+#include "core/include/fpdfapi/cpdf_stream.h"
 #include "core/include/fpdfapi/ipdf_crypto_handler.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_safe_types.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp
index f427ec5d81..f427ec5d81 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
index ec84171059..2d1dcd4b5c 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
@@ -5,10 +5,10 @@
 #include <limits>
 #include <string>
 
+#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 #include "core/include/fpdfapi/cpdf_parser.h"
-#include "core/include/fxcrt/fx_stream.h"
 #include "core/include/fxcrt/fx_ext.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
+#include "core/include/fxcrt/fx_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/utils/path_service.h"
 
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_reference.cpp b/core/fpdfapi/fpdf_parser/cpdf_reference.cpp
index 4aede7d07a..4aede7d07a 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_reference.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_reference.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp
index ad656795f2..90d4e0b5ab 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp
@@ -6,7 +6,7 @@
 
 #include "core/include/fpdfapi/cpdf_simple_parser.h"
 
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 
 CPDF_SimpleParser::CPDF_SimpleParser(const uint8_t* pData, FX_DWORD dwSize)
     : m_pData(pData), m_dwSize(dwSize), m_dwCurPos(0) {}
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp
index bfcb0afc7f..a9acff4155 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp
@@ -6,8 +6,8 @@
 
 #include <string>
 
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
 
@@ -38,15 +38,13 @@ TEST(SimpleParserTest, GetWord) {
       STR_IN_OUT_CASE("\t\t<< /abc>>", "<<"),
       // Handling ending delimiters.
       STR_IN_OUT_CASE("> little bear", ">"),
-      STR_IN_OUT_CASE(") another bear", ")"),
-      STR_IN_OUT_CASE(">> end ", ">>"),
+      STR_IN_OUT_CASE(") another bear", ")"), STR_IN_OUT_CASE(">> end ", ">>"),
       // No ending delimiters.
       STR_IN_OUT_CASE("(sdfgfgbcv", "(sdfgfgbcv"),
       // Regular cases.
       STR_IN_OUT_CASE("apple pear", "apple"),
       STR_IN_OUT_CASE(" pi=3.1415 ", "pi=3.1415"),
-      STR_IN_OUT_CASE(" p t x c ", "p"),
-      STR_IN_OUT_CASE(" pt\0xc ", "pt"),
+      STR_IN_OUT_CASE(" p t x c ", "p"), STR_IN_OUT_CASE(" pt\0xc ", "pt"),
       STR_IN_OUT_CASE(" $^&&*\t\0sdff ", "$^&&*"),
       STR_IN_OUT_CASE("\n\r+3.5656 -11.0", "+3.5656"),
   };
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp b/core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp
index b656572cff..b73238997c 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h"
 
 #include <time.h>
 
+#include "core/include/fdrm/fx_crypt.h"
 #include "core/include/fpdfapi/cpdf_parser.h"
 #include "core/include/fpdfapi/cpdf_simple_parser.h"
 #include "core/include/fpdfapi/ipdf_security_handler.h"
-#include "core/include/fdrm/fx_crypt.h"
 
 IPDF_CryptoHandler::~IPDF_CryptoHandler() {}
 
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h b/core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h
index 3ef1f7143f..28b7503f6e 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_CRYPTO_HANDLER_H_
-#define CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_CRYPTO_HANDLER_H_
+#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_CRYPTO_HANDLER_H_
+#define CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_CRYPTO_HANDLER_H_
 
 #include "core/include/fpdfapi/ipdf_crypto_handler.h"
 
@@ -61,4 +61,4 @@ class CPDF_StandardCryptoHandler : public IPDF_CryptoHandler {
   uint8_t* m_pAESContext;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_CRYPTO_HANDLER_H_
+#endif  // CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_CRYPTO_HANDLER_H_
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp
index feb152ba4a..e5eb4c8469 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h"
 
 #include <time.h>
 
+#include "core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h"
 #include "core/include/fdrm/fx_crypt.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
-#include "core/include/fpdfapi/cpdf_parser.h"
 #include "core/include/fpdfapi/cpdf_object.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h"
+#include "core/include/fpdfapi/cpdf_parser.h"
 
 namespace {
 
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h
index fa761a1846..3341ec391c 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_
-#define CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_
+#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_
+#define CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_
 
 #include "core/include/fpdfapi/ipdf_security_handler.h"
 #include "core/include/fxcrt/fx_string.h"
@@ -102,4 +102,4 @@ class CPDF_StandardSecurityHandler : public IPDF_SecurityHandler {
   int m_KeyLen;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_
+#endif  // CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_stream.cpp b/core/fpdfapi/fpdf_parser/cpdf_stream.cpp
index 45c946ab5f..45c946ab5f 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_stream.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_stream.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_string.cpp b/core/fpdfapi/fpdf_parser/cpdf_string.cpp
index 1d0bf0b829..1d0bf0b829 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_string.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_string.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp
index 89ad5eec33..62be48818b 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp
@@ -4,10 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
+#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 
 #include <vector>
 
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_boolean.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
@@ -21,7 +22,6 @@
 #include "core/include/fpdfapi/fpdf_parser_decode.h"
 #include "core/include/fpdfapi/ipdf_crypto_handler.h"
 #include "core/include/fxcrt/fx_ext.h"
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "third_party/base/numerics/safe_math.h"
 
 namespace {
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
index f8794bcb7f..842b35f8f2 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_SYNTAX_PARSER_H_
-#define CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_SYNTAX_PARSER_H_
+#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_SYNTAX_PARSER_H_
+#define CORE_FPDFAPI_FPDF_PARSER_CPDF_SYNTAX_PARSER_H_
 
 #include <memory>
 
@@ -93,4 +93,4 @@ class CPDF_SyntaxParser {
   FX_DWORD m_WordSize;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_CPDF_SYNTAX_PARSER_H_
+#endif  // CORE_FPDFAPI_FPDF_PARSER_CPDF_SYNTAX_PARSER_H_
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp
index b03b1af450..f501c01715 100644
--- a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp
@@ -5,10 +5,10 @@
 #include <limits>
 #include <string>
 
+#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 #include "core/include/fpdfapi/cpdf_parser.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_stream.h"
-#include "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/utils/path_service.h"
 
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
index e6de7cb7ff..eeb365d0e6 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
@@ -9,12 +9,12 @@
 #include <limits.h>
 #include <vector>
 
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_ext.h"
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 #include "third_party/base/stl_util.h"
 
 #define _STREAM_MAX_SIZE_ 20 * 1024 * 1024
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
index 2412f4310c..2412f4310c 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
index e00759da7a..e00759da7a 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
index c5d21f4bdd..1f0ab5f876 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
+#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
 
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h
index cdc1199623..d0410eec98 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
-#define CORE_SRC_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
+#ifndef CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
+#define CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -36,4 +36,4 @@ inline bool PDFCharIsLineEnding(uint8_t c) {
 int32_t GetHeaderOffset(IFX_FileRead* pFile);
 int32_t GetDirectInteger(CPDF_Dictionary* pDict, const CFX_ByteStringC& key);
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
+#endif  // CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index 1a7a83a55f..2b82ed4cc6 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc)
     : m_pPDFDoc(pPDFDoc), m_pFontCache(new CFX_FontCache) {}
@@ -176,8 +176,7 @@ CPDF_RenderStatus::CPDF_RenderStatus()
       m_T3FillColor(0),
       m_curBlend(FXDIB_BLEND_NORMAL) {}
 
-CPDF_RenderStatus::~CPDF_RenderStatus() {
-}
+CPDF_RenderStatus::~CPDF_RenderStatus() {}
 
 FX_BOOL CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext,
                                       CFX_RenderDevice* pDevice,
@@ -1198,8 +1197,7 @@ void CPDF_DocRenderData::ReleaseTransferFunc(CPDF_Object* pObj) {
 CPDF_DeviceBuffer::CPDF_DeviceBuffer()
     : m_pDevice(nullptr), m_pContext(nullptr), m_pObject(nullptr) {}
 
-CPDF_DeviceBuffer::~CPDF_DeviceBuffer() {
-}
+CPDF_DeviceBuffer::~CPDF_DeviceBuffer() {}
 
 FX_BOOL CPDF_DeviceBuffer::Initialize(CPDF_RenderContext* pContext,
                                       CFX_RenderDevice* pDevice,
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
index 9636d1b23a..f5ab7e0da5 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 struct CACHEINFO {
   FX_DWORD time;
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index 237be06c82..6c235a0258 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -4,11 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 
 #include <utility>
 #include <vector>
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
@@ -18,7 +19,6 @@
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 FX_BOOL CPDF_RenderStatus::ProcessImage(const CPDF_ImageObject* pImageObj,
                                         const CFX_Matrix* pObj2Device) {
@@ -151,8 +151,7 @@ CFX_DIBSource* CPDF_TransferFunc::TranslateImage(const CFX_DIBSource* pSrc,
   return pDest;
 }
 
-CPDF_DIBTransferFunc::~CPDF_DIBTransferFunc() {
-}
+CPDF_DIBTransferFunc::~CPDF_DIBTransferFunc() {}
 
 FXDIB_Format CPDF_DIBTransferFunc::GetDestFormat() {
   if (m_pSrc->IsAlphaMask()) {
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index 93b867005c..f1a06c4fc7 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -4,12 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
@@ -19,7 +20,6 @@
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 namespace {
 
@@ -71,9 +71,7 @@ class JpxBitMapContext {
   explicit JpxBitMapContext(ICodec_JpxModule* jpx_module)
       : jpx_module_(jpx_module), decoder_(nullptr) {}
 
-  ~JpxBitMapContext() {
-    jpx_module_->DestroyDecoder(decoder_);
-  }
+  ~JpxBitMapContext() { jpx_module_->DestroyDecoder(decoder_); }
 
   // Takes ownership of |decoder|.
   void set_decoder(CJPX_Decoder* decoder) { decoder_ = decoder; }
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp
index 427abb8e37..427abb8e37 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
index 7e45399eef..5ad8db1646 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 #define SHADING_STEPS 256
 static void DrawAxialShading(CFX_DIBitmap* pBitmap,
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp
index 176c923372..176c923372 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
index c817c7c374..24b77ed368 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 CPDF_Type3Cache::~CPDF_Type3Cache() {
   for (const auto& pair : m_SizeMap) {
@@ -785,4 +785,3 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj,
     ProcessPath(&path, pObj2Device);
   }
 }
-
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h
index d691f7dc52..c15612466c 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/fpdfapi/fpdf_render/render_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
-#define CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
+#ifndef CORE_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
+#define CORE_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 
 #include <map>
 #include <memory>
@@ -616,4 +616,4 @@ struct _CPDF_UniqueKeyGen {
   int m_KeyLen;
 };
 
-#endif  // CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
+#endif  // CORE_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
diff --git a/core/src/fpdfdoc/doc_action.cpp b/core/fpdfdoc/doc_action.cpp
index 0af219e47e..0af219e47e 100644
--- a/core/src/fpdfdoc/doc_action.cpp
+++ b/core/fpdfdoc/doc_action.cpp
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/fpdfdoc/doc_annot.cpp
index b17347cce3..b17347cce3 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/fpdfdoc/doc_annot.cpp
diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/fpdfdoc/doc_ap.cpp
index d91b4678ca..d2400123d2 100644
--- a/core/src/fpdfdoc/doc_ap.cpp
+++ b/core/fpdfdoc/doc_ap.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdfdoc/doc_utils.h"
+#include "core/fpdfdoc/pdf_vt.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/cpdf_simple_parser.h"
 #include "core/include/fpdfdoc/fpdf_ap.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
-#include "core/src/fpdfdoc/doc_utils.h"
-#include "core/src/fpdfdoc/pdf_vt.h"
 
 #define PBS_SOLID 0
 #define PBS_DASH 1
diff --git a/core/src/fpdfdoc/doc_basic.cpp b/core/fpdfdoc/doc_basic.cpp
index 40c61d22bf..b3a6511734 100644
--- a/core/src/fpdfdoc/doc_basic.cpp
+++ b/core/fpdfdoc/doc_basic.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdfdoc/doc_utils.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/src/fpdfdoc/doc_utils.h"
 
 const int nMaxRecursion = 32;
 int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) {
diff --git a/core/src/fpdfdoc/doc_basic_unittest.cpp b/core/fpdfdoc/doc_basic_unittest.cpp
index 60bc1345ca..659643851d 100644
--- a/core/src/fpdfdoc/doc_basic_unittest.cpp
+++ b/core/fpdfdoc/doc_basic_unittest.cpp
@@ -7,8 +7,8 @@
 #include <memory>
 #include <vector>
 
-#include "core/include/fpdfapi/cpdf_string.h"
 #include "core/include/fpdfapi/cpdf_name.h"
+#include "core/include/fpdfapi/cpdf_string.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
 
@@ -34,8 +34,8 @@ TEST(doc_basic_filespec, EncodeDecodeFileName) {
     {L"\\pdfdocs\\spec.pdf", L"//pdfdocs/spec.pdf"},
     // Absolute path with double backslashes.
     {L"\\\\pdfdocs\\spec.pdf", L"/pdfdocs/spec.pdf"},
-    // Network resource name. It is not supported yet.
-    // {L"pclib/eng:\\pdfdocs\\spec.pdf", L"/pclib/eng/pdfdocs/spec.pdf"},
+// Network resource name. It is not supported yet.
+// {L"pclib/eng:\\pdfdocs\\spec.pdf", L"/pclib/eng/pdfdocs/spec.pdf"},
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
     // Absolute path with colon separator.
     {L"Mac HD:PDFDocs:spec.pdf", L"/Mac HD/PDFDocs/spec.pdf"},
diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/fpdfdoc/doc_bookmark.cpp
index c338e5d48c..c338e5d48c 100644
--- a/core/src/fpdfdoc/doc_bookmark.cpp
+++ b/core/fpdfdoc/doc_bookmark.cpp
diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/fpdfdoc/doc_form.cpp
index 076d3b6363..c205588335 100644
--- a/core/src/fpdfdoc/doc_form.cpp
+++ b/core/fpdfdoc/doc_form.cpp
@@ -6,12 +6,12 @@
 
 #include <vector>
 
+#include "core/fpdfdoc/doc_utils.h"
 #include "core/include/fpdfapi/cfdf_document.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/cpdf_string.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/src/fpdfdoc/doc_utils.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/fpdfdoc/doc_formcontrol.cpp
index 15ff7b5e64..15ff7b5e64 100644
--- a/core/src/fpdfdoc/doc_formcontrol.cpp
+++ b/core/fpdfdoc/doc_formcontrol.cpp
diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/fpdfdoc/doc_formfield.cpp
index 4bce85e831..7ad8cacea9 100644
--- a/core/src/fpdfdoc/doc_formfield.cpp
+++ b/core/fpdfdoc/doc_formfield.cpp
@@ -4,6 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdfdoc/doc_utils.h"
 #include "core/include/fpdfapi/cfdf_document.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_document.h"
@@ -11,7 +12,6 @@
 #include "core/include/fpdfapi/cpdf_simple_parser.h"
 #include "core/include/fpdfapi/cpdf_string.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/src/fpdfdoc/doc_utils.h"
 
 FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) {
   FX_BOOL bUnison = FALSE;
diff --git a/core/src/fpdfdoc/doc_link.cpp b/core/fpdfdoc/doc_link.cpp
index a32d4c7a2d..8aedb40034 100644
--- a/core/src/fpdfdoc/doc_link.cpp
+++ b/core/fpdfdoc/doc_link.cpp
@@ -10,11 +10,9 @@
 
 #include "core/include/fpdfapi/cpdf_array.h"
 
-CPDF_LinkList::CPDF_LinkList() {
-}
+CPDF_LinkList::CPDF_LinkList() {}
 
-CPDF_LinkList::~CPDF_LinkList() {
-}
+CPDF_LinkList::~CPDF_LinkList() {}
 
 const std::vector<CPDF_Dictionary*>* CPDF_LinkList::GetPageLinks(
     CPDF_Page* pPage) {
diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/fpdfdoc/doc_metadata.cpp
index 78364c4cbf..78364c4cbf 100644
--- a/core/src/fpdfdoc/doc_metadata.cpp
+++ b/core/fpdfdoc/doc_metadata.cpp
diff --git a/core/src/fpdfdoc/doc_ocg.cpp b/core/fpdfdoc/doc_ocg.cpp
index 3af745580c..3af745580c 100644
--- a/core/src/fpdfdoc/doc_ocg.cpp
+++ b/core/fpdfdoc/doc_ocg.cpp
diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/fpdfdoc/doc_tagged.cpp
index 523800b43b..015f4db878 100644
--- a/core/src/fpdfdoc/doc_tagged.cpp
+++ b/core/fpdfdoc/doc_tagged.cpp
@@ -6,14 +6,14 @@
 
 #include <map>
 
+#include "core/fpdfdoc/doc_utils.h"
+#include "core/fpdfdoc/tagged_int.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/cpdf_reference.h"
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfdoc/fpdf_tagged.h"
-#include "core/src/fpdfdoc/doc_utils.h"
-#include "core/src/fpdfdoc/tagged_int.h"
 
 const int nMaxRecursion = 32;
 static FX_BOOL IsTagged(const CPDF_Document* pDoc) {
diff --git a/core/src/fpdfdoc/doc_utils.cpp b/core/fpdfdoc/doc_utils.cpp
index 5005e213ab..5160c1115c 100644
--- a/core/src/fpdfdoc/doc_utils.cpp
+++ b/core/fpdfdoc/doc_utils.cpp
@@ -7,11 +7,11 @@
 #include <algorithm>
 #include <vector>
 
+#include "core/fpdfdoc/doc_utils.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/cpdf_simple_parser.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/src/fpdfdoc/doc_utils.h"
 
 namespace {
 
diff --git a/core/src/fpdfdoc/doc_utils.h b/core/fpdfdoc/doc_utils.h
index d69652fedc..ed687943da 100644
--- a/core/src/fpdfdoc/doc_utils.h
+++ b/core/fpdfdoc/doc_utils.h
@@ -4,11 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFDOC_DOC_UTILS_H_
-#define CORE_SRC_FPDFDOC_DOC_UTILS_H_
+#ifndef CORE_FPDFDOC_DOC_UTILS_H_
+#define CORE_FPDFDOC_DOC_UTILS_H_
 
 #include <vector>
 
+#include "core/include/fpdfapi/cpdf_parser.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
+
 class CPDF_Dictionary;
 class CPDF_FormField;
 
@@ -74,4 +77,4 @@ FX_BOOL NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0);
 void EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT);
 void UpdateEncodeFieldName(CPDF_Dictionary* pFieldDict, int nLevel = 0);
 
-#endif  // CORE_SRC_FPDFDOC_DOC_UTILS_H_
+#endif  // CORE_FPDFDOC_DOC_UTILS_H_
diff --git a/core/src/fpdfdoc/doc_viewerPreferences.cpp b/core/fpdfdoc/doc_viewerPreferences.cpp
index 582f3a5a93..582f3a5a93 100644
--- a/core/src/fpdfdoc/doc_viewerPreferences.cpp
+++ b/core/fpdfdoc/doc_viewerPreferences.cpp
diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/fpdfdoc/doc_vt.cpp
index 477df25a14..dddc57f2dd 100644
--- a/core/src/fpdfdoc/doc_vt.cpp
+++ b/core/fpdfdoc/doc_vt.cpp
@@ -6,9 +6,9 @@
 
 #include <algorithm>
 
+#include "core/fpdfdoc/pdf_vt.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
-#include "core/src/fpdfdoc/pdf_vt.h"
 
 const uint8_t gFontSizeSteps[] = {4,  6,  8,   9,   10,  12,  14, 18, 20,
                                   25, 30, 35,  40,  45,  50,  55, 60, 70,
diff --git a/core/src/fpdfdoc/doc_vtmodule.cpp b/core/fpdfdoc/doc_vtmodule.cpp
index d5ea91f67e..85e19ffd08 100644
--- a/core/src/fpdfdoc/doc_vtmodule.cpp
+++ b/core/fpdfdoc/doc_vtmodule.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdfdoc/pdf_vt.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
-#include "core/src/fpdfdoc/pdf_vt.h"
 
 IPDF_VariableText* IPDF_VariableText::NewVariableText() {
   return new CPDF_VariableText();
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/fpdfdoc/pdf_vt.h
index 13ec71a125..53c48af4ec 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/fpdfdoc/pdf_vt.h
@@ -4,21 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFDOC_PDF_VT_H_
-#define CORE_SRC_FPDFDOC_PDF_VT_H_
+#ifndef CORE_FPDFDOC_PDF_VT_H_
+#define CORE_FPDFDOC_PDF_VT_H_
+
+#include "core/include/fpdfdoc/fpdf_vt.h"
 
-class CPVT_Size;
-class CPVT_FloatRect;
-struct CPVT_SectionInfo;
-struct CPVT_LineInfo;
-struct CPVT_WordInfo;
-class CLine;
-class CLines;
-class CSection;
-class CTypeset;
-class CPDF_EditContainer;
 class CPDF_VariableText;
 class CPDF_VariableText_Iterator;
+
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
@@ -558,4 +551,4 @@ class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator {
   CPDF_VariableText* m_pVT;
 };
 
-#endif  // CORE_SRC_FPDFDOC_PDF_VT_H_
+#endif  // CORE_FPDFDOC_PDF_VT_H_
diff --git a/core/src/fpdfdoc/tagged_int.h b/core/fpdfdoc/tagged_int.h
index 7dc9549569..e930f613b1 100644
--- a/core/src/fpdfdoc/tagged_int.h
+++ b/core/fpdfdoc/tagged_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFDOC_TAGGED_INT_H_
-#define CORE_SRC_FPDFDOC_TAGGED_INT_H_
+#ifndef CORE_FPDFDOC_TAGGED_INT_H_
+#define CORE_FPDFDOC_TAGGED_INT_H_
 
 #include <map>
 
@@ -103,4 +103,4 @@ class CPDF_StructElementImpl final : public CPDF_StructElement {
   friend class CPDF_StructTreeImpl;
 };
 
-#endif  // CORE_SRC_FPDFDOC_TAGGED_INT_H_
+#endif  // CORE_FPDFDOC_TAGGED_INT_H_
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/fpdftext/fpdf_text_int.cpp
index 16e2c8529b..d16ccb8dde 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/fpdftext/fpdf_text_int.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fpdftext/text_int.h"
+#include "core/fpdftext/text_int.h"
 
 #include <algorithm>
 #include <cctype>
@@ -2281,8 +2281,7 @@ int CPDF_TextPageFind::GetMatchedCount() const {
 }
 
 CPDF_LinkExtract::CPDF_LinkExtract()
-    : m_pTextPage(nullptr), m_bIsParsed(false) {
-}
+    : m_pTextPage(nullptr), m_bIsParsed(false) {}
 
 CPDF_LinkExtract::~CPDF_LinkExtract() {
   DeleteLinkList();
diff --git a/core/src/fpdftext/fpdf_text_int_unittest.cpp b/core/fpdftext/fpdf_text_int_unittest.cpp
index b482f02be4..d114ba75ce 100644
--- a/core/src/fpdftext/fpdf_text_int_unittest.cpp
+++ b/core/fpdftext/fpdf_text_int_unittest.cpp
@@ -4,7 +4,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "core/src/fpdftext/text_int.h"
+#include "core/fpdftext/text_int.h"
 
 // Class to help test functions in CPDF_LinkExtract class.
 class CPDF_TestLinkExtract : public CPDF_LinkExtract {
diff --git a/core/src/fpdftext/text_int.h b/core/fpdftext/text_int.h
index dd30148094..bc110c719b 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/fpdftext/text_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFTEXT_TEXT_INT_H_
-#define CORE_SRC_FPDFTEXT_TEXT_INT_H_
+#ifndef CORE_FPDFTEXT_TEXT_INT_H_
+#define CORE_FPDFTEXT_TEXT_INT_H_
 
 #include <deque>
 #include <vector>
@@ -241,4 +241,4 @@ class CPDF_LinkExtract : public IPDF_LinkExtract {
 
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
 
-#endif  // CORE_SRC_FPDFTEXT_TEXT_INT_H_
+#endif  // CORE_FPDFTEXT_TEXT_INT_H_
diff --git a/core/src/fpdftext/unicodenormalization.cpp b/core/fpdftext/unicodenormalization.cpp
index d3b404dfcf..6ede1365c4 100644
--- a/core/src/fpdftext/unicodenormalization.cpp
+++ b/core/fpdftext/unicodenormalization.cpp
@@ -4,15 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdftext/unicodenormalizationdata.h"
 #include "core/include/fxcrt/fx_string.h"
-#include "core/src/fpdftext/unicodenormalizationdata.h"
 
 const FX_WCHAR* const g_UnicodeData_Normalization_Maps[5] = {
-    nullptr,
-    g_UnicodeData_Normalization_Map1,
-    g_UnicodeData_Normalization_Map2,
-    g_UnicodeData_Normalization_Map3,
-    g_UnicodeData_Normalization_Map4};
+    nullptr, g_UnicodeData_Normalization_Map1, g_UnicodeData_Normalization_Map2,
+    g_UnicodeData_Normalization_Map3, g_UnicodeData_Normalization_Map4};
 
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst) {
   wch = wch & 0xFFFF;
diff --git a/core/src/fpdftext/unicodenormalizationdata.cpp b/core/fpdftext/unicodenormalizationdata.cpp
index f3843603d4..e9f3fbf2e9 100644
--- a/core/src/fpdftext/unicodenormalizationdata.cpp
+++ b/core/fpdftext/unicodenormalizationdata.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fpdftext/unicodenormalizationdata.h"
 #include "core/include/fxcrt/fx_system.h"
-#include "core/src/fpdftext/unicodenormalizationdata.h"
 
 const FX_WCHAR g_UnicodeData_Normalization[65536] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/core/src/fpdftext/unicodenormalizationdata.h b/core/fpdftext/unicodenormalizationdata.h
index c0f07b35ab..d586aa3781 100644
--- a/core/src/fpdftext/unicodenormalizationdata.h
+++ b/core/fpdftext/unicodenormalizationdata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FPDFTEXT_UNICODENORMALIZATIONDATA_H_
-#define CORE_SRC_FPDFTEXT_UNICODENORMALIZATIONDATA_H_
+#ifndef CORE_FPDFTEXT_UNICODENORMALIZATIONDATA_H_
+#define CORE_FPDFTEXT_UNICODENORMALIZATIONDATA_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -15,4 +15,4 @@ extern const FX_WCHAR g_UnicodeData_Normalization_Map2[];
 extern const FX_WCHAR g_UnicodeData_Normalization_Map3[];
 extern const FX_WCHAR g_UnicodeData_Normalization_Map4[];
 
-#endif  // CORE_SRC_FPDFTEXT_UNICODENORMALIZATIONDATA_H_
+#endif  // CORE_FPDFTEXT_UNICODENORMALIZATIONDATA_H_
diff --git a/core/src/fxcodec/DEPS b/core/fxcodec/DEPS
index a88b3294a9..a88b3294a9 100644
--- a/core/src/fxcodec/DEPS
+++ b/core/fxcodec/DEPS
diff --git a/core/src/fxcodec/codec/DEPS b/core/fxcodec/codec/DEPS
index 495d288992..495d288992 100644
--- a/core/src/fxcodec/codec/DEPS
+++ b/core/fxcodec/codec/DEPS
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/fxcodec/codec/codec_int.h
index 5c784adad6..d2f44dd674 100644
--- a/core/src/fxcodec/codec/codec_int.h
+++ b/core/fxcodec/codec/codec_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_
-#define CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_
+#ifndef CORE_FXCODEC_CODEC_CODEC_INT_H_
+#define CORE_FXCODEC_CODEC_CODEC_INT_H_
 
 #include <limits.h>
 
@@ -14,8 +14,8 @@
 #include <memory>
 #include <vector>
 
+#include "core/fxcodec/jbig2/JBig2_Context.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fxcodec/jbig2/JBig2_Context.h"
 #include "third_party/libopenjpeg20/openjpeg.h"  // For OPJ_SIZE_T.
 
 class CFX_IccProfileCache;
@@ -425,4 +425,4 @@ OPJ_SIZE_T opj_write_from_memory(void* p_buffer,
 OPJ_OFF_T opj_skip_from_memory(OPJ_OFF_T nb_bytes, void* p_user_data);
 OPJ_BOOL opj_seek_from_memory(OPJ_OFF_T nb_bytes, void* p_user_data);
 
-#endif  // CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_
+#endif  // CORE_FXCODEC_CODEC_CODEC_INT_H_
diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp
index 17e665d608..f1298f9fb3 100644
--- a/core/src/fxcodec/codec/fx_codec.cpp
+++ b/core/fxcodec/codec/fx_codec.cpp
@@ -9,9 +9,9 @@
 #include <cmath>
 #include <utility>
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_safe_types.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 #include "third_party/base/logging.h"
 
 CCodec_ModuleMgr::CCodec_ModuleMgr()
@@ -35,8 +35,7 @@ CCodec_ScanlineDecoder::ImageDataCache::ImageDataCache(int width,
                                                        FX_DWORD pitch)
     : m_Width(width), m_Height(height), m_Pitch(pitch), m_nCachedLines(0) {}
 
-CCodec_ScanlineDecoder::ImageDataCache::~ImageDataCache() {
-}
+CCodec_ScanlineDecoder::ImageDataCache::~ImageDataCache() {}
 
 bool CCodec_ScanlineDecoder::ImageDataCache::AllocateCache() {
   if (m_Pitch == 0 || m_Height < 0)
@@ -72,11 +71,9 @@ const uint8_t* CCodec_ScanlineDecoder::ImageDataCache::GetLine(int line) const {
 }
 
 CCodec_ScanlineDecoder::CCodec_ScanlineDecoder()
-    : m_NextLine(-1), m_pLastScanline(nullptr) {
-}
+    : m_NextLine(-1), m_pLastScanline(nullptr) {}
 
-CCodec_ScanlineDecoder::~CCodec_ScanlineDecoder() {
-}
+CCodec_ScanlineDecoder::~CCodec_ScanlineDecoder() {}
 
 const uint8_t* CCodec_ScanlineDecoder::GetScanline(int line) {
   if (m_pDataCache && line < m_pDataCache->NumLines())
diff --git a/core/src/fxcodec/codec/fx_codec_bmp.cpp b/core/fxcodec/codec/fx_codec_bmp.cpp
index 41a881d3ae..d2299d6e56 100644
--- a/core/src/fxcodec/codec/fx_codec_bmp.cpp
+++ b/core/fxcodec/codec/fx_codec_bmp.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/lbmp/fx_bmp.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "core/src/fxcodec/codec/codec_int.h"
-#include "core/src/fxcodec/lbmp/fx_bmp.h"
 struct FXBMP_Context {
   bmp_decompress_struct_p bmp_ptr;
   void* parent_ptr;
diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp
index 36b92f06ff..13ffcda174 100644
--- a/core/src/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/fxcodec/codec/fx_codec_fax.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 
 namespace {
 
diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp
index faffebda28..49a4f34166 100644
--- a/core/src/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/fx_codec_flate.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/codec/codec_int.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/core/src/fxcodec/codec/fx_codec_gif.cpp b/core/fxcodec/codec/fx_codec_gif.cpp
index 661732fb3f..60ca00f9fa 100644
--- a/core/src/fxcodec/codec/fx_codec_gif.cpp
+++ b/core/fxcodec/codec/fx_codec_gif.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/lgif/fx_gif.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "core/src/fxcodec/codec/codec_int.h"
-#include "core/src/fxcodec/lgif/fx_gif.h"
 struct FXGIF_Context {
   gif_decompress_struct_p gif_ptr;
   void* parent_ptr;
diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp
index ebec0b0a34..fc8113e4e6 100644
--- a/core/src/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/fxcodec/codec/fx_codec_icc.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 
 const FX_DWORD N_COMPONENT_LAB = 3;
diff --git a/core/src/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp
index 44e30aa953..557d246ca4 100644
--- a/core/src/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/fxcodec/codec/fx_codec_jbig.cpp
@@ -6,8 +6,8 @@
 
 #include <list>
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 
 // Holds per-document JBig2 related data.
 class JBig2DocumentContext : public CFX_DestructObject {
@@ -43,8 +43,7 @@ CCodec_Jbig2Context::CCodec_Jbig2Context() {
   FXSYS_memset(this, 0, sizeof(CCodec_Jbig2Context));
 }
 
-CCodec_Jbig2Module::~CCodec_Jbig2Module() {
-}
+CCodec_Jbig2Module::~CCodec_Jbig2Module() {}
 
 void* CCodec_Jbig2Module::CreateJbig2Context() {
   return new CCodec_Jbig2Context();
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index 14cc194db4..efbeb790e3 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -6,10 +6,10 @@
 
 #include <setjmp.h>
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxge/fx_dib.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index 4ace3ad220..486cb929b8 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -8,10 +8,10 @@
 #include <limits>
 #include <vector>
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 #include "third_party/libopenjpeg20/openjpeg.h"
 
@@ -859,8 +859,7 @@ bool CJPX_Decoder::Decode(uint8_t* dest_buf,
 }
 
 CCodec_JpxModule::CCodec_JpxModule() {}
-CCodec_JpxModule::~CCodec_JpxModule() {
-}
+CCodec_JpxModule::~CCodec_JpxModule() {}
 
 CJPX_Decoder* CCodec_JpxModule::CreateDecoder(const uint8_t* src_buf,
                                               FX_DWORD src_size,
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/fxcodec/codec/fx_codec_jpx_unittest.cpp
index c472ef18c6..d58b152a78 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_unittest.cpp
@@ -6,7 +6,7 @@
 
 #include <limits>
 
-#include "core/src/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/codec/codec_int.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -496,14 +496,8 @@ TEST(fxcodec, YUV420ToRGB) {
   const struct {
     OPJ_UINT32 w;
     bool expected;
-  } cases[] = {{0, false},
-               {1, false},
-               {30, false},
-               {31, true},
-               {32, true},
-               {33, true},
-               {34, false},
-               {UINT_MAX, false}};
+  } cases[] = {{0, false}, {1, false}, {30, false}, {31, true},
+               {32, true}, {33, true}, {34, false}, {UINT_MAX, false}};
   for (int i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) {
     y.w = cases[i].w;
     y.h = y.w;
diff --git a/core/src/fxcodec/codec/fx_codec_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp
index c8cb1b8a6a..a3882ba8fb 100644
--- a/core/src/fxcodec/codec/fx_codec_png.cpp
+++ b/core/fxcodec/codec/fx_codec_png.cpp
@@ -6,9 +6,9 @@
 
 #include <algorithm>
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/src/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index 5d8502a87a..b22d20339b 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/codec/fx_codec_progress.h"
+
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "core/src/fxcodec/codec/fx_codec_progress.h"
+
 void CFXCODEC_WeightTable::Calc(int dest_len,
                                 int dest_min,
                                 int dest_max,
diff --git a/core/src/fxcodec/codec/fx_codec_progress.h b/core/fxcodec/codec/fx_codec_progress.h
index 4fb13640ff..c9ee389e02 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.h
+++ b/core/fxcodec/codec/fx_codec_progress.h
@@ -4,20 +4,28 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
-#define CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+#ifndef CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+#define CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+
+#include "core/include/fxcodec/fx_codec.h"
+#include "core/include/fxcrt/fx_memory.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "core/include/fxge/fx_dib.h"
 
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA 2.2
+
 #if _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
 #undef FXCODEC_PNG_GAMMA
 #define FXCODEC_PNG_GAMMA 1.7
 #endif
+
 struct PixelWeight {
   int m_SrcStart;
   int m_SrcEnd;
   int m_Weights[1];
 };
+
 class CFXCODEC_WeightTable {
  public:
   CFXCODEC_WeightTable() { m_pWeightTables = NULL; }
@@ -210,4 +218,4 @@ class CCodec_ProgressiveDecoder : public ICodec_ProgressiveDecoder {
   FXCODEC_STATUS m_status;
 };
 
-#endif  // CORE_SRC_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+#endif  // CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/fxcodec/codec/fx_codec_tiff.cpp
index 38c2af6287..2af92f2f12 100644
--- a/core/src/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/fxcodec/codec/fx_codec_tiff.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "core/src/fxcodec/codec/codec_int.h"
 
 extern "C" {
 #include "third_party/libtiff/tiffiop.h"
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp
index 9e32304f41..1673110c7e 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp
+++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
 
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
 
 namespace {
 
@@ -20,53 +20,22 @@ struct JBig2ArithQe {
 
 const JBig2ArithQe kQeTable[] = {
     // Stupid hack to keep clang-format from reformatting this badly.
-    {0x5601, 1, 1, 1},
-    {0x3401, 2, 6, 0},
-    {0x1801, 3, 9, 0},
-    {0x0AC1, 4, 12, 0},
-    {0x0521, 5, 29, 0},
-    {0x0221, 38, 33, 0},
-    {0x5601, 7, 6, 1},
-    {0x5401, 8, 14, 0},
-    {0x4801, 9, 14, 0},
-    {0x3801, 10, 14, 0},
-    {0x3001, 11, 17, 0},
-    {0x2401, 12, 18, 0},
-    {0x1C01, 13, 20, 0},
-    {0x1601, 29, 21, 0},
-    {0x5601, 15, 14, 1},
-    {0x5401, 16, 14, 0},
-    {0x5101, 17, 15, 0},
-    {0x4801, 18, 16, 0},
-    {0x3801, 19, 17, 0},
-    {0x3401, 20, 18, 0},
-    {0x3001, 21, 19, 0},
-    {0x2801, 22, 19, 0},
-    {0x2401, 23, 20, 0},
-    {0x2201, 24, 21, 0},
-    {0x1C01, 25, 22, 0},
-    {0x1801, 26, 23, 0},
-    {0x1601, 27, 24, 0},
-    {0x1401, 28, 25, 0},
-    {0x1201, 29, 26, 0},
-    {0x1101, 30, 27, 0},
-    {0x0AC1, 31, 28, 0},
-    {0x09C1, 32, 29, 0},
-    {0x08A1, 33, 30, 0},
-    {0x0521, 34, 31, 0},
-    {0x0441, 35, 32, 0},
-    {0x02A1, 36, 33, 0},
-    {0x0221, 37, 34, 0},
-    {0x0141, 38, 35, 0},
-    {0x0111, 39, 36, 0},
-    {0x0085, 40, 37, 0},
-    {0x0049, 41, 38, 0},
-    {0x0025, 42, 39, 0},
-    {0x0015, 43, 40, 0},
-    {0x0009, 44, 41, 0},
-    {0x0005, 45, 42, 0},
-    {0x0001, 45, 43, 0},
-    {0x5601, 46, 46, 0}};
+    {0x5601, 1, 1, 1},   {0x3401, 2, 6, 0},   {0x1801, 3, 9, 0},
+    {0x0AC1, 4, 12, 0},  {0x0521, 5, 29, 0},  {0x0221, 38, 33, 0},
+    {0x5601, 7, 6, 1},   {0x5401, 8, 14, 0},  {0x4801, 9, 14, 0},
+    {0x3801, 10, 14, 0}, {0x3001, 11, 17, 0}, {0x2401, 12, 18, 0},
+    {0x1C01, 13, 20, 0}, {0x1601, 29, 21, 0}, {0x5601, 15, 14, 1},
+    {0x5401, 16, 14, 0}, {0x5101, 17, 15, 0}, {0x4801, 18, 16, 0},
+    {0x3801, 19, 17, 0}, {0x3401, 20, 18, 0}, {0x3001, 21, 19, 0},
+    {0x2801, 22, 19, 0}, {0x2401, 23, 20, 0}, {0x2201, 24, 21, 0},
+    {0x1C01, 25, 22, 0}, {0x1801, 26, 23, 0}, {0x1601, 27, 24, 0},
+    {0x1401, 28, 25, 0}, {0x1201, 29, 26, 0}, {0x1101, 30, 27, 0},
+    {0x0AC1, 31, 28, 0}, {0x09C1, 32, 29, 0}, {0x08A1, 33, 30, 0},
+    {0x0521, 34, 31, 0}, {0x0441, 35, 32, 0}, {0x02A1, 36, 33, 0},
+    {0x0221, 37, 34, 0}, {0x0141, 38, 35, 0}, {0x0111, 39, 36, 0},
+    {0x0085, 40, 37, 0}, {0x0049, 41, 38, 0}, {0x0025, 42, 39, 0},
+    {0x0015, 43, 40, 0}, {0x0009, 44, 41, 0}, {0x0005, 45, 42, 0},
+    {0x0001, 45, 43, 0}, {0x5601, 46, 46, 0}};
 
 const unsigned int kDefaultAValue = 0x8000;
 
@@ -96,8 +65,7 @@ CJBig2_ArithDecoder::CJBig2_ArithDecoder(CJBig2_BitStream* pStream)
   m_A = kDefaultAValue;
 }
 
-CJBig2_ArithDecoder::~CJBig2_ArithDecoder() {
-}
+CJBig2_ArithDecoder::~CJBig2_ArithDecoder() {}
 
 int CJBig2_ArithDecoder::DECODE(JBig2ArithCtx* pCX) {
   if (!pCX || pCX->I >= FX_ArraySize(kQeTable))
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.h b/core/fxcodec/jbig2/JBig2_ArithDecoder.h
index 3cb95acd95..a8ab5dd730 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.h
+++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_
 
 class CJBig2_BitStream;
 
@@ -35,4 +35,4 @@ class CJBig2_ArithDecoder {
   CJBig2_BitStream* const m_pStream;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
index 2fac8df5a9..63594672c7 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
+++ b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
 
 #include <vector>
 
@@ -20,12 +20,7 @@ const struct ArithIntDecodeData {
   int nNeedBits;
   int nValue;
 } g_ArithIntDecodeData[] = {
-    {2, 0},
-    {4, 4},
-    {6, 20},
-    {8, 84},
-    {12, 340},
-    {32, 4436},
+    {2, 0}, {4, 4}, {6, 20}, {8, 84}, {12, 340}, {32, 4436},
 };
 
 size_t RecursiveDecode(CJBig2_ArithDecoder* decoder,
@@ -50,8 +45,7 @@ CJBig2_ArithIntDecoder::CJBig2_ArithIntDecoder() {
   m_IAx.resize(512);
 }
 
-CJBig2_ArithIntDecoder::~CJBig2_ArithIntDecoder() {
-}
+CJBig2_ArithIntDecoder::~CJBig2_ArithIntDecoder() {}
 
 bool CJBig2_ArithIntDecoder::decode(CJBig2_ArithDecoder* pArithDecoder,
                                     int* nResult) {
@@ -84,8 +78,7 @@ CJBig2_ArithIaidDecoder::CJBig2_ArithIaidDecoder(unsigned char SBSYMCODELENA)
   m_IAID.resize(1 << SBSYMCODELEN);
 }
 
-CJBig2_ArithIaidDecoder::~CJBig2_ArithIaidDecoder() {
-}
+CJBig2_ArithIaidDecoder::~CJBig2_ArithIaidDecoder() {}
 
 void CJBig2_ArithIaidDecoder::decode(CJBig2_ArithDecoder* pArithDecoder,
                                      FX_DWORD* nResult) {
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h
index 4909ce48f8..9a04504ca7 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h
+++ b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_ARITHINTDECODER_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_ARITHINTDECODER_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_ARITHINTDECODER_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_ARITHINTDECODER_H_
 
 #include <vector>
 
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
 #include "core/include/fxcrt/fx_system.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
 
 class CJBig2_ArithIntDecoder {
  public:
@@ -38,4 +38,4 @@ class CJBig2_ArithIaidDecoder {
   const unsigned char SBSYMCODELEN;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_ARITHINTDECODER_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_ARITHINTDECODER_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp b/core/fxcodec/jbig2/JBig2_BitStream.cpp
index 1fe7a26aa8..87451c2d72 100644
--- a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp
+++ b/core/fxcodec/jbig2/JBig2_BitStream.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
 
 #include <algorithm>
 
@@ -23,8 +23,7 @@ CJBig2_BitStream::CJBig2_BitStream(CPDF_StreamAcc* pSrcStream)
   }
 }
 
-CJBig2_BitStream::~CJBig2_BitStream() {
-}
+CJBig2_BitStream::~CJBig2_BitStream() {}
 
 int32_t CJBig2_BitStream::readNBits(FX_DWORD dwBits, FX_DWORD* dwResult) {
   FX_DWORD dwBitPos = getBitPos();
diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h
index fc9aa8a5c4..c24fedfba1 100644
--- a/core/src/fxcodec/jbig2/JBig2_BitStream.h
+++ b/core/fxcodec/jbig2/JBig2_BitStream.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ -55,4 +55,4 @@ class CJBig2_BitStream {
   void operator=(const CJBig2_BitStream&) = delete;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.cpp b/core/fxcodec/jbig2/JBig2_Context.cpp
index 9279971b46..0a17fff328 100644
--- a/core/src/fxcodec/jbig2/JBig2_Context.cpp
+++ b/core/fxcodec/jbig2/JBig2_Context.cpp
@@ -4,23 +4,23 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_Context.h"
+#include "core/fxcodec/jbig2/JBig2_Context.h"
 
 #include <algorithm>
 #include <list>
 #include <utility>
 #include <vector>
 
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_GrrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_HtrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
+#include "core/fxcodec/jbig2/JBig2_PddProc.h"
+#include "core/fxcodec/jbig2/JBig2_SddProc.h"
+#include "core/fxcodec/jbig2/JBig2_TrdProc.h"
 #include "core/include/fpdfapi/cpdf_stream.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_HtrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
-#include "core/src/fxcodec/jbig2/JBig2_PddProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_SddProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_TrdProc.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/fxcodec/jbig2/JBig2_Context.h
index 68c575392a..f09b8fc1ab 100644
--- a/core/src/fxcodec/jbig2/JBig2_Context.h
+++ b/core/fxcodec/jbig2/JBig2_Context.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_CONTEXT_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_CONTEXT_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_CONTEXT_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_CONTEXT_H_
 
 #include <list>
 #include <memory>
 #include <utility>
 
+#include "core/fxcodec/jbig2/JBig2_List.h"
+#include "core/fxcodec/jbig2/JBig2_Page.h"
+#include "core/fxcodec/jbig2/JBig2_Segment.h"
 #include "core/include/fpdfapi/cpdf_object.h"
 #include "core/include/fxcodec/fx_codec_def.h"
-#include "core/src/fxcodec/jbig2/JBig2_List.h"
-#include "core/src/fxcodec/jbig2/JBig2_Page.h"
-#include "core/src/fxcodec/jbig2/JBig2_Segment.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_GRDProc;
@@ -131,4 +131,4 @@ class CJBig2_Context {
   bool m_bIsGlobal;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_CONTEXT_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_CONTEXT_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/fxcodec/jbig2/JBig2_Define.h
index 68e2ff2533..5149c19ef2 100644
--- a/core/src/fxcodec/jbig2/JBig2_Define.h
+++ b/core/fxcodec/jbig2/JBig2_Define.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_DEFINE_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_DEFINE_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -33,4 +33,4 @@ struct JBig2HuffmanCode {
 #define JBIG2_MAX_PATTERN_INDEX 65535
 #define JBIG2_MAX_IMAGE_SIZE 65535
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_DEFINE_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_DEFINE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
index cf0f60405c..a3fc33c2be 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_GrdProc.h"
 
 #include <memory>
 
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_GRDProc::CJBig2_GRDProc()
     : m_loopIndex(0),
@@ -68,7 +68,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template0_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine, *pLine1, *pLine2, cVal;
+  uint8_t *pLine, *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -206,7 +206,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template1_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine, *pLine1, *pLine2, cVal;
+  uint8_t *pLine, *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -340,7 +340,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template2_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine, *pLine1, *pLine2, cVal;
+  uint8_t *pLine, *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -473,7 +473,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template3_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1;
-  uint8_t* pLine, *pLine1, cVal;
+  uint8_t *pLine, *pLine1, cVal;
   int32_t nStride, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -700,7 +700,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template0_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine1, *pLine2, cVal;
+  uint8_t *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
@@ -850,7 +850,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template1_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine1, *pLine2, cVal;
+  uint8_t *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
@@ -995,7 +995,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template2_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine1, *pLine2, cVal;
+  uint8_t *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
@@ -1140,7 +1140,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template3_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1;
-  uint8_t* pLine1, cVal;
+  uint8_t *pLine1, cVal;
   int32_t nStride, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h
index 07f28cca6d..2a181b1822 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
 
 #include "core/include/fxcodec/fx_codec_def.h"
 #include "core/include/fxcrt/fx_coordinates.h"
@@ -121,4 +121,4 @@ class CJBig2_GRDProc {
   FX_RECT m_ReplaceRect;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrrdProc.cpp
index eaa9a76608..c6ff3dd647 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GrrdProc.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_GrrdProc.h"
 
 #include <memory>
 
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_Image* CJBig2_GRRDProc::decode(CJBig2_ArithDecoder* pArithDecoder,
                                       JBig2ArithCtx* grContext) {
@@ -155,7 +155,7 @@ CJBig2_Image* CJBig2_GRRDProc::decode_Template0_opt(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line1_r, line2_r, line3_r;
-  uint8_t* pLine, *pLineR, cVal;
+  uint8_t *pLine, *pLineR, cVal;
   intptr_t nStride, nStrideR, nOffset;
   int32_t k, nBits;
   int32_t GRWR, GRHR;
@@ -393,7 +393,7 @@ CJBig2_Image* CJBig2_GRRDProc::decode_Template1_opt(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line1_r, line2_r, line3_r;
-  uint8_t* pLine, *pLineR, cVal;
+  uint8_t *pLine, *pLineR, cVal;
   intptr_t nStride, nStrideR, nOffset;
   int32_t k, nBits;
   int32_t GRWR, GRHR;
diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h b/core/fxcodec/jbig2/JBig2_GrrdProc.h
index 5d8eabb164..36cfdcae3c 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrrdProc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -40,4 +40,4 @@ class CJBig2_GRRDProc {
   int8_t GRAT[4];
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp b/core/fxcodec/jbig2/JBig2_GsidProc.cpp
index 42b3b59142..92532d7238 100644
--- a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GsidProc.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_GsidProc.h"
+#include "core/fxcodec/jbig2/JBig2_GsidProc.h"
 
 #include <memory>
 
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_Image.h"
+#include "core/fxcodec/jbig2/JBig2_List.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
-#include "core/src/fxcodec/jbig2/JBig2_List.h"
 
 FX_DWORD* CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
                                         JBig2ArithCtx* gbContext,
diff --git a/core/src/fxcodec/jbig2/JBig2_GsidProc.h b/core/fxcodec/jbig2/JBig2_GsidProc.h
index dfd16b8f0c..50c24eaa60 100644
--- a/core/src/fxcodec/jbig2/JBig2_GsidProc.h
+++ b/core/fxcodec/jbig2/JBig2_GsidProc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -33,4 +33,4 @@ class CJBig2_GSIDProc {
   CJBig2_Image* GSKIP;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp
index d49cab92e5..daee067d74 100644
--- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_HtrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_HtrdProc.h"
 
 #include <memory>
 
+#include "core/fxcodec/jbig2/JBig2_GsidProc.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fxcodec/jbig2/JBig2_GsidProc.h"
 
 CJBig2_Image* CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
                                             JBig2ArithCtx* gbContext,
diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h b/core/fxcodec/jbig2/JBig2_HtrdProc.h
index f66ad75eca..583145b5ca 100644
--- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_HtrdProc.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
 
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/include/fxcrt/fx_system.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_BitStream;
@@ -43,4 +43,4 @@ class CJBig2_HTRDProc {
   uint8_t HPH;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
index 093d2abadb..afcc17a55e 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
+++ b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
@@ -4,13 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
 
-#include "core/src/fxcodec/jbig2/JBig2_Define.h"
+#include "core/fxcodec/jbig2/JBig2_Define.h"
 
 CJBig2_HuffmanDecoder::CJBig2_HuffmanDecoder(CJBig2_BitStream* pStream)
-    : m_pStream(pStream) {
-}
+    : m_pStream(pStream) {}
 
 CJBig2_HuffmanDecoder::~CJBig2_HuffmanDecoder() {}
 
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h
index afa81796c2..c72346ac18 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
+++ b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
 
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanTable.h"
 class CJBig2_HuffmanDecoder {
  public:
   explicit CJBig2_HuffmanDecoder(CJBig2_BitStream* pStream);
@@ -21,4 +21,4 @@ class CJBig2_HuffmanDecoder {
   CJBig2_BitStream* const m_pStream;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp b/core/fxcodec/jbig2/JBig2_HuffmanTable.cpp
index 5833f118fe..f4a838eb24 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanTable.h"
 
 #include <algorithm>
 #include <vector>
 
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_Define.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
 #include "core/include/fxcrt/fx_memory.h"
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/src/fxcodec/jbig2/JBig2_Define.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
 
 CJBig2_HuffmanTable::CJBig2_HuffmanTable(const JBig2TableLine* pTable,
                                          FX_DWORD nLines,
@@ -26,8 +26,7 @@ CJBig2_HuffmanTable::CJBig2_HuffmanTable(CJBig2_BitStream* pStream)
   m_bOK = ParseFromCodedBuffer(pStream);
 }
 
-CJBig2_HuffmanTable::~CJBig2_HuffmanTable() {
-}
+CJBig2_HuffmanTable::~CJBig2_HuffmanTable() {}
 
 void CJBig2_HuffmanTable::ParseFromStandardTable(const JBig2TableLine* pTable) {
   PREFLEN.resize(NTEMP);
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.h b/core/fxcodec/jbig2/JBig2_HuffmanTable.h
index 568c497350..892c19e9d6 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.h
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_H_
 
 #include <vector>
 
@@ -47,4 +47,4 @@ class CJBig2_HuffmanTable {
   std::vector<int> RANGELOW;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
index a2ce232d63..0b768654f5 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -95,4 +95,4 @@ const JBig2TableLine HuffmanTable_B15[] = {
     {1, 0, 0},   {3, 0, 1},    {4, 0, 2},  {5, 1, 3},  {6, 2, 5},
     {7, 4, 9},   {7, 32, -25}, {7, 32, 25}};
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/fxcodec/jbig2/JBig2_Image.cpp
index 16e4243e3b..311c38270e 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.cpp
+++ b/core/fxcodec/jbig2/JBig2_Image.cpp
@@ -6,9 +6,9 @@
 
 #include <limits.h>
 
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_safe_types.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) {
   m_nWidth = w;
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.h b/core/fxcodec/jbig2/JBig2_Image.h
index e7b0779816..a18a95d596 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.h
+++ b/core/fxcodec/jbig2/JBig2_Image.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_IMAGE_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_IMAGE_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_IMAGE_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_IMAGE_H_
 
-#include "core/src/fxcodec/jbig2/JBig2_Define.h"
+#include "core/fxcodec/jbig2/JBig2_Define.h"
 
 enum JBig2ComposeOp {
   JBIG2_COMPOSE_OR = 0,
@@ -82,4 +82,4 @@ class CJBig2_Image {
   FX_BOOL m_bNeedFree;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_IMAGE_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_IMAGE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_List.h b/core/fxcodec/jbig2/JBig2_List.h
index 6f6169064d..b021ac3375 100644
--- a/core/src/fxcodec/jbig2/JBig2_List.h
+++ b/core/fxcodec/jbig2/JBig2_List.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_LIST_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_LIST_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_LIST_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_LIST_H_
 
 #include <stdlib.h>
 
@@ -19,9 +19,7 @@ class CJBig2_List {
   CJBig2_List() {}
   explicit CJBig2_List(size_t count) { resize(count); }
 
-  ~CJBig2_List() {
-    clear();
-  }
+  ~CJBig2_List() { clear(); }
 
   TYPE* get(size_t index) const { return m_vector[index]; }
   TYPE* back() const { return m_vector.back(); }
@@ -53,4 +51,4 @@ class CJBig2_List {
   std::vector<TYPE*> m_vector;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_LIST_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_LIST_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Page.h b/core/fxcodec/jbig2/JBig2_Page.h
index 50fe4cef3c..b3e09d8ae0 100644
--- a/core/src/fxcodec/jbig2/JBig2_Page.h
+++ b/core/fxcodec/jbig2/JBig2_Page.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_PAGE_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_PAGE_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -19,4 +19,4 @@ struct JBig2PageInfo {
   FX_WORD m_wMaxStripeSize;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_PAGE_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_PAGE_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp b/core/fxcodec/jbig2/JBig2_PatternDict.cpp
index aa78954aaa..58157ef13a 100644
--- a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp
+++ b/core/fxcodec/jbig2/JBig2_PatternDict.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h"
+#include "core/fxcodec/jbig2/JBig2_PatternDict.h"
 
 #include "core/include/fxcrt/fx_memory.h"
 
diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.h b/core/fxcodec/jbig2/JBig2_PatternDict.h
index e363c9bce3..3196fcaaf3 100644
--- a/core/src/fxcodec/jbig2/JBig2_PatternDict.h
+++ b/core/fxcodec/jbig2/JBig2_PatternDict.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
 
-#include "core/src/fxcodec/jbig2/JBig2_Define.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
+#include "core/fxcodec/jbig2/JBig2_Define.h"
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 
 class CJBig2_PatternDict {
  public:
@@ -20,4 +20,4 @@ class CJBig2_PatternDict {
   CJBig2_Image** HDPATS;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_PATTERNDICT_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp b/core/fxcodec/jbig2/JBig2_PddProc.cpp
index ba4755ce59..5b67aadb57 100644
--- a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_PddProc.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_PddProc.h"
+#include "core/fxcodec/jbig2/JBig2_PddProc.h"
 
 #include <memory>
 
-#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
-#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h"
+#include "core/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_Image.h"
+#include "core/fxcodec/jbig2/JBig2_PatternDict.h"
 
 CJBig2_PatternDict* CJBig2_PDDProc::decode_Arith(
     CJBig2_ArithDecoder* pArithDecoder,
diff --git a/core/src/fxcodec/jbig2/JBig2_PddProc.h b/core/fxcodec/jbig2/JBig2_PddProc.h
index 2f875f5d92..25f941235f 100644
--- a/core/src/fxcodec/jbig2/JBig2_PddProc.h
+++ b/core/fxcodec/jbig2/JBig2_PddProc.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -31,4 +31,4 @@ class CJBig2_PDDProc {
   uint8_t HDTEMPLATE;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp b/core/fxcodec/jbig2/JBig2_SddProc.cpp
index faa70621ab..80079b93a5 100644
--- a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_SddProc.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_SddProc.h"
+#include "core/fxcodec/jbig2/JBig2_SddProc.h"
 
 #include <memory>
 #include <vector>
 
+#include "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_GrrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanTable.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
+#include "core/fxcodec/jbig2/JBig2_SymbolDict.h"
+#include "core/fxcodec/jbig2/JBig2_TrdProc.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
-#include "core/src/fxcodec/jbig2/JBig2_SymbolDict.h"
-#include "core/src/fxcodec/jbig2/JBig2_TrdProc.h"
 
 CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith(
     CJBig2_ArithDecoder* pArithDecoder,
@@ -296,7 +296,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman(
   int32_t HCDH;
   FX_DWORD SYMWIDTH, TOTWIDTH, HCFIRSTSYM;
   int32_t DW;
-  CJBig2_Image* BS, *BHC;
+  CJBig2_Image *BS, *BHC;
   FX_DWORD I, J, REFAGGNINST;
   FX_BOOL* EXFLAGS;
   FX_DWORD EXINDEX;
diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.h b/core/fxcodec/jbig2/JBig2_SddProc.h
index b01ce2fd66..fa1211b4b4 100644
--- a/core/src/fxcodec/jbig2/JBig2_SddProc.h
+++ b/core/fxcodec/jbig2/JBig2_SddProc.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_SDDPROC_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_SDDPROC_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_SDDPROC_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_SDDPROC_H_
 
 #include <vector>
 
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
 #include "core/include/fxcrt/fx_system.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
 
 class CJBig2_BitStream;
 class CJBig2_HuffmanTable;
@@ -46,4 +46,4 @@ class CJBig2_SDDProc {
   int8_t SDRAT[4];
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_SDDPROC_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_SDDPROC_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.cpp b/core/fxcodec/jbig2/JBig2_Segment.cpp
index 21fa4d4572..a6bac36141 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.cpp
+++ b/core/fxcodec/jbig2/JBig2_Segment.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_Segment.h"
+#include "core/fxcodec/jbig2/JBig2_Segment.h"
 
 #include "core/include/fxcrt/fx_memory.h"
 
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.h b/core/fxcodec/jbig2/JBig2_Segment.h
index 0f76ad2ab3..61550ada09 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.h
+++ b/core/fxcodec/jbig2/JBig2_Segment.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
 
-#include "core/src/fxcodec/jbig2/JBig2_Define.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
-#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h"
-#include "core/src/fxcodec/jbig2/JBig2_SymbolDict.h"
+#include "core/fxcodec/jbig2/JBig2_Define.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanTable.h"
+#include "core/fxcodec/jbig2/JBig2_PatternDict.h"
+#include "core/fxcodec/jbig2/JBig2_SymbolDict.h"
 
 #define JBIG2_GET_INT32(buf) \
   (((buf)[0] << 24) | ((buf)[1] << 16) | ((buf)[2] << 8) | (buf)[3])
@@ -63,4 +63,4 @@ class CJBig2_Segment {
   } m_Result;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_SEGMENT_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/fxcodec/jbig2/JBig2_SymbolDict.cpp
index 5db77250f0..9fe3d54a0c 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
+++ b/core/fxcodec/jbig2/JBig2_SymbolDict.cpp
@@ -4,16 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_SymbolDict.h"
+#include "core/fxcodec/jbig2/JBig2_SymbolDict.h"
 
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/include/fxcrt/fx_memory.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
-CJBig2_SymbolDict::CJBig2_SymbolDict() {
-}
+CJBig2_SymbolDict::CJBig2_SymbolDict() {}
 
-CJBig2_SymbolDict::~CJBig2_SymbolDict() {
-}
+CJBig2_SymbolDict::~CJBig2_SymbolDict() {}
 
 std::unique_ptr<CJBig2_SymbolDict> CJBig2_SymbolDict::DeepCopy() const {
   const CJBig2_SymbolDict* src = this;
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h b/core/fxcodec/jbig2/JBig2_SymbolDict.h
index 5880a83bef..64ab881596 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h
+++ b/core/fxcodec/jbig2/JBig2_SymbolDict.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_
 
 #include <memory>
 #include <vector>
 
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_List.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_List.h"
 
 class CJBig2_Image;
 
@@ -45,4 +45,4 @@ class CJBig2_SymbolDict {
   CJBig2_List<CJBig2_Image> m_SDEXSYMS;
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_
diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/fxcodec/jbig2/JBig2_TrdProc.cpp
index aa9ca59893..401249e3f2 100644
--- a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_TrdProc.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_TrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_TrdProc.h"
 
 #include <memory>
 
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h"
-#include "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_GrrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
 
 CJBig2_Image* CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream* pStream,
                                              JBig2ArithCtx* grContext) {
diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.h b/core/fxcodec/jbig2/JBig2_TrdProc.h
index e36b269ba6..090e564726 100644
--- a/core/src/fxcodec/jbig2/JBig2_TrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_TrdProc.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
-#define CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
 
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/include/fxcrt/fx_system.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_ArithIaidDecoder;
@@ -79,4 +79,4 @@ class CJBig2_TRDProc {
   int8_t SBRAT[4];
 };
 
-#endif  // CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
diff --git a/core/src/fxcodec/lbmp/fx_bmp.cpp b/core/fxcodec/lbmp/fx_bmp.cpp
index 07e83a1618..15384d56ff 100644
--- a/core/src/fxcodec/lbmp/fx_bmp.cpp
+++ b/core/fxcodec/lbmp/fx_bmp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/lbmp/fx_bmp.h"
+#include "core/fxcodec/lbmp/fx_bmp.h"
 
 #include <algorithm>
 
diff --git a/core/src/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/lbmp/fx_bmp.h
index 24c94cabbe..2ef0c0a8b0 100644
--- a/core/src/fxcodec/lbmp/fx_bmp.h
+++ b/core/fxcodec/lbmp/fx_bmp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
-#define CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
+#ifndef CORE_FXCODEC_LBMP_FX_BMP_H_
+#define CORE_FXCODEC_LBMP_FX_BMP_H_
 
 #include <setjmp.h>
 
@@ -152,4 +152,4 @@ FX_BOOL bmp_encode_image(bmp_compress_struct_p bmp_ptr,
 FX_WORD GetWord_LSBFirst(uint8_t* p);
 void SetWord_LSBFirst(uint8_t* p, FX_WORD v);
 
-#endif  // CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
+#endif  // CORE_FXCODEC_LBMP_FX_BMP_H_
diff --git a/core/src/fxcodec/lgif/fx_gif.cpp b/core/fxcodec/lgif/fx_gif.cpp
index a4de72978a..af447dc84b 100644
--- a/core/src/fxcodec/lgif/fx_gif.cpp
+++ b/core/fxcodec/lgif/fx_gif.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/lgif/fx_gif.h"
+#include "core/fxcodec/lgif/fx_gif.h"
 
-#include "core/src/fxcodec/lbmp/fx_bmp.h"
+#include "core/fxcodec/lbmp/fx_bmp.h"
 
 void CGifLZWDecoder::Input(uint8_t* src_buf, FX_DWORD src_size) {
   next_in = src_buf;
diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/fxcodec/lgif/fx_gif.h
index 32300a50e5..c44fb7a7cb 100644
--- a/core/src/fxcodec/lgif/fx_gif.h
+++ b/core/fxcodec/lgif/fx_gif.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
-#define CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
+#ifndef CORE_FXCODEC_LGIF_FX_GIF_H_
+#define CORE_FXCODEC_LGIF_FX_GIF_H_
 
 #include <setjmp.h>
 
@@ -293,4 +293,4 @@ FX_BOOL gif_encode(gif_compress_struct_p gif_ptr,
                    uint8_t*& dst_buf,
                    FX_DWORD& dst_len);
 
-#endif  // CORE_SRC_FXCODEC_LGIF_FX_GIF_H_
+#endif  // CORE_FXCODEC_LGIF_FX_GIF_H_
diff --git a/core/src/fxcrt/extension.h b/core/fxcrt/extension.h
index 5ce29ddd50..dbbc889fd0 100644
--- a/core/src/fxcrt/extension.h
+++ b/core/fxcrt/extension.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCRT_EXTENSION_H_
-#define CORE_SRC_FXCRT_EXTENSION_H_
+#ifndef CORE_FXCRT_EXTENSION_H_
+#define CORE_FXCRT_EXTENSION_H_
 
 #include <algorithm>
 
@@ -331,4 +331,4 @@ FX_BOOL FX_GenerateCryptoRandom(FX_DWORD* pBuffer, int32_t iCount);
 }
 #endif
 
-#endif  // CORE_SRC_FXCRT_EXTENSION_H_
+#endif  // CORE_FXCRT_EXTENSION_H_
diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp
index e611be0c52..dfc3d802e5 100644
--- a/core/src/fxcrt/fx_arabic.cpp
+++ b/core/fxcrt/fx_arabic.cpp
@@ -4,192 +4,102 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcrt/fx_arabic.h"
 #include "core/include/fxcrt/fx_ucd.h"
-#include "core/src/fxcrt/fx_arabic.h"
 
 namespace {
 
 const FX_ARBFORMTABLE g_FX_ArabicFormTables[] = {
-    {0xFE81, 0xFE82, 0xFE81, 0xFE82},
-    {0xFE83, 0xFE84, 0xFE83, 0xFE84},
-    {0xFE85, 0xFE86, 0xFE85, 0xFE86},
-    {0xFE87, 0xFE88, 0xFE87, 0xFE88},
-    {0xFE89, 0xFE8A, 0xFE8B, 0xFE8C},
-    {0xFE8D, 0xFE8E, 0xFE8D, 0xFE8E},
-    {0xFE8F, 0xFE90, 0xFE91, 0xFE92},
-    {0xFE93, 0xFE94, 0xFE93, 0xFE94},
-    {0xFE95, 0xFE96, 0xFE97, 0xFE98},
-    {0xFE99, 0xFE9A, 0xFE9B, 0xFE9C},
-    {0xFE9D, 0xFE9E, 0xFE9F, 0xFEA0},
-    {0xFEA1, 0xFEA2, 0xFEA3, 0xFEA4},
-    {0xFEA5, 0xFEA6, 0xFEA7, 0xFEA8},
-    {0xFEA9, 0xFEAA, 0xFEA9, 0xFEAA},
-    {0xFEAB, 0xFEAC, 0xFEAB, 0xFEAC},
-    {0xFEAD, 0xFEAE, 0xFEAD, 0xFEAE},
-    {0xFEAF, 0xFEB0, 0xFEAF, 0xFEB0},
-    {0xFEB1, 0xFEB2, 0xFEB3, 0xFEB4},
-    {0xFEB5, 0xFEB6, 0xFEB7, 0xFEB8},
-    {0xFEB9, 0xFEBA, 0xFEBB, 0xFEBC},
-    {0xFEBD, 0xFEBE, 0xFEBF, 0xFEC0},
-    {0xFEC1, 0xFEC2, 0xFEC3, 0xFEC4},
-    {0xFEC5, 0xFEC6, 0xFEC7, 0xFEC8},
-    {0xFEC9, 0xFECA, 0xFECB, 0xFECC},
-    {0xFECD, 0xFECE, 0xFECF, 0xFED0},
-    {0x063B, 0x063B, 0x063B, 0x063B},
-    {0x063C, 0x063C, 0x063C, 0x063C},
-    {0x063D, 0x063D, 0x063D, 0x063D},
-    {0x063E, 0x063E, 0x063E, 0x063E},
-    {0x063F, 0x063F, 0x063F, 0x063F},
-    {0x0640, 0x0640, 0x0640, 0x0640},
-    {0xFED1, 0xFED2, 0xFED3, 0xFED4},
-    {0xFED5, 0xFED6, 0xFED7, 0xFED8},
-    {0xFED9, 0xFEDA, 0xFEDB, 0xFEDC},
-    {0xFEDD, 0xFEDE, 0xFEDF, 0xFEE0},
-    {0xFEE1, 0xFEE2, 0xFEE3, 0xFEE4},
-    {0xFEE5, 0xFEE6, 0xFEE7, 0xFEE8},
-    {0xFEE9, 0xFEEA, 0xFEEB, 0xFEEC},
-    {0xFEED, 0xFEEE, 0xFEED, 0xFEEE},
-    {0xFEEF, 0xFEF0, 0xFBFE, 0xFBFF},
-    {0xFEF1, 0xFEF2, 0xFEF3, 0xFEF4},
-    {0x064B, 0x064B, 0x064B, 0x064B},
-    {0x064C, 0x064C, 0x064C, 0x064C},
-    {0x064D, 0x064D, 0x064D, 0x064D},
-    {0x064E, 0x064E, 0x064E, 0x064E},
-    {0x064F, 0x064F, 0x064F, 0x064F},
-    {0x0650, 0x0650, 0x0650, 0x0650},
-    {0x0651, 0x0651, 0x0651, 0x0651},
-    {0x0652, 0x0652, 0x0652, 0x0652},
-    {0x0653, 0x0653, 0x0653, 0x0653},
-    {0x0654, 0x0654, 0x0654, 0x0654},
-    {0x0655, 0x0655, 0x0655, 0x0655},
-    {0x0656, 0x0656, 0x0656, 0x0656},
-    {0x0657, 0x0657, 0x0657, 0x0657},
-    {0x0658, 0x0658, 0x0658, 0x0658},
-    {0x0659, 0x0659, 0x0659, 0x0659},
-    {0x065A, 0x065A, 0x065A, 0x065A},
-    {0x065B, 0x065B, 0x065B, 0x065B},
-    {0x065C, 0x065C, 0x065C, 0x065C},
-    {0x065D, 0x065D, 0x065D, 0x065D},
-    {0x065E, 0x065E, 0x065E, 0x065E},
-    {0x065F, 0x065F, 0x065F, 0x065F},
-    {0x0660, 0x0660, 0x0660, 0x0660},
-    {0x0661, 0x0661, 0x0661, 0x0661},
-    {0x0662, 0x0662, 0x0662, 0x0662},
-    {0x0663, 0x0663, 0x0663, 0x0663},
-    {0x0664, 0x0664, 0x0664, 0x0664},
-    {0x0665, 0x0665, 0x0665, 0x0665},
-    {0x0666, 0x0666, 0x0666, 0x0666},
-    {0x0667, 0x0667, 0x0667, 0x0667},
-    {0x0668, 0x0668, 0x0668, 0x0668},
-    {0x0669, 0x0669, 0x0669, 0x0669},
-    {0x066A, 0x066A, 0x066A, 0x066A},
-    {0x066B, 0x066B, 0x066B, 0x066B},
-    {0x066C, 0x066C, 0x066C, 0x066C},
-    {0x066D, 0x066D, 0x066D, 0x066D},
-    {0x066E, 0x066E, 0x066E, 0x066E},
-    {0x066F, 0x066F, 0x066F, 0x066F},
-    {0x0670, 0x0670, 0x0670, 0x0670},
-    {0xFB50, 0xFB51, 0xFB50, 0xFB51},
-    {0x0672, 0x0672, 0x0672, 0x0672},
-    {0x0673, 0x0673, 0x0673, 0x0673},
-    {0x0674, 0x0674, 0x0674, 0x0674},
-    {0x0675, 0x0675, 0x0675, 0x0675},
-    {0x0676, 0x0676, 0x0676, 0x0676},
-    {0x0677, 0x0677, 0x0677, 0x0677},
-    {0x0678, 0x0678, 0x0678, 0x0678},
-    {0xFB66, 0xFB67, 0xFB68, 0xFB69},
-    {0xFB5E, 0xFB5F, 0xFB60, 0xFB61},
-    {0xFB52, 0xFB53, 0xFB54, 0xFB55},
-    {0x067C, 0x067C, 0x067C, 0x067C},
-    {0x067D, 0x067D, 0x067D, 0x067D},
-    {0xFB56, 0xFB57, 0xFB58, 0xFB59},
-    {0xFB62, 0xFB63, 0xFB64, 0xFB65},
-    {0xFB5A, 0xFB5B, 0xFB5C, 0xFB5D},
-    {0x0681, 0x0681, 0x0681, 0x0681},
-    {0x0682, 0x0682, 0x0682, 0x0682},
-    {0xFB76, 0xFB77, 0xFB78, 0xFB79},
-    {0xFB72, 0xFB73, 0xFB74, 0xFB75},
-    {0x0685, 0x0685, 0x0685, 0x0685},
-    {0xFB7A, 0xFB7B, 0xFB7C, 0xFB7D},
-    {0xFB7E, 0xFB7F, 0xFB80, 0xFB81},
-    {0xFB88, 0xFB89, 0xFB88, 0xFB89},
-    {0x0689, 0x0689, 0x0689, 0x0689},
-    {0x068A, 0x068A, 0x068A, 0x068A},
-    {0x068B, 0x068B, 0x068B, 0x068B},
-    {0xFB84, 0xFB85, 0xFB84, 0xFB85},
-    {0xFB82, 0xFB83, 0xFB82, 0xFB83},
-    {0xFB86, 0xFB87, 0xFB86, 0xFB87},
-    {0x068F, 0x068F, 0x068F, 0x068F},
-    {0x0690, 0x0690, 0x0690, 0x0690},
-    {0xFB8C, 0xFB8D, 0xFB8C, 0xFB8D},
-    {0x0692, 0x0692, 0x0692, 0x0692},
-    {0x0693, 0x0693, 0x0693, 0x0693},
-    {0x0694, 0x0694, 0x0694, 0x0694},
-    {0x0695, 0x0695, 0x0695, 0x0695},
-    {0x0696, 0x0696, 0x0696, 0x0696},
-    {0x0697, 0x0697, 0x0697, 0x0697},
-    {0xFB8A, 0xFB8B, 0xFB8A, 0xFB8B},
-    {0x0699, 0x0699, 0x0699, 0x0699},
-    {0x069A, 0x069A, 0x069A, 0x069A},
-    {0x069B, 0x069B, 0x069B, 0x069B},
-    {0x069C, 0x069C, 0x069C, 0x069C},
-    {0x069D, 0x069D, 0x069D, 0x069D},
-    {0x069E, 0x069E, 0x069E, 0x069E},
-    {0x069F, 0x069F, 0x069F, 0x069F},
-    {0x06A0, 0x06A0, 0x06A0, 0x06A0},
-    {0x06A1, 0x06A1, 0x06A1, 0x06A1},
-    {0x06A2, 0x06A2, 0x06A2, 0x06A2},
-    {0x06A3, 0x06A3, 0x06A3, 0x06A3},
-    {0xFB6A, 0xFB6B, 0xFB6C, 0xFB6D},
-    {0x06A5, 0x06A5, 0x06A5, 0x06A5},
-    {0xFB6E, 0xFB6F, 0xFB70, 0xFB71},
-    {0x06A7, 0x06A7, 0x06A7, 0x06A7},
-    {0x06A8, 0x06A8, 0x06A8, 0x06A8},
-    {0xFB8E, 0xFB8F, 0xFB90, 0xFB91},
-    {0x06AA, 0x06AA, 0x06AA, 0x06AA},
-    {0x06AB, 0x06AB, 0x06AB, 0x06AB},
-    {0x06AC, 0x06AC, 0x06AC, 0x06AC},
-    {0xFBD3, 0xFBD4, 0xFBD5, 0xFBD6},
-    {0x06AE, 0x06AE, 0x06AE, 0x06AE},
-    {0xFB92, 0xFB93, 0xFB94, 0xFB95},
-    {0x06B0, 0x06B0, 0x06B0, 0x06B0},
-    {0xFB9A, 0xFB9B, 0xFB9C, 0xFB9D},
-    {0x06B2, 0x06B2, 0x06B2, 0x06B2},
-    {0xFB96, 0xFB97, 0xFB98, 0xFB99},
-    {0x06B4, 0x06B4, 0x06B4, 0x06B4},
-    {0x06B5, 0x06B5, 0x06B5, 0x06B5},
-    {0x06B6, 0x06B6, 0x06B6, 0x06B6},
-    {0x06B7, 0x06B7, 0x06B7, 0x06B7},
-    {0x06B8, 0x06B8, 0x06B8, 0x06B8},
-    {0x06B9, 0x06B9, 0x06B9, 0x06B9},
-    {0xFB9E, 0xFB9F, 0xFBE8, 0xFBE9},
-    {0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3},
-    {0x06BC, 0x06BC, 0x06BC, 0x06BC},
-    {0x06BD, 0x06BD, 0x06BD, 0x06BD},
-    {0xFBAA, 0xFBAB, 0xFBAC, 0xFBAD},
-    {0x06BF, 0x06BF, 0x06BF, 0x06BF},
-    {0xFBA4, 0xFBA5, 0xFBA4, 0xFBA5},
-    {0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9},
-    {0x06C2, 0x06C2, 0x06C2, 0x06C2},
-    {0x06C3, 0x06C3, 0x06C3, 0x06C3},
-    {0x06C4, 0x06C4, 0x06C4, 0x06C4},
-    {0xFBE0, 0xFBE1, 0xFBE0, 0xFBE1},
-    {0xFBD9, 0xFBDA, 0xFBD9, 0xFBDA},
-    {0xFBD7, 0xFBD8, 0xFBD7, 0xFBD8},
-    {0xFBDB, 0xFBDC, 0xFBDB, 0xFBDC},
-    {0xFBE2, 0xFBE3, 0xFBE2, 0xFBE3},
-    {0x06CA, 0x06CA, 0x06CA, 0x06CA},
-    {0xFBDE, 0xFBDF, 0xFBDE, 0xFBDF},
-    {0xFBFC, 0xFBFD, 0xFBFE, 0xFBFF},
-    {0x06CD, 0x06CD, 0x06CD, 0x06CD},
-    {0x06CE, 0x06CE, 0x06CE, 0x06CE},
-    {0x06CF, 0x06CF, 0x06CF, 0x06CF},
-    {0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7},
-    {0x06D1, 0x06D1, 0x06D1, 0x06D1},
-    {0xFBAE, 0xFBAF, 0xFBAE, 0xFBAF},
-    {0xFBB0, 0xFBB1, 0xFBB0, 0xFBB1},
-    {0x06D4, 0x06D4, 0x06D4, 0x06D4},
-    {0x06D5, 0x06D5, 0x06D5, 0x06D5},
+    {0xFE81, 0xFE82, 0xFE81, 0xFE82}, {0xFE83, 0xFE84, 0xFE83, 0xFE84},
+    {0xFE85, 0xFE86, 0xFE85, 0xFE86}, {0xFE87, 0xFE88, 0xFE87, 0xFE88},
+    {0xFE89, 0xFE8A, 0xFE8B, 0xFE8C}, {0xFE8D, 0xFE8E, 0xFE8D, 0xFE8E},
+    {0xFE8F, 0xFE90, 0xFE91, 0xFE92}, {0xFE93, 0xFE94, 0xFE93, 0xFE94},
+    {0xFE95, 0xFE96, 0xFE97, 0xFE98}, {0xFE99, 0xFE9A, 0xFE9B, 0xFE9C},
+    {0xFE9D, 0xFE9E, 0xFE9F, 0xFEA0}, {0xFEA1, 0xFEA2, 0xFEA3, 0xFEA4},
+    {0xFEA5, 0xFEA6, 0xFEA7, 0xFEA8}, {0xFEA9, 0xFEAA, 0xFEA9, 0xFEAA},
+    {0xFEAB, 0xFEAC, 0xFEAB, 0xFEAC}, {0xFEAD, 0xFEAE, 0xFEAD, 0xFEAE},
+    {0xFEAF, 0xFEB0, 0xFEAF, 0xFEB0}, {0xFEB1, 0xFEB2, 0xFEB3, 0xFEB4},
+    {0xFEB5, 0xFEB6, 0xFEB7, 0xFEB8}, {0xFEB9, 0xFEBA, 0xFEBB, 0xFEBC},
+    {0xFEBD, 0xFEBE, 0xFEBF, 0xFEC0}, {0xFEC1, 0xFEC2, 0xFEC3, 0xFEC4},
+    {0xFEC5, 0xFEC6, 0xFEC7, 0xFEC8}, {0xFEC9, 0xFECA, 0xFECB, 0xFECC},
+    {0xFECD, 0xFECE, 0xFECF, 0xFED0}, {0x063B, 0x063B, 0x063B, 0x063B},
+    {0x063C, 0x063C, 0x063C, 0x063C}, {0x063D, 0x063D, 0x063D, 0x063D},
+    {0x063E, 0x063E, 0x063E, 0x063E}, {0x063F, 0x063F, 0x063F, 0x063F},
+    {0x0640, 0x0640, 0x0640, 0x0640}, {0xFED1, 0xFED2, 0xFED3, 0xFED4},
+    {0xFED5, 0xFED6, 0xFED7, 0xFED8}, {0xFED9, 0xFEDA, 0xFEDB, 0xFEDC},
+    {0xFEDD, 0xFEDE, 0xFEDF, 0xFEE0}, {0xFEE1, 0xFEE2, 0xFEE3, 0xFEE4},
+    {0xFEE5, 0xFEE6, 0xFEE7, 0xFEE8}, {0xFEE9, 0xFEEA, 0xFEEB, 0xFEEC},
+    {0xFEED, 0xFEEE, 0xFEED, 0xFEEE}, {0xFEEF, 0xFEF0, 0xFBFE, 0xFBFF},
+    {0xFEF1, 0xFEF2, 0xFEF3, 0xFEF4}, {0x064B, 0x064B, 0x064B, 0x064B},
+    {0x064C, 0x064C, 0x064C, 0x064C}, {0x064D, 0x064D, 0x064D, 0x064D},
+    {0x064E, 0x064E, 0x064E, 0x064E}, {0x064F, 0x064F, 0x064F, 0x064F},
+    {0x0650, 0x0650, 0x0650, 0x0650}, {0x0651, 0x0651, 0x0651, 0x0651},
+    {0x0652, 0x0652, 0x0652, 0x0652}, {0x0653, 0x0653, 0x0653, 0x0653},
+    {0x0654, 0x0654, 0x0654, 0x0654}, {0x0655, 0x0655, 0x0655, 0x0655},
+    {0x0656, 0x0656, 0x0656, 0x0656}, {0x0657, 0x0657, 0x0657, 0x0657},
+    {0x0658, 0x0658, 0x0658, 0x0658}, {0x0659, 0x0659, 0x0659, 0x0659},
+    {0x065A, 0x065A, 0x065A, 0x065A}, {0x065B, 0x065B, 0x065B, 0x065B},
+    {0x065C, 0x065C, 0x065C, 0x065C}, {0x065D, 0x065D, 0x065D, 0x065D},
+    {0x065E, 0x065E, 0x065E, 0x065E}, {0x065F, 0x065F, 0x065F, 0x065F},
+    {0x0660, 0x0660, 0x0660, 0x0660}, {0x0661, 0x0661, 0x0661, 0x0661},
+    {0x0662, 0x0662, 0x0662, 0x0662}, {0x0663, 0x0663, 0x0663, 0x0663},
+    {0x0664, 0x0664, 0x0664, 0x0664}, {0x0665, 0x0665, 0x0665, 0x0665},
+    {0x0666, 0x0666, 0x0666, 0x0666}, {0x0667, 0x0667, 0x0667, 0x0667},
+    {0x0668, 0x0668, 0x0668, 0x0668}, {0x0669, 0x0669, 0x0669, 0x0669},
+    {0x066A, 0x066A, 0x066A, 0x066A}, {0x066B, 0x066B, 0x066B, 0x066B},
+    {0x066C, 0x066C, 0x066C, 0x066C}, {0x066D, 0x066D, 0x066D, 0x066D},
+    {0x066E, 0x066E, 0x066E, 0x066E}, {0x066F, 0x066F, 0x066F, 0x066F},
+    {0x0670, 0x0670, 0x0670, 0x0670}, {0xFB50, 0xFB51, 0xFB50, 0xFB51},
+    {0x0672, 0x0672, 0x0672, 0x0672}, {0x0673, 0x0673, 0x0673, 0x0673},
+    {0x0674, 0x0674, 0x0674, 0x0674}, {0x0675, 0x0675, 0x0675, 0x0675},
+    {0x0676, 0x0676, 0x0676, 0x0676}, {0x0677, 0x0677, 0x0677, 0x0677},
+    {0x0678, 0x0678, 0x0678, 0x0678}, {0xFB66, 0xFB67, 0xFB68, 0xFB69},
+    {0xFB5E, 0xFB5F, 0xFB60, 0xFB61}, {0xFB52, 0xFB53, 0xFB54, 0xFB55},
+    {0x067C, 0x067C, 0x067C, 0x067C}, {0x067D, 0x067D, 0x067D, 0x067D},
+    {0xFB56, 0xFB57, 0xFB58, 0xFB59}, {0xFB62, 0xFB63, 0xFB64, 0xFB65},
+    {0xFB5A, 0xFB5B, 0xFB5C, 0xFB5D}, {0x0681, 0x0681, 0x0681, 0x0681},
+    {0x0682, 0x0682, 0x0682, 0x0682}, {0xFB76, 0xFB77, 0xFB78, 0xFB79},
+    {0xFB72, 0xFB73, 0xFB74, 0xFB75}, {0x0685, 0x0685, 0x0685, 0x0685},
+    {0xFB7A, 0xFB7B, 0xFB7C, 0xFB7D}, {0xFB7E, 0xFB7F, 0xFB80, 0xFB81},
+    {0xFB88, 0xFB89, 0xFB88, 0xFB89}, {0x0689, 0x0689, 0x0689, 0x0689},
+    {0x068A, 0x068A, 0x068A, 0x068A}, {0x068B, 0x068B, 0x068B, 0x068B},
+    {0xFB84, 0xFB85, 0xFB84, 0xFB85}, {0xFB82, 0xFB83, 0xFB82, 0xFB83},
+    {0xFB86, 0xFB87, 0xFB86, 0xFB87}, {0x068F, 0x068F, 0x068F, 0x068F},
+    {0x0690, 0x0690, 0x0690, 0x0690}, {0xFB8C, 0xFB8D, 0xFB8C, 0xFB8D},
+    {0x0692, 0x0692, 0x0692, 0x0692}, {0x0693, 0x0693, 0x0693, 0x0693},
+    {0x0694, 0x0694, 0x0694, 0x0694}, {0x0695, 0x0695, 0x0695, 0x0695},
+    {0x0696, 0x0696, 0x0696, 0x0696}, {0x0697, 0x0697, 0x0697, 0x0697},
+    {0xFB8A, 0xFB8B, 0xFB8A, 0xFB8B}, {0x0699, 0x0699, 0x0699, 0x0699},
+    {0x069A, 0x069A, 0x069A, 0x069A}, {0x069B, 0x069B, 0x069B, 0x069B},
+    {0x069C, 0x069C, 0x069C, 0x069C}, {0x069D, 0x069D, 0x069D, 0x069D},
+    {0x069E, 0x069E, 0x069E, 0x069E}, {0x069F, 0x069F, 0x069F, 0x069F},
+    {0x06A0, 0x06A0, 0x06A0, 0x06A0}, {0x06A1, 0x06A1, 0x06A1, 0x06A1},
+    {0x06A2, 0x06A2, 0x06A2, 0x06A2}, {0x06A3, 0x06A3, 0x06A3, 0x06A3},
+    {0xFB6A, 0xFB6B, 0xFB6C, 0xFB6D}, {0x06A5, 0x06A5, 0x06A5, 0x06A5},
+    {0xFB6E, 0xFB6F, 0xFB70, 0xFB71}, {0x06A7, 0x06A7, 0x06A7, 0x06A7},
+    {0x06A8, 0x06A8, 0x06A8, 0x06A8}, {0xFB8E, 0xFB8F, 0xFB90, 0xFB91},
+    {0x06AA, 0x06AA, 0x06AA, 0x06AA}, {0x06AB, 0x06AB, 0x06AB, 0x06AB},
+    {0x06AC, 0x06AC, 0x06AC, 0x06AC}, {0xFBD3, 0xFBD4, 0xFBD5, 0xFBD6},
+    {0x06AE, 0x06AE, 0x06AE, 0x06AE}, {0xFB92, 0xFB93, 0xFB94, 0xFB95},
+    {0x06B0, 0x06B0, 0x06B0, 0x06B0}, {0xFB9A, 0xFB9B, 0xFB9C, 0xFB9D},
+    {0x06B2, 0x06B2, 0x06B2, 0x06B2}, {0xFB96, 0xFB97, 0xFB98, 0xFB99},
+    {0x06B4, 0x06B4, 0x06B4, 0x06B4}, {0x06B5, 0x06B5, 0x06B5, 0x06B5},
+    {0x06B6, 0x06B6, 0x06B6, 0x06B6}, {0x06B7, 0x06B7, 0x06B7, 0x06B7},
+    {0x06B8, 0x06B8, 0x06B8, 0x06B8}, {0x06B9, 0x06B9, 0x06B9, 0x06B9},
+    {0xFB9E, 0xFB9F, 0xFBE8, 0xFBE9}, {0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3},
+    {0x06BC, 0x06BC, 0x06BC, 0x06BC}, {0x06BD, 0x06BD, 0x06BD, 0x06BD},
+    {0xFBAA, 0xFBAB, 0xFBAC, 0xFBAD}, {0x06BF, 0x06BF, 0x06BF, 0x06BF},
+    {0xFBA4, 0xFBA5, 0xFBA4, 0xFBA5}, {0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9},
+    {0x06C2, 0x06C2, 0x06C2, 0x06C2}, {0x06C3, 0x06C3, 0x06C3, 0x06C3},
+    {0x06C4, 0x06C4, 0x06C4, 0x06C4}, {0xFBE0, 0xFBE1, 0xFBE0, 0xFBE1},
+    {0xFBD9, 0xFBDA, 0xFBD9, 0xFBDA}, {0xFBD7, 0xFBD8, 0xFBD7, 0xFBD8},
+    {0xFBDB, 0xFBDC, 0xFBDB, 0xFBDC}, {0xFBE2, 0xFBE3, 0xFBE2, 0xFBE3},
+    {0x06CA, 0x06CA, 0x06CA, 0x06CA}, {0xFBDE, 0xFBDF, 0xFBDE, 0xFBDF},
+    {0xFBFC, 0xFBFD, 0xFBFE, 0xFBFF}, {0x06CD, 0x06CD, 0x06CD, 0x06CD},
+    {0x06CE, 0x06CE, 0x06CE, 0x06CE}, {0x06CF, 0x06CF, 0x06CF, 0x06CF},
+    {0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7}, {0x06D1, 0x06D1, 0x06D1, 0x06D1},
+    {0xFBAE, 0xFBAF, 0xFBAE, 0xFBAF}, {0xFBB0, 0xFBB1, 0xFBB0, 0xFBB1},
+    {0x06D4, 0x06D4, 0x06D4, 0x06D4}, {0x06D5, 0x06D5, 0x06D5, 0x06D5},
 };
 
 const FX_ARAALEF gs_FX_AlefTable[] = {
@@ -200,11 +110,8 @@ const FX_ARAALEF gs_FX_AlefTable[] = {
 };
 
 const FX_ARASHADDA gs_FX_ShaddaTable[] = {
-    {0x064C, 0xFC5E},
-    {0x064D, 0xFC5F},
-    {0x064E, 0xFC60},
-    {0x064F, 0xFC61},
-    {0x0650, 0xFC62},
+    {0x064C, 0xFC5E}, {0x064D, 0xFC5F}, {0x064E, 0xFC60},
+    {0x064F, 0xFC61}, {0x0650, 0xFC62},
 };
 
 }  // namespace
diff --git a/core/src/fxcrt/fx_arabic.h b/core/fxcrt/fx_arabic.h
index 9a1758683b..f785e21a91 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/fxcrt/fx_arabic.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCRT_FX_ARABIC_H_
-#define CORE_SRC_FXCRT_FX_ARABIC_H_
+#ifndef CORE_FXCRT_FX_ARABIC_H_
+#define CORE_FXCRT_FX_ARABIC_H_
 
 #include "core/include/fxcrt/fx_arb.h"
 
@@ -208,4 +208,4 @@ void FX_BidiReorder(int32_t iBaseLevel,
                     CFX_WideString& wsText,
                     const CFX_Int32Array& levels);
 
-#endif  // CORE_SRC_FXCRT_FX_ARABIC_H_
+#endif  // CORE_FXCRT_FX_ARABIC_H_
diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/fxcrt/fx_basic_array.cpp
index 18e2bd26d2..18e2bd26d2 100644
--- a/core/src/fxcrt/fx_basic_array.cpp
+++ b/core/fxcrt/fx_basic_array.cpp
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/fxcrt/fx_basic_bstring.cpp
index 5d38d57757..5d38d57757 100644
--- a/core/src/fxcrt/fx_basic_bstring.cpp
+++ b/core/fxcrt/fx_basic_bstring.cpp
diff --git a/core/src/fxcrt/fx_basic_bstring_unittest.cpp b/core/fxcrt/fx_basic_bstring_unittest.cpp
index 337775d9af..337775d9af 100644
--- a/core/src/fxcrt/fx_basic_bstring_unittest.cpp
+++ b/core/fxcrt/fx_basic_bstring_unittest.cpp
diff --git a/core/src/fxcrt/fx_basic_buffer.cpp b/core/fxcrt/fx_basic_buffer.cpp
index a3039f4188..a3039f4188 100644
--- a/core/src/fxcrt/fx_basic_buffer.cpp
+++ b/core/fxcrt/fx_basic_buffer.cpp
diff --git a/core/src/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp
index 4f723ef919..4f723ef919 100644
--- a/core/src/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/fxcrt/fx_basic_gcc.cpp
index 2c9c54c8b6..2c9c54c8b6 100644
--- a/core/src/fxcrt/fx_basic_gcc.cpp
+++ b/core/fxcrt/fx_basic_gcc.cpp
diff --git a/core/src/fxcrt/fx_basic_gcc_unittest.cpp b/core/fxcrt/fx_basic_gcc_unittest.cpp
index eb1e0669ae..eb1e0669ae 100644
--- a/core/src/fxcrt/fx_basic_gcc_unittest.cpp
+++ b/core/fxcrt/fx_basic_gcc_unittest.cpp
diff --git a/core/src/fxcrt/fx_basic_list.cpp b/core/fxcrt/fx_basic_list.cpp
index 5944a2c4af..e893773aad 100644
--- a/core/src/fxcrt/fx_basic_list.cpp
+++ b/core/fxcrt/fx_basic_list.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcrt/plex.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fxcrt/plex.h"
 
 CFX_PtrList::CFX_PtrList(int nBlockSize)
     : m_pNodeHead(NULL),
diff --git a/core/src/fxcrt/fx_basic_maps.cpp b/core/fxcrt/fx_basic_maps.cpp
index 60d75b610c..eb4f2868f5 100644
--- a/core/src/fxcrt/fx_basic_maps.cpp
+++ b/core/fxcrt/fx_basic_maps.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcrt/plex.h"
 #include "core/include/fxcrt/fx_basic.h"
-#include "core/src/fxcrt/plex.h"
 
 CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize)
     : m_pHashTable(NULL),
diff --git a/core/src/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_basic_memmgr.cpp
index a0af6aef6d..a0af6aef6d 100644
--- a/core/src/fxcrt/fx_basic_memmgr.cpp
+++ b/core/fxcrt/fx_basic_memmgr.cpp
diff --git a/core/src/fxcrt/fx_basic_memmgr_unittest.cpp b/core/fxcrt/fx_basic_memmgr_unittest.cpp
index 9821ca9057..9821ca9057 100644
--- a/core/src/fxcrt/fx_basic_memmgr_unittest.cpp
+++ b/core/fxcrt/fx_basic_memmgr_unittest.cpp
diff --git a/core/src/fxcrt/fx_basic_plex.cpp b/core/fxcrt/fx_basic_plex.cpp
index 8689b97bb6..1cddbc32a0 100644
--- a/core/src/fxcrt/fx_basic_plex.cpp
+++ b/core/fxcrt/fx_basic_plex.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcrt/plex.h"
 #include "core/include/fxcrt/fx_memory.h"
-#include "core/src/fxcrt/plex.h"
 
 CFX_Plex* CFX_Plex::Create(CFX_Plex*& pHead,
                            FX_DWORD nMax,
diff --git a/core/src/fxcrt/fx_basic_utf.cpp b/core/fxcrt/fx_basic_utf.cpp
index 3625feb130..3625feb130 100644
--- a/core/src/fxcrt/fx_basic_utf.cpp
+++ b/core/fxcrt/fx_basic_utf.cpp
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp
index 2422212d59..2422212d59 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/fxcrt/fx_basic_util.cpp
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp
index 95b761bd09..95b761bd09 100644
--- a/core/src/fxcrt/fx_basic_wstring.cpp
+++ b/core/fxcrt/fx_basic_wstring.cpp
diff --git a/core/src/fxcrt/fx_basic_wstring_unittest.cpp b/core/fxcrt/fx_basic_wstring_unittest.cpp
index 64d694c436..64d694c436 100644
--- a/core/src/fxcrt/fx_basic_wstring_unittest.cpp
+++ b/core/fxcrt/fx_basic_wstring_unittest.cpp
diff --git a/core/src/fxcrt/fx_bidi.cpp b/core/fxcrt/fx_bidi.cpp
index a7a3ecb295..a7a3ecb295 100644
--- a/core/src/fxcrt/fx_bidi.cpp
+++ b/core/fxcrt/fx_bidi.cpp
diff --git a/core/src/fxcrt/fx_bidi_unittest.cpp b/core/fxcrt/fx_bidi_unittest.cpp
index a3c148702b..a3c148702b 100644
--- a/core/src/fxcrt/fx_bidi_unittest.cpp
+++ b/core/fxcrt/fx_bidi_unittest.cpp
diff --git a/core/src/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp
index 09414cb0c0..ef284a2357 100644
--- a/core/src/fxcrt/fx_extension.cpp
+++ b/core/fxcrt/fx_extension.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcrt/extension.h"
 #include "core/include/fxcrt/fx_basic.h"
 #include "core/include/fxcrt/fx_ext.h"
-#include "core/src/fxcrt/extension.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #include <wincrypt.h>
diff --git a/core/src/fxcrt/fx_extension_unittest.cpp b/core/fxcrt/fx_extension_unittest.cpp
index e2ae870f93..e2ae870f93 100644
--- a/core/src/fxcrt/fx_extension_unittest.cpp
+++ b/core/fxcrt/fx_extension_unittest.cpp
diff --git a/core/src/fxcrt/fx_system_unittest.cpp b/core/fxcrt/fx_system_unittest.cpp
index f877eb2aa5..f877eb2aa5 100644
--- a/core/src/fxcrt/fx_system_unittest.cpp
+++ b/core/fxcrt/fx_system_unittest.cpp
diff --git a/core/src/fxcrt/fx_ucddata.cpp b/core/fxcrt/fx_ucddata.cpp
index c373d6e9d6..c373d6e9d6 100644
--- a/core/src/fxcrt/fx_ucddata.cpp
+++ b/core/fxcrt/fx_ucddata.cpp
diff --git a/core/src/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp
index 140bab0b27..140bab0b27 100644
--- a/core/src/fxcrt/fx_unicode.cpp
+++ b/core/fxcrt/fx_unicode.cpp
diff --git a/core/src/fxcrt/fx_xml_composer.cpp b/core/fxcrt/fx_xml_composer.cpp
index e539510372..93aee899dd 100644
--- a/core/src/fxcrt/fx_xml_composer.cpp
+++ b/core/fxcrt/fx_xml_composer.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcrt/xml_int.h"
+#include "core/fxcrt/xml_int.h"
 
 #include "core/include/fxcrt/fx_xml.h"
 
diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/fxcrt/fx_xml_parser.cpp
index ffdc5040b6..d5326d3882 100644
--- a/core/src/fxcrt/fx_xml_parser.cpp
+++ b/core/fxcrt/fx_xml_parser.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcrt/xml_int.h"
+#include "core/fxcrt/xml_int.h"
 
 #include <vector>
 
diff --git a/core/src/fxcrt/fxcrt_platforms.cpp b/core/fxcrt/fxcrt_platforms.cpp
index 85081a237f..b4f6ffa109 100644
--- a/core/src/fxcrt/fxcrt_platforms.cpp
+++ b/core/fxcrt/fxcrt_platforms.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcrt/fxcrt_platforms.h"
+#include "core/fxcrt/fxcrt_platforms.h"
 
 #include "core/include/fxcrt/fx_basic.h"
 
diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/fxcrt/fxcrt_platforms.h
index 7c659d3a5f..6bbebcba13 100644
--- a/core/src/fxcrt/fxcrt_platforms.h
+++ b/core/fxcrt/fxcrt_platforms.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
-#define CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
+#ifndef CORE_FXCRT_FXCRT_PLATFORMS_H_
+#define CORE_FXCRT_FXCRT_PLATFORMS_H_
 
-#include "core/src/fxcrt/extension.h"
+#include "core/fxcrt/extension.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString& bsMode);
@@ -39,4 +39,4 @@ class CFXCRT_FileAccess_CRT : public IFXCRT_FileAccess {
 };
 #endif
 
-#endif  // CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
+#endif  // CORE_FXCRT_FXCRT_PLATFORMS_H_
diff --git a/core/src/fxcrt/fxcrt_posix.cpp b/core/fxcrt/fxcrt_posix.cpp
index 1d3b0c2310..161506dd74 100644
--- a/core/src/fxcrt/fxcrt_posix.cpp
+++ b/core/fxcrt/fxcrt_posix.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcrt/fxcrt_posix.h"
+#include "core/fxcrt/fxcrt_posix.h"
 
 #include "core/include/fxcrt/fx_basic.h"
 
diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/fxcrt/fxcrt_posix.h
index f67618ff96..cf5f634874 100644
--- a/core/src/fxcrt/fxcrt_posix.h
+++ b/core/fxcrt/fxcrt_posix.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCRT_FXCRT_POSIX_H_
-#define CORE_SRC_FXCRT_FXCRT_POSIX_H_
+#ifndef CORE_FXCRT_FXCRT_POSIX_H_
+#define CORE_FXCRT_FXCRT_POSIX_H_
 
-#include "core/src/fxcrt/extension.h"
+#include "core/fxcrt/extension.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \
     _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
@@ -39,4 +39,4 @@ class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess {
 };
 #endif
 
-#endif  // CORE_SRC_FXCRT_FXCRT_POSIX_H_
+#endif  // CORE_FXCRT_FXCRT_POSIX_H_
diff --git a/core/src/fxcrt/fxcrt_stream.cpp b/core/fxcrt/fxcrt_stream.cpp
index 2f50153e9e..2f50153e9e 100644
--- a/core/src/fxcrt/fxcrt_stream.cpp
+++ b/core/fxcrt/fxcrt_stream.cpp
diff --git a/core/src/fxcrt/fxcrt_windows.cpp b/core/fxcrt/fxcrt_windows.cpp
index d5b535bb16..528a3b78ac 100644
--- a/core/src/fxcrt/fxcrt_windows.cpp
+++ b/core/fxcrt/fxcrt_windows.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcrt/fxcrt_windows.h"
+#include "core/fxcrt/fxcrt_windows.h"
 
 #include "core/include/fxcrt/fx_string.h"
 
diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/fxcrt/fxcrt_windows.h
index 522ceec9e5..04a1a55b16 100644
--- a/core/src/fxcrt/fxcrt_windows.h
+++ b/core/fxcrt/fxcrt_windows.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
-#define CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
+#ifndef CORE_FXCRT_FXCRT_WINDOWS_H_
+#define CORE_FXCRT_FXCRT_WINDOWS_H_
 
-#include "core/src/fxcrt/extension.h"
+#include "core/fxcrt/extension.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess {
@@ -37,4 +37,4 @@ class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess {
 };
 #endif
 
-#endif  // CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
+#endif  // CORE_FXCRT_FXCRT_WINDOWS_H_
diff --git a/core/src/fxcrt/plex.h b/core/fxcrt/plex.h
index 12b7bd45a1..25fca64d72 100644
--- a/core/src/fxcrt/plex.h
+++ b/core/fxcrt/plex.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCRT_PLEX_H_
-#define CORE_SRC_FXCRT_PLEX_H_
+#ifndef CORE_FXCRT_PLEX_H_
+#define CORE_FXCRT_PLEX_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -16,4 +16,4 @@ struct CFX_Plex {
   void FreeDataChain();
 };
 
-#endif  // CORE_SRC_FXCRT_PLEX_H_
+#endif  // CORE_FXCRT_PLEX_H_
diff --git a/core/src/fxcrt/xml_int.h b/core/fxcrt/xml_int.h
index a837327445..18dbf9b955 100644
--- a/core/src/fxcrt/xml_int.h
+++ b/core/fxcrt/xml_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXCRT_XML_INT_H_
-#define CORE_SRC_FXCRT_XML_INT_H_
+#ifndef CORE_FXCRT_XML_INT_H_
+#define CORE_FXCRT_XML_INT_H_
 
 #include <algorithm>
 
@@ -127,4 +127,4 @@ void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName,
                                CFX_ByteStringC& bsSpace,
                                CFX_ByteStringC& bsName);
 
-#endif  // CORE_SRC_FXCRT_XML_INT_H_
+#endif  // CORE_FXCRT_XML_INT_H_
diff --git a/core/src/fxge/agg/DEPS b/core/fxge/agg/DEPS
index 25d9e110e6..25d9e110e6 100644
--- a/core/src/fxge/agg/DEPS
+++ b/core/fxge/agg/DEPS
diff --git a/core/src/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 2f376b2b19..cd72865421 100644
--- a/core/src/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/agg/fx_agg_driver.h"
+#include "core/fxge/agg/fx_agg_driver.h"
 
 #include <algorithm>
 
+#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/dib/dib_int.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 #include "third_party/agg23/agg_conv_dash.h"
 #include "third_party/agg23/agg_conv_stroke.h"
 #include "third_party/agg23/agg_curves.h"
diff --git a/core/src/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index ac2dfd02e3..3631016fea 100644
--- a/core/src/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_AGG_FX_AGG_DRIVER_H_
-#define CORE_SRC_FXGE_AGG_FX_AGG_DRIVER_H_
+#ifndef CORE_FXGE_AGG_FX_AGG_DRIVER_H_
+#define CORE_FXGE_AGG_FX_AGG_DRIVER_H_
 
 #include "core/include/fxge/fx_ge.h"
 #include "third_party/agg23/agg_clip_liang_barsky.h"
@@ -149,4 +149,4 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
   FX_BOOL m_bGroupKnockout;
 };
 
-#endif  // CORE_SRC_FXGE_AGG_FX_AGG_DRIVER_H_
+#endif  // CORE_FXGE_AGG_FX_AGG_DRIVER_H_
diff --git a/core/src/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp
index ba0c40a4f4..b94ec055bf 100644
--- a/core/src/fxge/android/fpf_skiafont.cpp
+++ b/core/fxge/android/fpf_skiafont.cpp
@@ -10,9 +10,9 @@
 
 #include <algorithm>
 
+#include "core/fxge/android/fpf_skiafont.h"
+#include "core/fxge/android/fpf_skiafontmgr.h"
 #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)
 
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h
index c12ec43690..f1ccedb56d 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/fxge/android/fpf_skiafont.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
-#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
+#ifndef CORE_FXGE_ANDROID_FPF_SKIAFONT_H_
+#define CORE_FXGE_ANDROID_FPF_SKIAFONT_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -57,4 +57,4 @@ class CFPF_SkiaFont : public IFPF_Font {
 };
 #endif
 
-#endif  // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_
+#endif  // CORE_FXGE_ANDROID_FPF_SKIAFONT_H_
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp
index 5d075c6d08..e9249ba76f 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/fxge/android/fpf_skiafontmgr.cpp
@@ -13,10 +13,10 @@
 #define FPF_SKIAMATCHWEIGHT_1 16
 #define FPF_SKIAMATCHWEIGHT_2 8
 
+#include "core/fxge/android/fpf_skiafont.h"
+#include "core/fxge/android/fpf_skiafontmgr.h"
 #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" {
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h
index 1a304e578a..9f5cafbed5 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.h
+++ b/core/fxge/android/fpf_skiafontmgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
-#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
+#ifndef CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
+#define CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -124,4 +124,4 @@ class CFPF_SkiaFontMgr : public IFPF_FontMgr {
 
 #endif
 
-#endif  // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
+#endif  // CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/fxge/android/fpf_skiamodule.cpp
index 76ee853602..91f00c78e8 100644
--- a/core/src/fxge/android/fpf_skiamodule.cpp
+++ b/core/fxge/android/fpf_skiamodule.cpp
@@ -8,8 +8,8 @@
 
 #if _FX_OS_ == _FX_ANDROID_
 
-#include "core/src/fxge/android/fpf_skiafontmgr.h"
-#include "core/src/fxge/android/fpf_skiamodule.h"
+#include "core/fxge/android/fpf_skiafontmgr.h"
+#include "core/fxge/android/fpf_skiamodule.h"
 
 static IFPF_DeviceModule* gs_pPFModule = NULL;
 IFPF_DeviceModule* FPF_GetDeviceModule() {
diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/fxge/android/fpf_skiamodule.h
index ff99eda75d..a95c974b5d 100644
--- a/core/src/fxge/android/fpf_skiamodule.h
+++ b/core/fxge/android/fpf_skiamodule.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_
-#define CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_
+#ifndef CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_
+#define CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_
 
 #if _FX_OS_ == _FX_ANDROID_
 
@@ -27,4 +27,4 @@ class CFPF_SkiaDeviceModule : public IFPF_DeviceModule {
 };
 #endif
 
-#endif  // CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_
+#endif  // CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_
diff --git a/core/src/fxge/android/fx_android_font.cpp b/core/fxge/android/fx_android_font.cpp
index f28bf286e5..58d20faa7b 100644
--- a/core/src/fxge/android/fx_android_font.cpp
+++ b/core/fxge/android/fx_android_font.cpp
@@ -8,8 +8,8 @@
 
 #if _FX_OS_ == _FX_ANDROID_
 
+#include "core/fxge/android/fx_android_font.h"
 #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) {
diff --git a/core/src/fxge/android/fx_android_font.h b/core/fxge/android/fx_android_font.h
index 0ebc97d096..ef8062dda8 100644
--- a/core/src/fxge/android/fx_android_font.h
+++ b/core/fxge/android/fx_android_font.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
-#define CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
+#ifndef CORE_FXGE_ANDROID_FX_ANDROID_FONT_H_
+#define CORE_FXGE_ANDROID_FX_ANDROID_FONT_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -46,4 +46,4 @@ class CFX_AndroidFontInfo : public IFX_SystemFontInfo {
 };
 #endif
 
-#endif  // CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_
+#endif  // CORE_FXGE_ANDROID_FX_ANDROID_FONT_H_
diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp
index 271e0012d8..6d04e4ffc2 100644
--- a/core/src/fxge/android/fx_android_imp.cpp
+++ b/core/fxge/android/fx_android_imp.cpp
@@ -8,9 +8,9 @@
 
 #if _FX_OS_ == _FX_ANDROID_
 
+#include "core/fxge/android/fx_android_font.h"
 #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();
diff --git a/core/src/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h
index 5b7be6e6c7..6fc665e8c3 100644
--- a/core/src/fxge/apple/apple_int.h
+++ b/core/fxge/apple/apple_int.h
@@ -4,8 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_APPLE_APPLE_INT_H_
-#define CORE_SRC_FXGE_APPLE_APPLE_INT_H_
+#ifndef CORE_FXGE_APPLE_APPLE_INT_H_
+#define CORE_FXGE_APPLE_APPLE_INT_H_
+
+#include "core/include/fxcrt/fx_system.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
@@ -266,4 +268,4 @@ uint32_t FX_IOSGetFamilyNamesCount();
 const FX_CHAR* FX_IOSGetFamilyName(uint32_t uIndex);
 #endif
 
-#endif  // CORE_SRC_FXGE_APPLE_APPLE_INT_H_
+#endif  // CORE_FXGE_APPLE_APPLE_INT_H_
diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp
index f56ea44e92..098e9261ae 100644
--- a/core/src/fxge/apple/fx_apple_platform.cpp
+++ b/core/fxge/apple/fx_apple_platform.cpp
@@ -9,12 +9,12 @@
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
+#include "core/fxge/agg/fx_agg_driver.h"
+#include "core/fxge/apple/apple_int.h"
+#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_apple.h"
-#include "core/src/fxge/agg/fx_agg_driver.h"
-#include "core/src/fxge/apple/apple_int.h"
-#include "core/src/fxge/dib/dib_int.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 
 void CFX_AggDeviceDriver::InitPlatform() {
   CQuartz2D& quartz2d =
diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp
index 1d2f68645d..db9f802d64 100644
--- a/core/src/fxge/apple/fx_mac_imp.cpp
+++ b/core/fxge/apple/fx_mac_imp.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/apple/apple_int.h"
 #include "core/include/fxge/fx_ge.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/fxge/apple/fx_quartz_device.cpp
index 2beca42efe..c39ee5e795 100644
--- a/core/src/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/agg/fx_agg_driver.h"
+#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/agg/fx_agg_driver.h"
-#include "core/src/fxge/dib/dib_int.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#include "core/fxge/apple/apple_int.h"
 #include "core/include/fxge/fx_ge_apple.h"
-#include "core/src/fxge/apple/apple_int.h"
 #ifndef CGFLOAT_IS_DOUBLE
 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
 #endif
diff --git a/core/src/fxge/dib/dib_int.h b/core/fxge/dib/dib_int.h
index b89e19f875..85888fed50 100644
--- a/core/src/fxge/dib/dib_int.h
+++ b/core/fxge/dib/dib_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_DIB_DIB_INT_H_
-#define CORE_SRC_FXGE_DIB_DIB_INT_H_
+#ifndef CORE_FXGE_DIB_DIB_INT_H_
+#define CORE_FXGE_DIB_DIB_INT_H_
 
 #include <stdint.h>
 
@@ -104,4 +104,4 @@ FX_RECT FXDIB_SwapClipBox(FX_RECT& clip,
                           FX_BOOL bFlipX,
                           FX_BOOL bFlipY);
 
-#endif  // CORE_SRC_FXGE_DIB_DIB_INT_H_
+#endif  // CORE_FXGE_DIB_DIB_INT_H_
diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp
index e2781d6244..0bf67ccb71 100644
--- a/core/src/fxge/dib/fx_dib_composite.cpp
+++ b/core/fxge/dib/fx_dib_composite.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/dib/dib_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_ge.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_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp
index a1c18ae121..a1c18ae121 100644
--- a/core/src/fxge/dib/fx_dib_convert.cpp
+++ b/core/fxge/dib/fx_dib_convert.cpp
diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/fxge/dib/fx_dib_engine.cpp
index 322040539e..10e5e67bbc 100644
--- a/core/src/fxge/dib/fx_dib_engine.cpp
+++ b/core/fxge/dib/fx_dib_engine.cpp
@@ -6,9 +6,9 @@
 
 #include <limits.h>
 
+#include "core/fxge/dib/dib_int.h"
 #include "core/include/fxge/fx_dib.h"
 #include "core/include/fxge/fx_ge.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/fxge/dib/fx_dib_main.cpp
index ab4c170af5..8ce20568df 100644
--- a/core/src/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -8,9 +8,9 @@
 
 #include <limits.h>
 
+#include "core/fxge/dib/dib_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_ge.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/fxge/dib/fx_dib_transform.cpp
index 01c37d207e..dc6fb93c75 100644
--- a/core/src/fxge/dib/fx_dib_transform.cpp
+++ b/core/fxge/dib/fx_dib_transform.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/dib/dib_int.h"
+#include "core/fxge/dib/dib_int.h"
 
 #include "core/include/fxge/fx_dib.h"
 
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.cpp b/core/fxge/fontdata/chromefontdata/FoxitDingbats.cpp
index 47950979a3..75088cef5d 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitDingbats.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitDingbatsFontData[29513] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x11, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixed.cpp b/core/fxge/fontdata/chromefontdata/FoxitFixed.cpp
index bbd1525db6..61c0857593 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixed.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitFixed.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedFontData[17597] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0xe,  0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp b/core/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp
index 58df84debe..c1494f51aa 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedBoldFontData[18055] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x13, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp b/core/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp
index d6de9f6006..c9509e6c6b 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedBoldItalicFontData[19151] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x19, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp b/core/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp
index 905e7bbc5c..7fe9f63c0e 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitFixedItalicFontData[18746] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x15, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSans.cpp b/core/fxge/fontdata/chromefontdata/FoxitSans.cpp
index 26cd319403..16da03e54e 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSans.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSans.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansFontData[15025] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0xd,  0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.cpp b/core/fxge/fontdata/chromefontdata/FoxitSansBold.cpp
index 8b185f50c4..10a63a53c6 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSansBold.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansBoldFontData[16344] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x12, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp b/core/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp
index 884c6ebdf6..054976cced 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansBoldItalicFontData[16418] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x17, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp b/core/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp
index 9e1b558340..2912e1688e 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansItalicFontData[16339] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x14, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.cpp b/core/fxge/fontdata/chromefontdata/FoxitSansMM.cpp
index 3cc6ef8d1e..7f540aef1f 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSansMM.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSansMMFontData[66919] = {
     0x80, 0x01, 0xD2, 0x29, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2D, 0x41,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerif.cpp b/core/fxge/fontdata/chromefontdata/FoxitSerif.cpp
index 57e70dc0b9..5fa276de4e 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerif.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSerif.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifFontData[19469] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0xe,  0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp b/core/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp
index ee481beba5..2875863037 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifBoldFontData[19395] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x13, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp b/core/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp
index e3eea02753..159e535246 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifBoldItalicFontData[20733] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x19, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp b/core/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp
index e13edf995e..eec32d71d3 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifItalicFontData[21227] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0x15, 0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp b/core/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp
index 5180d10912..4195e9cb4a 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSerifMMFontData[113417] = {
     0x80, 0x01, 0xD6, 0x29, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2D, 0x41,
diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.cpp b/core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp
index c9681b2c5a..37ce309f58 100644
--- a/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.cpp
+++ b/core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 
 const unsigned char g_FoxitSymbolFontData[16729] = {
     0x1,  0x0,  0x4,  0x2,  0x0,  0x1,  0x1,  0x1,  0xf,  0x43, 0x68, 0x72,
diff --git a/core/src/fxge/fontdata/chromefontdata/chromefontdata.h b/core/fxge/fontdata/chromefontdata/chromefontdata.h
index 9b640568e5..3cd8d1a8ca 100644
--- a/core/src/fxge/fontdata/chromefontdata/chromefontdata.h
+++ b/core/fxge/fontdata/chromefontdata/chromefontdata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_
-#define CORE_SRC_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_
+#ifndef CORE_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_
+#define CORE_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,4 +32,4 @@ extern const unsigned char g_FoxitSansMMFontData[66919];
 }  // extern "C"
 #endif
 
-#endif  // CORE_SRC_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_
+#endif  // CORE_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_
diff --git a/core/src/fxge/freetype/fx_freetype.cpp b/core/fxge/freetype/fx_freetype.cpp
index 2fc60e913e..2fc60e913e 100644
--- a/core/src/fxge/freetype/fx_freetype.cpp
+++ b/core/fxge/freetype/fx_freetype.cpp
diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/fxge/ge/fx_ge.cpp
index d310a3f372..7ae9942dec 100644
--- a/core/src/fxge/ge/fx_ge.cpp
+++ b/core/fxge/ge/fx_ge.cpp
@@ -6,7 +6,7 @@
 
 #include "core/include/fxge/fx_ge.h"
 
-#include "core/src/fxge/ge/fx_text_int.h"
+#include "core/fxge/ge/fx_text_int.h"
 
 static CFX_GEModule* g_pGEModule = NULL;
 CFX_GEModule::CFX_GEModule(const char** pUserFontPaths) {
diff --git a/core/src/fxge/ge/fx_ge_device.cpp b/core/fxge/ge/fx_ge_device.cpp
index b8ddfec841..b8ddfec841 100644
--- a/core/src/fxge/ge/fx_ge_device.cpp
+++ b/core/fxge/ge/fx_ge_device.cpp
diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp
index 672c28d86b..14783085ac 100644
--- a/core/src/fxge/ge/fx_ge_font.cpp
+++ b/core/fxge/ge/fx_ge_font.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 
 #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
 
@@ -20,19 +20,13 @@ namespace {
 
 #ifdef PDF_ENABLE_XFA
 const FX_DWORD g_EncodingID[] = {
-  FXFM_ENCODING_MS_SYMBOL,
-  FXFM_ENCODING_UNICODE,
-  FXFM_ENCODING_MS_SJIS,
-  FXFM_ENCODING_MS_GB2312,
-  FXFM_ENCODING_MS_BIG5,
-  FXFM_ENCODING_MS_WANSUNG,
-  FXFM_ENCODING_MS_JOHAB,
-  FXFM_ENCODING_ADOBE_STANDARD,
-  FXFM_ENCODING_ADOBE_EXPERT,
-  FXFM_ENCODING_ADOBE_CUSTOM,
-  FXFM_ENCODING_ADOBE_LATIN_1,
-  FXFM_ENCODING_OLD_LATIN_2,
-  FXFM_ENCODING_APPLE_ROMAN,
+    FXFM_ENCODING_MS_SYMBOL,     FXFM_ENCODING_UNICODE,
+    FXFM_ENCODING_MS_SJIS,       FXFM_ENCODING_MS_GB2312,
+    FXFM_ENCODING_MS_BIG5,       FXFM_ENCODING_MS_WANSUNG,
+    FXFM_ENCODING_MS_JOHAB,      FXFM_ENCODING_ADOBE_STANDARD,
+    FXFM_ENCODING_ADOBE_EXPERT,  FXFM_ENCODING_ADOBE_CUSTOM,
+    FXFM_ENCODING_ADOBE_LATIN_1, FXFM_ENCODING_OLD_LATIN_2,
+    FXFM_ENCODING_APPLE_ROMAN,
 };
 
 CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
@@ -456,11 +450,9 @@ int CFX_Font::GetULthickness() const {
                    FXFT_Get_Face_UnderLineThickness(m_Face));
 }
 
-CFX_UnicodeEncoding::CFX_UnicodeEncoding(CFX_Font* pFont) : m_pFont(pFont) {
-}
+CFX_UnicodeEncoding::CFX_UnicodeEncoding(CFX_Font* pFont) : m_pFont(pFont) {}
 
-CFX_UnicodeEncoding::~CFX_UnicodeEncoding() {
-}
+CFX_UnicodeEncoding::~CFX_UnicodeEncoding() {}
 
 FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD charcode) {
   FXFT_Face face = m_pFont->GetFace();
@@ -483,11 +475,9 @@ FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD charcode) {
 #ifdef PDF_ENABLE_XFA
 CFX_UnicodeEncodingEx::CFX_UnicodeEncodingEx(CFX_Font* pFont,
                                              FX_DWORD EncodingID)
-    : CFX_UnicodeEncoding(pFont), m_nEncodingID(EncodingID) {
-}
+    : CFX_UnicodeEncoding(pFont), m_nEncodingID(EncodingID) {}
 
-CFX_UnicodeEncodingEx::~CFX_UnicodeEncodingEx() {
-}
+CFX_UnicodeEncodingEx::~CFX_UnicodeEncodingEx() {}
 
 FX_DWORD CFX_UnicodeEncodingEx::GlyphFromCharCode(FX_DWORD charcode) {
   FXFT_Face face = m_pFont->GetFace();
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp
index 2ad1e5c9de..1dc61a210f 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/fxge/ge/fx_ge_fontmap.cpp
@@ -8,10 +8,10 @@
 #include <limits>
 #include <vector>
 
+#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 #include "third_party/base/stl_util.h"
 
 #define GET_TT_SHORT(w) (FX_WORD)(((w)[0] << 8) | (w)[1])
diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/fxge/ge/fx_ge_linux.cpp
index 0166266564..af731f78da 100644
--- a/core/src/fxge/ge/fx_ge_linux.cpp
+++ b/core/fxge/ge/fx_ge_linux.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/agg/fx_agg_driver.h"
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/agg/fx_agg_driver.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
 class CFX_LinuxFontInfo : public CFX_FolderFontInfo {
diff --git a/core/src/fxge/ge/fx_ge_path.cpp b/core/fxge/ge/fx_ge_path.cpp
index 0b52cdf9e4..0b52cdf9e4 100644
--- a/core/src/fxge/ge/fx_ge_path.cpp
+++ b/core/fxge/ge/fx_ge_path.cpp
diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp
index d6f6089033..2470025852 100644
--- a/core/src/fxge/ge/fx_ge_ps.cpp
+++ b/core/fxge/ge/fx_ge_ps.cpp
@@ -6,8 +6,8 @@
 
 #include "core/include/fxge/fx_ge.h"
 
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 
 struct PSGlyph {
   CFX_Font* m_pFont;
diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 8fb03d86eb..3f001d2f96 100644
--- a/core/src/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 
 #undef FX_GAMMA
 #undef FX_GAMMA_INVERSE
diff --git a/core/src/fxge/ge/fx_text_int.h b/core/fxge/ge/fx_text_int.h
index b568b61a54..d88b2a7cb9 100644
--- a/core/src/fxge/ge/fx_text_int.h
+++ b/core/fxge/ge/fx_text_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_GE_FX_TEXT_INT_H_
-#define CORE_SRC_FXGE_GE_FX_TEXT_INT_H_
+#ifndef CORE_FXGE_GE_FX_TEXT_INT_H_
+#define CORE_FXGE_GE_FX_TEXT_INT_H_
 
 #include <map>
 
@@ -81,4 +81,4 @@ class CFX_FontFaceInfo {
   FX_DWORD m_Charsets;
 };
 
-#endif  // CORE_SRC_FXGE_GE_FX_TEXT_INT_H_
+#endif  // CORE_FXGE_GE_FX_TEXT_INT_H_
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 9938298c12..10eebe496c 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -7,8 +7,8 @@
 #if defined(_SKIA_SUPPORT_)
 #include "core/include/fxcodec/fx_codec.h"
 
-#include "core/src/fxge/agg/fx_agg_driver.h"
-#include "core/src/fxge/skia/fx_skia_device.h"
+#include "core/fxge/agg/fx_agg_driver.h"
+#include "core/fxge/skia/fx_skia_device.h"
 
 #include "SkCanvas.h"
 #include "SkDashPathEffect.h"
@@ -92,9 +92,8 @@ void CFX_SkiaDeviceDriver::PaintStroke(SkPaint* spaint,
       intervals[i * 2] = on;
       intervals[i * 2 + 1] = off;
     }
-    spaint
-        ->setPathEffect(SkDashPathEffect::Create(intervals, count * 2,
-                                                 pGraphState->m_DashPhase))
+    spaint->setPathEffect(SkDashPathEffect::Create(intervals, count * 2,
+                                                   pGraphState->m_DashPhase))
         ->unref();
   }
   spaint->setStyle(SkPaint::kStroke_Style);
diff --git a/core/src/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index 31c5982188..1a36fbe85b 100644
--- a/core/src/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
-#define CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
+#ifndef CORE_FXGE_SKIA_FX_SKIA_DEVICE_H_
+#define CORE_FXGE_SKIA_FX_SKIA_DEVICE_H_
 
 #if defined(_SKIA_SUPPORT_)
 
@@ -146,4 +146,4 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 };
 #endif  // defined(_SKIA_SUPPORT_)
 
-#endif  // CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
+#endif  // CORE_FXGE_SKIA_FX_SKIA_DEVICE_H_
diff --git a/core/src/fxge/win32/dwrite_int.h b/core/fxge/win32/dwrite_int.h
index 206cdf5020..62672b2387 100644
--- a/core/src/fxge/win32/dwrite_int.h
+++ b/core/fxge/win32/dwrite_int.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
-#define CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
+#ifndef CORE_FXGE_WIN32_DWRITE_INT_H_
+#define CORE_FXGE_WIN32_DWRITE_INT_H_
 
 #ifndef DECLSPEC_UUID
 #if (_MSC_VER >= 1100) && defined(__cplusplus)
@@ -63,4 +63,4 @@ class CDWriteExt {
   void* m_pDwTextRenderer;
 };
 
-#endif  // CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
+#endif  // CORE_FXGE_WIN32_DWRITE_INT_H_
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index cdfc21bddc..c7afab39a7 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -9,14 +9,14 @@
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <crtdbg.h>
 
+#include "core/fxge/agg/fx_agg_driver.h"
+#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/win32/dwrite_int.h"
+#include "core/fxge/win32/win32_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_win32.h"
-#include "core/src/fxge/agg/fx_agg_driver.h"
-#include "core/src/fxge/dib/dib_int.h"
-#include "core/src/fxge/ge/fx_text_int.h"
-#include "core/src/fxge/win32/dwrite_int.h"
-#include "core/src/fxge/win32/win32_int.h"
 #include "third_party/base/stl_util.h"
 
 class CFX_Win32FallbackFontInfo final : public CFX_FolderFontInfo {
diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/fx_win32_dib.cpp
index d3f8b60c08..cd48d07554 100644
--- a/core/src/fxge/win32/fx_win32_dib.cpp
+++ b/core/fxge/win32/fx_win32_dib.cpp
@@ -9,8 +9,8 @@
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <windows.h>
 
+#include "core/fxge/win32/win32_int.h"
 #include "core/include/fxge/fx_ge_win32.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/fxge/win32/fx_win32_dwrite.cpp
index 55b9bff2d1..972295c5cc 100644
--- a/core/src/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/fxge/win32/fx_win32_dwrite.cpp
@@ -9,8 +9,8 @@
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <dwrite.h>
 
+#include "core/fxge/win32/dwrite_int.h"
 #include "core/include/fxge/fx_ge_win32.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/fxge/win32/fx_win32_gdipext.cpp
index aba67dacfe..ce181bb448 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -17,8 +17,8 @@ using std::max;
 
 #include <gdiplus.h>
 
+#include "core/fxge/win32/win32_int.h"
 #include "core/include/fxge/fx_ge_win32.h"
-#include "core/src/fxge/win32/win32_int.h"
 
 using namespace Gdiplus;              // NOLINT
 using namespace Gdiplus::DllExports;  // NOLINT
diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index acd73d1427..c8529098eb 100644
--- a/core/src/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -10,11 +10,11 @@
 
 #include <windows.h>
 
+#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/win32/win32_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #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 "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/fxge/win32/win32_int.h
index 233fe367f5..bdba9547b3 100644
--- a/core/src/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_SRC_FXGE_WIN32_WIN32_INT_H_
-#define CORE_SRC_FXGE_WIN32_WIN32_INT_H_
+#ifndef CORE_FXGE_WIN32_WIN32_INT_H_
+#define CORE_FXGE_WIN32_WIN32_INT_H_
 
+#include "core/fxge/win32/dwrite_int.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/win32/dwrite_int.h"
 
 struct WINDIB_Open_Args_;
 class CGdiplusExt {
@@ -366,4 +366,4 @@ void _Color2Argb(FX_ARGB& argb,
                  int alpha_flag,
                  void* pIccTransform);
 
-#endif  // CORE_SRC_FXGE_WIN32_WIN32_INT_H_
+#endif  // CORE_FXGE_WIN32_WIN32_INT_H_
diff --git a/pdfium.gyp b/pdfium.gyp
index f5743d242e..4f21ba41a3 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -213,9 +213,9 @@
       'type': 'static_library',
       'sources': [
         'core/include/fdrm/fx_crypt.h',
-        'core/src/fdrm/crypto/fx_crypt.cpp',
-        'core/src/fdrm/crypto/fx_crypt_aes.cpp',
-        'core/src/fdrm/crypto/fx_crypt_sha.cpp',
+        'core/fdrm/crypto/fx_crypt.cpp',
+        'core/fdrm/crypto/fx_crypt_aes.cpp',
+        'core/fdrm/crypto/fx_crypt_sha.cpp',
       ],
     },
     {
@@ -226,25 +226,25 @@
         'core/include/fpdfdoc/fpdf_doc.h',
         'core/include/fpdfdoc/fpdf_tagged.h',
         'core/include/fpdfdoc/fpdf_vt.h',
-        'core/src/fpdfdoc/doc_action.cpp',
-        'core/src/fpdfdoc/doc_annot.cpp',
-        'core/src/fpdfdoc/doc_ap.cpp',
-        'core/src/fpdfdoc/doc_basic.cpp',
-        'core/src/fpdfdoc/doc_bookmark.cpp',
-        'core/src/fpdfdoc/doc_form.cpp',
-        'core/src/fpdfdoc/doc_formcontrol.cpp',
-        'core/src/fpdfdoc/doc_formfield.cpp',
-        'core/src/fpdfdoc/doc_link.cpp',
-        'core/src/fpdfdoc/doc_metadata.cpp',
-        'core/src/fpdfdoc/doc_ocg.cpp',
-        'core/src/fpdfdoc/doc_tagged.cpp',
-        'core/src/fpdfdoc/doc_utils.cpp',
-        'core/src/fpdfdoc/doc_utils.h',
-        'core/src/fpdfdoc/doc_viewerPreferences.cpp',
-        'core/src/fpdfdoc/doc_vt.cpp',
-        'core/src/fpdfdoc/doc_vtmodule.cpp',
-        'core/src/fpdfdoc/pdf_vt.h',
-        'core/src/fpdfdoc/tagged_int.h',
+        'core/fpdfdoc/doc_action.cpp',
+        'core/fpdfdoc/doc_annot.cpp',
+        'core/fpdfdoc/doc_ap.cpp',
+        'core/fpdfdoc/doc_basic.cpp',
+        'core/fpdfdoc/doc_bookmark.cpp',
+        'core/fpdfdoc/doc_form.cpp',
+        'core/fpdfdoc/doc_formcontrol.cpp',
+        'core/fpdfdoc/doc_formfield.cpp',
+        'core/fpdfdoc/doc_link.cpp',
+        'core/fpdfdoc/doc_metadata.cpp',
+        'core/fpdfdoc/doc_ocg.cpp',
+        'core/fpdfdoc/doc_tagged.cpp',
+        'core/fpdfdoc/doc_utils.cpp',
+        'core/fpdfdoc/doc_utils.h',
+        'core/fpdfdoc/doc_viewerPreferences.cpp',
+        'core/fpdfdoc/doc_vt.cpp',
+        'core/fpdfdoc/doc_vtmodule.cpp',
+        'core/fpdfdoc/pdf_vt.h',
+        'core/fpdfdoc/tagged_int.h',
       ],
     },
     {
@@ -276,127 +276,127 @@
         'core/include/fpdfapi/ipdf_crypto_handler.h',
         'core/include/fpdfapi/ipdf_data_avail.h',
         'core/include/fpdfapi/ipdf_security_handler.h',
-        'core/src/fpdfapi/fpdf_basic_module.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/cmap_int.h',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp',
-        'core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp',
-        'core/src/fpdfapi/fpdf_edit/editint.h',
-        'core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp',
-        'core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp',
-        'core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp',
-        'core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp',
-        'core/src/fpdfapi/fpdf_font/font_int.h',
-        'core/src/fpdfapi/fpdf_font/fpdf_font.cpp',
-        'core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp',
-        'core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp',
-        'core/src/fpdfapi/fpdf_font/ttgsubtable.cpp',
-        'core/src/fpdfapi/fpdf_font/ttgsubtable.h',
-        'core/src/fpdfapi/fpdf_page/fpdf_page.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp',
-        'core/src/fpdfapi/fpdf_page/pageint.h',
-        'core/src/fpdfapi/fpdf_parser/cfdf_document.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_array.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_boolean.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_data_avail.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_data_avail.h',
-        'core/src/fpdfapi/fpdf_parser/cpdf_dictionary.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_document.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.h',
-        'core/src/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_name.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_null.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_number.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_object.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_reference.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h',
-        'core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h',
-        'core/src/fpdfapi/fpdf_parser/cpdf_stream.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_string.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h',
-        'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp',
-        'core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp',
-        'core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h',
-        'core/src/fpdfapi/fpdf_render/fpdf_render.cpp',
-        'core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp',
-        'core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp',
-        'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp',
-        'core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp',
-        'core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp',
-        'core/src/fpdfapi/fpdf_render/render_int.h',
+        'core/fpdfapi/fpdf_basic_module.cpp',
+        'core/fpdfapi/fpdf_cmaps/cmap_int.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/cmaps_cns1.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/fpdf_cmaps.cpp',
+        'core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp',
+        'core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.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/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/cmaps_japan1.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/Korea1/Adobe-Korea1-UCS2_2.cpp',
+        'core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.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_edit/editint.h',
+        'core/fpdfapi/fpdf_edit/fpdf_edit_content.cpp',
+        'core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp',
+        'core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp',
+        'core/fpdfapi/fpdf_edit/fpdf_edit_image.cpp',
+        'core/fpdfapi/fpdf_font/font_int.h',
+        'core/fpdfapi/fpdf_font/fpdf_font.cpp',
+        'core/fpdfapi/fpdf_font/fpdf_font_charset.cpp',
+        'core/fpdfapi/fpdf_font/fpdf_font_cid.cpp',
+        'core/fpdfapi/fpdf_font/ttgsubtable.cpp',
+        'core/fpdfapi/fpdf_font/ttgsubtable.h',
+        'core/fpdfapi/fpdf_page/fpdf_page.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_colors.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_doc.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_func.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_image.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_parser.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_path.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_pattern.cpp',
+        'core/fpdfapi/fpdf_page/pageint.h',
+        'core/fpdfapi/fpdf_parser/cfdf_document.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_array.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_boolean.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_data_avail.h',
+        'core/fpdfapi/fpdf_parser/cpdf_dictionary.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_document.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_hint_tables.h',
+        'core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_name.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_null.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_number.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_object.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_parser.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_reference.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h',
+        'core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h',
+        'core/fpdfapi/fpdf_parser/cpdf_stream.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_string.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h',
+        'core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp',
+        'core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp',
+        'core/fpdfapi/fpdf_parser/fpdf_parser_utility.h',
+        'core/fpdfapi/fpdf_render/fpdf_render.cpp',
+        'core/fpdfapi/fpdf_render/fpdf_render_cache.cpp',
+        'core/fpdfapi/fpdf_render/fpdf_render_image.cpp',
+        'core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp',
+        'core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp',
+        'core/fpdfapi/fpdf_render/fpdf_render_text.cpp',
+        'core/fpdfapi/fpdf_render/render_int.h',
       ],
     },
     {
@@ -404,11 +404,11 @@
       'type': 'static_library',
       'sources': [
         'core/include/fpdftext/fpdf_text.h',
-        'core/src/fpdftext/fpdf_text_int.cpp',
-        'core/src/fpdftext/text_int.h',
-        'core/src/fpdftext/unicodenormalization.cpp',
-        'core/src/fpdftext/unicodenormalizationdata.cpp',
-        'core/src/fpdftext/unicodenormalizationdata.h',
+        'core/fpdftext/fpdf_text_int.cpp',
+        'core/fpdftext/text_int.h',
+        'core/fpdftext/unicodenormalization.cpp',
+        'core/fpdftext/unicodenormalizationdata.cpp',
+        'core/fpdftext/unicodenormalizationdata.h',
       ],
     },
     {
@@ -424,52 +424,52 @@
         'core/include/fxcodec/fx_codec.h',
         'core/include/fxcodec/fx_codec_def.h',
         'core/include/fxcodec/fx_codec_flate.h',
-        'core/src/fxcodec/codec/codec_int.h',
-        'core/src/fxcodec/codec/fx_codec.cpp',
-        'core/src/fxcodec/codec/fx_codec_fax.cpp',
-        'core/src/fxcodec/codec/fx_codec_flate.cpp',
-        'core/src/fxcodec/codec/fx_codec_icc.cpp',
-        'core/src/fxcodec/codec/fx_codec_jbig.cpp',
-        'core/src/fxcodec/codec/fx_codec_jpeg.cpp',
-        'core/src/fxcodec/codec/fx_codec_jpx_opj.cpp',
-        'core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp',
-        'core/src/fxcodec/jbig2/JBig2_ArithDecoder.h',
-        'core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp',
-        'core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h',
-        'core/src/fxcodec/jbig2/JBig2_BitStream.cpp',
-        'core/src/fxcodec/jbig2/JBig2_BitStream.h',
-        'core/src/fxcodec/jbig2/JBig2_Context.cpp',
-        'core/src/fxcodec/jbig2/JBig2_Context.h',
-        'core/src/fxcodec/jbig2/JBig2_Define.h',
-        'core/src/fxcodec/jbig2/JBig2_GrdProc.cpp',
-        'core/src/fxcodec/jbig2/JBig2_GrdProc.h',
-        'core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp',
-        'core/src/fxcodec/jbig2/JBig2_GrrdProc.h',
-        'core/src/fxcodec/jbig2/JBig2_GsidProc.cpp',
-        'core/src/fxcodec/jbig2/JBig2_GsidProc.h',
-        'core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp',
-        'core/src/fxcodec/jbig2/JBig2_HtrdProc.h',
-        'core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp',
-        'core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h',
-        'core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp',
-        'core/src/fxcodec/jbig2/JBig2_HuffmanTable.h',
-        'core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h',
-        'core/src/fxcodec/jbig2/JBig2_Image.cpp',
-        'core/src/fxcodec/jbig2/JBig2_Image.h',
-        'core/src/fxcodec/jbig2/JBig2_List.h',
-        'core/src/fxcodec/jbig2/JBig2_Page.h',
-        'core/src/fxcodec/jbig2/JBig2_PatternDict.cpp',
-        'core/src/fxcodec/jbig2/JBig2_PatternDict.h',
-        'core/src/fxcodec/jbig2/JBig2_PddProc.cpp',
-        'core/src/fxcodec/jbig2/JBig2_PddProc.h',
-        'core/src/fxcodec/jbig2/JBig2_SddProc.cpp',
-        'core/src/fxcodec/jbig2/JBig2_SddProc.h',
-        'core/src/fxcodec/jbig2/JBig2_Segment.cpp',
-        'core/src/fxcodec/jbig2/JBig2_Segment.h',
-        'core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp',
-        'core/src/fxcodec/jbig2/JBig2_SymbolDict.h',
-        'core/src/fxcodec/jbig2/JBig2_TrdProc.cpp',
-        'core/src/fxcodec/jbig2/JBig2_TrdProc.h',
+        'core/fxcodec/codec/codec_int.h',
+        'core/fxcodec/codec/fx_codec.cpp',
+        'core/fxcodec/codec/fx_codec_fax.cpp',
+        'core/fxcodec/codec/fx_codec_flate.cpp',
+        'core/fxcodec/codec/fx_codec_icc.cpp',
+        'core/fxcodec/codec/fx_codec_jbig.cpp',
+        'core/fxcodec/codec/fx_codec_jpeg.cpp',
+        'core/fxcodec/codec/fx_codec_jpx_opj.cpp',
+        'core/fxcodec/jbig2/JBig2_ArithDecoder.cpp',
+        'core/fxcodec/jbig2/JBig2_ArithDecoder.h',
+        'core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp',
+        'core/fxcodec/jbig2/JBig2_ArithIntDecoder.h',
+        'core/fxcodec/jbig2/JBig2_BitStream.cpp',
+        'core/fxcodec/jbig2/JBig2_BitStream.h',
+        'core/fxcodec/jbig2/JBig2_Context.cpp',
+        'core/fxcodec/jbig2/JBig2_Context.h',
+        'core/fxcodec/jbig2/JBig2_Define.h',
+        'core/fxcodec/jbig2/JBig2_GrdProc.cpp',
+        'core/fxcodec/jbig2/JBig2_GrdProc.h',
+        'core/fxcodec/jbig2/JBig2_GrrdProc.cpp',
+        'core/fxcodec/jbig2/JBig2_GrrdProc.h',
+        'core/fxcodec/jbig2/JBig2_GsidProc.cpp',
+        'core/fxcodec/jbig2/JBig2_GsidProc.h',
+        'core/fxcodec/jbig2/JBig2_HtrdProc.cpp',
+        'core/fxcodec/jbig2/JBig2_HtrdProc.h',
+        'core/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp',
+        'core/fxcodec/jbig2/JBig2_HuffmanDecoder.h',
+        'core/fxcodec/jbig2/JBig2_HuffmanTable.cpp',
+        'core/fxcodec/jbig2/JBig2_HuffmanTable.h',
+        'core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h',
+        'core/fxcodec/jbig2/JBig2_Image.cpp',
+        'core/fxcodec/jbig2/JBig2_Image.h',
+        'core/fxcodec/jbig2/JBig2_List.h',
+        'core/fxcodec/jbig2/JBig2_Page.h',
+        'core/fxcodec/jbig2/JBig2_PatternDict.cpp',
+        'core/fxcodec/jbig2/JBig2_PatternDict.h',
+        'core/fxcodec/jbig2/JBig2_PddProc.cpp',
+        'core/fxcodec/jbig2/JBig2_PddProc.h',
+        'core/fxcodec/jbig2/JBig2_SddProc.cpp',
+        'core/fxcodec/jbig2/JBig2_SddProc.h',
+        'core/fxcodec/jbig2/JBig2_Segment.cpp',
+        'core/fxcodec/jbig2/JBig2_Segment.h',
+        'core/fxcodec/jbig2/JBig2_SymbolDict.cpp',
+        'core/fxcodec/jbig2/JBig2_SymbolDict.h',
+        'core/fxcodec/jbig2/JBig2_TrdProc.cpp',
+        'core/fxcodec/jbig2/JBig2_TrdProc.h',
       ],
       'msvs_settings': {
         'VCCLCompilerTool': {
@@ -485,20 +485,20 @@
             'third_party/third_party.gyp:fx_tiff',
           ],
           'sources': [
-            'core/src/fxcodec/codec/fx_codec_bmp.cpp',
-            'core/src/fxcodec/codec/fx_codec_gif.cpp',
-            'core/src/fxcodec/codec/fx_codec_png.cpp',
-            'core/src/fxcodec/codec/fx_codec_progress.cpp',
-            'core/src/fxcodec/codec/fx_codec_progress.h',
-            'core/src/fxcodec/codec/fx_codec_tiff.cpp',
-            'core/src/fxcodec/lbmp/fx_bmp.cpp',
-            'core/src/fxcodec/lbmp/fx_bmp.h',
-            'core/src/fxcodec/lgif/fx_gif.cpp',
-            'core/src/fxcodec/lgif/fx_gif.h',
+            'core/fxcodec/codec/fx_codec_bmp.cpp',
+            'core/fxcodec/codec/fx_codec_gif.cpp',
+            'core/fxcodec/codec/fx_codec_png.cpp',
+            'core/fxcodec/codec/fx_codec_progress.cpp',
+            'core/fxcodec/codec/fx_codec_progress.h',
+            'core/fxcodec/codec/fx_codec_tiff.cpp',
+            'core/fxcodec/lbmp/fx_bmp.cpp',
+            'core/fxcodec/lbmp/fx_bmp.h',
+            'core/fxcodec/lgif/fx_gif.cpp',
+            'core/fxcodec/lgif/fx_gif.h',
           ],
         }],
         ['os_posix==1', {
-          # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
+          # core/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
           # conversion to check that an address is 16-bit aligned (benign).
           'cflags_c': [ '-Wno-pointer-to-int-cast' ],
         }],
@@ -519,41 +519,41 @@
         'core/include/fxcrt/fx_system.h',
         'core/include/fxcrt/fx_ucd.h',
         'core/include/fxcrt/fx_xml.h',
-        'core/src/fxcrt/extension.h',
-        'core/src/fxcrt/fxcrt_platforms.cpp',
-        'core/src/fxcrt/fxcrt_platforms.h',
-        'core/src/fxcrt/fxcrt_posix.cpp',
-        'core/src/fxcrt/fxcrt_posix.h',
-        'core/src/fxcrt/fxcrt_stream.cpp',
-        'core/src/fxcrt/fxcrt_windows.cpp',
-        'core/src/fxcrt/fxcrt_windows.h',
-        'core/src/fxcrt/fx_basic_array.cpp',
-        'core/src/fxcrt/fx_basic_bstring.cpp',
-        'core/src/fxcrt/fx_basic_buffer.cpp',
-        'core/src/fxcrt/fx_basic_coords.cpp',
-        'core/src/fxcrt/fx_basic_gcc.cpp',
-        'core/src/fxcrt/fx_basic_list.cpp',
-        'core/src/fxcrt/fx_basic_memmgr.cpp',
-        'core/src/fxcrt/fx_basic_plex.cpp',
-        'core/src/fxcrt/fx_basic_utf.cpp',
-        'core/src/fxcrt/fx_basic_util.cpp',
-        'core/src/fxcrt/fx_basic_wstring.cpp',
-        'core/src/fxcrt/fx_bidi.cpp',
-        'core/src/fxcrt/fx_extension.cpp',
-        'core/src/fxcrt/fx_ucddata.cpp',
-        'core/src/fxcrt/fx_unicode.cpp',
-        'core/src/fxcrt/fx_xml_composer.cpp',
-        'core/src/fxcrt/fx_xml_parser.cpp',
-        'core/src/fxcrt/plex.h',
-        'core/src/fxcrt/xml_int.h',
+        'core/fxcrt/extension.h',
+        'core/fxcrt/fxcrt_platforms.cpp',
+        'core/fxcrt/fxcrt_platforms.h',
+        'core/fxcrt/fxcrt_posix.cpp',
+        'core/fxcrt/fxcrt_posix.h',
+        'core/fxcrt/fxcrt_stream.cpp',
+        'core/fxcrt/fxcrt_windows.cpp',
+        'core/fxcrt/fxcrt_windows.h',
+        'core/fxcrt/fx_basic_array.cpp',
+        'core/fxcrt/fx_basic_bstring.cpp',
+        'core/fxcrt/fx_basic_buffer.cpp',
+        'core/fxcrt/fx_basic_coords.cpp',
+        'core/fxcrt/fx_basic_gcc.cpp',
+        'core/fxcrt/fx_basic_list.cpp',
+        'core/fxcrt/fx_basic_memmgr.cpp',
+        'core/fxcrt/fx_basic_plex.cpp',
+        'core/fxcrt/fx_basic_utf.cpp',
+        'core/fxcrt/fx_basic_util.cpp',
+        'core/fxcrt/fx_basic_wstring.cpp',
+        'core/fxcrt/fx_bidi.cpp',
+        'core/fxcrt/fx_extension.cpp',
+        'core/fxcrt/fx_ucddata.cpp',
+        'core/fxcrt/fx_unicode.cpp',
+        'core/fxcrt/fx_xml_composer.cpp',
+        'core/fxcrt/fx_xml_parser.cpp',
+        'core/fxcrt/plex.h',
+        'core/fxcrt/xml_int.h',
       ],
       'conditions': [
         ['pdf_enable_xfa==1', {
           'sources': [
             'core/include/fxcrt/fx_arb.h',
-            'core/src/fxcrt/fx_arabic.cpp',
-            'core/src/fxcrt/fx_arabic.h',
-            'core/src/fxcrt/fx_basic_maps.cpp',
+            'core/fxcrt/fx_arabic.cpp',
+            'core/fxcrt/fx_arabic.h',
+            'core/fxcrt/fx_basic_maps.cpp',
           ],
         }],
       ],
@@ -572,54 +572,54 @@
         'core/include/fxge/fx_ge.h',
         'core/include/fxge/fx_ge_apple.h',
         'core/include/fxge/fx_ge_win32.h',
-        'core/src/fxge/agg/fx_agg_driver.h',
-        'core/src/fxge/agg/fx_agg_driver.cpp',
-        'core/src/fxge/android/fpf_skiafont.cpp',
-        'core/src/fxge/android/fpf_skiafont.h',
-        'core/src/fxge/android/fpf_skiafontmgr.cpp',
-        'core/src/fxge/android/fpf_skiafontmgr.h',
-        'core/src/fxge/android/fpf_skiamodule.cpp',
-        'core/src/fxge/android/fpf_skiamodule.h',
-        'core/src/fxge/android/fx_android_font.cpp',
-        'core/src/fxge/android/fx_android_font.h',
-        'core/src/fxge/android/fx_android_imp.cpp',
-        'core/src/fxge/apple/apple_int.h',
-        'core/src/fxge/apple/fx_apple_platform.cpp',
-        'core/src/fxge/apple/fx_mac_imp.cpp',
-        'core/src/fxge/apple/fx_quartz_device.cpp',
-        'core/src/fxge/dib/dib_int.h',
-        'core/src/fxge/dib/fx_dib_composite.cpp',
-        'core/src/fxge/dib/fx_dib_convert.cpp',
-        'core/src/fxge/dib/fx_dib_engine.cpp',
-        'core/src/fxge/dib/fx_dib_main.cpp',
-        'core/src/fxge/dib/fx_dib_transform.cpp',
-        'core/src/fxge/fontdata/chromefontdata/chromefontdata.h',
-        'core/src/fxge/fontdata/chromefontdata/FoxitDingbats.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitFixed.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSans.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSansBold.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSansMM.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSerif.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp',
-        'core/src/fxge/fontdata/chromefontdata/FoxitSymbol.cpp',
-        'core/src/fxge/freetype/fx_freetype.cpp',
-        'core/src/fxge/ge/fx_ge.cpp',
-        'core/src/fxge/ge/fx_ge_device.cpp',
-        'core/src/fxge/ge/fx_ge_font.cpp',
-        'core/src/fxge/ge/fx_ge_fontmap.cpp',
-        'core/src/fxge/ge/fx_ge_linux.cpp',
-        'core/src/fxge/ge/fx_ge_path.cpp',
-        'core/src/fxge/ge/fx_ge_ps.cpp',
-        'core/src/fxge/ge/fx_ge_text.cpp',
-        'core/src/fxge/ge/fx_text_int.h',
+        'core/fxge/agg/fx_agg_driver.h',
+        'core/fxge/agg/fx_agg_driver.cpp',
+        'core/fxge/android/fpf_skiafont.cpp',
+        'core/fxge/android/fpf_skiafont.h',
+        'core/fxge/android/fpf_skiafontmgr.cpp',
+        'core/fxge/android/fpf_skiafontmgr.h',
+        'core/fxge/android/fpf_skiamodule.cpp',
+        'core/fxge/android/fpf_skiamodule.h',
+        'core/fxge/android/fx_android_font.cpp',
+        'core/fxge/android/fx_android_font.h',
+        'core/fxge/android/fx_android_imp.cpp',
+        'core/fxge/apple/apple_int.h',
+        'core/fxge/apple/fx_apple_platform.cpp',
+        'core/fxge/apple/fx_mac_imp.cpp',
+        'core/fxge/apple/fx_quartz_device.cpp',
+        'core/fxge/dib/dib_int.h',
+        'core/fxge/dib/fx_dib_composite.cpp',
+        'core/fxge/dib/fx_dib_convert.cpp',
+        'core/fxge/dib/fx_dib_engine.cpp',
+        'core/fxge/dib/fx_dib_main.cpp',
+        'core/fxge/dib/fx_dib_transform.cpp',
+        'core/fxge/fontdata/chromefontdata/chromefontdata.h',
+        'core/fxge/fontdata/chromefontdata/FoxitDingbats.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitFixed.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSans.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSansBold.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSansMM.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSerif.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp',
+        'core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp',
+        'core/fxge/freetype/fx_freetype.cpp',
+        'core/fxge/ge/fx_ge.cpp',
+        'core/fxge/ge/fx_ge_device.cpp',
+        'core/fxge/ge/fx_ge_font.cpp',
+        'core/fxge/ge/fx_ge_fontmap.cpp',
+        'core/fxge/ge/fx_ge_linux.cpp',
+        'core/fxge/ge/fx_ge_path.cpp',
+        'core/fxge/ge/fx_ge_ps.cpp',
+        'core/fxge/ge/fx_ge_text.cpp',
+        'core/fxge/ge/fx_text_int.h',
       ],
       'variables': {
         'clang_warning_flags': [
@@ -630,7 +630,7 @@
       'conditions': [
         ['pdf_use_skia==1', {
           'sources': [
-            'core/src/fxge/skia/fx_skia_device.cpp',
+            'core/fxge/skia/fx_skia_device.cpp',
           ],
           'dependencies': [
             '<(DEPTH)/skia/skia.gyp:skia',
@@ -641,13 +641,13 @@
             'WIN32_LEAN_AND_MEAN'
           ],
           'sources': [
-            'core/src/fxge/win32/dwrite_int.h',
-            'core/src/fxge/win32/fx_win32_device.cpp',
-            'core/src/fxge/win32/fx_win32_dib.cpp',
-            'core/src/fxge/win32/fx_win32_dwrite.cpp',
-            'core/src/fxge/win32/fx_win32_gdipext.cpp',
-            'core/src/fxge/win32/fx_win32_print.cpp',
-            'core/src/fxge/win32/win32_int.h',
+            'core/fxge/win32/dwrite_int.h',
+            'core/fxge/win32/fx_win32_device.cpp',
+            'core/fxge/win32/fx_win32_dib.cpp',
+            'core/fxge/win32/fx_win32_dwrite.cpp',
+            'core/fxge/win32/fx_win32_gdipext.cpp',
+            'core/fxge/win32/fx_win32_print.cpp',
+            'core/fxge/win32/win32_int.h',
           ],
         }],
       ],
@@ -811,24 +811,24 @@
         'test_support',
       ],
       'sources': [
-        'core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp',
-        'core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp',
-        'core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp',
-        'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp',
-        'core/src/fpdfdoc/doc_basic_unittest.cpp',
-        'core/src/fpdftext/fpdf_text_int_unittest.cpp',
-        'core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp',
-        'core/src/fxcrt/fx_basic_bstring_unittest.cpp',
-        'core/src/fxcrt/fx_basic_gcc_unittest.cpp',
-        'core/src/fxcrt/fx_basic_memmgr_unittest.cpp',
-        'core/src/fxcrt/fx_basic_wstring_unittest.cpp',
-        'core/src/fxcrt/fx_bidi_unittest.cpp',
-        'core/src/fxcrt/fx_extension_unittest.cpp',
-        'core/src/fxcrt/fx_system_unittest.cpp',
+        'core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp',
+        'core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp',
+        'core/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp',
+        'core/fpdfdoc/doc_basic_unittest.cpp',
+        'core/fpdftext/fpdf_text_int_unittest.cpp',
+        'core/fxcodec/codec/fx_codec_jpx_unittest.cpp',
+        'core/fxcrt/fx_basic_bstring_unittest.cpp',
+        'core/fxcrt/fx_basic_gcc_unittest.cpp',
+        'core/fxcrt/fx_basic_memmgr_unittest.cpp',
+        'core/fxcrt/fx_basic_wstring_unittest.cpp',
+        'core/fxcrt/fx_bidi_unittest.cpp',
+        'core/fxcrt/fx_extension_unittest.cpp',
+        'core/fxcrt/fx_system_unittest.cpp',
         'fpdfsdk/src/fpdfdoc_unittest.cpp',
         'testing/fx_string_testhelpers.h',
         'testing/fx_string_testhelpers.cpp',
@@ -852,11 +852,11 @@
         'test_support',
       ],
       'sources': [
-        'core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp',
-        'core/src/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp',
-        'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp',
-        'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp',
-        'core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp',
+        'core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp',
+        'core/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp',
+        'core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp',
+        'core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp',
+        'core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp',
         'fpdfsdk/src/fpdf_dataavail_embeddertest.cpp',
         'fpdfsdk/src/fpdfdoc_embeddertest.cpp',
         'fpdfsdk/src/fpdfedit_embeddertest.cpp',