Move fpdfsdk/src up to fpdfsdk/.

This CL moves the files in fpdfsdk/src/ up one level to fpdfsdk/ and fixes
up the include paths, include guards and build files.

R=tsepez@chromium.org

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

115 files changed, 548 insertions, 575 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 4116132034..590d1fdcd6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -73,31 +73,31 @@ config("pdfium_config") {
 
 static_library("pdfium") {
   sources = [
+    "fpdfsdk/fpdf_dataavail.cpp",
+    "fpdfsdk/fpdf_ext.cpp",
+    "fpdfsdk/fpdf_flatten.cpp",
+    "fpdfsdk/fpdf_progressive.cpp",
+    "fpdfsdk/fpdf_searchex.cpp",
+    "fpdfsdk/fpdf_sysfontinfo.cpp",
+    "fpdfsdk/fpdf_transformpage.cpp",
+    "fpdfsdk/fpdfdoc.cpp",
+    "fpdfsdk/fpdfeditimg.cpp",
+    "fpdfsdk/fpdfeditpage.cpp",
+    "fpdfsdk/fpdfformfill.cpp",
+    "fpdfsdk/fpdfppo.cpp",
+    "fpdfsdk/fpdfsave.cpp",
+    "fpdfsdk/fpdftext.cpp",
+    "fpdfsdk/fpdfview.cpp",
+    "fpdfsdk/fsdk_actionhandler.cpp",
+    "fpdfsdk/fsdk_annothandler.cpp",
+    "fpdfsdk/fsdk_baseannot.cpp",
+    "fpdfsdk/fsdk_baseform.cpp",
+    "fpdfsdk/fsdk_mgr.cpp",
+    "fpdfsdk/fsdk_rendercontext.cpp",
     "fpdfsdk/include/fsdk_actionhandler.h",
     "fpdfsdk/include/fsdk_annothandler.h",
     "fpdfsdk/include/fsdk_baseannot.h",
     "fpdfsdk/include/fsdk_baseform.h",
-    "fpdfsdk/src/fpdf_dataavail.cpp",
-    "fpdfsdk/src/fpdf_ext.cpp",
-    "fpdfsdk/src/fpdf_flatten.cpp",
-    "fpdfsdk/src/fpdf_progressive.cpp",
-    "fpdfsdk/src/fpdf_searchex.cpp",
-    "fpdfsdk/src/fpdf_sysfontinfo.cpp",
-    "fpdfsdk/src/fpdf_transformpage.cpp",
-    "fpdfsdk/src/fpdfdoc.cpp",
-    "fpdfsdk/src/fpdfeditimg.cpp",
-    "fpdfsdk/src/fpdfeditpage.cpp",
-    "fpdfsdk/src/fpdfformfill.cpp",
-    "fpdfsdk/src/fpdfppo.cpp",
-    "fpdfsdk/src/fpdfsave.cpp",
-    "fpdfsdk/src/fpdftext.cpp",
-    "fpdfsdk/src/fpdfview.cpp",
-    "fpdfsdk/src/fsdk_actionhandler.cpp",
-    "fpdfsdk/src/fsdk_annothandler.cpp",
-    "fpdfsdk/src/fsdk_baseannot.cpp",
-    "fpdfsdk/src/fsdk_baseform.cpp",
-    "fpdfsdk/src/fsdk_mgr.cpp",
-    "fpdfsdk/src/fsdk_rendercontext.cpp",
     "public/fpdf_dataavail.h",
     "public/fpdf_doc.h",
     "public/fpdf_edit.h",
@@ -639,14 +639,14 @@ static_library("fxge") {
 
 static_library("fxedit") {
   sources = [
+    "fpdfsdk/fxedit/fxet_ap.cpp",
+    "fpdfsdk/fxedit/fxet_edit.cpp",
+    "fpdfsdk/fxedit/fxet_list.cpp",
+    "fpdfsdk/fxedit/fxet_module.cpp",
+    "fpdfsdk/fxedit/fxet_pageobjs.cpp",
     "fpdfsdk/include/fxedit/fx_edit.h",
     "fpdfsdk/include/fxedit/fxet_edit.h",
     "fpdfsdk/include/fxedit/fxet_list.h",
-    "fpdfsdk/src/fxedit/fxet_ap.cpp",
-    "fpdfsdk/src/fxedit/fxet_edit.cpp",
-    "fpdfsdk/src/fxedit/fxet_list.cpp",
-    "fpdfsdk/src/fxedit/fxet_module.cpp",
-    "fpdfsdk/src/fxedit/fxet_pageobjs.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
@@ -670,23 +670,23 @@ static_library("pdfwindow") {
     "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h",
     "fpdfsdk/include/pdfwindow/PWL_Utils.h",
     "fpdfsdk/include/pdfwindow/PWL_Wnd.h",
-    "fpdfsdk/src/pdfwindow/PWL_Button.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Caret.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Edit.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_FontMap.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Icon.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_IconList.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Label.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ListBox.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Note.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Signature.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Utils.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Wnd.cpp",
+    "fpdfsdk/pdfwindow/PWL_Button.cpp",
+    "fpdfsdk/pdfwindow/PWL_Caret.cpp",
+    "fpdfsdk/pdfwindow/PWL_ComboBox.cpp",
+    "fpdfsdk/pdfwindow/PWL_Edit.cpp",
+    "fpdfsdk/pdfwindow/PWL_EditCtrl.cpp",
+    "fpdfsdk/pdfwindow/PWL_FontMap.cpp",
+    "fpdfsdk/pdfwindow/PWL_Icon.cpp",
+    "fpdfsdk/pdfwindow/PWL_IconList.cpp",
+    "fpdfsdk/pdfwindow/PWL_Label.cpp",
+    "fpdfsdk/pdfwindow/PWL_ListBox.cpp",
+    "fpdfsdk/pdfwindow/PWL_ListCtrl.cpp",
+    "fpdfsdk/pdfwindow/PWL_Note.cpp",
+    "fpdfsdk/pdfwindow/PWL_ScrollBar.cpp",
+    "fpdfsdk/pdfwindow/PWL_Signature.cpp",
+    "fpdfsdk/pdfwindow/PWL_SpecialButton.cpp",
+    "fpdfsdk/pdfwindow/PWL_Utils.cpp",
+    "fpdfsdk/pdfwindow/PWL_Wnd.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
@@ -698,46 +698,46 @@ static_library("javascript") {
   if (pdf_enable_v8) {
     sources += [
       "fpdfsdk/include/jsapi/fxjs_v8.h",
-      "fpdfsdk/src/javascript/Consts.cpp",
-      "fpdfsdk/src/javascript/Consts.h",
-      "fpdfsdk/src/javascript/Document.cpp",
-      "fpdfsdk/src/javascript/Document.h",
-      "fpdfsdk/src/javascript/Field.cpp",
-      "fpdfsdk/src/javascript/Field.h",
-      "fpdfsdk/src/javascript/Icon.cpp",
-      "fpdfsdk/src/javascript/Icon.h",
-      "fpdfsdk/src/javascript/JS_Context.cpp",
-      "fpdfsdk/src/javascript/JS_Context.h",
-      "fpdfsdk/src/javascript/JS_Define.h",
-      "fpdfsdk/src/javascript/JS_EventHandler.cpp",
-      "fpdfsdk/src/javascript/JS_EventHandler.h",
-      "fpdfsdk/src/javascript/JS_GlobalData.cpp",
-      "fpdfsdk/src/javascript/JS_GlobalData.h",
-      "fpdfsdk/src/javascript/JS_Object.cpp",
-      "fpdfsdk/src/javascript/JS_Object.h",
-      "fpdfsdk/src/javascript/JS_Runtime.cpp",
-      "fpdfsdk/src/javascript/JS_Runtime.h",
-      "fpdfsdk/src/javascript/JS_Value.cpp",
-      "fpdfsdk/src/javascript/JS_Value.h",
-      "fpdfsdk/src/javascript/PublicMethods.cpp",
-      "fpdfsdk/src/javascript/PublicMethods.h",
-      "fpdfsdk/src/javascript/app.cpp",
-      "fpdfsdk/src/javascript/app.h",
-      "fpdfsdk/src/javascript/color.cpp",
-      "fpdfsdk/src/javascript/color.h",
-      "fpdfsdk/src/javascript/console.cpp",
-      "fpdfsdk/src/javascript/console.h",
-      "fpdfsdk/src/javascript/event.cpp",
-      "fpdfsdk/src/javascript/event.h",
-      "fpdfsdk/src/javascript/global.cpp",
-      "fpdfsdk/src/javascript/global.h",
-      "fpdfsdk/src/javascript/report.cpp",
-      "fpdfsdk/src/javascript/report.h",
-      "fpdfsdk/src/javascript/resource.cpp",
-      "fpdfsdk/src/javascript/resource.h",
-      "fpdfsdk/src/javascript/util.cpp",
-      "fpdfsdk/src/javascript/util.h",
-      "fpdfsdk/src/jsapi/fxjs_v8.cpp",
+      "fpdfsdk/javascript/Consts.cpp",
+      "fpdfsdk/javascript/Consts.h",
+      "fpdfsdk/javascript/Document.cpp",
+      "fpdfsdk/javascript/Document.h",
+      "fpdfsdk/javascript/Field.cpp",
+      "fpdfsdk/javascript/Field.h",
+      "fpdfsdk/javascript/Icon.cpp",
+      "fpdfsdk/javascript/Icon.h",
+      "fpdfsdk/javascript/JS_Context.cpp",
+      "fpdfsdk/javascript/JS_Context.h",
+      "fpdfsdk/javascript/JS_Define.h",
+      "fpdfsdk/javascript/JS_EventHandler.cpp",
+      "fpdfsdk/javascript/JS_EventHandler.h",
+      "fpdfsdk/javascript/JS_GlobalData.cpp",
+      "fpdfsdk/javascript/JS_GlobalData.h",
+      "fpdfsdk/javascript/JS_Object.cpp",
+      "fpdfsdk/javascript/JS_Object.h",
+      "fpdfsdk/javascript/JS_Runtime.cpp",
+      "fpdfsdk/javascript/JS_Runtime.h",
+      "fpdfsdk/javascript/JS_Value.cpp",
+      "fpdfsdk/javascript/JS_Value.h",
+      "fpdfsdk/javascript/PublicMethods.cpp",
+      "fpdfsdk/javascript/PublicMethods.h",
+      "fpdfsdk/javascript/app.cpp",
+      "fpdfsdk/javascript/app.h",
+      "fpdfsdk/javascript/color.cpp",
+      "fpdfsdk/javascript/color.h",
+      "fpdfsdk/javascript/console.cpp",
+      "fpdfsdk/javascript/console.h",
+      "fpdfsdk/javascript/event.cpp",
+      "fpdfsdk/javascript/event.h",
+      "fpdfsdk/javascript/global.cpp",
+      "fpdfsdk/javascript/global.h",
+      "fpdfsdk/javascript/report.cpp",
+      "fpdfsdk/javascript/report.h",
+      "fpdfsdk/javascript/resource.cpp",
+      "fpdfsdk/javascript/resource.h",
+      "fpdfsdk/javascript/util.cpp",
+      "fpdfsdk/javascript/util.h",
+      "fpdfsdk/jsapi/fxjs_v8.cpp",
     ]
     include_dirs = [
       "//v8",
@@ -748,13 +748,22 @@ static_library("javascript") {
     ]
     configs += [ "//v8:external_startup_data" ]
   } else {
-    sources += [ "fpdfsdk/src/javascript/JS_Runtime_Stub.cpp" ]
+    sources += [ "fpdfsdk/javascript/JS_Runtime_Stub.cpp" ]
   }
   configs += [ ":pdfium_config" ]
 }
 
 static_library("formfiller") {
   sources = [
+    "fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp",
+    "fpdfsdk/formfiller/FFL_CheckBox.cpp",
+    "fpdfsdk/formfiller/FFL_ComboBox.cpp",
+    "fpdfsdk/formfiller/FFL_FormFiller.cpp",
+    "fpdfsdk/formfiller/FFL_IFormFiller.cpp",
+    "fpdfsdk/formfiller/FFL_ListBox.cpp",
+    "fpdfsdk/formfiller/FFL_PushButton.cpp",
+    "fpdfsdk/formfiller/FFL_RadioButton.cpp",
+    "fpdfsdk/formfiller/FFL_TextField.cpp",
     "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h",
     "fpdfsdk/include/formfiller/FFL_CheckBox.h",
     "fpdfsdk/include/formfiller/FFL_ComboBox.h",
@@ -764,15 +773,6 @@ static_library("formfiller") {
     "fpdfsdk/include/formfiller/FFL_PushButton.h",
     "fpdfsdk/include/formfiller/FFL_RadioButton.h",
     "fpdfsdk/include/formfiller/FFL_TextField.h",
-    "fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp",
-    "fpdfsdk/src/formfiller/FFL_CheckBox.cpp",
-    "fpdfsdk/src/formfiller/FFL_ComboBox.cpp",
-    "fpdfsdk/src/formfiller/FFL_FormFiller.cpp",
-    "fpdfsdk/src/formfiller/FFL_IFormFiller.cpp",
-    "fpdfsdk/src/formfiller/FFL_ListBox.cpp",
-    "fpdfsdk/src/formfiller/FFL_PushButton.cpp",
-    "fpdfsdk/src/formfiller/FFL_RadioButton.cpp",
-    "fpdfsdk/src/formfiller/FFL_TextField.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
@@ -780,14 +780,14 @@ static_library("formfiller") {
 if (pdf_enable_xfa) {
   static_library("fpdfxfa") {
     sources = [
+      "fpdfsdk/fpdfxfa/fpdfxfa_app.cpp",
+      "fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp",
+      "fpdfsdk/fpdfxfa/fpdfxfa_page.cpp",
+      "fpdfsdk/fpdfxfa/fpdfxfa_util.cpp",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp",
     ]
     deps = [
       ":xfa",
@@ -1463,7 +1463,7 @@ test("pdfium_unittests") {
     "core/fxcrt/fx_bidi_unittest.cpp",
     "core/fxcrt/fx_extension_unittest.cpp",
     "core/fxcrt/fx_system_unittest.cpp",
-    "fpdfsdk/src/fpdfdoc_unittest.cpp",
+    "fpdfsdk/fpdfdoc_unittest.cpp",
   ]
   deps = [
     ":pdfium",
@@ -1487,17 +1487,17 @@ test("pdfium_embeddertests") {
     "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",
-    "fpdfsdk/src/fpdfext_embeddertest.cpp",
-    "fpdfsdk/src/fpdfformfill_embeddertest.cpp",
-    "fpdfsdk/src/fpdfsave_embeddertest.cpp",
-    "fpdfsdk/src/fpdftext_embeddertest.cpp",
-    "fpdfsdk/src/fpdfview_c_api_test.c",
-    "fpdfsdk/src/fpdfview_c_api_test.h",
-    "fpdfsdk/src/fpdfview_embeddertest.cpp",
-    "fpdfsdk/src/fsdk_baseform_embeddertest.cpp",
+    "fpdfsdk/fpdf_dataavail_embeddertest.cpp",
+    "fpdfsdk/fpdfdoc_embeddertest.cpp",
+    "fpdfsdk/fpdfedit_embeddertest.cpp",
+    "fpdfsdk/fpdfext_embeddertest.cpp",
+    "fpdfsdk/fpdfformfill_embeddertest.cpp",
+    "fpdfsdk/fpdfsave_embeddertest.cpp",
+    "fpdfsdk/fpdftext_embeddertest.cpp",
+    "fpdfsdk/fpdfview_c_api_test.c",
+    "fpdfsdk/fpdfview_c_api_test.h",
+    "fpdfsdk/fpdfview_embeddertest.cpp",
+    "fpdfsdk/fsdk_baseform_embeddertest.cpp",
     "testing/embedder_test.cpp",
     "testing/embedder_test.h",
     "testing/embedder_test_mock_delegate.h",
@@ -1513,8 +1513,8 @@ test("pdfium_embeddertests") {
   include_dirs = []
   if (pdf_enable_v8) {
     sources += [
-      "fpdfsdk/src/javascript/public_methods_embeddertest.cpp",
-      "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp",
+      "fpdfsdk/javascript/public_methods_embeddertest.cpp",
+      "fpdfsdk/jsapi/fxjs_v8_embeddertest.cpp",
       "testing/js_embedder_test.cpp",
       "testing/js_embedder_test.h",
     ]
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 298e5e2fc7..71711e3b16 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -112,7 +112,7 @@ class CPDF_RenderContext {
 class CPDF_ProgressiveRenderer {
  public:
   // Must match FDF_RENDER_* definitions in public/fpdf_progressive.h, but
-  // cannot #include that header. fpdfsdk/src/fpdf_progressive.cpp has
+  // cannot #include that header. fpdfsdk/fpdf_progressive.cpp has
   // static_asserts to make sure the two sets of values match.
   enum Status {
     Ready,          // FPDF_RENDER_READER
diff --git a/core/include/fpdfapi/ipdf_data_avail.h b/core/include/fpdfapi/ipdf_data_avail.h
index 5b8fd0b5e2..e2b22eaf2a 100644
--- a/core/include/fpdfapi/ipdf_data_avail.h
+++ b/core/include/fpdfapi/ipdf_data_avail.h
@@ -16,7 +16,7 @@ class CPDF_Object;
 class IPDF_DataAvail {
  public:
   // Must match PDF_DATA_* definitions in public/fpdf_dataavail.h, but cannot
-  // #include that header. fpdfsdk/src/fpdf_dataavail.cpp has static_asserts
+  // #include that header. fpdfsdk/fpdf_dataavail.cpp has static_asserts
   // to make sure the two sets of values match.
   enum DocAvailStatus {
     DataError = -1,        // PDF_DATA_ERROR
@@ -25,7 +25,7 @@ class IPDF_DataAvail {
   };
 
   // Must match PDF_*LINEAR* definitions in public/fpdf_dataavail.h, but cannot
-  // #include that header. fpdfsdk/src/fpdf_dataavail.cpp has static_asserts
+  // #include that header. fpdfsdk/fpdf_dataavail.cpp has static_asserts
   // to make sure the two sets of values match.
   enum DocLinearizationStatus {
     LinearizationUnknown = -1,  // PDF_LINEARIZATION_UNKNOWN
@@ -34,7 +34,7 @@ class IPDF_DataAvail {
   };
 
   // Must match PDF_FORM_* definitions in public/fpdf_dataavail.h, but cannot
-  // #include that header. fpdfsdk/src/fpdf_dataavail.cpp has static_asserts
+  // #include that header. fpdfsdk/fpdf_dataavail.cpp has static_asserts
   // to make sure the two sets of values match.
   enum DocFormStatus {
     FormError = -1,        // PDF_FORM_ERROR
diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp
index 35c2be6319..35c2be6319 100644
--- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
+++ b/fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp b/fpdfsdk/formfiller/FFL_CheckBox.cpp
index 485f86ba75..485f86ba75 100644
--- a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp
+++ b/fpdfsdk/formfiller/FFL_CheckBox.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/formfiller/FFL_ComboBox.cpp
index 5e88a5d133..5e88a5d133 100644
--- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
+++ b/fpdfsdk/formfiller/FFL_ComboBox.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/formfiller/FFL_FormFiller.cpp
index e596ba08ba..e596ba08ba 100644
--- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp
+++ b/fpdfsdk/formfiller/FFL_FormFiller.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/formfiller/FFL_IFormFiller.cpp
index 75f18e7c73..75f18e7c73 100644
--- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp
+++ b/fpdfsdk/formfiller/FFL_IFormFiller.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/formfiller/FFL_ListBox.cpp
index 638618f784..638618f784 100644
--- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp
+++ b/fpdfsdk/formfiller/FFL_ListBox.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_PushButton.cpp b/fpdfsdk/formfiller/FFL_PushButton.cpp
index d5bd509718..d5bd509718 100644
--- a/fpdfsdk/src/formfiller/FFL_PushButton.cpp
+++ b/fpdfsdk/formfiller/FFL_PushButton.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp b/fpdfsdk/formfiller/FFL_RadioButton.cpp
index 029bcf1a17..029bcf1a17 100644
--- a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp
+++ b/fpdfsdk/formfiller/FFL_RadioButton.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/formfiller/FFL_TextField.cpp
index 42f2aad48f..42f2aad48f 100644
--- a/fpdfsdk/src/formfiller/FFL_TextField.cpp
+++ b/fpdfsdk/formfiller/FFL_TextField.cpp
diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/fpdf_dataavail.cpp
index 6dc706a001..0a1ebefaef 100644
--- a/fpdfsdk/src/fpdf_dataavail.cpp
+++ b/fpdfsdk/fpdf_dataavail.cpp
@@ -114,8 +114,8 @@ DLLEXPORT void STDCALL FPDFAvail_Destroy(FPDF_AVAIL avail) {
   delete (CFPDF_DataAvail*)avail;
 }
 
-DLLEXPORT int STDCALL
-FPDFAvail_IsDocAvail(FPDF_AVAIL avail, FX_DOWNLOADHINTS* hints) {
+DLLEXPORT int STDCALL FPDFAvail_IsDocAvail(FPDF_AVAIL avail,
+                                           FX_DOWNLOADHINTS* hints) {
   if (!avail || !hints)
     return PDF_DATA_ERROR;
   CFPDF_DownloadHintsWrap hints_wrap(hints);
diff --git a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/fpdf_dataavail_embeddertest.cpp
index 222fdc4be2..222fdc4be2 100644
--- a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp
+++ b/fpdfsdk/fpdf_dataavail_embeddertest.cpp
diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp
index bf35cecd9c..bf35cecd9c 100644
--- a/fpdfsdk/src/fpdf_ext.cpp
+++ b/fpdfsdk/fpdf_ext.cpp
diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp
index cca63d6b76..cca63d6b76 100644
--- a/fpdfsdk/src/fpdf_flatten.cpp
+++ b/fpdfsdk/fpdf_flatten.cpp
diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp
index b6fd8e071e..b6fd8e071e 100644
--- a/fpdfsdk/src/fpdf_progressive.cpp
+++ b/fpdfsdk/fpdf_progressive.cpp
diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/fpdf_searchex.cpp
index 96c5e53309..96c5e53309 100644
--- a/fpdfsdk/src/fpdf_searchex.cpp
+++ b/fpdfsdk/fpdf_searchex.cpp
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp
index 655c4a22bb..655c4a22bb 100644
--- a/fpdfsdk/src/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/fpdf_sysfontinfo.cpp
diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp
index f3c2576dd5..f3c2576dd5 100644
--- a/fpdfsdk/src/fpdf_transformpage.cpp
+++ b/fpdfsdk/fpdf_transformpage.cpp
diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp
index a6d09b70cf..9fa9f4fcab 100644
--- a/fpdfsdk/src/fpdfdoc.cpp
+++ b/fpdfsdk/fpdfdoc.cpp
@@ -174,8 +174,9 @@ DLLEXPORT FPDF_DEST STDCALL FPDFAction_GetDest(FPDF_DOCUMENT document,
   return action.GetDest(pDoc).GetObject();
 }
 
-DLLEXPORT unsigned long STDCALL
-FPDFAction_GetFilePath(FPDF_ACTION pDict, void* buffer, unsigned long buflen) {
+DLLEXPORT unsigned long STDCALL FPDFAction_GetFilePath(FPDF_ACTION pDict,
+                                                       void* buffer,
+                                                       unsigned long buflen) {
   unsigned long type = FPDFAction_GetType(pDict);
   if (type != PDFACTION_REMOTEGOTO && type != PDFACTION_LAUNCH)
     return 0;
@@ -216,8 +217,9 @@ DLLEXPORT unsigned long STDCALL FPDFDest_GetPageIndex(FPDF_DOCUMENT document,
   return dest.GetPageIndex(pDoc);
 }
 
-DLLEXPORT FPDF_LINK STDCALL
-FPDFLink_GetLinkAtPoint(FPDF_PAGE page, double x, double y) {
+DLLEXPORT FPDF_LINK STDCALL FPDFLink_GetLinkAtPoint(FPDF_PAGE page,
+                                                    double x,
+                                                    double y) {
   CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
   if (!pPage)
     return nullptr;
@@ -230,8 +232,9 @@ FPDFLink_GetLinkAtPoint(FPDF_PAGE page, double x, double y) {
       .GetDict();
 }
 
-DLLEXPORT int STDCALL
-FPDFLink_GetLinkZOrderAtPoint(FPDF_PAGE page, double x, double y) {
+DLLEXPORT int STDCALL FPDFLink_GetLinkZOrderAtPoint(FPDF_PAGE page,
+                                                    double x,
+                                                    double y) {
   CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
   if (!pPage)
     return -1;
diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/fpdfdoc_embeddertest.cpp
index 4788773982..4788773982 100644
--- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp
+++ b/fpdfsdk/fpdfdoc_embeddertest.cpp
diff --git a/fpdfsdk/src/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp
index 04f885264e..04f885264e 100644
--- a/fpdfsdk/src/fpdfdoc_unittest.cpp
+++ b/fpdfsdk/fpdfdoc_unittest.cpp
diff --git a/fpdfsdk/src/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp
index 480ef51dbd..480ef51dbd 100644
--- a/fpdfsdk/src/fpdfedit_embeddertest.cpp
+++ b/fpdfsdk/fpdfedit_embeddertest.cpp
diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp
index de5c72f659..de5c72f659 100644
--- a/fpdfsdk/src/fpdfeditimg.cpp
+++ b/fpdfsdk/fpdfeditimg.cpp
diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index 992f08eb8b..992f08eb8b 100644
--- a/fpdfsdk/src/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
diff --git a/fpdfsdk/src/fpdfext_embeddertest.cpp b/fpdfsdk/fpdfext_embeddertest.cpp
index 7c28c29a8e..7c28c29a8e 100644
--- a/fpdfsdk/src/fpdfext_embeddertest.cpp
+++ b/fpdfsdk/fpdfext_embeddertest.cpp
diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp
index 31f5732ce5..31f5732ce5 100644
--- a/fpdfsdk/src/fpdfformfill.cpp
+++ b/fpdfsdk/fpdfformfill.cpp
diff --git a/fpdfsdk/src/fpdfformfill_embeddertest.cpp b/fpdfsdk/fpdfformfill_embeddertest.cpp
index c73dc008f7..c73dc008f7 100644
--- a/fpdfsdk/src/fpdfformfill_embeddertest.cpp
+++ b/fpdfsdk/fpdfformfill_embeddertest.cpp
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp
index 4253cc5fd9..4253cc5fd9 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/fpdfppo.cpp
diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index 81defbf0a7..81defbf0a7 100644
--- a/fpdfsdk/src/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
diff --git a/fpdfsdk/src/fpdfsave_embeddertest.cpp b/fpdfsdk/fpdfsave_embeddertest.cpp
index 1c93f4f0e1..1c93f4f0e1 100644
--- a/fpdfsdk/src/fpdfsave_embeddertest.cpp
+++ b/fpdfsdk/fpdfsave_embeddertest.cpp
diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/fpdftext.cpp
index 80d56920bc..80d56920bc 100644
--- a/fpdfsdk/src/fpdftext.cpp
+++ b/fpdfsdk/fpdftext.cpp
diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/fpdftext_embeddertest.cpp
index 3eaa5815d9..3eaa5815d9 100644
--- a/fpdfsdk/src/fpdftext_embeddertest.cpp
+++ b/fpdfsdk/fpdftext_embeddertest.cpp
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index 1f6d11d3fe..48fe0664a2 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -230,8 +230,8 @@ DLLEXPORT void STDCALL FPDF_InitLibrary() {
   FPDF_InitLibraryWithConfig(nullptr);
 }
 
-DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig(
-    const FPDF_LIBRARY_CONFIG* cfg) {
+DLLEXPORT void STDCALL
+FPDF_InitLibraryWithConfig(const FPDF_LIBRARY_CONFIG* cfg) {
   g_pCodecModule = new CCodec_ModuleMgr();
 
   CFX_GEModule::Create(cfg ? cfg->m_pUserFontPaths : nullptr);
diff --git a/fpdfsdk/src/fpdfview_c_api_test.c b/fpdfsdk/fpdfview_c_api_test.c
index 52bbd11b00..2f0cb49fc2 100644
--- a/fpdfsdk/src/fpdfview_c_api_test.c
+++ b/fpdfsdk/fpdfview_c_api_test.c
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include "fpdfsdk/src/fpdfview_c_api_test.h"
+#include "fpdfsdk/fpdfview_c_api_test.h"
 
 #include "public/fpdf_dataavail.h"
 #include "public/fpdf_doc.h"
diff --git a/fpdfsdk/src/fpdfview_c_api_test.h b/fpdfsdk/fpdfview_c_api_test.h
index 755d8215c9..d5b84a27a9 100644
--- a/fpdfsdk/src/fpdfview_c_api_test.h
+++ b/fpdfsdk/fpdfview_c_api_test.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 FPDFSDK_SRC_FPDFVIEW_C_API_TEST_H_
-#define FPDFSDK_SRC_FPDFVIEW_C_API_TEST_H_
+#ifndef FPDFSDK_FPDFVIEW_C_API_TEST_H_
+#define FPDFSDK_FPDFVIEW_C_API_TEST_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,4 +17,4 @@ int CheckPDFiumCApi();
 }
 #endif
 
-#endif  // FPDFSDK_SRC_FPDFVIEW_C_API_TEST_H_
+#endif  // FPDFSDK_FPDFVIEW_C_API_TEST_H_
diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/fpdfview_embeddertest.cpp
index da7313dd5f..29eb91ab4d 100644
--- a/fpdfsdk/src/fpdfview_embeddertest.cpp
+++ b/fpdfsdk/fpdfview_embeddertest.cpp
@@ -5,7 +5,7 @@
 #include <limits>
 #include <string>
 
-#include "fpdfsdk/src/fpdfview_c_api_test.h"
+#include "fpdfsdk/fpdfview_c_api_test.h"
 #include "public/fpdfview.h"
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
index 910cdc511e..910cdc511e 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
index 18f3d498e7..ede9b7e892 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
@@ -44,8 +44,7 @@ CPDFXFA_Document::CPDFXFA_Document(CPDF_Document* pPDFDoc,
       m_pXFADoc(nullptr),
       m_pXFADocView(nullptr),
       m_pApp(pProvider),
-      m_pJSContext(nullptr) {
-}
+      m_pJSContext(nullptr) {}
 
 CPDFXFA_Document::~CPDFXFA_Document() {
   if (m_pXFADoc) {
@@ -700,8 +699,7 @@ void CPDFXFA_Document::ExportData(IXFA_Doc* hDoc,
   }
 }
 void CPDFXFA_Document::ImportData(IXFA_Doc* hDoc,
-                                  const CFX_WideStringC& wsFilePath) {
-}
+                                  const CFX_WideStringC& wsFilePath) {}
 
 void CPDFXFA_Document::GotoURL(IXFA_Doc* hDoc,
                                const CFX_WideStringC& bsURL,
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
index 0210ac1c08..0210ac1c08 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
index 7814d8bd8a..7814d8bd8a 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp
index 7bca1b7865..0b3ee54ed5 100644
--- a/fpdfsdk/src/fsdk_actionhandler.cpp
+++ b/fpdfsdk/fsdk_actionhandler.cpp
@@ -15,8 +15,7 @@
 #include "third_party/base/stl_util.h"
 
 CPDFSDK_ActionHandler::CPDFSDK_ActionHandler()
-    : m_pFormActionHandler(new CPDFSDK_FormActionHandler) {
-}
+    : m_pFormActionHandler(new CPDFSDK_FormActionHandler) {}
 
 FX_BOOL CPDFSDK_ActionHandler::DoAction_DocOpen(const CPDF_Action& action,
                                                 CPDFSDK_Document* pDocument) {
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/fsdk_annothandler.cpp
index 989f535e50..f2456b0fb4 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/fsdk_annothandler.cpp
@@ -1091,8 +1091,7 @@ CPDFSDK_AnnotIterator::CPDFSDK_AnnotIterator(CPDFSDK_PageView* pPageView,
   }
 }
 
-CPDFSDK_AnnotIterator::~CPDFSDK_AnnotIterator() {
-}
+CPDFSDK_AnnotIterator::~CPDFSDK_AnnotIterator() {}
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::NextAnnot() {
   if (m_pos < m_iteratorAnnotList.size())
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/fsdk_baseannot.cpp
index 276d302bdd..606f02c2ed 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/fsdk_baseannot.cpp
@@ -485,13 +485,11 @@ CPDFSDK_DateTime& CPDFSDK_DateTime::AddSeconds(int seconds) {
 }
 
 CPDFSDK_Annot::CPDFSDK_Annot(CPDFSDK_PageView* pPageView)
-    : m_pPageView(pPageView), m_bSelected(FALSE), m_nTabOrder(-1) {
-}
+    : m_pPageView(pPageView), m_bSelected(FALSE), m_nTabOrder(-1) {}
 
 CPDFSDK_BAAnnot::CPDFSDK_BAAnnot(CPDF_Annot* pAnnot,
                                  CPDFSDK_PageView* pPageView)
-    : CPDFSDK_Annot(pPageView), m_pAnnot(pAnnot) {
-}
+    : CPDFSDK_Annot(pPageView), m_pAnnot(pAnnot) {}
 
 CPDF_Annot* CPDFSDK_BAAnnot::GetPDFAnnot() const {
   return m_pAnnot;
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp
index 89d27726e8..141e1f5f82 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/fsdk_baseform.cpp
@@ -1988,8 +1988,9 @@ FX_BOOL CPDFSDK_Widget::HitTest(FX_FLOAT pageX, FX_FLOAT pageY) {
 CPDFSDK_XFAWidget::CPDFSDK_XFAWidget(IXFA_Widget* pAnnot,
                                      CPDFSDK_PageView* pPageView,
                                      CPDFSDK_InterForm* pInterForm)
-    : CPDFSDK_Annot(pPageView), m_pInterForm(pInterForm), m_hXFAWidget(pAnnot) {
-}
+    : CPDFSDK_Annot(pPageView),
+      m_pInterForm(pInterForm),
+      m_hXFAWidget(pAnnot) {}
 
 FX_BOOL CPDFSDK_XFAWidget::IsXFAField() {
   return TRUE;
@@ -2726,8 +2727,7 @@ CBA_AnnotIterator::CBA_AnnotIterator(CPDFSDK_PageView* pPageView,
   GenerateResults();
 }
 
-CBA_AnnotIterator::~CBA_AnnotIterator() {
-}
+CBA_AnnotIterator::~CBA_AnnotIterator() {}
 
 CPDFSDK_Annot* CBA_AnnotIterator::GetFirstAnnot() {
   return m_Annots.empty() ? nullptr : m_Annots.front();
diff --git a/fpdfsdk/src/fsdk_baseform_embeddertest.cpp b/fpdfsdk/fsdk_baseform_embeddertest.cpp
index 4fd3bb785c..4fd3bb785c 100644
--- a/fpdfsdk/src/fsdk_baseform_embeddertest.cpp
+++ b/fpdfsdk/fsdk_baseform_embeddertest.cpp
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp
index 519aa06945..519aa06945 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/fsdk_mgr.cpp
diff --git a/fpdfsdk/src/fsdk_rendercontext.cpp b/fpdfsdk/fsdk_rendercontext.cpp
index 3b671caea6..c91772d41c 100644
--- a/fpdfsdk/src/fsdk_rendercontext.cpp
+++ b/fpdfsdk/fsdk_rendercontext.cpp
@@ -36,8 +36,7 @@ IFSDK_PAUSE_Adapter::IFSDK_PAUSE_Adapter(IFSDK_PAUSE* IPause) {
   m_IPause = IPause;
 }
 
-IFSDK_PAUSE_Adapter::~IFSDK_PAUSE_Adapter() {
-}
+IFSDK_PAUSE_Adapter::~IFSDK_PAUSE_Adapter() {}
 
 FX_BOOL IFSDK_PAUSE_Adapter::NeedToPauseNow() {
   if (m_IPause->NeedToPauseNow) {
diff --git a/fpdfsdk/src/fxedit/fxet_ap.cpp b/fpdfsdk/fxedit/fxet_ap.cpp
index 22f200d753..22f200d753 100644
--- a/fpdfsdk/src/fxedit/fxet_ap.cpp
+++ b/fpdfsdk/fxedit/fxet_ap.cpp
diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index 1b68dc0510..1b68dc0510 100644
--- a/fpdfsdk/src/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
diff --git a/fpdfsdk/src/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp
index cc9696030e..cc9696030e 100644
--- a/fpdfsdk/src/fxedit/fxet_list.cpp
+++ b/fpdfsdk/fxedit/fxet_list.cpp
diff --git a/fpdfsdk/src/fxedit/fxet_module.cpp b/fpdfsdk/fxedit/fxet_module.cpp
index 889b0f81a6..889b0f81a6 100644
--- a/fpdfsdk/src/fxedit/fxet_module.cpp
+++ b/fpdfsdk/fxedit/fxet_module.cpp
diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/fxedit/fxet_pageobjs.cpp
index 6d091b7c19..6d091b7c19 100644
--- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
+++ b/fpdfsdk/fxedit/fxet_pageobjs.cpp
diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/javascript/Consts.cpp
index b7cc2d0a46..3fdbb40ccb 100644
--- a/fpdfsdk/src/javascript/Consts.cpp
+++ b/fpdfsdk/javascript/Consts.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/Consts.h"
+#include "fpdfsdk/javascript/Consts.h"
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 BEGIN_JS_STATIC_CONST(CJS_Border)
 JS_STATIC_CONST_ENTRY_STRING(L"s", L"solid")
diff --git a/fpdfsdk/src/javascript/Consts.h b/fpdfsdk/javascript/Consts.h
index 6cd1d1d809..165e91ffaa 100644
--- a/fpdfsdk/src/javascript/Consts.h
+++ b/fpdfsdk/javascript/Consts.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_CONSTS_H_
-#define FPDFSDK_SRC_JAVASCRIPT_CONSTS_H_
+#ifndef FPDFSDK_JAVASCRIPT_CONSTS_H_
+#define FPDFSDK_JAVASCRIPT_CONSTS_H_
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 /* ------------------------------ border ------------------------------ */
 
@@ -113,4 +113,4 @@ class CJS_GlobalArrays : public CJS_Object {
   static void DefineJSObjects(CJS_Runtime* pRuntmie);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_CONSTS_H_
+#endif  // FPDFSDK_JAVASCRIPT_CONSTS_H_
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index 672a3a3874..032ca5467e 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -4,23 +4,23 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/Document.h"
+#include "fpdfsdk/javascript/Document.h"
 
 #include <vector>
 
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/Field.h"
-#include "fpdfsdk/src/javascript/Icon.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/app.h"
-#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/javascript/Field.h"
+#include "fpdfsdk/javascript/Icon.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/app.h"
+#include "fpdfsdk/javascript/resource.h"
 #include "third_party/base/numerics/safe_math.h"
 
 static v8::Isolate* GetIsolate(IJS_Context* cc) {
diff --git a/fpdfsdk/src/javascript/Document.h b/fpdfsdk/javascript/Document.h
index 06c4121510..8ae6c1d21d 100644
--- a/fpdfsdk/src/javascript/Document.h
+++ b/fpdfsdk/javascript/Document.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_DOCUMENT_H_
-#define FPDFSDK_SRC_JAVASCRIPT_DOCUMENT_H_
+#ifndef FPDFSDK_JAVASCRIPT_DOCUMENT_H_
+#define FPDFSDK_JAVASCRIPT_DOCUMENT_H_
 
 #include <list>
 #include <memory>
 #include <vector>
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class PrintParamsObj : public CJS_EmbedObj {
  public:
@@ -362,4 +362,4 @@ class CJS_Document : public CJS_Object {
   JS_STATIC_METHOD(mailDoc, Document);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_DOCUMENT_H_
+#endif  // FPDFSDK_JAVASCRIPT_DOCUMENT_H_
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp
index 0c0dfd17bf..abe18f4e36 100644
--- a/fpdfsdk/src/javascript/Field.cpp
+++ b/fpdfsdk/javascript/Field.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/Field.h"
+#include "fpdfsdk/javascript/Field.h"
 
 #include <algorithm>
 #include <memory>
@@ -13,16 +13,16 @@
 
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/Document.h"
-#include "fpdfsdk/src/javascript/Icon.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/PublicMethods.h"
-#include "fpdfsdk/src/javascript/color.h"
+#include "fpdfsdk/javascript/Document.h"
+#include "fpdfsdk/javascript/Icon.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/color.h"
 
 BEGIN_JS_STATIC_CONST(CJS_Field)
 END_JS_STATIC_CONST()
diff --git a/fpdfsdk/src/javascript/Field.h b/fpdfsdk/javascript/Field.h
index 49103c8284..171b081669 100644
--- a/fpdfsdk/src/javascript/Field.h
+++ b/fpdfsdk/javascript/Field.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_FIELD_H_
-#define FPDFSDK_SRC_JAVASCRIPT_FIELD_H_
+#ifndef FPDFSDK_JAVASCRIPT_FIELD_H_
+#define FPDFSDK_JAVASCRIPT_FIELD_H_
 
 #include <string>
 #include <vector>
 
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"  // For CPWL_Color.
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class CPDFSDK_Widget;
 class Document;
@@ -582,4 +582,4 @@ class CJS_Field : public CJS_Object {
   JS_STATIC_METHOD(signatureValidate, Field);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_FIELD_H_
+#endif  // FPDFSDK_JAVASCRIPT_FIELD_H_
diff --git a/fpdfsdk/src/javascript/Icon.cpp b/fpdfsdk/javascript/Icon.cpp
index 0bad2c5656..d3c2ba8039 100644
--- a/fpdfsdk/src/javascript/Icon.cpp
+++ b/fpdfsdk/javascript/Icon.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/Icon.h"
+#include "fpdfsdk/javascript/Icon.h"
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 /* ---------------------- Icon ---------------------- */
 
diff --git a/fpdfsdk/src/javascript/Icon.h b/fpdfsdk/javascript/Icon.h
index 512002dce1..bd125d8299 100644
--- a/fpdfsdk/src/javascript/Icon.h
+++ b/fpdfsdk/javascript/Icon.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_ICON_H_
-#define FPDFSDK_SRC_JAVASCRIPT_ICON_H_
+#ifndef FPDFSDK_JAVASCRIPT_ICON_H_
+#define FPDFSDK_JAVASCRIPT_ICON_H_
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class Icon : public CJS_EmbedObj {
  public:
@@ -34,4 +34,4 @@ class CJS_Icon : public CJS_Object {
   JS_STATIC_PROP(name, Icon);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_ICON_H_
+#endif  // FPDFSDK_JAVASCRIPT_ICON_H_
diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/javascript/JS_Context.cpp
index 304abfaae2..c382b07b8b 100644
--- a/fpdfsdk/src/javascript/JS_Context.cpp
+++ b/fpdfsdk/javascript/JS_Context.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Context.h"
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/resource.h"
 
 /* -------------------------- CJS_Context -------------------------- */
 
diff --git a/fpdfsdk/src/javascript/JS_Context.h b/fpdfsdk/javascript/JS_Context.h
index 93ef1523a3..cd57187720 100644
--- a/fpdfsdk/src/javascript/JS_Context.h
+++ b/fpdfsdk/javascript/JS_Context.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_
-#define FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_CONTEXT_H_
+#define FPDFSDK_JAVASCRIPT_JS_CONTEXT_H_
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -134,4 +134,4 @@ class CJS_Context : public IJS_Context {
   FX_BOOL m_bMsgBoxEnable;
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_CONTEXT_H_
diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/javascript/JS_Define.h
index e16c5a097a..3c148cf358 100644
--- a/fpdfsdk/src/javascript/JS_Define.h
+++ b/fpdfsdk/javascript/JS_Define.h
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_
-#define FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_DEFINE_H_
+#define FPDFSDK_JAVASCRIPT_JS_DEFINE_H_
 
 #include <vector>
 
 #include "fpdfsdk/include/jsapi/fxjs_v8.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/resource.h"
 
 struct JSConstSpec {
   const wchar_t* pName;
   double number;
   const wchar_t* string;  // NOLINT
-  uint8_t t;  // 0:double 1:str
+  uint8_t t;              // 0:double 1:str
 };
 
 struct JSPropertySpec {
@@ -50,11 +50,11 @@ struct JSMethodSpec {
 
 #define BEGIN_JS_STATIC_PROP(js_class_name) \
   JSPropertySpec js_class_name::JS_Class_Properties[] = {
-#define JS_STATIC_PROP_ENTRY(prop_name)                 \
-  {                                                     \
+#define JS_STATIC_PROP_ENTRY(prop_name)                                                    \
+  {                                                                                        \
     JS_WIDESTRING(prop_name), get_##prop_name##_static, \
-        set_##prop_name##_static                        \
-  }                                                     \
+        set_##prop_name##_static \
+  }                                                                                        \
   ,
 
 #define END_JS_STATIC_PROP() \
@@ -490,4 +490,4 @@ void JSGlobalFunc(const char* func_name_string,
 
 CJS_Value::Type GET_VALUE_TYPE(v8::Local<v8::Value> p);
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_DEFINE_H_
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/javascript/JS_EventHandler.cpp
index e11cfa39ae..697cfeb208 100644
--- a/fpdfsdk/src/javascript/JS_EventHandler.cpp
+++ b/fpdfsdk/javascript/JS_EventHandler.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/Document.h"
-#include "fpdfsdk/src/javascript/Field.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/Document.h"
+#include "fpdfsdk/javascript/Field.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 /* ---------------------------- CJS_EventHandler ---------------------------- */
 
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h
index 2af19d9ad5..5a819749ef 100644
--- a/fpdfsdk/src/javascript/JS_EventHandler.h
+++ b/fpdfsdk/javascript/JS_EventHandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_EVENTHANDLER_H_
-#define FPDFSDK_SRC_JAVASCRIPT_JS_EVENTHANDLER_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_
+#define FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -217,4 +217,4 @@ class CJS_EventHandler {
   CPDFSDK_Annot* m_pTargetAnnot;
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_JS_EVENTHANDLER_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/javascript/JS_GlobalData.cpp
index 1491d018e7..1408dbe33d 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/javascript/JS_GlobalData.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/JS_GlobalData.h"
+#include "fpdfsdk/javascript/JS_GlobalData.h"
 
 #include "core/include/fdrm/fx_crypt.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.h b/fpdfsdk/javascript/JS_GlobalData.h
index 6a07fa84e4..28833d8c12 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.h
+++ b/fpdfsdk/javascript/JS_GlobalData.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_GLOBALDATA_H_
-#define FPDFSDK_SRC_JAVASCRIPT_JS_GLOBALDATA_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
+#define FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ -103,4 +103,4 @@ class CJS_GlobalData {
   CFX_WideString m_sFilePath;
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_JS_GLOBALDATA_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/javascript/JS_Object.cpp
index 3f0fe8cb48..e6af576339 100644
--- a/fpdfsdk/src/javascript/JS_Object.cpp
+++ b/fpdfsdk/javascript/JS_Object.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Object.h"
 
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 namespace {
 
@@ -65,8 +65,7 @@ CJS_Object::CJS_Object(v8::Local<v8::Object> pObject) {
   m_pV8Object.Reset(m_pIsolate, pObject);
 }
 
-CJS_Object::~CJS_Object() {
-}
+CJS_Object::~CJS_Object() {}
 
 void CJS_Object::MakeWeak() {
   m_pV8Object.SetWeak(this, DisposeObject,
diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/javascript/JS_Object.h
index deae2d2a8f..983b713744 100644
--- a/fpdfsdk/src/javascript/JS_Object.h
+++ b/fpdfsdk/javascript/JS_Object.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_OBJECT_H_
-#define FPDFSDK_SRC_JAVASCRIPT_JS_OBJECT_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_OBJECT_H_
+#define FPDFSDK_JAVASCRIPT_JS_OBJECT_H_
 
 #include <map>
 #include <memory>
 
 #include "fpdfsdk/include/fsdk_define.h"  // For FX_UINT
 #include "fpdfsdk/include/jsapi/fxjs_v8.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
 
 class CJS_Context;
 class CJS_Object;
@@ -113,4 +113,4 @@ class CJS_Timer : public CJS_Runtime::Observer {
   CPDFDoc_Environment* const m_pApp;
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_JS_OBJECT_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_OBJECT_H_
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/javascript/JS_Runtime.cpp
index dd7ef0f09d..d56a8aca39 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/javascript/JS_Runtime.cpp
@@ -4,28 +4,28 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
 
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/Consts.h"
-#include "fpdfsdk/src/javascript/Document.h"
-#include "fpdfsdk/src/javascript/Field.h"
-#include "fpdfsdk/src/javascript/Icon.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_GlobalData.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/PublicMethods.h"
-#include "fpdfsdk/src/javascript/app.h"
-#include "fpdfsdk/src/javascript/color.h"
-#include "fpdfsdk/src/javascript/console.h"
-#include "fpdfsdk/src/javascript/event.h"
-#include "fpdfsdk/src/javascript/global.h"
-#include "fpdfsdk/src/javascript/report.h"
-#include "fpdfsdk/src/javascript/util.h"
+#include "fpdfsdk/javascript/Consts.h"
+#include "fpdfsdk/javascript/Document.h"
+#include "fpdfsdk/javascript/Field.h"
+#include "fpdfsdk/javascript/Icon.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_GlobalData.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/app.h"
+#include "fpdfsdk/javascript/color.h"
+#include "fpdfsdk/javascript/console.h"
+#include "fpdfsdk/javascript/event.h"
+#include "fpdfsdk/javascript/global.h"
+#include "fpdfsdk/javascript/report.h"
+#include "fpdfsdk/javascript/util.h"
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/javascript/JS_Runtime.h
index c7b0009ccb..377916416f 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.h
+++ b/fpdfsdk/javascript/JS_Runtime.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_RUNTIME_H_
-#define FPDFSDK_SRC_JAVASCRIPT_JS_RUNTIME_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_RUNTIME_H_
+#define FPDFSDK_JAVASCRIPT_JS_RUNTIME_H_
 
-#include <set>
 #include <map>
+#include <set>
 #include <utility>
 #include <vector>
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "fpdfsdk/include/jsapi/fxjs_v8.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
 
 class CJS_Context;
 
@@ -88,4 +88,4 @@ class CJS_Runtime : public IJS_Runtime {
   std::set<Observer*> m_observers;
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_JS_RUNTIME_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_RUNTIME_H_
diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/javascript/JS_Runtime_Stub.cpp
index ab20e0e365..d7962807c9 100644
--- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
+++ b/fpdfsdk/javascript/JS_Runtime_Stub.cpp
@@ -159,8 +159,7 @@ class CJS_RuntimeStub final : public IJS_Runtime {
 };
 
 // static
-void IJS_Runtime::Initialize(unsigned int slot, void* isolate) {
-}
+void IJS_Runtime::Initialize(unsigned int slot, void* isolate) {}
 
 // static
 IJS_Runtime* IJS_Runtime::Create(CPDFDoc_Environment* pEnv) {
diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/javascript/JS_Value.cpp
index 70ccdb5e97..8e5e463e61 100644
--- a/fpdfsdk/src/javascript/JS_Value.cpp
+++ b/fpdfsdk/javascript/JS_Value.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 #include <time.h>
 
@@ -13,9 +13,9 @@
 #include <limits>
 #include <vector>
 
-#include "fpdfsdk/src/javascript/Document.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/Document.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Object.h"
 
 static const FX_DWORD g_nan[2] = {0, 0x7FF80000};
 static double GetNan() {
@@ -23,12 +23,10 @@ static double GetNan() {
 }
 
 CJS_Value::CJS_Value(CJS_Runtime* pRuntime)
-    : m_eType(VT_unknown), m_pJSRuntime(pRuntime) {
-}
+    : m_eType(VT_unknown), m_pJSRuntime(pRuntime) {}
 
 CJS_Value::CJS_Value(CJS_Runtime* pRuntime, v8::Local<v8::Value> pValue, Type t)
-    : m_eType(t), m_pValue(pValue), m_pJSRuntime(pRuntime) {
-}
+    : m_eType(t), m_pValue(pValue), m_pJSRuntime(pRuntime) {}
 
 CJS_Value::CJS_Value(CJS_Runtime* pRuntime, const int& iValue)
     : m_pJSRuntime(pRuntime) {
@@ -290,11 +288,9 @@ CJS_PropValue::CJS_PropValue(const CJS_Value& value)
     : CJS_Value(value), m_bIsSetting(0) {}
 
 CJS_PropValue::CJS_PropValue(CJS_Runtime* pRuntime)
-    : CJS_Value(pRuntime), m_bIsSetting(0) {
-}
+    : CJS_Value(pRuntime), m_bIsSetting(0) {}
 
-CJS_PropValue::~CJS_PropValue() {
-}
+CJS_PropValue::~CJS_PropValue() {}
 
 void CJS_PropValue::operator<<(int iValue) {
   ASSERT(!m_bIsSetting);
@@ -412,8 +408,7 @@ CJS_PropValue::operator v8::Local<v8::Value>() const {
   return m_pValue;
 }
 
-CJS_Array::CJS_Array(CJS_Runtime* pRuntime) : m_pJSRuntime(pRuntime) {
-}
+CJS_Array::CJS_Array(CJS_Runtime* pRuntime) : m_pJSRuntime(pRuntime) {}
 
 CJS_Array::~CJS_Array() {}
 
@@ -454,8 +449,7 @@ CJS_Array::operator v8::Local<v8::Array>() {
   return m_pArray;
 }
 
-CJS_Date::CJS_Date(CJS_Runtime* pRuntime) : m_pJSRuntime(pRuntime) {
-}
+CJS_Date::CJS_Date(CJS_Runtime* pRuntime) : m_pJSRuntime(pRuntime) {}
 
 CJS_Date::CJS_Date(CJS_Runtime* pRuntime, double dMsecTime)
     : m_pJSRuntime(pRuntime) {
@@ -660,10 +654,10 @@ double _TimeFromYear(int y) {
 }
 
 double _TimeFromYearMonth(int y, int m) {
-  static int daysMonth[12] = {
-      0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-  static int leapDaysMonth[12] = {
-      0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335};
+  static int daysMonth[12] = {0,   31,  59,  90,  120, 151,
+                              181, 212, 243, 273, 304, 334};
+  static int leapDaysMonth[12] = {0,   31,  60,  91,  121, 152,
+                                  182, 213, 244, 274, 305, 335};
   int* pMonth = daysMonth;
   if (_isLeapYear(y))
     pMonth = leapDaysMonth;
@@ -814,7 +808,8 @@ double JS_DateParse(const wchar_t* str) {
     v8::Local<v8::Object> o = v->ToObject(context).ToLocalChecked();
     v = o->Get(context, v8::String::NewFromUtf8(pIsolate, "parse",
                                                 v8::NewStringType::kNormal)
-                            .ToLocalChecked()).ToLocalChecked();
+                            .ToLocalChecked())
+            .ToLocalChecked();
     if (v->IsFunction()) {
       v8::Local<v8::Function> funC = v8::Local<v8::Function>::Cast(v);
 
diff --git a/fpdfsdk/src/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h
index f6c1c360ca..70f76cef87 100644
--- a/fpdfsdk/src/javascript/JS_Value.h
+++ b/fpdfsdk/javascript/JS_Value.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_
-#define FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_VALUE_H_
+#define FPDFSDK_JAVASCRIPT_JS_VALUE_H_
 
 #include <vector>
 
@@ -227,4 +227,4 @@ std::vector<CJS_Value> JS_ExpandKeywordParams(
     size_t nKeywords,
     ...);
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_VALUE_H_
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index 014dea2d6a..d154fc1766 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/PublicMethods.h"
 
 #include <algorithm>
 #include <string>
@@ -13,16 +13,16 @@
 #include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/Field.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/color.h"
-#include "fpdfsdk/src/javascript/resource.h"
-#include "fpdfsdk/src/javascript/util.h"
+#include "fpdfsdk/javascript/Field.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/color.h"
+#include "fpdfsdk/javascript/resource.h"
+#include "fpdfsdk/javascript/util.h"
 
 #define DOUBLE_CORRECT 0.000000000000001
 
@@ -53,31 +53,14 @@ END_JS_STATIC_GLOBAL_FUN()
 
 IMPLEMENT_JS_STATIC_GLOBAL_FUN(CJS_PublicMethods)
 
-static const FX_WCHAR* const months[] = {L"Jan",
-                                         L"Feb",
-                                         L"Mar",
-                                         L"Apr",
-                                         L"May",
-                                         L"Jun",
-                                         L"Jul",
-                                         L"Aug",
-                                         L"Sep",
-                                         L"Oct",
-                                         L"Nov",
-                                         L"Dec"};
-
-static const FX_WCHAR* const fullmonths[] = {L"January",
-                                             L"February",
-                                             L"March",
-                                             L"April",
-                                             L"May",
-                                             L"June",
-                                             L"July",
-                                             L"August",
-                                             L"September",
-                                             L"October",
-                                             L"November",
-                                             L"December"};
+static const FX_WCHAR* const months[] = {L"Jan", L"Feb", L"Mar", L"Apr",
+                                         L"May", L"Jun", L"Jul", L"Aug",
+                                         L"Sep", L"Oct", L"Nov", L"Dec"};
+
+static const FX_WCHAR* const fullmonths[] = {
+    L"January",   L"February", L"March",    L"April",
+    L"May",       L"June",     L"July",     L"August",
+    L"September", L"October",  L"November", L"December"};
 
 FX_BOOL CJS_PublicMethods::IsNumber(const FX_WCHAR* str) {
   CFX_WideString sTrim = StrTrim(str);
diff --git a/fpdfsdk/src/javascript/PublicMethods.h b/fpdfsdk/javascript/PublicMethods.h
index d0c81e03e3..8961c5abc8 100644
--- a/fpdfsdk/src/javascript/PublicMethods.h
+++ b/fpdfsdk/javascript/PublicMethods.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_PUBLICMETHODS_H_
-#define FPDFSDK_SRC_JAVASCRIPT_PUBLICMETHODS_H_
+#ifndef FPDFSDK_JAVASCRIPT_PUBLICMETHODS_H_
+#define FPDFSDK_JAVASCRIPT_PUBLICMETHODS_H_
 
 #include <string>
 #include <vector>
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class CJS_PublicMethods : public CJS_Object {
  public:
@@ -172,4 +172,4 @@ class CJS_PublicMethods : public CJS_Object {
   static CJS_Array AF_MakeArrayFromList(CJS_Runtime* pRuntime, CJS_Value val);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_PUBLICMETHODS_H_
+#endif  // FPDFSDK_JAVASCRIPT_PUBLICMETHODS_H_
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/javascript/app.cpp
index 767555ff3b..2f81791dc7 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/javascript/app.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/app.h"
+#include "fpdfsdk/javascript/app.h"
 
 #include <memory>
 #include <vector>
 
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/Document.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/javascript/Document.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/resource.h"
 
 BEGIN_JS_STATIC_CONST(CJS_TimerObj)
 END_JS_STATIC_CONST()
diff --git a/fpdfsdk/src/javascript/app.h b/fpdfsdk/javascript/app.h
index faebcbd5ce..764f73b2f7 100644
--- a/fpdfsdk/src/javascript/app.h
+++ b/fpdfsdk/javascript/app.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_APP_H_
-#define FPDFSDK_SRC_JAVASCRIPT_APP_H_
+#ifndef FPDFSDK_JAVASCRIPT_APP_H_
+#define FPDFSDK_JAVASCRIPT_APP_H_
 
 #include <vector>
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class CJS_Runtime;
 class CJS_Timer;
@@ -208,4 +208,4 @@ class CJS_App : public CJS_Object {
   JS_STATIC_METHOD(setTimeOut, app);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_APP_H_
+#endif  // FPDFSDK_JAVASCRIPT_APP_H_
diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/javascript/color.cpp
index 4339b4eccf..2681a8693e 100644
--- a/fpdfsdk/src/javascript/color.cpp
+++ b/fpdfsdk/javascript/color.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/color.h"
+#include "fpdfsdk/javascript/color.h"
 
 #include <vector>
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 /* -------------------------- color -------------------------- */
 
@@ -58,8 +58,7 @@ color::color(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {
   m_crLTGray = CPWL_Color(COLORTYPE_GRAY, 0.75);
 }
 
-color::~color() {
-}
+color::~color() {}
 
 void color::ConvertPWLColorToArray(const CPWL_Color& color, CJS_Array& array) {
   switch (color.nColorType) {
diff --git a/fpdfsdk/src/javascript/color.h b/fpdfsdk/javascript/color.h
index 616337414d..cb5e59dd6a 100644
--- a/fpdfsdk/src/javascript/color.h
+++ b/fpdfsdk/javascript/color.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_COLOR_H_
-#define FPDFSDK_SRC_JAVASCRIPT_COLOR_H_
+#ifndef FPDFSDK_JAVASCRIPT_COLOR_H_
+#define FPDFSDK_JAVASCRIPT_COLOR_H_
 
 #include <vector>
 
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class color : public CJS_EmbedObj {
  public:
@@ -84,4 +84,4 @@ class CJS_Color : public CJS_Object {
   JS_STATIC_METHOD(equal, color);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_COLOR_H_
+#endif  // FPDFSDK_JAVASCRIPT_COLOR_H_
diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/javascript/console.cpp
index 8beb083f1e..4cce32d54a 100644
--- a/fpdfsdk/src/javascript/console.cpp
+++ b/fpdfsdk/javascript/console.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/console.h"
+#include "fpdfsdk/javascript/console.h"
 
 #include <vector>
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 /* ------------------------ console ------------------------ */
 
diff --git a/fpdfsdk/src/javascript/console.h b/fpdfsdk/javascript/console.h
index 651899bf4c..589dbc8914 100644
--- a/fpdfsdk/src/javascript/console.h
+++ b/fpdfsdk/javascript/console.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_CONSOLE_H_
-#define FPDFSDK_SRC_JAVASCRIPT_CONSOLE_H_
+#ifndef FPDFSDK_JAVASCRIPT_CONSOLE_H_
+#define FPDFSDK_JAVASCRIPT_CONSOLE_H_
 
 #include <vector>
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class console : public CJS_EmbedObj {
  public:
@@ -48,4 +48,4 @@ class CJS_Console : public CJS_Object {
   JS_STATIC_METHOD(show, console);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_CONSOLE_H_
+#endif  // FPDFSDK_JAVASCRIPT_CONSOLE_H_
diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/javascript/event.cpp
index f964908b9b..7549451e6c 100644
--- a/fpdfsdk/src/javascript/event.cpp
+++ b/fpdfsdk/javascript/event.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/event.h"
+#include "fpdfsdk/javascript/event.h"
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/Field.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/Field.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 /* -------------------------- event -------------------------- */
 
@@ -49,8 +49,7 @@ IMPLEMENT_JS_CLASS(CJS_Event, event)
 
 event::event(CJS_Object* pJsObject) : CJS_EmbedObj(pJsObject) {}
 
-event::~event() {
-}
+event::~event() {}
 
 FX_BOOL event::change(IJS_Context* cc,
                       CJS_PropValue& vp,
diff --git a/fpdfsdk/src/javascript/event.h b/fpdfsdk/javascript/event.h
index cf37bf6b08..57b3416bf9 100644
--- a/fpdfsdk/src/javascript/event.h
+++ b/fpdfsdk/javascript/event.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_EVENT_H_
-#define FPDFSDK_SRC_JAVASCRIPT_EVENT_H_
+#ifndef FPDFSDK_JAVASCRIPT_EVENT_H_
+#define FPDFSDK_JAVASCRIPT_EVENT_H_
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class event : public CJS_EmbedObj {
  public:
@@ -73,4 +73,4 @@ class CJS_Event : public CJS_Object {
   JS_STATIC_PROP(willCommit, event);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_EVENT_H_
+#endif  // FPDFSDK_JAVASCRIPT_EVENT_H_
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/javascript/global.cpp
index 234e132d46..c22c05d1db 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/javascript/global.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/global.h"
+#include "fpdfsdk/javascript/global.h"
 
 #include <vector>
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_GlobalData.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_GlobalData.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/resource.h"
 
 /* ---------------------------- global ---------------------------- */
 
@@ -97,8 +97,7 @@ void CJS_Global::InitInstance(IJS_Runtime* pIRuntime) {
 }
 
 JSGlobalAlternate::JSGlobalAlternate(CJS_Object* pJSObject)
-    : CJS_EmbedObj(pJSObject), m_pApp(NULL) {
-}
+    : CJS_EmbedObj(pJSObject), m_pApp(NULL) {}
 
 JSGlobalAlternate::~JSGlobalAlternate() {
   DestroyGlobalPersisitentVariables();
@@ -298,17 +297,14 @@ void JSGlobalAlternate::CommitGlobalPersisitentVariables(IJS_Context* cc) {
           m_pGlobalData->SetGlobalVariableString(name, pData->sData);
           m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
           break;
-        case JS_GLOBALDATA_TYPE_OBJECT:
-          {
-            CJS_GlobalVariableArray array;
-            v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(
-                GetJSObject()->GetIsolate(), pData->pData);
-            ObjectToArray(cc, obj, array);
-            m_pGlobalData->SetGlobalVariableObject(name, array);
-            m_pGlobalData->SetGlobalVariablePersistent(name,
-                                                       pData->bPersistent);
-          }
-          break;
+        case JS_GLOBALDATA_TYPE_OBJECT: {
+          CJS_GlobalVariableArray array;
+          v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(
+              GetJSObject()->GetIsolate(), pData->pData);
+          ObjectToArray(cc, obj, array);
+          m_pGlobalData->SetGlobalVariableObject(name, array);
+          m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
+        } break;
         case JS_GLOBALDATA_TYPE_NULL:
           m_pGlobalData->SetGlobalVariableNull(name);
           m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
diff --git a/fpdfsdk/src/javascript/global.h b/fpdfsdk/javascript/global.h
index e8172e691e..335b540271 100644
--- a/fpdfsdk/src/javascript/global.h
+++ b/fpdfsdk/javascript/global.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_GLOBAL_H_
-#define FPDFSDK_SRC_JAVASCRIPT_GLOBAL_H_
+#ifndef FPDFSDK_JAVASCRIPT_GLOBAL_H_
+#define FPDFSDK_JAVASCRIPT_GLOBAL_H_
 
 #include <map>
 #include <vector>
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class CJS_GlobalData;
 class CJS_GlobalVariableArray;
@@ -89,4 +89,4 @@ class CJS_Global : public CJS_Object {
   JS_SPECIAL_STATIC_METHOD(setPersistent, JSGlobalAlternate, global);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_GLOBAL_H_
+#endif  // FPDFSDK_JAVASCRIPT_GLOBAL_H_
diff --git a/fpdfsdk/src/javascript/public_methods_embeddertest.cpp b/fpdfsdk/javascript/public_methods_embeddertest.cpp
index cf6f96802b..a298cfc2c8 100644
--- a/fpdfsdk/src/javascript/public_methods_embeddertest.cpp
+++ b/fpdfsdk/javascript/public_methods_embeddertest.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 
 #include "core/include/fxcrt/fx_string.h"
-#include "fpdfsdk/src/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/PublicMethods.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/js_embedder_test.h"
 
diff --git a/fpdfsdk/src/javascript/report.cpp b/fpdfsdk/javascript/report.cpp
index 8374f3c2c8..ca7e199b0f 100644
--- a/fpdfsdk/src/javascript/report.cpp
+++ b/fpdfsdk/javascript/report.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/report.h"
+#include "fpdfsdk/javascript/report.h"
 
 #include <vector>
 
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Value.h"
 
 /* ---------------------- report ---------------------- */
 
diff --git a/fpdfsdk/src/javascript/report.h b/fpdfsdk/javascript/report.h
index 55d74648fc..3cd3b3b02c 100644
--- a/fpdfsdk/src/javascript/report.h
+++ b/fpdfsdk/javascript/report.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_REPORT_H_
-#define FPDFSDK_SRC_JAVASCRIPT_REPORT_H_
+#ifndef FPDFSDK_JAVASCRIPT_REPORT_H_
+#define FPDFSDK_JAVASCRIPT_REPORT_H_
 
 #include <vector>
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class Report : public CJS_EmbedObj {
  public:
@@ -38,4 +38,4 @@ class CJS_Report : public CJS_Object {
   JS_STATIC_METHOD(writeText, Report);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_REPORT_H_
+#endif  // FPDFSDK_JAVASCRIPT_REPORT_H_
diff --git a/fpdfsdk/src/javascript/resource.cpp b/fpdfsdk/javascript/resource.cpp
index 7031da34d1..88721efd2c 100644
--- a/fpdfsdk/src/javascript/resource.cpp
+++ b/fpdfsdk/javascript/resource.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/javascript/resource.h"
 
 CFX_WideString JSGetStringFromID(CJS_Context* pContext, FX_UINT id) {
   switch (id) {
diff --git a/fpdfsdk/src/javascript/resource.h b/fpdfsdk/javascript/resource.h
index be3ae13d90..4f35f276bc 100644
--- a/fpdfsdk/src/javascript/resource.h
+++ b/fpdfsdk/javascript/resource.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_
-#define FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_
+#ifndef FPDFSDK_JAVASCRIPT_RESOURCE_H_
+#define FPDFSDK_JAVASCRIPT_RESOURCE_H_
 
 #include "core/include/fxcrt/fx_string.h"  // For CFX_WideString.
 #include "fpdfsdk/include/fsdk_define.h"   // For FX_UINT.
@@ -36,4 +36,4 @@ CFX_WideString JSFormatErrorString(const char* class_name,
                                    const char* property_name,
                                    const CFX_WideString& details);
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_
+#endif  // FPDFSDK_JAVASCRIPT_RESOURCE_H_
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/javascript/util.cpp
index 52a93625b9..d488cb23da 100644
--- a/fpdfsdk/src/javascript/util.cpp
+++ b/fpdfsdk/javascript/util.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/src/javascript/util.h"
+#include "fpdfsdk/javascript/util.h"
 
 #include <time.h>
 
@@ -13,14 +13,14 @@
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/src/javascript/JS_Context.h"
-#include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/src/javascript/JS_EventHandler.h"
-#include "fpdfsdk/src/javascript/JS_Object.h"
-#include "fpdfsdk/src/javascript/JS_Runtime.h"
-#include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/src/javascript/PublicMethods.h"
-#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/javascript/JS_Context.h"
+#include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_EventHandler.h"
+#include "fpdfsdk/javascript/JS_Object.h"
+#include "fpdfsdk/javascript/JS_Runtime.h"
+#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/resource.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 #include <ctype.h>
@@ -44,8 +44,7 @@ IMPLEMENT_JS_CLASS(CJS_Util, util)
 
 util::util(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {}
 
-util::~util() {
-}
+util::~util() {}
 
 struct stru_TbConvert {
   const FX_WCHAR* lpszJSMark;
diff --git a/fpdfsdk/src/javascript/util.h b/fpdfsdk/javascript/util.h
index 6e3a5d2901..50fa31ad27 100644
--- a/fpdfsdk/src/javascript/util.h
+++ b/fpdfsdk/javascript/util.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_SRC_JAVASCRIPT_UTIL_H_
-#define FPDFSDK_SRC_JAVASCRIPT_UTIL_H_
+#ifndef FPDFSDK_JAVASCRIPT_UTIL_H_
+#define FPDFSDK_JAVASCRIPT_UTIL_H_
 
 #include <string>
 #include <vector>
 
-#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 
 class util : public CJS_EmbedObj {
  public:
@@ -64,4 +64,4 @@ class CJS_Util : public CJS_Object {
   JS_STATIC_METHOD(byteToChar, util);
 };
 
-#endif  // FPDFSDK_SRC_JAVASCRIPT_UTIL_H_
+#endif  // FPDFSDK_JAVASCRIPT_UTIL_H_
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/jsapi/fxjs_v8.cpp
index 86f6ced198..156f1c9a3c 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/jsapi/fxjs_v8.cpp
@@ -227,7 +227,8 @@ void FXJS_DefineObjMethod(v8::Isolate* pIsolate,
       CFXJS_ObjDefinition::ForID(pIsolate, nObjDefnID);
   pObjDef->GetInstanceTemplate()->Set(
       v8::String::NewFromUtf8(pIsolate, bsMethodName.c_str(),
-                              v8::NewStringType::kNormal).ToLocalChecked(),
+                              v8::NewStringType::kNormal)
+          .ToLocalChecked(),
       v8::FunctionTemplate::New(pIsolate, pMethodCall, v8::Local<v8::Value>(),
                                 pObjDef->GetSignature()),
       v8::ReadOnly);
@@ -245,7 +246,8 @@ void FXJS_DefineObjProperty(v8::Isolate* pIsolate,
       CFXJS_ObjDefinition::ForID(pIsolate, nObjDefnID);
   pObjDef->GetInstanceTemplate()->SetAccessor(
       v8::String::NewFromUtf8(pIsolate, bsPropertyName.c_str(),
-                              v8::NewStringType::kNormal).ToLocalChecked(),
+                              v8::NewStringType::kNormal)
+          .ToLocalChecked(),
       pPropGet, pPropPut);
 }
 
@@ -281,10 +283,11 @@ void FXJS_DefineGlobalMethod(v8::Isolate* pIsolate,
   v8::Isolate::Scope isolate_scope(pIsolate);
   v8::HandleScope handle_scope(pIsolate);
   CFX_ByteString bsMethodName = CFX_WideString(sMethodName).UTF8Encode();
-  GetGlobalObjectTemplate(pIsolate)->Set(
-      v8::String::NewFromUtf8(pIsolate, bsMethodName.c_str(),
-                              v8::NewStringType::kNormal).ToLocalChecked(),
-      v8::FunctionTemplate::New(pIsolate, pMethodCall), v8::ReadOnly);
+  GetGlobalObjectTemplate(pIsolate)
+      ->Set(v8::String::NewFromUtf8(pIsolate, bsMethodName.c_str(),
+                                    v8::NewStringType::kNormal)
+                .ToLocalChecked(),
+            v8::FunctionTemplate::New(pIsolate, pMethodCall), v8::ReadOnly);
 }
 
 void FXJS_DefineGlobalConst(v8::Isolate* pIsolate,
@@ -344,8 +347,8 @@ void FXJS_InitializeRuntime(
       CFX_ByteString bs = CFX_WideString(pObjDef->m_ObjName).UTF8Encode();
       v8::Local<v8::String> m_ObjName =
           v8::String::NewFromUtf8(pIsolate, bs.c_str(),
-                                  v8::NewStringType::kNormal,
-                                  bs.GetLength()).ToLocalChecked();
+                                  v8::NewStringType::kNormal, bs.GetLength())
+              .ToLocalChecked();
 
       v8::Local<v8::Object> obj =
           FXJS_NewFxDynamicObj(pIsolate, pIRuntime, i, true);
@@ -425,10 +428,11 @@ int FXJS_Execute(v8::Isolate* pIsolate,
   CFX_ByteString bsScript = CFX_WideString(script).UTF8Encode();
   v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
   v8::Local<v8::Script> compiled_script;
-  if (!v8::Script::Compile(
-           context, v8::String::NewFromUtf8(
-                        pIsolate, bsScript.c_str(), v8::NewStringType::kNormal,
-                        bsScript.GetLength()).ToLocalChecked())
+  if (!v8::Script::Compile(context,
+                           v8::String::NewFromUtf8(pIsolate, bsScript.c_str(),
+                                                   v8::NewStringType::kNormal,
+                                                   bsScript.GetLength())
+                               .ToLocalChecked())
            .ToLocal(&compiled_script)) {
     v8::String::Utf8Value error(try_catch.Exception());
     // TODO(tsepez): return error via pError->message.
@@ -508,9 +512,10 @@ void FXJS_Error(v8::Isolate* pIsolate, const CFX_WideString& message) {
   // wide-strings isn't handled by v8, so use UTF8 as a common
   // intermediate format.
   CFX_ByteString utf8_message = message.UTF8Encode();
-  pIsolate->ThrowException(
-      v8::String::NewFromUtf8(pIsolate, utf8_message.c_str(),
-                              v8::NewStringType::kNormal).ToLocalChecked());
+  pIsolate->ThrowException(v8::String::NewFromUtf8(pIsolate,
+                                                   utf8_message.c_str(),
+                                                   v8::NewStringType::kNormal)
+                               .ToLocalChecked());
 }
 
 const wchar_t* FXJS_GetTypeof(v8::Local<v8::Value> pObj) {
@@ -585,7 +590,8 @@ v8::Local<v8::String> FXJS_WSToJSString(v8::Isolate* pIsolate,
   if (!pIsolate)
     pIsolate = v8::Isolate::GetCurrent();
   return v8::String::NewFromUtf8(pIsolate, bs.c_str(),
-                                 v8::NewStringType::kNormal).ToLocalChecked();
+                                 v8::NewStringType::kNormal)
+      .ToLocalChecked();
 }
 
 v8::Local<v8::Value> FXJS_GetObjectElement(v8::Isolate* pIsolate,
@@ -595,7 +601,8 @@ v8::Local<v8::Value> FXJS_GetObjectElement(v8::Isolate* pIsolate,
     return v8::Local<v8::Value>();
   v8::Local<v8::Value> val;
   if (!pObj->Get(pIsolate->GetCurrentContext(),
-                 FXJS_WSToJSString(pIsolate, PropertyName)).ToLocal(&val))
+                 FXJS_WSToJSString(pIsolate, PropertyName))
+           .ToLocal(&val))
     return v8::Local<v8::Value>();
   return val;
 }
@@ -618,7 +625,8 @@ void FXJS_PutObjectString(v8::Isolate* pIsolate,
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
             FXJS_WSToJSString(pIsolate, PropertyName),
-            FXJS_WSToJSString(pIsolate, sValue)).FromJust();
+            FXJS_WSToJSString(pIsolate, sValue))
+      .FromJust();
 }
 
 void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
@@ -629,7 +637,8 @@ void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
             FXJS_WSToJSString(pIsolate, PropertyName),
-            v8::Int32::New(pIsolate, nValue)).FromJust();
+            v8::Int32::New(pIsolate, nValue))
+      .FromJust();
 }
 
 void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
@@ -640,7 +649,8 @@ void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
             FXJS_WSToJSString(pIsolate, PropertyName),
-            v8::Number::New(pIsolate, (double)fValue)).FromJust();
+            v8::Number::New(pIsolate, (double)fValue))
+      .FromJust();
 }
 
 void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
@@ -651,7 +661,8 @@ void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
             FXJS_WSToJSString(pIsolate, PropertyName),
-            v8::Number::New(pIsolate, (double)dValue)).FromJust();
+            v8::Number::New(pIsolate, (double)dValue))
+      .FromJust();
 }
 
 void FXJS_PutObjectBoolean(v8::Isolate* pIsolate,
@@ -662,7 +673,8 @@ void FXJS_PutObjectBoolean(v8::Isolate* pIsolate,
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
             FXJS_WSToJSString(pIsolate, PropertyName),
-            v8::Boolean::New(pIsolate, bValue)).FromJust();
+            v8::Boolean::New(pIsolate, bValue))
+      .FromJust();
 }
 
 void FXJS_PutObjectObject(v8::Isolate* pIsolate,
@@ -672,7 +684,8 @@ void FXJS_PutObjectObject(v8::Isolate* pIsolate,
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName), pPut).FromJust();
+            FXJS_WSToJSString(pIsolate, PropertyName), pPut)
+      .FromJust();
 }
 
 void FXJS_PutObjectNull(v8::Isolate* pIsolate,
@@ -681,8 +694,8 @@ void FXJS_PutObjectNull(v8::Isolate* pIsolate,
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName),
-            v8::Local<v8::Object>()).FromJust();
+            FXJS_WSToJSString(pIsolate, PropertyName), v8::Local<v8::Object>())
+      .FromJust();
 }
 
 v8::Local<v8::Array> FXJS_NewArray(v8::Isolate* pIsolate) {
@@ -808,5 +821,3 @@ v8::Local<v8::Array> FXJS_ToArray(v8::Isolate* pIsolate,
 void FXJS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom) {
   pTo = pFrom;
 }
-
-
diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/jsapi/fxjs_v8_embeddertest.cpp
index b7700c8b60..b7700c8b60 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
+++ b/fpdfsdk/jsapi/fxjs_v8_embeddertest.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Button.cpp b/fpdfsdk/pdfwindow/PWL_Button.cpp
index 2c6c36c047..1a57784c74 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Button.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Button.cpp
@@ -10,8 +10,7 @@
 
 CPWL_Button::CPWL_Button() : m_bMouseDown(FALSE) {}
 
-CPWL_Button::~CPWL_Button() {
-}
+CPWL_Button::~CPWL_Button() {}
 
 CFX_ByteString CPWL_Button::GetClassName() const {
   return "CPWL_Button";
diff --git a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp
index 320b2bf62f..320b2bf62f 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
index 6edd6bdd85..6edd6bdd85 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index c4a5bf03fd..c4a5bf03fd 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
index 10b5d6c04f..10b5d6c04f 100644
--- a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index 0a70357efd..0a70357efd 100644
--- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/pdfwindow/PWL_Icon.cpp
index 2a33b96cf9..2a33b96cf9 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Icon.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp b/fpdfsdk/pdfwindow/PWL_IconList.cpp
index 7dc8ba9f44..7dc8ba9f44 100644
--- a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
+++ b/fpdfsdk/pdfwindow/PWL_IconList.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Label.cpp b/fpdfsdk/pdfwindow/PWL_Label.cpp
index 5f8d2d8685..5f8d2d8685 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Label.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Label.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
index 2c0b79d2f1..2c0b79d2f1 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
index 7c2c1f4d17..7c2c1f4d17 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/pdfwindow/PWL_Note.cpp
index 7ba6f6ad66..7ba6f6ad66 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Note.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
index 03bf3238fa..03bf3238fa 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp b/fpdfsdk/pdfwindow/PWL_Signature.cpp
index ffb4461878..ffb4461878 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Signature.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp b/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
index c19a233940..c19a233940 100644
--- a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp
+++ b/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp
index 926ab3f0b7..926ab3f0b7 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp
diff --git a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
index 28bd0e04ed..597db35ec7 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
@@ -85,9 +85,7 @@ class CPWL_MsgControl {
     Default();
   }
 
-  ~CPWL_MsgControl() {
-    Default();
-  }
+  ~CPWL_MsgControl() { Default(); }
 
   void Default() {
     m_aMousePath.RemoveAll();
diff --git a/pdfium.gyp b/pdfium.gyp
index 4f21ba41a3..d1ace6181c 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -131,27 +131,27 @@
         'fpdfsdk/include/fsdk_annothandler.h',
         'fpdfsdk/include/fsdk_baseannot.h',
         'fpdfsdk/include/fsdk_baseform.h',
-        'fpdfsdk/src/fpdfdoc.cpp',
-        'fpdfsdk/src/fpdfeditimg.cpp',
-        'fpdfsdk/src/fpdfeditpage.cpp',
-        'fpdfsdk/src/fpdfformfill.cpp',
-        'fpdfsdk/src/fpdfppo.cpp',
-        'fpdfsdk/src/fpdfsave.cpp',
-        'fpdfsdk/src/fpdftext.cpp',
-        'fpdfsdk/src/fpdfview.cpp',
-        'fpdfsdk/src/fpdf_dataavail.cpp',
-        'fpdfsdk/src/fpdf_ext.cpp',
-        'fpdfsdk/src/fpdf_flatten.cpp',
-        'fpdfsdk/src/fpdf_progressive.cpp',
-        'fpdfsdk/src/fpdf_searchex.cpp',
-        'fpdfsdk/src/fpdf_sysfontinfo.cpp',
-        'fpdfsdk/src/fpdf_transformpage.cpp',
-        'fpdfsdk/src/fsdk_actionhandler.cpp',
-        'fpdfsdk/src/fsdk_annothandler.cpp',
-        'fpdfsdk/src/fsdk_baseannot.cpp',
-        'fpdfsdk/src/fsdk_baseform.cpp',
-        'fpdfsdk/src/fsdk_mgr.cpp',
-        'fpdfsdk/src/fsdk_rendercontext.cpp',
+        'fpdfsdk/fpdfdoc.cpp',
+        'fpdfsdk/fpdfeditimg.cpp',
+        'fpdfsdk/fpdfeditpage.cpp',
+        'fpdfsdk/fpdfformfill.cpp',
+        'fpdfsdk/fpdfppo.cpp',
+        'fpdfsdk/fpdfsave.cpp',
+        'fpdfsdk/fpdftext.cpp',
+        'fpdfsdk/fpdfview.cpp',
+        'fpdfsdk/fpdf_dataavail.cpp',
+        'fpdfsdk/fpdf_ext.cpp',
+        'fpdfsdk/fpdf_flatten.cpp',
+        'fpdfsdk/fpdf_progressive.cpp',
+        'fpdfsdk/fpdf_searchex.cpp',
+        'fpdfsdk/fpdf_sysfontinfo.cpp',
+        'fpdfsdk/fpdf_transformpage.cpp',
+        'fpdfsdk/fsdk_actionhandler.cpp',
+        'fpdfsdk/fsdk_annothandler.cpp',
+        'fpdfsdk/fsdk_baseannot.cpp',
+        'fpdfsdk/fsdk_baseform.cpp',
+        'fpdfsdk/fsdk_mgr.cpp',
+        'fpdfsdk/fsdk_rendercontext.cpp',
         'public/fpdf_dataavail.h',
         'public/fpdf_doc.h',
         'public/fpdf_edit.h',
@@ -659,11 +659,11 @@
         'fpdfsdk/include/fxedit/fx_edit.h',
         'fpdfsdk/include/fxedit/fxet_edit.h',
         'fpdfsdk/include/fxedit/fxet_list.h',
-        'fpdfsdk/src/fxedit/fxet_ap.cpp',
-        'fpdfsdk/src/fxedit/fxet_edit.cpp',
-        'fpdfsdk/src/fxedit/fxet_list.cpp',
-        'fpdfsdk/src/fxedit/fxet_module.cpp',
-        'fpdfsdk/src/fxedit/fxet_pageobjs.cpp',
+        'fpdfsdk/fxedit/fxet_ap.cpp',
+        'fpdfsdk/fxedit/fxet_edit.cpp',
+        'fpdfsdk/fxedit/fxet_list.cpp',
+        'fpdfsdk/fxedit/fxet_module.cpp',
+        'fpdfsdk/fxedit/fxet_pageobjs.cpp',
       ],
     },
     {
@@ -687,23 +687,23 @@
         'fpdfsdk/include/pdfwindow/PWL_SpecialButton.h',
         'fpdfsdk/include/pdfwindow/PWL_Utils.h',
         'fpdfsdk/include/pdfwindow/PWL_Wnd.h',
-        'fpdfsdk/src/pdfwindow/PWL_Button.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Caret.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Edit.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_FontMap.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Icon.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_IconList.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Label.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_ListBox.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Note.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Signature.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Utils.cpp',
-        'fpdfsdk/src/pdfwindow/PWL_Wnd.cpp',
+        'fpdfsdk/pdfwindow/PWL_Button.cpp',
+        'fpdfsdk/pdfwindow/PWL_Caret.cpp',
+        'fpdfsdk/pdfwindow/PWL_ComboBox.cpp',
+        'fpdfsdk/pdfwindow/PWL_Edit.cpp',
+        'fpdfsdk/pdfwindow/PWL_EditCtrl.cpp',
+        'fpdfsdk/pdfwindow/PWL_FontMap.cpp',
+        'fpdfsdk/pdfwindow/PWL_Icon.cpp',
+        'fpdfsdk/pdfwindow/PWL_IconList.cpp',
+        'fpdfsdk/pdfwindow/PWL_Label.cpp',
+        'fpdfsdk/pdfwindow/PWL_ListBox.cpp',
+        'fpdfsdk/pdfwindow/PWL_ListCtrl.cpp',
+        'fpdfsdk/pdfwindow/PWL_Note.cpp',
+        'fpdfsdk/pdfwindow/PWL_ScrollBar.cpp',
+        'fpdfsdk/pdfwindow/PWL_Signature.cpp',
+        'fpdfsdk/pdfwindow/PWL_SpecialButton.cpp',
+        'fpdfsdk/pdfwindow/PWL_Utils.cpp',
+        'fpdfsdk/pdfwindow/PWL_Wnd.cpp',
       ],
     },
     {
@@ -711,7 +711,7 @@
       'type': 'static_library',
       'sources': [
         'fpdfsdk/include/javascript/IJavaScript.h',
-        'fpdfsdk/src/javascript/JS_Runtime_Stub.cpp',
+        'fpdfsdk/javascript/JS_Runtime_Stub.cpp',
       ],
       'conditions': [
         ['pdf_enable_v8==1', {
@@ -726,53 +726,53 @@
             '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
           ],
           'sources!': [
-            'fpdfsdk/src/javascript/JS_Runtime_Stub.cpp',
+            'fpdfsdk/javascript/JS_Runtime_Stub.cpp',
           ],
           'sources': [
-            'fpdfsdk/src/javascript/Consts.cpp',
-            'fpdfsdk/src/javascript/Consts.h',
-            'fpdfsdk/src/javascript/Document.cpp',
-            'fpdfsdk/src/javascript/Document.h',
-            'fpdfsdk/src/javascript/Field.cpp',
-            'fpdfsdk/src/javascript/Field.h',
-            'fpdfsdk/src/javascript/Icon.cpp',
-            'fpdfsdk/src/javascript/Icon.h',
-            'fpdfsdk/src/javascript/JS_Context.cpp',
-            'fpdfsdk/src/javascript/JS_Context.h',
-            'fpdfsdk/src/javascript/JS_Define.h',
-            'fpdfsdk/src/javascript/JS_EventHandler.cpp',
-            'fpdfsdk/src/javascript/JS_EventHandler.h',
-            'fpdfsdk/src/javascript/JS_GlobalData.cpp',
-            'fpdfsdk/src/javascript/JS_GlobalData.h',
-            'fpdfsdk/src/javascript/JS_Object.cpp',
-            'fpdfsdk/src/javascript/JS_Object.h',
-            'fpdfsdk/src/javascript/JS_Runtime.cpp',
-            'fpdfsdk/src/javascript/JS_Runtime.h',
-            'fpdfsdk/src/javascript/JS_Value.cpp',
-            'fpdfsdk/src/javascript/JS_Value.h',
-            'fpdfsdk/src/javascript/PublicMethods.cpp',
-            'fpdfsdk/src/javascript/PublicMethods.h',
-            'fpdfsdk/src/javascript/app.cpp',
-            'fpdfsdk/src/javascript/app.cpp',
-            'fpdfsdk/src/javascript/app.h',
-            'fpdfsdk/src/javascript/color.cpp',
-            'fpdfsdk/src/javascript/color.cpp',
-            'fpdfsdk/src/javascript/color.h',
-            'fpdfsdk/src/javascript/console.cpp',
-            'fpdfsdk/src/javascript/console.cpp',
-            'fpdfsdk/src/javascript/console.h',
-            'fpdfsdk/src/javascript/event.cpp',
-            'fpdfsdk/src/javascript/event.h',
-            'fpdfsdk/src/javascript/global.cpp',
-            'fpdfsdk/src/javascript/global.h',
-            'fpdfsdk/src/javascript/report.cpp',
-            'fpdfsdk/src/javascript/report.h',
-            'fpdfsdk/src/javascript/resource.cpp',
-            'fpdfsdk/src/javascript/resource.h',
-            'fpdfsdk/src/javascript/util.cpp',
-            'fpdfsdk/src/javascript/util.h',
+            'fpdfsdk/javascript/Consts.cpp',
+            'fpdfsdk/javascript/Consts.h',
+            'fpdfsdk/javascript/Document.cpp',
+            'fpdfsdk/javascript/Document.h',
+            'fpdfsdk/javascript/Field.cpp',
+            'fpdfsdk/javascript/Field.h',
+            'fpdfsdk/javascript/Icon.cpp',
+            'fpdfsdk/javascript/Icon.h',
+            'fpdfsdk/javascript/JS_Context.cpp',
+            'fpdfsdk/javascript/JS_Context.h',
+            'fpdfsdk/javascript/JS_Define.h',
+            'fpdfsdk/javascript/JS_EventHandler.cpp',
+            'fpdfsdk/javascript/JS_EventHandler.h',
+            'fpdfsdk/javascript/JS_GlobalData.cpp',
+            'fpdfsdk/javascript/JS_GlobalData.h',
+            'fpdfsdk/javascript/JS_Object.cpp',
+            'fpdfsdk/javascript/JS_Object.h',
+            'fpdfsdk/javascript/JS_Runtime.cpp',
+            'fpdfsdk/javascript/JS_Runtime.h',
+            'fpdfsdk/javascript/JS_Value.cpp',
+            'fpdfsdk/javascript/JS_Value.h',
+            'fpdfsdk/javascript/PublicMethods.cpp',
+            'fpdfsdk/javascript/PublicMethods.h',
+            'fpdfsdk/javascript/app.cpp',
+            'fpdfsdk/javascript/app.cpp',
+            'fpdfsdk/javascript/app.h',
+            'fpdfsdk/javascript/color.cpp',
+            'fpdfsdk/javascript/color.cpp',
+            'fpdfsdk/javascript/color.h',
+            'fpdfsdk/javascript/console.cpp',
+            'fpdfsdk/javascript/console.cpp',
+            'fpdfsdk/javascript/console.h',
+            'fpdfsdk/javascript/event.cpp',
+            'fpdfsdk/javascript/event.h',
+            'fpdfsdk/javascript/global.cpp',
+            'fpdfsdk/javascript/global.h',
+            'fpdfsdk/javascript/report.cpp',
+            'fpdfsdk/javascript/report.h',
+            'fpdfsdk/javascript/resource.cpp',
+            'fpdfsdk/javascript/resource.h',
+            'fpdfsdk/javascript/util.cpp',
+            'fpdfsdk/javascript/util.h',
             'fpdfsdk/include/jsapi/fxjs_v8.h',
-            'fpdfsdk/src/jsapi/fxjs_v8.cpp',
+            'fpdfsdk/jsapi/fxjs_v8.cpp',
           ],
         }],
       ],
@@ -790,15 +790,15 @@
         'fpdfsdk/include/formfiller/FFL_PushButton.h',
         'fpdfsdk/include/formfiller/FFL_RadioButton.h',
         'fpdfsdk/include/formfiller/FFL_TextField.h',
-        'fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp',
-        'fpdfsdk/src/formfiller/FFL_CheckBox.cpp',
-        'fpdfsdk/src/formfiller/FFL_ComboBox.cpp',
-        'fpdfsdk/src/formfiller/FFL_FormFiller.cpp',
-        'fpdfsdk/src/formfiller/FFL_IFormFiller.cpp',
-        'fpdfsdk/src/formfiller/FFL_ListBox.cpp',
-        'fpdfsdk/src/formfiller/FFL_PushButton.cpp',
-        'fpdfsdk/src/formfiller/FFL_RadioButton.cpp',
-        'fpdfsdk/src/formfiller/FFL_TextField.cpp',
+        'fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp',
+        'fpdfsdk/formfiller/FFL_CheckBox.cpp',
+        'fpdfsdk/formfiller/FFL_ComboBox.cpp',
+        'fpdfsdk/formfiller/FFL_FormFiller.cpp',
+        'fpdfsdk/formfiller/FFL_IFormFiller.cpp',
+        'fpdfsdk/formfiller/FFL_ListBox.cpp',
+        'fpdfsdk/formfiller/FFL_PushButton.cpp',
+        'fpdfsdk/formfiller/FFL_RadioButton.cpp',
+        'fpdfsdk/formfiller/FFL_TextField.cpp',
       ],
     },
     {
@@ -829,7 +829,7 @@
         'core/fxcrt/fx_bidi_unittest.cpp',
         'core/fxcrt/fx_extension_unittest.cpp',
         'core/fxcrt/fx_system_unittest.cpp',
-        'fpdfsdk/src/fpdfdoc_unittest.cpp',
+        'fpdfsdk/fpdfdoc_unittest.cpp',
         'testing/fx_string_testhelpers.h',
         'testing/fx_string_testhelpers.cpp',
       ],
@@ -857,17 +857,17 @@
         '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',
-        'fpdfsdk/src/fpdfext_embeddertest.cpp',
-        'fpdfsdk/src/fpdfformfill_embeddertest.cpp',
-        'fpdfsdk/src/fpdfsave_embeddertest.cpp',
-        'fpdfsdk/src/fpdftext_embeddertest.cpp',
-        'fpdfsdk/src/fpdfview_c_api_test.c',
-        'fpdfsdk/src/fpdfview_c_api_test.h',
-        'fpdfsdk/src/fpdfview_embeddertest.cpp',
-        'fpdfsdk/src/fsdk_baseform_embeddertest.cpp',
+        'fpdfsdk/fpdf_dataavail_embeddertest.cpp',
+        'fpdfsdk/fpdfdoc_embeddertest.cpp',
+        'fpdfsdk/fpdfedit_embeddertest.cpp',
+        'fpdfsdk/fpdfext_embeddertest.cpp',
+        'fpdfsdk/fpdfformfill_embeddertest.cpp',
+        'fpdfsdk/fpdfsave_embeddertest.cpp',
+        'fpdfsdk/fpdftext_embeddertest.cpp',
+        'fpdfsdk/fpdfview_c_api_test.c',
+        'fpdfsdk/fpdfview_c_api_test.h',
+        'fpdfsdk/fpdfview_embeddertest.cpp',
+        'fpdfsdk/fsdk_baseform_embeddertest.cpp',
         'testing/embedder_test.cpp',
         'testing/embedder_test.h',
         'testing/embedder_test_mock_delegate.h',
@@ -889,8 +889,8 @@
             '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
           ],
           'sources': [
-            'fpdfsdk/src/javascript/public_methods_embeddertest.cpp',
-            'fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp',
+            'fpdfsdk/javascript/public_methods_embeddertest.cpp',
+            'fpdfsdk/jsapi/fxjs_v8_embeddertest.cpp',
             'testing/js_embedder_test.cpp',
             'testing/js_embedder_test.h',
           ],
@@ -936,10 +936,10 @@
             'xfa.gyp:xfa',
           ],
           'sources': [
-            'fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp',
-            'fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp',
-            'fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp',
-            'fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp',
+            'fpdfsdk/fpdfxfa/fpdfxfa_app.cpp',
+            'fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp',
+            'fpdfsdk/fpdfxfa/fpdfxfa_page.cpp',
+            'fpdfsdk/fpdfxfa/fpdfxfa_util.cpp',
             'fpdfsdk/include/fpdfxfa/fpdfxfa_app.h',
             'fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h',
             'fpdfsdk/include/fpdfxfa/fpdfxfa_page.h',