92 files changed, 436 insertions, 441 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 5550790462..e49b0d0156 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -191,7 +191,7 @@ static_library("pdfium") {
     ":fxcodec",
     ":fxcrt",
     ":fxge",
-    ":javascript",
+    ":fxjs",
     ":pwl",
     "third_party:bigint",
     "third_party:pdfium_base",
@@ -1176,10 +1176,10 @@ static_library("pwl") {
   ]
 }
 
-static_library("javascript") {
+static_library("fxjs") {
   sources = [
-    "fpdfsdk/javascript/ijs_event_context.h",
-    "fpdfsdk/javascript/ijs_runtime.h",
+    "fxjs/ijs_event_context.h",
+    "fxjs/ijs_runtime.h",
   ]
   configs += [ ":pdfium_core_config" ]
   deps = [
@@ -1188,88 +1188,119 @@ static_library("javascript") {
 
   if (pdf_enable_v8) {
     sources += [
-      "fpdfsdk/javascript/JS_Define.cpp",
-      "fpdfsdk/javascript/JS_Define.h",
-      "fpdfsdk/javascript/JS_GlobalData.cpp",
-      "fpdfsdk/javascript/JS_GlobalData.h",
-      "fpdfsdk/javascript/JS_KeyValue.cpp",
-      "fpdfsdk/javascript/JS_KeyValue.h",
-      "fpdfsdk/javascript/cjs_annot.cpp",
-      "fpdfsdk/javascript/cjs_annot.h",
-      "fpdfsdk/javascript/cjs_app.cpp",
-      "fpdfsdk/javascript/cjs_app.h",
-      "fpdfsdk/javascript/cjs_border.cpp",
-      "fpdfsdk/javascript/cjs_border.h",
-      "fpdfsdk/javascript/cjs_color.cpp",
-      "fpdfsdk/javascript/cjs_color.h",
-      "fpdfsdk/javascript/cjs_console.cpp",
-      "fpdfsdk/javascript/cjs_console.h",
-      "fpdfsdk/javascript/cjs_delaydata.cpp",
-      "fpdfsdk/javascript/cjs_delaydata.h",
-      "fpdfsdk/javascript/cjs_display.cpp",
-      "fpdfsdk/javascript/cjs_display.h",
-      "fpdfsdk/javascript/cjs_document.cpp",
-      "fpdfsdk/javascript/cjs_document.h",
-      "fpdfsdk/javascript/cjs_embedobj.cpp",
-      "fpdfsdk/javascript/cjs_embedobj.h",
-      "fpdfsdk/javascript/cjs_event.cpp",
-      "fpdfsdk/javascript/cjs_event.h",
-      "fpdfsdk/javascript/cjs_event_context.cpp",
-      "fpdfsdk/javascript/cjs_event_context.h",
-      "fpdfsdk/javascript/cjs_eventhandler.cpp",
-      "fpdfsdk/javascript/cjs_eventhandler.h",
-      "fpdfsdk/javascript/cjs_field.cpp",
-      "fpdfsdk/javascript/cjs_field.h",
-      "fpdfsdk/javascript/cjs_font.cpp",
-      "fpdfsdk/javascript/cjs_font.h",
-      "fpdfsdk/javascript/cjs_global.cpp",
-      "fpdfsdk/javascript/cjs_global.h",
-      "fpdfsdk/javascript/cjs_globalarrays.cpp",
-      "fpdfsdk/javascript/cjs_globalarrays.h",
-      "fpdfsdk/javascript/cjs_globalconsts.cpp",
-      "fpdfsdk/javascript/cjs_globalconsts.h",
-      "fpdfsdk/javascript/cjs_highlight.cpp",
-      "fpdfsdk/javascript/cjs_highlight.h",
-      "fpdfsdk/javascript/cjs_icon.cpp",
-      "fpdfsdk/javascript/cjs_icon.h",
-      "fpdfsdk/javascript/cjs_object.cpp",
-      "fpdfsdk/javascript/cjs_object.h",
-      "fpdfsdk/javascript/cjs_position.cpp",
-      "fpdfsdk/javascript/cjs_position.h",
-      "fpdfsdk/javascript/cjs_printparamsobj.cpp",
-      "fpdfsdk/javascript/cjs_printparamsobj.h",
-      "fpdfsdk/javascript/cjs_publicmethods.cpp",
-      "fpdfsdk/javascript/cjs_publicmethods.h",
-      "fpdfsdk/javascript/cjs_report.cpp",
-      "fpdfsdk/javascript/cjs_report.h",
-      "fpdfsdk/javascript/cjs_return.cpp",
-      "fpdfsdk/javascript/cjs_return.h",
-      "fpdfsdk/javascript/cjs_runtime.cpp",
-      "fpdfsdk/javascript/cjs_runtime.h",
-      "fpdfsdk/javascript/cjs_scalehow.cpp",
-      "fpdfsdk/javascript/cjs_scalehow.h",
-      "fpdfsdk/javascript/cjs_scalewhen.cpp",
-      "fpdfsdk/javascript/cjs_scalewhen.h",
-      "fpdfsdk/javascript/cjs_style.cpp",
-      "fpdfsdk/javascript/cjs_style.h",
-      "fpdfsdk/javascript/cjs_timerobj.cpp",
-      "fpdfsdk/javascript/cjs_timerobj.h",
-      "fpdfsdk/javascript/cjs_util.cpp",
-      "fpdfsdk/javascript/cjs_util.h",
-      "fpdfsdk/javascript/cjs_zoomtype.cpp",
-      "fpdfsdk/javascript/cjs_zoomtype.h",
-      "fpdfsdk/javascript/global_timer.cpp",
-      "fpdfsdk/javascript/global_timer.h",
-      "fpdfsdk/javascript/js_resources.cpp",
-      "fpdfsdk/javascript/js_resources.h",
+      "fxjs/JS_Define.cpp",
+      "fxjs/JS_Define.h",
+      "fxjs/JS_GlobalData.cpp",
+      "fxjs/JS_GlobalData.h",
+      "fxjs/JS_KeyValue.cpp",
+      "fxjs/JS_KeyValue.h",
+      "fxjs/cjs_annot.cpp",
+      "fxjs/cjs_annot.h",
+      "fxjs/cjs_app.cpp",
+      "fxjs/cjs_app.h",
+      "fxjs/cjs_border.cpp",
+      "fxjs/cjs_border.h",
+      "fxjs/cjs_color.cpp",
+      "fxjs/cjs_color.h",
+      "fxjs/cjs_console.cpp",
+      "fxjs/cjs_console.h",
+      "fxjs/cjs_delaydata.cpp",
+      "fxjs/cjs_delaydata.h",
+      "fxjs/cjs_display.cpp",
+      "fxjs/cjs_display.h",
+      "fxjs/cjs_document.cpp",
+      "fxjs/cjs_document.h",
+      "fxjs/cjs_embedobj.cpp",
+      "fxjs/cjs_embedobj.h",
+      "fxjs/cjs_event.cpp",
+      "fxjs/cjs_event.h",
+      "fxjs/cjs_event_context.cpp",
+      "fxjs/cjs_event_context.h",
+      "fxjs/cjs_eventhandler.cpp",
+      "fxjs/cjs_eventhandler.h",
+      "fxjs/cjs_field.cpp",
+      "fxjs/cjs_field.h",
+      "fxjs/cjs_font.cpp",
+      "fxjs/cjs_font.h",
+      "fxjs/cjs_global.cpp",
+      "fxjs/cjs_global.h",
+      "fxjs/cjs_globalarrays.cpp",
+      "fxjs/cjs_globalarrays.h",
+      "fxjs/cjs_globalconsts.cpp",
+      "fxjs/cjs_globalconsts.h",
+      "fxjs/cjs_highlight.cpp",
+      "fxjs/cjs_highlight.h",
+      "fxjs/cjs_icon.cpp",
+      "fxjs/cjs_icon.h",
+      "fxjs/cjs_object.cpp",
+      "fxjs/cjs_object.h",
+      "fxjs/cjs_position.cpp",
+      "fxjs/cjs_position.h",
+      "fxjs/cjs_printparamsobj.cpp",
+      "fxjs/cjs_printparamsobj.h",
+      "fxjs/cjs_publicmethods.cpp",
+      "fxjs/cjs_publicmethods.h",
+      "fxjs/cjs_report.cpp",
+      "fxjs/cjs_report.h",
+      "fxjs/cjs_return.cpp",
+      "fxjs/cjs_return.h",
+      "fxjs/cjs_runtime.cpp",
+      "fxjs/cjs_runtime.h",
+      "fxjs/cjs_scalehow.cpp",
+      "fxjs/cjs_scalehow.h",
+      "fxjs/cjs_scalewhen.cpp",
+      "fxjs/cjs_scalewhen.h",
+      "fxjs/cjs_style.cpp",
+      "fxjs/cjs_style.h",
+      "fxjs/cjs_timerobj.cpp",
+      "fxjs/cjs_timerobj.h",
+      "fxjs/cjs_util.cpp",
+      "fxjs/cjs_util.h",
+      "fxjs/cjs_zoomtype.cpp",
+      "fxjs/cjs_zoomtype.h",
+      "fxjs/fxjs_v8.cpp",
+      "fxjs/fxjs_v8.h",
+      "fxjs/global_timer.cpp",
+      "fxjs/global_timer.h",
+      "fxjs/js_resources.cpp",
+      "fxjs/js_resources.h",
+    ]
+    deps += [
+      ":fxcrt",
+      "//v8",
+      "//v8:v8_libplatform",
     ]
-    deps += [ ":fxjs" ]
     configs += [ "//v8:external_startup_data" ]
+    include_dirs = [
+      "//v8",
+      "//v8/include",
+    ]
+    public_deps = [
+      "//v8",
+    ]
+
+    if (pdf_enable_xfa) {
+      sources += [
+        "fxjs/cfxjse_arguments.cpp",
+        "fxjs/cfxjse_arguments.h",
+        "fxjs/cfxjse_class.cpp",
+        "fxjs/cfxjse_class.h",
+        "fxjs/cfxjse_context.cpp",
+        "fxjs/cfxjse_context.h",
+        "fxjs/cfxjse_isolatetracker.cpp",
+        "fxjs/cfxjse_isolatetracker.h",
+        "fxjs/cfxjse_runtimedata.cpp",
+        "fxjs/cfxjse_runtimedata.h",
+        "fxjs/cfxjse_value.cpp",
+        "fxjs/cfxjse_value.h",
+        "fxjs/fxjse.h",
+      ]
+    }
   } else {
     sources += [
-      "fpdfsdk/javascript/cjs_event_context_stub.cpp",
-      "fpdfsdk/javascript/cjs_event_context_stub.h",
-      "fpdfsdk/javascript/cjs_runtimestub.cpp",
+      "fxjs/cjs_event_context_stub.cpp",
+      "fxjs/cjs_event_context_stub.h",
+      "fxjs/cjs_runtimestub.cpp",
     ]
   }
 }
@@ -1305,46 +1336,6 @@ static_library("formfiller") {
   ]
 }
 
-if (pdf_enable_v8) {
-  static_library("fxjs") {
-    sources = [
-      "fxjs/fxjs_v8.cpp",
-      "fxjs/fxjs_v8.h",
-    ]
-    configs += [ ":pdfium_core_config" ]
-    deps = [
-      ":fxcrt",
-      "//v8",
-      "//v8:v8_libplatform",
-    ]
-    include_dirs = [
-      "//v8",
-      "//v8/include",
-    ]
-    public_deps = [
-      "//v8",
-    ]
-
-    if (pdf_enable_xfa) {
-      sources += [
-        "fxjs/cfxjse_arguments.cpp",
-        "fxjs/cfxjse_arguments.h",
-        "fxjs/cfxjse_class.cpp",
-        "fxjs/cfxjse_class.h",
-        "fxjs/cfxjse_context.cpp",
-        "fxjs/cfxjse_context.h",
-        "fxjs/cfxjse_isolatetracker.cpp",
-        "fxjs/cfxjse_isolatetracker.h",
-        "fxjs/cfxjse_runtimedata.cpp",
-        "fxjs/cfxjse_runtimedata.h",
-        "fxjs/cfxjse_value.cpp",
-        "fxjs/cfxjse_value.h",
-        "fxjs/fxjse.h",
-      ]
-    }
-  }
-}
-
 if (pdf_enable_xfa) {
   static_library("fpdfxfa") {
     sources = [
@@ -2014,8 +2005,8 @@ test("pdfium_unittests") {
   }
   if (pdf_enable_v8) {
     sources += [
-      "fpdfsdk/javascript/cjs_publicmethods_unittest.cpp",
-      "fpdfsdk/javascript/cjs_util_unittest.cpp",
+      "fxjs/cjs_publicmethods_unittest.cpp",
+      "fxjs/cjs_util_unittest.cpp",
     ]
     include_dirs += [
       "//v8",
@@ -2078,7 +2069,7 @@ test("pdfium_embeddertests") {
 
   if (pdf_enable_v8) {
     sources += [
-      "fpdfsdk/javascript/cjs_publicmethods_embeddertest.cpp",
+      "fxjs/cjs_publicmethods_embeddertest.cpp",
       "fxjs/fxjs_v8_embeddertest.cpp",
       "testing/js_embedder_test.cpp",
       "testing/js_embedder_test.h",
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index 807b397298..95ddfe16cc 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   '+core',
+  '+fxjs',
   '+public',
   '+v8',
   '+xfa/fwl',
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 9e65b46f44..b72a10b5e2 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -17,7 +17,7 @@
 #include "fpdfsdk/cpdfsdk_widget.h"
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
 #include "fpdfsdk/fsdk_actionhandler.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/ijs_runtime.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp
index 635655c033..04680e93bf 100644
--- a/fpdfsdk/cpdfsdk_interform.cpp
+++ b/fpdfsdk/cpdfsdk_interform.cpp
@@ -31,8 +31,8 @@
 #include "fpdfsdk/fsdk_actionhandler.h"
 #include "fpdfsdk/fsdk_define.h"
 #include "fpdfsdk/ipdfsdk_annothandler.h"
-#include "fpdfsdk/javascript/ijs_event_context.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/ijs_event_context.h"
+#include "fxjs/ijs_runtime.h"
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index 96777cca63..b68b72ed93 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -36,7 +36,7 @@
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/fsdk_define.h"
 #include "fpdfsdk/fsdk_pauseadapter.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/ijs_runtime.h"
 #include "public/fpdf_edit.h"
 #include "public/fpdf_ext.h"
 #include "public/fpdf_formfill.h"
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
index 95f1efcfca..6496042e7d 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
@@ -16,8 +16,8 @@
 #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 #include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/cjs_runtime.h"
+#include "fxjs/ijs_runtime.h"
 #include "public/fpdf_formfill.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index a5cdd3c8d1..6040517d93 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -17,7 +17,7 @@
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
 #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/ijs_runtime.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/cxfa_ffwidgethandler.h"
diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp
index ea7d2c3a08..de5c9313b5 100644
--- a/fpdfsdk/fsdk_actionhandler.cpp
+++ b/fpdfsdk/fsdk_actionhandler.cpp
@@ -15,8 +15,8 @@
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/javascript/ijs_event_context.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/ijs_event_context.h"
+#include "fxjs/ijs_runtime.h"
 #include "third_party/base/logging.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/javascript/DEPS b/fpdfsdk/javascript/DEPS
deleted file mode 100644
index 36a51aa92f..0000000000
--- a/fpdfsdk/javascript/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  '+fxjs'
-]
diff --git a/fxjs/DEPS b/fxjs/DEPS
index 633eeed561..bea61c1856 100644
--- a/fxjs/DEPS
+++ b/fxjs/DEPS
@@ -1,4 +1,10 @@
 include_rules = [
+  '+core/fdrm',
+  '+core/fpdfapi',
+  '+core/fpdfdoc',
   '+core/fxcrt',
+  '+core/fxge',
+  '+public',
+  '+fpdfsdk',
   '+v8/include',
 ]
diff --git a/fpdfsdk/javascript/JS_Define.cpp b/fxjs/JS_Define.cpp
index 18887e636a..90f7557422 100644
--- a/fpdfsdk/javascript/JS_Define.cpp
+++ b/fxjs/JS_Define.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 #include <time.h>
 
@@ -13,8 +13,8 @@
 #include <limits>
 #include <vector>
 
-#include "fpdfsdk/javascript/cjs_document.h"
-#include "fpdfsdk/javascript/cjs_object.h"
+#include "fxjs/cjs_document.h"
+#include "fxjs/cjs_object.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/JS_Define.h b/fxjs/JS_Define.h
index 41dccc6c8c..6de56f40e0 100644
--- a/fpdfsdk/javascript/JS_Define.h
+++ b/fxjs/JS_Define.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_JS_DEFINE_H_
-#define FPDFSDK_JAVASCRIPT_JS_DEFINE_H_
+#ifndef FXJS_JS_DEFINE_H_
+#define FXJS_JS_DEFINE_H_
 
 #include <vector>
 
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/cjs_return.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/cjs_return.h"
 #include "fxjs/fxjs_v8.h"
+#include "fxjs/js_resources.h"
 
 double JS_GetDateTime();
 int JS_GetYearFromTime(double dt);
@@ -163,4 +163,4 @@ void JSMethod(const char* method_name_string,
                                                    info);                     \
   }
 
-#endif  // FPDFSDK_JAVASCRIPT_JS_DEFINE_H_
+#endif  // FXJS_JS_DEFINE_H_
diff --git a/fpdfsdk/javascript/JS_GlobalData.cpp b/fxjs/JS_GlobalData.cpp
index ce3ce68fb3..78e19c9482 100644
--- a/fpdfsdk/javascript/JS_GlobalData.cpp
+++ b/fxjs/JS_GlobalData.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/JS_GlobalData.h"
+#include "fxjs/JS_GlobalData.h"
 
 #include <utility>
 
diff --git a/fpdfsdk/javascript/JS_GlobalData.h b/fxjs/JS_GlobalData.h
index 249bca6a74..c167d1e4e1 100644
--- a/fpdfsdk/javascript/JS_GlobalData.h
+++ b/fxjs/JS_GlobalData.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
-#define FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
+#ifndef FXJS_JS_GLOBALDATA_H_
+#define FXJS_JS_GLOBALDATA_H_
 
 #include <memory>
 #include <vector>
 
 #include "core/fxcrt/cfx_binarybuf.h"
-#include "fpdfsdk/javascript/JS_KeyValue.h"
+#include "fxjs/JS_KeyValue.h"
 
 class CPDFSDK_FormFillEnvironment;
 
@@ -74,4 +74,4 @@ class CJS_GlobalData {
   WideString m_sFilePath;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
+#endif  // FXJS_JS_GLOBALDATA_H_
diff --git a/fpdfsdk/javascript/JS_KeyValue.cpp b/fxjs/JS_KeyValue.cpp
index 7d1e575377..aabfc38c76 100644
--- a/fpdfsdk/javascript/JS_KeyValue.cpp
+++ b/fxjs/JS_KeyValue.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/JS_KeyValue.h"
+#include "fxjs/JS_KeyValue.h"
 
 CJS_GlobalVariableArray::CJS_GlobalVariableArray() {}
 
diff --git a/fpdfsdk/javascript/JS_KeyValue.h b/fxjs/JS_KeyValue.h
index 63669358a4..a81a6b432e 100644
--- a/fpdfsdk/javascript/JS_KeyValue.h
+++ b/fxjs/JS_KeyValue.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_JS_KEYVALUE_H_
-#define FPDFSDK_JAVASCRIPT_JS_KEYVALUE_H_
+#ifndef FXJS_JS_KEYVALUE_H_
+#define FXJS_JS_KEYVALUE_H_
 
 #include <memory>
 #include <vector>
@@ -43,4 +43,4 @@ class CJS_KeyValue {
   CJS_GlobalVariableArray objData;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_JS_KEYVALUE_H_
+#endif  // FXJS_JS_KEYVALUE_H_
diff --git a/fpdfsdk/javascript/cjs_annot.cpp b/fxjs/cjs_annot.cpp
index 586e4629aa..f4f9669eff 100644
--- a/fpdfsdk/javascript/cjs_annot.cpp
+++ b/fxjs/cjs_annot.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_annot.h"
+#include "fxjs/cjs_annot.h"
 
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_annot.h b/fxjs/cjs_annot.h
index 966e5835f4..18124f6216 100644
--- a/fpdfsdk/javascript/cjs_annot.h
+++ b/fxjs/cjs_annot.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
+#ifndef FXJS_CJS_ANNOT_H_
+#define FXJS_CJS_ANNOT_H_
 
 #include "fpdfsdk/cpdfsdk_baannot.h"
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class Annot : public CJS_EmbedObj {
  public:
@@ -47,4 +47,4 @@ class CJS_Annot : public CJS_Object {
   static const JSPropertySpec PropertySpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
+#endif  // FXJS_CJS_ANNOT_H_
diff --git a/fpdfsdk/javascript/cjs_app.cpp b/fxjs/cjs_app.cpp
index df590976d8..f013e7eaa8 100644
--- a/fpdfsdk/javascript/cjs_app.cpp
+++ b/fxjs/cjs_app.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_app.h"
+#include "fxjs/cjs_app.h"
 
 #include "fpdfsdk/cpdfsdk_interform.h"
-#include "fpdfsdk/javascript/cjs_document.h"
-#include "fpdfsdk/javascript/cjs_timerobj.h"
-#include "fpdfsdk/javascript/global_timer.h"
-#include "fpdfsdk/javascript/ijs_event_context.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/cjs_document.h"
+#include "fxjs/cjs_timerobj.h"
+#include "fxjs/global_timer.h"
+#include "fxjs/ijs_event_context.h"
+#include "fxjs/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_app.h b/fxjs/cjs_app.h
index b385d66186..703c7052d3 100644
--- a/fpdfsdk/javascript/cjs_app.h
+++ b/fxjs/cjs_app.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_APP_H_
-#define FPDFSDK_JAVASCRIPT_CJS_APP_H_
+#ifndef FXJS_CJS_APP_H_
+#define FXJS_CJS_APP_H_
 
 #include <memory>
 #include <set>
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Runtime;
 class GlobalTimer;
@@ -166,4 +166,4 @@ class CJS_App : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_APP_H_
+#endif  // FXJS_CJS_APP_H_
diff --git a/fpdfsdk/javascript/cjs_border.cpp b/fxjs/cjs_border.cpp
index f418aeec61..24d50ffcad 100644
--- a/fpdfsdk/javascript/cjs_border.cpp
+++ b/fxjs/cjs_border.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_border.h"
+#include "fxjs/cjs_border.h"
 
 const JSConstSpec CJS_Border::ConstSpecs[] = {
     {"s", JSConstSpec::String, 0, "solid"},
diff --git a/fpdfsdk/javascript/cjs_border.h b/fxjs/cjs_border.h
index 5a1d6b75f3..b3fcef7f21 100644
--- a/fpdfsdk/javascript/cjs_border.h
+++ b/fxjs/cjs_border.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_BORDER_H_
-#define FPDFSDK_JAVASCRIPT_CJS_BORDER_H_
+#ifndef FXJS_CJS_BORDER_H_
+#define FXJS_CJS_BORDER_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Border : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_Border : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_BORDER_H_
+#endif  // FXJS_CJS_BORDER_H_
diff --git a/fpdfsdk/javascript/cjs_color.cpp b/fxjs/cjs_color.cpp
index 0c0d9640d1..1bebf79ea8 100644
--- a/fpdfsdk/javascript/cjs_color.cpp
+++ b/fxjs/cjs_color.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_color.h"
+#include "fxjs/cjs_color.h"
 
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/cjs_runtime.h"
 
 const JSPropertySpec CJS_Color::PropertySpecs[] = {
     {"black", get_black_static, set_black_static},
diff --git a/fpdfsdk/javascript/cjs_color.h b/fxjs/cjs_color.h
index 1942f3dd38..5f7c1e5e30 100644
--- a/fpdfsdk/javascript/cjs_color.h
+++ b/fxjs/cjs_color.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_COLOR_H_
-#define FPDFSDK_JAVASCRIPT_CJS_COLOR_H_
+#ifndef FXJS_CJS_COLOR_H_
+#define FXJS_CJS_COLOR_H_
 
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/pwl/cpwl_wnd.h"
+#include "fxjs/JS_Define.h"
 
 class color : public CJS_EmbedObj {
  public:
@@ -112,4 +112,4 @@ class CJS_Color : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_COLOR_H_
+#endif  // FXJS_CJS_COLOR_H_
diff --git a/fpdfsdk/javascript/cjs_console.cpp b/fxjs/cjs_console.cpp
index 58a691c866..c5e23a3c27 100644
--- a/fpdfsdk/javascript/cjs_console.cpp
+++ b/fxjs/cjs_console.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_console.h"
+#include "fxjs/cjs_console.h"
 
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_object.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_object.h"
 
 const JSMethodSpec CJS_Console::MethodSpecs[] = {{"clear", clear_static},
                                                  {"hide", hide_static},
diff --git a/fpdfsdk/javascript/cjs_console.h b/fxjs/cjs_console.h
index 43ab8f63d8..43a55bc7b0 100644
--- a/fpdfsdk/javascript/cjs_console.h
+++ b/fxjs/cjs_console.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_CONSOLE_H_
-#define FPDFSDK_JAVASCRIPT_CJS_CONSOLE_H_
+#ifndef FXJS_CJS_CONSOLE_H_
+#define FXJS_CJS_CONSOLE_H_
 
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class console : public CJS_EmbedObj {
  public:
@@ -44,4 +44,4 @@ class CJS_Console : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_CONSOLE_H_
+#endif  // FXJS_CJS_CONSOLE_H_
diff --git a/fpdfsdk/javascript/cjs_delaydata.cpp b/fxjs/cjs_delaydata.cpp
index bf5e3469c8..d7e1f78004 100644
--- a/fpdfsdk/javascript/cjs_delaydata.cpp
+++ b/fxjs/cjs_delaydata.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_delaydata.h"
+#include "fxjs/cjs_delaydata.h"
 
 CJS_DelayData::CJS_DelayData(FIELD_PROP prop, int idx, const WideString& name)
     : eProp(prop), nControlIndex(idx), sFieldName(name) {}
diff --git a/fpdfsdk/javascript/cjs_delaydata.h b/fxjs/cjs_delaydata.h
index 3aa9e27fda..deeb65d56f 100644
--- a/fpdfsdk/javascript/cjs_delaydata.h
+++ b/fxjs/cjs_delaydata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_DELAYDATA_H_
-#define FPDFSDK_JAVASCRIPT_CJS_DELAYDATA_H_
+#ifndef FXJS_CJS_DELAYDATA_H_
+#define FXJS_CJS_DELAYDATA_H_
 
 #include <string>
 #include <vector>
@@ -13,7 +13,7 @@
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/widestring.h"
 #include "core/fxge/cfx_color.h"
-#include "fpdfsdk/javascript/cjs_field.h"
+#include "fxjs/cjs_field.h"
 
 struct CJS_DelayData {
   CJS_DelayData(FIELD_PROP prop, int idx, const WideString& name);
@@ -32,4 +32,4 @@ struct CJS_DelayData {
   std::vector<WideString> widestringarray;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_DELAYDATA_H_
+#endif  // FXJS_CJS_DELAYDATA_H_
diff --git a/fpdfsdk/javascript/cjs_display.cpp b/fxjs/cjs_display.cpp
index 391f09005a..a52b51d462 100644
--- a/fpdfsdk/javascript/cjs_display.cpp
+++ b/fxjs/cjs_display.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_display.h"
+#include "fxjs/cjs_display.h"
 
 const JSConstSpec CJS_Display::ConstSpecs[] = {
     {"visible", JSConstSpec::Number, 0, 0},
diff --git a/fpdfsdk/javascript/cjs_display.h b/fxjs/cjs_display.h
index b0f9f70ddf..7b13c38cbe 100644
--- a/fpdfsdk/javascript/cjs_display.h
+++ b/fxjs/cjs_display.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_DISPLAY_H_
-#define FPDFSDK_JAVASCRIPT_CJS_DISPLAY_H_
+#ifndef FXJS_CJS_DISPLAY_H_
+#define FXJS_CJS_DISPLAY_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Display : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_Display : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_DISPLAY_H_
+#endif  // FXJS_CJS_DISPLAY_H_
diff --git a/fpdfsdk/javascript/cjs_document.cpp b/fxjs/cjs_document.cpp
index 8b0afa8eff..5383c9e45e 100644
--- a/fpdfsdk/javascript/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_document.h"
+#include "fxjs/cjs_document.h"
 
 #include <utility>
 
@@ -19,13 +19,13 @@
 #include "fpdfsdk/cpdfsdk_annotiteration.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/javascript/cjs_annot.h"
-#include "fpdfsdk/javascript/cjs_app.h"
-#include "fpdfsdk/javascript/cjs_delaydata.h"
-#include "fpdfsdk/javascript/cjs_field.h"
-#include "fpdfsdk/javascript/cjs_icon.h"
-#include "fpdfsdk/javascript/cjs_printparamsobj.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/cjs_annot.h"
+#include "fxjs/cjs_app.h"
+#include "fxjs/cjs_delaydata.h"
+#include "fxjs/cjs_field.h"
+#include "fxjs/cjs_icon.h"
+#include "fxjs/cjs_printparamsobj.h"
+#include "fxjs/js_resources.h"
 
 const JSPropertySpec CJS_Document::PropertySpecs[] = {
     {"ADBE", get_ADBE_static, set_ADBE_static},
diff --git a/fpdfsdk/javascript/cjs_document.h b/fxjs/cjs_document.h
index f935eae7d4..edfaf96200 100644
--- a/fpdfsdk/javascript/cjs_document.h
+++ b/fxjs/cjs_document.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_DOCUMENT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_DOCUMENT_H_
+#ifndef FXJS_CJS_DOCUMENT_H_
+#define FXJS_CJS_DOCUMENT_H_
 
 #include <list>
 #include <memory>
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Document;
 class CPDF_TextObject;
@@ -327,4 +327,4 @@ class CJS_Document : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_DOCUMENT_H_
+#endif  // FXJS_CJS_DOCUMENT_H_
diff --git a/fpdfsdk/javascript/cjs_embedobj.cpp b/fxjs/cjs_embedobj.cpp
index fe17862e69..cbebd6311b 100644
--- a/fpdfsdk/javascript/cjs_embedobj.cpp
+++ b/fxjs/cjs_embedobj.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_embedobj.h"
+#include "fxjs/cjs_embedobj.h"
 
-#include "fpdfsdk/javascript/cjs_object.h"
+#include "fxjs/cjs_object.h"
 
 CJS_EmbedObj::CJS_EmbedObj(CJS_Object* pJSObject) : m_pJSObject(pJSObject) {}
 
diff --git a/fpdfsdk/javascript/cjs_embedobj.h b/fxjs/cjs_embedobj.h
index edc9ac5c11..82e549e321 100644
--- a/fpdfsdk/javascript/cjs_embedobj.h
+++ b/fxjs/cjs_embedobj.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_EMBEDOBJ_H_
-#define FPDFSDK_JAVASCRIPT_CJS_EMBEDOBJ_H_
+#ifndef FXJS_CJS_EMBEDOBJ_H_
+#define FXJS_CJS_EMBEDOBJ_H_
 
 #include "core/fxcrt/unowned_ptr.h"
 
@@ -22,4 +22,4 @@ class CJS_EmbedObj {
   UnownedPtr<CJS_Object> const m_pJSObject;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_EMBEDOBJ_H_
+#endif  // FXJS_CJS_EMBEDOBJ_H_
diff --git a/fpdfsdk/javascript/cjs_event.cpp b/fxjs/cjs_event.cpp
index 28756a45b4..4e20bbc8ba 100644
--- a/fpdfsdk/javascript/cjs_event.cpp
+++ b/fxjs/cjs_event.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_event.h"
+#include "fxjs/cjs_event.h"
 
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_field.h"
-#include "fpdfsdk/javascript/cjs_object.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_field.h"
+#include "fxjs/cjs_object.h"
 
 const JSPropertySpec CJS_Event::PropertySpecs[] = {
     {"change", get_change_static, set_change_static},
diff --git a/fpdfsdk/javascript/cjs_event.h b/fxjs/cjs_event.h
index 27e158926b..4ae5fa234f 100644
--- a/fpdfsdk/javascript/cjs_event.h
+++ b/fxjs/cjs_event.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_EVENT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_EVENT_H_
+#ifndef FXJS_CJS_EVENT_H_
+#define FXJS_CJS_EVENT_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class event : public CJS_EmbedObj {
  public:
@@ -108,4 +108,4 @@ class CJS_Event : public CJS_Object {
   static const JSPropertySpec PropertySpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_EVENT_H_
+#endif  // FXJS_CJS_EVENT_H_
diff --git a/fpdfsdk/javascript/cjs_event_context.cpp b/fxjs/cjs_event_context.cpp
index 98f3c6d14a..bc908a5db2 100644
--- a/fpdfsdk/javascript/cjs_event_context.cpp
+++ b/fxjs/cjs_event_context.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_event_context.h"
+#include "fxjs/cjs_event_context.h"
 
 #include "core/fxcrt/autorestorer.h"
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_runtime.h"
+#include "fxjs/js_resources.h"
 
 CJS_EventContext::CJS_EventContext(CJS_Runtime* pRuntime)
     : m_pRuntime(pRuntime),
diff --git a/fpdfsdk/javascript/cjs_event_context.h b/fxjs/cjs_event_context.h
index e6ab94e4be..f9572909e8 100644
--- a/fpdfsdk/javascript/cjs_event_context.h
+++ b/fxjs/cjs_event_context.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_EVENT_CONTEXT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_EVENT_CONTEXT_H_
+#ifndef FXJS_CJS_EVENT_CONTEXT_H_
+#define FXJS_CJS_EVENT_CONTEXT_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/unowned_ptr.h"
-#include "fpdfsdk/javascript/ijs_event_context.h"
+#include "fxjs/ijs_event_context.h"
 
 class CJS_EventHandler;
 class CJS_Runtime;
@@ -133,4 +133,4 @@ class CJS_EventContext : public IJS_EventContext {
   bool m_bBusy;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_EVENT_CONTEXT_H_
+#endif  // FXJS_CJS_EVENT_CONTEXT_H_
diff --git a/fpdfsdk/javascript/cjs_event_context_stub.cpp b/fxjs/cjs_event_context_stub.cpp
index ac8022b8ed..0517ab2c49 100644
--- a/fpdfsdk/javascript/cjs_event_context_stub.cpp
+++ b/fxjs/cjs_event_context_stub.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_event_context_stub.h"
+#include "fxjs/cjs_event_context_stub.h"
 
 bool CJS_EventContextStub::RunScript(const WideString& script,
                                      WideString* info) {
diff --git a/fpdfsdk/javascript/cjs_event_context_stub.h b/fxjs/cjs_event_context_stub.h
index f3763c3f1f..bc853694df 100644
--- a/fpdfsdk/javascript/cjs_event_context_stub.h
+++ b/fxjs/cjs_event_context_stub.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_EVENT_CONTEXT_STUB_H_
-#define FPDFSDK_JAVASCRIPT_CJS_EVENT_CONTEXT_STUB_H_
+#ifndef FXJS_CJS_EVENT_CONTEXT_STUB_H_
+#define FXJS_CJS_EVENT_CONTEXT_STUB_H_
 
-#include "fpdfsdk/javascript/ijs_event_context.h"
+#include "fxjs/ijs_event_context.h"
 
 class CJS_EventContextStub final : public IJS_EventContext {
  public:
@@ -115,4 +115,4 @@ class CJS_EventContextStub final : public IJS_EventContext {
   void OnExternal_Exec() override {}
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_EVENT_CONTEXT_STUB_H_
+#endif  // FXJS_CJS_EVENT_CONTEXT_STUB_H_
diff --git a/fpdfsdk/javascript/cjs_eventhandler.cpp b/fxjs/cjs_eventhandler.cpp
index 406fd0bb1c..c052f9ed58 100644
--- a/fpdfsdk/javascript/cjs_eventhandler.cpp
+++ b/fxjs/cjs_eventhandler.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
+#include "fxjs/cjs_eventhandler.h"
 
 #include "core/fpdfdoc/cpdf_formfield.h"
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_document.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_field.h"
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_document.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_field.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/cjs_runtime.h"
 
 CJS_EventHandler::CJS_EventHandler(CJS_EventContext* pContext)
     : m_pJSEventContext(pContext),
diff --git a/fpdfsdk/javascript/cjs_eventhandler.h b/fxjs/cjs_eventhandler.h
index 86e017772c..cb7b3c09b1 100644
--- a/fpdfsdk/javascript/cjs_eventhandler.h
+++ b/fxjs/cjs_eventhandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_EVENTHANDLER_H_
-#define FPDFSDK_JAVASCRIPT_CJS_EVENTHANDLER_H_
+#ifndef FXJS_CJS_EVENTHANDLER_H_
+#define FXJS_CJS_EVENTHANDLER_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -192,4 +192,4 @@ class CJS_EventHandler {
   CPDFSDK_Annot::ObservedPtr m_pTargetAnnot;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_EVENTHANDLER_H_
+#endif  // FXJS_CJS_EVENTHANDLER_H_
diff --git a/fpdfsdk/javascript/cjs_field.cpp b/fxjs/cjs_field.cpp
index 1c50f8ec98..51f8c5aafc 100644
--- a/fpdfsdk/javascript/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_field.h"
+#include "fxjs/cjs_field.h"
 
 #include <algorithm>
 #include <memory>
@@ -15,11 +15,11 @@
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/javascript/cjs_color.h"
-#include "fpdfsdk/javascript/cjs_delaydata.h"
-#include "fpdfsdk/javascript/cjs_document.h"
-#include "fpdfsdk/javascript/cjs_icon.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/cjs_color.h"
+#include "fxjs/cjs_delaydata.h"
+#include "fxjs/cjs_document.h"
+#include "fxjs/cjs_icon.h"
+#include "fxjs/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_field.h b/fxjs/cjs_field.h
index 11786ff0f8..8116e073cf 100644
--- a/fpdfsdk/javascript/cjs_field.h
+++ b/fxjs/cjs_field.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_FIELD_H_
-#define FPDFSDK_JAVASCRIPT_CJS_FIELD_H_
+#ifndef FXJS_CJS_FIELD_H_
+#define FXJS_CJS_FIELD_H_
 
 #include <string>
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CPDF_FormControl;
 class CPDFSDK_Widget;
@@ -435,4 +435,4 @@ class CJS_Field : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_FIELD_H_
+#endif  // FXJS_CJS_FIELD_H_
diff --git a/fpdfsdk/javascript/cjs_font.cpp b/fxjs/cjs_font.cpp
index 580b115833..b4ef66b869 100644
--- a/fpdfsdk/javascript/cjs_font.cpp
+++ b/fxjs/cjs_font.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_font.h"
+#include "fxjs/cjs_font.h"
 
 const JSConstSpec CJS_Font::ConstSpecs[] = {
     {"Times", JSConstSpec::String, 0, "Times-Roman"},
diff --git a/fpdfsdk/javascript/cjs_font.h b/fxjs/cjs_font.h
index 069410a139..31edf06836 100644
--- a/fpdfsdk/javascript/cjs_font.h
+++ b/fxjs/cjs_font.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_FONT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_FONT_H_
+#ifndef FXJS_CJS_FONT_H_
+#define FXJS_CJS_FONT_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Font : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_Font : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_FONT_H_
+#endif  // FXJS_CJS_FONT_H_
diff --git a/fpdfsdk/javascript/cjs_global.cpp b/fxjs/cjs_global.cpp
index 3d605b23ab..c4a8edcf32 100644
--- a/fpdfsdk/javascript/cjs_global.cpp
+++ b/fxjs/cjs_global.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_global.h"
+#include "fxjs/cjs_global.h"
 
 #include <map>
 #include <memory>
@@ -12,13 +12,13 @@
 #include <vector>
 
 #include "core/fxcrt/fx_extension.h"
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/JS_GlobalData.h"
-#include "fpdfsdk/javascript/JS_KeyValue.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/JS_GlobalData.h"
+#include "fxjs/JS_KeyValue.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_global.h b/fxjs/cjs_global.h
index ddb67b95c3..203d6e969d 100644
--- a/fpdfsdk/javascript/cjs_global.h
+++ b/fxjs/cjs_global.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_
-#define FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_
+#ifndef FXJS_CJS_GLOBAL_H_
+#define FXJS_CJS_GLOBAL_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Global : public CJS_Object {
  public:
@@ -39,4 +39,4 @@ class CJS_Global : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_
+#endif  // FXJS_CJS_GLOBAL_H_
diff --git a/fpdfsdk/javascript/cjs_globalarrays.cpp b/fxjs/cjs_globalarrays.cpp
index a68e2fae0d..7857161205 100644
--- a/fpdfsdk/javascript/cjs_globalarrays.cpp
+++ b/fxjs/cjs_globalarrays.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_globalarrays.h"
+#include "fxjs/cjs_globalarrays.h"
 
 #define GLOBAL_ARRAY(rt, name, ...)                                          \
   {                                                                          \
diff --git a/fpdfsdk/javascript/cjs_globalarrays.h b/fxjs/cjs_globalarrays.h
index ead57d8c8c..297b97b614 100644
--- a/fpdfsdk/javascript/cjs_globalarrays.h
+++ b/fxjs/cjs_globalarrays.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_GLOBALARRAYS_H_
-#define FPDFSDK_JAVASCRIPT_CJS_GLOBALARRAYS_H_
+#ifndef FXJS_CJS_GLOBALARRAYS_H_
+#define FXJS_CJS_GLOBALARRAYS_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_GlobalArrays : public CJS_Object {
  public:
   static void DefineJSObjects(CJS_Runtime* pRuntmie);
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_GLOBALARRAYS_H_
+#endif  // FXJS_CJS_GLOBALARRAYS_H_
diff --git a/fpdfsdk/javascript/cjs_globalconsts.cpp b/fxjs/cjs_globalconsts.cpp
index 7b7699d146..598479780a 100644
--- a/fpdfsdk/javascript/cjs_globalconsts.cpp
+++ b/fxjs/cjs_globalconsts.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_globalconsts.h"
+#include "fxjs/cjs_globalconsts.h"
 
 #define GLOBAL_STRING(rt, name, value)                                \
   (rt)->DefineGlobalConst(                                            \
diff --git a/fpdfsdk/javascript/cjs_globalconsts.h b/fxjs/cjs_globalconsts.h
index ce27a4e97d..8c6618ee6f 100644
--- a/fpdfsdk/javascript/cjs_globalconsts.h
+++ b/fxjs/cjs_globalconsts.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_GLOBALCONSTS_H_
-#define FPDFSDK_JAVASCRIPT_CJS_GLOBALCONSTS_H_
+#ifndef FXJS_CJS_GLOBALCONSTS_H_
+#define FXJS_CJS_GLOBALCONSTS_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_GlobalConsts : public CJS_Object {
  public:
   static void DefineJSObjects(CJS_Runtime* pRuntime);
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_GLOBALCONSTS_H_
+#endif  // FXJS_CJS_GLOBALCONSTS_H_
diff --git a/fpdfsdk/javascript/cjs_highlight.cpp b/fxjs/cjs_highlight.cpp
index bc206afd52..453a2662fb 100644
--- a/fpdfsdk/javascript/cjs_highlight.cpp
+++ b/fxjs/cjs_highlight.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_highlight.h"
+#include "fxjs/cjs_highlight.h"
 
 const JSConstSpec CJS_Highlight::ConstSpecs[] = {
     {"n", JSConstSpec::String, 0, "none"},
diff --git a/fpdfsdk/javascript/cjs_highlight.h b/fxjs/cjs_highlight.h
index 71b88adbb7..74091d341d 100644
--- a/fpdfsdk/javascript/cjs_highlight.h
+++ b/fxjs/cjs_highlight.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_HIGHLIGHT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_HIGHLIGHT_H_
+#ifndef FXJS_CJS_HIGHLIGHT_H_
+#define FXJS_CJS_HIGHLIGHT_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Highlight : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_Highlight : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_HIGHLIGHT_H_
+#endif  // FXJS_CJS_HIGHLIGHT_H_
diff --git a/fpdfsdk/javascript/cjs_icon.cpp b/fxjs/cjs_icon.cpp
index 2606b8213d..c4ef8e1684 100644
--- a/fpdfsdk/javascript/cjs_icon.cpp
+++ b/fxjs/cjs_icon.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_icon.h"
+#include "fxjs/cjs_icon.h"
 
 const JSPropertySpec CJS_Icon::PropertySpecs[] = {
     {"name", get_name_static, set_name_static},
diff --git a/fpdfsdk/javascript/cjs_icon.h b/fxjs/cjs_icon.h
index dd33426bf7..05b84384b3 100644
--- a/fpdfsdk/javascript/cjs_icon.h
+++ b/fxjs/cjs_icon.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_ICON_H_
-#define FPDFSDK_JAVASCRIPT_CJS_ICON_H_
+#ifndef FXJS_CJS_ICON_H_
+#define FXJS_CJS_ICON_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class Icon : public CJS_EmbedObj {
  public:
@@ -39,4 +39,4 @@ class CJS_Icon : public CJS_Object {
   static const JSPropertySpec PropertySpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_ICON_H_
+#endif  // FXJS_CJS_ICON_H_
diff --git a/fpdfsdk/javascript/cjs_object.cpp b/fxjs/cjs_object.cpp
index 282dfaf83d..ccddc7f8df 100644
--- a/fpdfsdk/javascript/cjs_object.cpp
+++ b/fxjs/cjs_object.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_object.h"
+#include "fxjs/cjs_object.h"
 
 // static
 void CJS_Object::DefineConsts(CFXJS_Engine* pEngine,
diff --git a/fpdfsdk/javascript/cjs_object.h b/fxjs/cjs_object.h
index 85dd19ccce..bed5088f03 100644
--- a/fpdfsdk/javascript/cjs_object.h
+++ b/fxjs/cjs_object.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_OBJECT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_OBJECT_H_
+#ifndef FXJS_CJS_OBJECT_H_
+#define FXJS_CJS_OBJECT_H_
 
 #include <memory>
 
 #include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/javascript/cjs_embedobj.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
+#include "fxjs/cjs_embedobj.h"
+#include "fxjs/cjs_runtime.h"
 #include "fxjs/fxjs_v8.h"
 
 struct JSConstSpec {
@@ -65,4 +65,4 @@ class CJS_Object {
   v8::Isolate* m_pIsolate;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_OBJECT_H_
+#endif  // FXJS_CJS_OBJECT_H_
diff --git a/fpdfsdk/javascript/cjs_position.cpp b/fxjs/cjs_position.cpp
index 744f159e60..ba1f3d947c 100644
--- a/fpdfsdk/javascript/cjs_position.cpp
+++ b/fxjs/cjs_position.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_position.h"
+#include "fxjs/cjs_position.h"
 
 const JSConstSpec CJS_Position::ConstSpecs[] = {
     {"textOnly", JSConstSpec::Number, 0, 0},
diff --git a/fpdfsdk/javascript/cjs_position.h b/fxjs/cjs_position.h
index 07971f1ad5..7557f01ab7 100644
--- a/fpdfsdk/javascript/cjs_position.h
+++ b/fxjs/cjs_position.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_POSITION_H_
-#define FPDFSDK_JAVASCRIPT_CJS_POSITION_H_
+#ifndef FXJS_CJS_POSITION_H_
+#define FXJS_CJS_POSITION_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Position : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_Position : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_POSITION_H_
+#endif  // FXJS_CJS_POSITION_H_
diff --git a/fpdfsdk/javascript/cjs_printparamsobj.cpp b/fxjs/cjs_printparamsobj.cpp
index 266298abdd..296c241736 100644
--- a/fpdfsdk/javascript/cjs_printparamsobj.cpp
+++ b/fxjs/cjs_printparamsobj.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_printparamsobj.h"
+#include "fxjs/cjs_printparamsobj.h"
 
 int CJS_PrintParamsObj::ObjDefnID = -1;
 
diff --git a/fpdfsdk/javascript/cjs_printparamsobj.h b/fxjs/cjs_printparamsobj.h
index 8029b82330..a0c91b0d43 100644
--- a/fpdfsdk/javascript/cjs_printparamsobj.h
+++ b/fxjs/cjs_printparamsobj.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_PRINTPARAMSOBJ_H_
-#define FPDFSDK_JAVASCRIPT_CJS_PRINTPARAMSOBJ_H_
+#ifndef FXJS_CJS_PRINTPARAMSOBJ_H_
+#define FXJS_CJS_PRINTPARAMSOBJ_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class PrintParamsObj : public CJS_EmbedObj {
  public:
@@ -38,4 +38,4 @@ class CJS_PrintParamsObj : public CJS_Object {
   static int ObjDefnID;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_PRINTPARAMSOBJ_H_
+#endif  // FXJS_CJS_PRINTPARAMSOBJ_H_
diff --git a/fpdfsdk/javascript/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp
index 3a309d4225..8c5ab07a2e 100644
--- a/fpdfsdk/javascript/cjs_publicmethods.cpp
+++ b/fxjs/cjs_publicmethods.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_publicmethods.h"
+#include "fxjs/cjs_publicmethods.h"
 
 #include <algorithm>
 #include <cmath>
@@ -19,15 +19,15 @@
 #include "core/fxcrt/fx_extension.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_color.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_field.h"
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fpdfsdk/javascript/cjs_util.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_color.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_field.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/cjs_runtime.h"
+#include "fxjs/cjs_util.h"
+#include "fxjs/js_resources.h"
 
 #define DOUBLE_CORRECT 0.000000000000001
 
diff --git a/fpdfsdk/javascript/cjs_publicmethods.h b/fxjs/cjs_publicmethods.h
index 9943654dab..95ee4995c9 100644
--- a/fpdfsdk/javascript/cjs_publicmethods.h
+++ b/fxjs/cjs_publicmethods.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_PUBLICMETHODS_H_
-#define FPDFSDK_JAVASCRIPT_CJS_PUBLICMETHODS_H_
+#ifndef FXJS_CJS_PUBLICMETHODS_H_
+#define FXJS_CJS_PUBLICMETHODS_H_
 
 #include <string>
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_PublicMethods : public CJS_Object {
  public:
@@ -156,4 +156,4 @@ class CJS_PublicMethods : public CJS_Object {
                                                    v8::Local<v8::Value> val);
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_PUBLICMETHODS_H_
+#endif  // FXJS_CJS_PUBLICMETHODS_H_
diff --git a/fpdfsdk/javascript/cjs_publicmethods_embeddertest.cpp b/fxjs/cjs_publicmethods_embeddertest.cpp
index b5a48d2064..dbab0817ce 100644
--- a/fpdfsdk/javascript/cjs_publicmethods_embeddertest.cpp
+++ b/fxjs/cjs_publicmethods_embeddertest.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 
 #include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/javascript/cjs_publicmethods.h"
+#include "fxjs/cjs_publicmethods.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/js_embedder_test.h"
 
diff --git a/fpdfsdk/javascript/cjs_publicmethods_unittest.cpp b/fxjs/cjs_publicmethods_unittest.cpp
index 82f2139576..37bf93ba43 100644
--- a/fpdfsdk/javascript/cjs_publicmethods_unittest.cpp
+++ b/fxjs/cjs_publicmethods_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fpdfsdk/javascript/cjs_publicmethods.h"
+#include "fxjs/cjs_publicmethods.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
diff --git a/fpdfsdk/javascript/cjs_report.cpp b/fxjs/cjs_report.cpp
index 6d78100e3b..2aa3f49078 100644
--- a/fpdfsdk/javascript/cjs_report.cpp
+++ b/fxjs/cjs_report.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_report.h"
+#include "fxjs/cjs_report.h"
 
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_object.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_object.h"
 
 const JSMethodSpec CJS_Report::MethodSpecs[] = {{"save", save_static},
                                                 {"writeText", writeText_static},
diff --git a/fpdfsdk/javascript/cjs_report.h b/fxjs/cjs_report.h
index fa6c574612..50259ef56f 100644
--- a/fpdfsdk/javascript/cjs_report.h
+++ b/fxjs/cjs_report.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_REPORT_H_
-#define FPDFSDK_JAVASCRIPT_CJS_REPORT_H_
+#ifndef FXJS_CJS_REPORT_H_
+#define FXJS_CJS_REPORT_H_
 
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class Report : public CJS_EmbedObj {
  public:
@@ -38,4 +38,4 @@ class CJS_Report : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_REPORT_H_
+#endif  // FXJS_CJS_REPORT_H_
diff --git a/fpdfsdk/javascript/cjs_return.cpp b/fxjs/cjs_return.cpp
index ecf36da705..adfd1c5c9f 100644
--- a/fpdfsdk/javascript/cjs_return.cpp
+++ b/fxjs/cjs_return.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_return.h"
+#include "fxjs/cjs_return.h"
 
 CJS_Return::CJS_Return(bool result) : is_error_(!result) {}
 
diff --git a/fpdfsdk/javascript/cjs_return.h b/fxjs/cjs_return.h
index f277c1a5a9..61c5778cda 100644
--- a/fpdfsdk/javascript/cjs_return.h
+++ b/fxjs/cjs_return.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_RETURN_H_
-#define FPDFSDK_JAVASCRIPT_CJS_RETURN_H_
+#ifndef FXJS_CJS_RETURN_H_
+#define FXJS_CJS_RETURN_H_
 
 #include "fxjs/fxjs_v8.h"
 
@@ -31,4 +31,4 @@ class CJS_Return {
   v8::Local<v8::Value> return_;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_RETURN_H_
+#endif  // FXJS_CJS_RETURN_H_
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp
index 9e09ad2996..6043debc44 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fxjs/cjs_runtime.cpp
@@ -4,41 +4,41 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_runtime.h"
+#include "fxjs/cjs_runtime.h"
 
 #include <algorithm>
 
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/JS_GlobalData.h"
-#include "fpdfsdk/javascript/cjs_annot.h"
-#include "fpdfsdk/javascript/cjs_app.h"
-#include "fpdfsdk/javascript/cjs_border.h"
-#include "fpdfsdk/javascript/cjs_color.h"
-#include "fpdfsdk/javascript/cjs_console.h"
-#include "fpdfsdk/javascript/cjs_display.h"
-#include "fpdfsdk/javascript/cjs_document.h"
-#include "fpdfsdk/javascript/cjs_event.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_field.h"
-#include "fpdfsdk/javascript/cjs_font.h"
-#include "fpdfsdk/javascript/cjs_global.h"
-#include "fpdfsdk/javascript/cjs_globalarrays.h"
-#include "fpdfsdk/javascript/cjs_globalconsts.h"
-#include "fpdfsdk/javascript/cjs_highlight.h"
-#include "fpdfsdk/javascript/cjs_icon.h"
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/cjs_position.h"
-#include "fpdfsdk/javascript/cjs_printparamsobj.h"
-#include "fpdfsdk/javascript/cjs_publicmethods.h"
-#include "fpdfsdk/javascript/cjs_report.h"
-#include "fpdfsdk/javascript/cjs_scalehow.h"
-#include "fpdfsdk/javascript/cjs_scalewhen.h"
-#include "fpdfsdk/javascript/cjs_style.h"
-#include "fpdfsdk/javascript/cjs_timerobj.h"
-#include "fpdfsdk/javascript/cjs_util.h"
-#include "fpdfsdk/javascript/cjs_zoomtype.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/JS_GlobalData.h"
+#include "fxjs/cjs_annot.h"
+#include "fxjs/cjs_app.h"
+#include "fxjs/cjs_border.h"
+#include "fxjs/cjs_color.h"
+#include "fxjs/cjs_console.h"
+#include "fxjs/cjs_display.h"
+#include "fxjs/cjs_document.h"
+#include "fxjs/cjs_event.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_field.h"
+#include "fxjs/cjs_font.h"
+#include "fxjs/cjs_global.h"
+#include "fxjs/cjs_globalarrays.h"
+#include "fxjs/cjs_globalconsts.h"
+#include "fxjs/cjs_highlight.h"
+#include "fxjs/cjs_icon.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/cjs_position.h"
+#include "fxjs/cjs_printparamsobj.h"
+#include "fxjs/cjs_publicmethods.h"
+#include "fxjs/cjs_report.h"
+#include "fxjs/cjs_scalehow.h"
+#include "fxjs/cjs_scalewhen.h"
+#include "fxjs/cjs_style.h"
+#include "fxjs/cjs_timerobj.h"
+#include "fxjs/cjs_util.h"
+#include "fxjs/cjs_zoomtype.h"
 #include "public/fpdf_formfill.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fxjs/cjs_runtime.h
index ce39c6cc3d..7ecc0d5ce4 100644
--- a/fpdfsdk/javascript/cjs_runtime.h
+++ b/fxjs/cjs_runtime.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_RUNTIME_H_
-#define FPDFSDK_JAVASCRIPT_CJS_RUNTIME_H_
+#ifndef FXJS_CJS_RUNTIME_H_
+#define FXJS_CJS_RUNTIME_H_
 
 #include <map>
 #include <memory>
@@ -15,9 +15,9 @@
 
 #include "core/fxcrt/observable.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/cjs_eventhandler.h"
 #include "fxjs/fxjs_v8.h"
+#include "fxjs/ijs_runtime.h"
 
 class CJS_EventContext;
 
@@ -70,4 +70,4 @@ class CJS_Runtime : public IJS_Runtime,
   std::set<FieldEvent> m_FieldEventSet;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_RUNTIME_H_
+#endif  // FXJS_CJS_RUNTIME_H_
diff --git a/fpdfsdk/javascript/cjs_runtimestub.cpp b/fxjs/cjs_runtimestub.cpp
index 391f400b22..919672832d 100644
--- a/fpdfsdk/javascript/cjs_runtimestub.cpp
+++ b/fxjs/cjs_runtimestub.cpp
@@ -7,8 +7,8 @@
 #include <memory>
 
 #include "core/fxcrt/unowned_ptr.h"
-#include "fpdfsdk/javascript/cjs_event_context_stub.h"
-#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fxjs/cjs_event_context_stub.h"
+#include "fxjs/ijs_runtime.h"
 #include "third_party/base/ptr_util.h"
 
 class CJS_RuntimeStub final : public IJS_Runtime {
diff --git a/fpdfsdk/javascript/cjs_scalehow.cpp b/fxjs/cjs_scalehow.cpp
index cd1b663a46..35c5ec22bf 100644
--- a/fpdfsdk/javascript/cjs_scalehow.cpp
+++ b/fxjs/cjs_scalehow.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_scalehow.h"
+#include "fxjs/cjs_scalehow.h"
 
 const JSConstSpec CJS_ScaleHow::ConstSpecs[] = {
     {"proportional", JSConstSpec::Number, 0, 0},
diff --git a/fpdfsdk/javascript/cjs_scalehow.h b/fxjs/cjs_scalehow.h
index e9272fb1ae..8177a3eabb 100644
--- a/fpdfsdk/javascript/cjs_scalehow.h
+++ b/fxjs/cjs_scalehow.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_SCALEHOW_H_
-#define FPDFSDK_JAVASCRIPT_CJS_SCALEHOW_H_
+#ifndef FXJS_CJS_SCALEHOW_H_
+#define FXJS_CJS_SCALEHOW_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_ScaleHow : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_ScaleHow : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_SCALEHOW_H_
+#endif  // FXJS_CJS_SCALEHOW_H_
diff --git a/fpdfsdk/javascript/cjs_scalewhen.cpp b/fxjs/cjs_scalewhen.cpp
index b27f1f4b24..b13e7ed928 100644
--- a/fpdfsdk/javascript/cjs_scalewhen.cpp
+++ b/fxjs/cjs_scalewhen.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_scalewhen.h"
+#include "fxjs/cjs_scalewhen.h"
 
 const JSConstSpec CJS_ScaleWhen::ConstSpecs[] = {
     {"always", JSConstSpec::Number, 0, 0},
diff --git a/fpdfsdk/javascript/cjs_scalewhen.h b/fxjs/cjs_scalewhen.h
index ec296d46ab..e97a285119 100644
--- a/fpdfsdk/javascript/cjs_scalewhen.h
+++ b/fxjs/cjs_scalewhen.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_SCALEWHEN_H_
-#define FPDFSDK_JAVASCRIPT_CJS_SCALEWHEN_H_
+#ifndef FXJS_CJS_SCALEWHEN_H_
+#define FXJS_CJS_SCALEWHEN_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_ScaleWhen : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_ScaleWhen : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_SCALEWHEN_H_
+#endif  // FXJS_CJS_SCALEWHEN_H_
diff --git a/fpdfsdk/javascript/cjs_style.cpp b/fxjs/cjs_style.cpp
index 26f97d1071..7458b2a18b 100644
--- a/fpdfsdk/javascript/cjs_style.cpp
+++ b/fxjs/cjs_style.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_style.h"
+#include "fxjs/cjs_style.h"
 
 const JSConstSpec CJS_Style::ConstSpecs[] = {
     {"ch", JSConstSpec::String, 0, "check"},
diff --git a/fpdfsdk/javascript/cjs_style.h b/fxjs/cjs_style.h
index 20a987fc51..46ab66b617 100644
--- a/fpdfsdk/javascript/cjs_style.h
+++ b/fxjs/cjs_style.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_STYLE_H_
-#define FPDFSDK_JAVASCRIPT_CJS_STYLE_H_
+#ifndef FXJS_CJS_STYLE_H_
+#define FXJS_CJS_STYLE_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Style : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_Style : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_STYLE_H_
+#endif  // FXJS_CJS_STYLE_H_
diff --git a/fpdfsdk/javascript/cjs_timerobj.cpp b/fxjs/cjs_timerobj.cpp
index f0b90292c6..410ad0846e 100644
--- a/fpdfsdk/javascript/cjs_timerobj.cpp
+++ b/fxjs/cjs_timerobj.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_timerobj.h"
+#include "fxjs/cjs_timerobj.h"
 
-#include "fpdfsdk/javascript/global_timer.h"
+#include "fxjs/global_timer.h"
 
 int CJS_TimerObj::ObjDefnID = -1;
 
diff --git a/fpdfsdk/javascript/cjs_timerobj.h b/fxjs/cjs_timerobj.h
index 6ee7758a5c..be095558e2 100644
--- a/fpdfsdk/javascript/cjs_timerobj.h
+++ b/fxjs/cjs_timerobj.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_TIMEROBJ_H_
-#define FPDFSDK_JAVASCRIPT_CJS_TIMEROBJ_H_
+#ifndef FXJS_CJS_TIMEROBJ_H_
+#define FXJS_CJS_TIMEROBJ_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class GlobalTimer;
 
@@ -35,4 +35,4 @@ class CJS_TimerObj : public CJS_Object {
   static int ObjDefnID;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_TIMEROBJ_H_
+#endif  // FXJS_CJS_TIMEROBJ_H_
diff --git a/fpdfsdk/javascript/cjs_util.cpp b/fxjs/cjs_util.cpp
index 6eb52f13fe..7a80700e7d 100644
--- a/fpdfsdk/javascript/cjs_util.cpp
+++ b/fxjs/cjs_util.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_util.h"
+#include "fxjs/cjs_util.h"
 
 #include <time.h>
 
@@ -15,13 +15,13 @@
 #include <vector>
 
 #include "core/fxcrt/fx_extension.h"
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/cjs_publicmethods.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/JS_Define.h"
+#include "fxjs/cjs_event_context.h"
+#include "fxjs/cjs_eventhandler.h"
+#include "fxjs/cjs_object.h"
+#include "fxjs/cjs_publicmethods.h"
+#include "fxjs/cjs_runtime.h"
+#include "fxjs/js_resources.h"
 
 #if _FX_OS_ == _FX_OS_ANDROID_
 #include <ctype.h>
diff --git a/fpdfsdk/javascript/cjs_util.h b/fxjs/cjs_util.h
index f3d808bcb6..cc2026dfc7 100644
--- a/fpdfsdk/javascript/cjs_util.h
+++ b/fxjs/cjs_util.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_UTIL_H_
-#define FPDFSDK_JAVASCRIPT_CJS_UTIL_H_
+#ifndef FXJS_CJS_UTIL_H_
+#define FXJS_CJS_UTIL_H_
 
 #include <string>
 #include <vector>
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 // Return values for ParseDataType() below.
 #define UTIL_INT 0
@@ -60,4 +60,4 @@ class CJS_Util : public CJS_Object {
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_UTIL_H_
+#endif  // FXJS_CJS_UTIL_H_
diff --git a/fpdfsdk/javascript/cjs_util_unittest.cpp b/fxjs/cjs_util_unittest.cpp
index bfd5b58abd..6f43f0fcb6 100644
--- a/fpdfsdk/javascript/cjs_util_unittest.cpp
+++ b/fxjs/cjs_util_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fpdfsdk/javascript/cjs_util.h"
+#include "fxjs/cjs_util.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
diff --git a/fpdfsdk/javascript/cjs_zoomtype.cpp b/fxjs/cjs_zoomtype.cpp
index dbd54068f3..1cca58e56d 100644
--- a/fpdfsdk/javascript/cjs_zoomtype.cpp
+++ b/fxjs/cjs_zoomtype.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/cjs_zoomtype.h"
+#include "fxjs/cjs_zoomtype.h"
 
 const JSConstSpec CJS_Zoomtype::ConstSpecs[] = {
     {"none", JSConstSpec::String, 0, "NoVary"},
diff --git a/fpdfsdk/javascript/cjs_zoomtype.h b/fxjs/cjs_zoomtype.h
index 5bc5520d1c..14db0a4c96 100644
--- a/fpdfsdk/javascript/cjs_zoomtype.h
+++ b/fxjs/cjs_zoomtype.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_CJS_ZOOMTYPE_H_
-#define FPDFSDK_JAVASCRIPT_CJS_ZOOMTYPE_H_
+#ifndef FXJS_CJS_ZOOMTYPE_H_
+#define FXJS_CJS_ZOOMTYPE_H_
 
-#include "fpdfsdk/javascript/JS_Define.h"
+#include "fxjs/JS_Define.h"
 
 class CJS_Zoomtype : public CJS_Object {
  public:
@@ -21,4 +21,4 @@ class CJS_Zoomtype : public CJS_Object {
   static const JSConstSpec ConstSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_CJS_ZOOMTYPE_H_
+#endif  // FXJS_CJS_ZOOMTYPE_H_
diff --git a/fpdfsdk/javascript/global_timer.cpp b/fxjs/global_timer.cpp
index 8e30cf92f0..6f7f09c673 100644
--- a/fpdfsdk/javascript/global_timer.cpp
+++ b/fxjs/global_timer.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/global_timer.h"
+#include "fxjs/global_timer.h"
 
 GlobalTimer::GlobalTimer(app* pObj,
                          CPDFSDK_FormFillEnvironment* pFormFillEnv,
diff --git a/fpdfsdk/javascript/global_timer.h b/fxjs/global_timer.h
index bc65b976a9..ec8806b9a1 100644
--- a/fpdfsdk/javascript/global_timer.h
+++ b/fxjs/global_timer.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_GLOBAL_TIMER_H_
-#define FPDFSDK_JAVASCRIPT_GLOBAL_TIMER_H_
+#ifndef FXJS_GLOBAL_TIMER_H_
+#define FXJS_GLOBAL_TIMER_H_
 
 #include <map>
 
-#include "fpdfsdk/javascript/cjs_app.h"
+#include "fxjs/cjs_app.h"
 
 class GlobalTimer {
  public:
@@ -47,4 +47,4 @@ class GlobalTimer {
   CPDFSDK_FormFillEnvironment::ObservedPtr m_pFormFillEnv;
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_GLOBAL_TIMER_H_
+#endif  // FXJS_GLOBAL_TIMER_H_
diff --git a/fpdfsdk/javascript/ijs_event_context.h b/fxjs/ijs_event_context.h
index 5d2d712e96..9b8dd8eabe 100644
--- a/fpdfsdk/javascript/ijs_event_context.h
+++ b/fxjs/ijs_event_context.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_IJS_EVENT_CONTEXT_H_
-#define FPDFSDK_JAVASCRIPT_IJS_EVENT_CONTEXT_H_
+#ifndef FXJS_IJS_EVENT_CONTEXT_H_
+#define FXJS_IJS_EVENT_CONTEXT_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -130,4 +130,4 @@ class IJS_EventContext {
   virtual ~IJS_EventContext() {}
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_IJS_EVENT_CONTEXT_H_
+#endif  // FXJS_IJS_EVENT_CONTEXT_H_
diff --git a/fpdfsdk/javascript/ijs_runtime.h b/fxjs/ijs_runtime.h
index a21ce809ac..e649aada0c 100644
--- a/fpdfsdk/javascript/ijs_runtime.h
+++ b/fxjs/ijs_runtime.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_IJS_RUNTIME_H_
-#define FPDFSDK_JAVASCRIPT_IJS_RUNTIME_H_
+#ifndef FXJS_IJS_RUNTIME_H_
+#define FXJS_IJS_RUNTIME_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -41,4 +41,4 @@ class IJS_Runtime {
   IJS_Runtime() {}
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_IJS_RUNTIME_H_
+#endif  // FXJS_IJS_RUNTIME_H_
diff --git a/fpdfsdk/javascript/js_resources.cpp b/fxjs/js_resources.cpp
index 39f59a6a63..c7ed06f274 100644
--- a/fpdfsdk/javascript/js_resources.cpp
+++ b/fxjs/js_resources.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/js_resources.h"
+#include "fxjs/js_resources.h"
 
 WideString JSGetStringFromID(uint32_t id) {
   switch (id) {
diff --git a/fpdfsdk/javascript/js_resources.h b/fxjs/js_resources.h
index e1c3d6ea18..9f655487ba 100644
--- a/fpdfsdk/javascript/js_resources.h
+++ b/fxjs/js_resources.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_JS_RESOURCES_H_
-#define FPDFSDK_JAVASCRIPT_JS_RESOURCES_H_
+#ifndef FXJS_JS_RESOURCES_H_
+#define FXJS_JS_RESOURCES_H_
 
 #include "core/fxcrt/widestring.h"
 
@@ -35,4 +35,4 @@ WideString JSFormatErrorString(const char* class_name,
                                const char* property_name,
                                const WideString& details);
 
-#endif  // FPDFSDK_JAVASCRIPT_JS_RESOURCES_H_
+#endif  // FXJS_JS_RESOURCES_H_