diff --git a/BUILD.gn b/BUILD.gn
index 3b872fe..f2015c3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1010,7 +1010,7 @@
   static_library("fxjs") {
     sources = [
       "fxjs/fxjs_v8.cpp",
-      "fxjs/include/fxjs_v8.h",
+      "fxjs/fxjs_v8.h",
     ]
     configs += [ ":pdfium_core_config" ]
     deps = [
@@ -1029,18 +1029,18 @@
     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/include/cfxjse_arguments.h",
-        "fxjs/include/cfxjse_class.h",
-        "fxjs/include/cfxjse_context.h",
-        "fxjs/include/cfxjse_value.h",
-        "fxjs/include/fxjse.h",
+        "fxjs/cfxjse_value.h",
+        "fxjs/fxjse.h",
       ]
     }
   }
diff --git a/fpdfsdk/javascript/DEPS b/fpdfsdk/javascript/DEPS
index 2598fba..819aa99 100644
--- a/fpdfsdk/javascript/DEPS
+++ b/fpdfsdk/javascript/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   '+core/fdrm/crypto',
   '+core/fpdfapi/fpdf_font',
-  '+fxjs/include'
+  '+fxjs'
 ]
diff --git a/fpdfsdk/javascript/JS_Define.h b/fpdfsdk/javascript/JS_Define.h
index 770f9f5..1c688d2 100644
--- a/fpdfsdk/javascript/JS_Define.h
+++ b/fpdfsdk/javascript/JS_Define.h
@@ -12,7 +12,7 @@
 #include "fpdfsdk/javascript/JS_Object.h"
 #include "fpdfsdk/javascript/JS_Value.h"
 #include "fpdfsdk/javascript/resource.h"
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 struct JSConstSpec {
   const wchar_t* pName;
diff --git a/fpdfsdk/javascript/JS_Object.h b/fpdfsdk/javascript/JS_Object.h
index 7653115..1f61918 100644
--- a/fpdfsdk/javascript/JS_Object.h
+++ b/fpdfsdk/javascript/JS_Object.h
@@ -12,7 +12,7 @@
 
 #include "fpdfsdk/fsdk_define.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 class CJS_Context;
 class CJS_Object;
diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h
index ef79d7b..ff2c620 100644
--- a/fpdfsdk/javascript/JS_Value.h
+++ b/fpdfsdk/javascript/JS_Value.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 class CJS_Array;
 class CJS_Date;
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index e078564..bae7ca0 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -33,7 +33,7 @@
 
 #ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 #endif  // PDF_ENABLE_XFA
 
 // static
diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fpdfsdk/javascript/cjs_runtime.h
index d438e46..3ad2e0f 100644
--- a/fpdfsdk/javascript/cjs_runtime.h
+++ b/fpdfsdk/javascript/cjs_runtime.h
@@ -17,7 +17,7 @@
 #include "core/fxcrt/fx_basic.h"
 #include "fpdfsdk/javascript/JS_EventHandler.h"
 #include "fpdfsdk/javascript/ijs_runtime.h"
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 class CJS_Context;
 
diff --git a/fpdfsdk/javascript/ijs_runtime.h b/fpdfsdk/javascript/ijs_runtime.h
index be0cd04..0c2bd04 100644
--- a/fpdfsdk/javascript/ijs_runtime.h
+++ b/fpdfsdk/javascript/ijs_runtime.h
@@ -11,7 +11,7 @@
 #include "core/fxcrt/fx_system.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fxjs/include/fxjse.h"
+#include "fxjs/fxjse.h"
 #endif  // PDF_ENABLE_XFA
 
 class CPDFSDK_Environment;
diff --git a/fxjs/cfxjse_arguments.cpp b/fxjs/cfxjse_arguments.cpp
index 1ff425d..f1dcd2c 100644
--- a/fxjs/cfxjse_arguments.cpp
+++ b/fxjs/cfxjse_arguments.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 
-#include "fxjs/include/cfxjse_context.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_context.h"
+#include "fxjs/cfxjse_value.h"
 
 v8::Isolate* CFXJSE_Arguments::GetRuntime() const {
   return m_pRetValue->GetIsolate();
diff --git a/fxjs/include/cfxjse_arguments.h b/fxjs/cfxjse_arguments.h
similarity index 86%
rename from fxjs/include/cfxjse_arguments.h
rename to fxjs/cfxjse_arguments.h
index e6c8659..c38c292 100644
--- a/fxjs/include/cfxjse_arguments.h
+++ b/fxjs/cfxjse_arguments.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_ARGUMENTS_H_
-#define FXJS_INCLUDE_CFXJSE_ARGUMENTS_H_
+#ifndef FXJS_CFXJSE_ARGUMENTS_H_
+#define FXJS_CFXJSE_ARGUMENTS_H_
 
 #include <memory>
 
-#include "fxjs/include/fxjse.h"
+#include "fxjs/fxjse.h"
 
 class CFXJSE_Class;
 
@@ -35,4 +35,4 @@
   CFXJSE_Value* m_pRetValue;
 };
 
-#endif  // FXJS_INCLUDE_CFXJSE_ARGUMENTS_H_
+#endif  // FXJS_CFXJSE_ARGUMENTS_H_
diff --git a/fxjs/cfxjse_class.cpp b/fxjs/cfxjse_class.cpp
index 6ccc0e2..c2c8e5f 100644
--- a/fxjs/cfxjse_class.cpp
+++ b/fxjs/cfxjse_class.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_class.h"
+#include "fxjs/cfxjse_class.h"
 
-#include "fxjs/include/cfxjse_context.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_context.h"
+#include "fxjs/cfxjse_value.h"
 
 namespace {
 
diff --git a/fxjs/include/cfxjse_class.h b/fxjs/cfxjse_class.h
similarity index 87%
rename from fxjs/include/cfxjse_class.h
rename to fxjs/cfxjse_class.h
index 13eb1ad..ac02b0d 100644
--- a/fxjs/include/cfxjse_class.h
+++ b/fxjs/cfxjse_class.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_CLASS_H_
-#define FXJS_INCLUDE_CFXJSE_CLASS_H_
+#ifndef FXJS_CFXJSE_CLASS_H_
+#define FXJS_CFXJSE_CLASS_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
-#include "fxjs/include/fxjse.h"
+#include "fxjs/cfxjse_arguments.h"
+#include "fxjs/fxjse.h"
 #include "v8/include/v8.h"
 
 class CFXJSE_Context;
@@ -42,4 +42,4 @@
   friend class CFXJSE_Value;
 };
 
-#endif  // FXJS_INCLUDE_CFXJSE_CLASS_H_
+#endif  // FXJS_CFXJSE_CLASS_H_
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp
index 4b0d0f6..93efc4f 100644
--- a/fxjs/cfxjse_context.cpp
+++ b/fxjs/cfxjse_context.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_context.h"
+#include "fxjs/cfxjse_context.h"
 
-#include "fxjs/include/cfxjse_class.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_class.h"
+#include "fxjs/cfxjse_value.h"
 
 namespace {
 
diff --git a/fxjs/include/cfxjse_context.h b/fxjs/cfxjse_context.h
similarity index 92%
rename from fxjs/include/cfxjse_context.h
rename to fxjs/cfxjse_context.h
index 669fa89..73f6264 100644
--- a/fxjs/include/cfxjse_context.h
+++ b/fxjs/cfxjse_context.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_CONTEXT_H_
-#define FXJS_INCLUDE_CFXJSE_CONTEXT_H_
+#ifndef FXJS_CFXJSE_CONTEXT_H_
+#define FXJS_CFXJSE_CONTEXT_H_
 
 #include <memory>
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
-#include "fxjs/include/fxjse.h"
+#include "fxjs/fxjse.h"
 #include "v8/include/v8.h"
 
 class CFXJSE_Class;
@@ -62,4 +62,4 @@
     const v8::Local<v8::Object>& hJSObject,
     CFXJSE_Class* lpClass = nullptr);
 
-#endif  // FXJS_INCLUDE_CFXJSE_CONTEXT_H_
+#endif  // FXJS_CFXJSE_CONTEXT_H_
diff --git a/fxjs/cfxjse_runtimedata.cpp b/fxjs/cfxjse_runtimedata.cpp
index 021fb1d..017916a 100644
--- a/fxjs/cfxjse_runtimedata.cpp
+++ b/fxjs/cfxjse_runtimedata.cpp
@@ -7,7 +7,7 @@
 #include "fxjs/cfxjse_runtimedata.h"
 
 #include "fxjs/cfxjse_isolatetracker.h"
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 namespace {
 
diff --git a/fxjs/cfxjse_value.cpp b/fxjs/cfxjse_value.cpp
index b1fc078..d0a428c 100644
--- a/fxjs/cfxjse_value.cpp
+++ b/fxjs/cfxjse_value.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 
 #include <math.h>
 
-#include "fxjs/include/cfxjse_class.h"
-#include "fxjs/include/cfxjse_context.h"
+#include "fxjs/cfxjse_class.h"
+#include "fxjs/cfxjse_context.h"
 
 namespace {
 
diff --git a/fxjs/include/cfxjse_value.h b/fxjs/cfxjse_value.h
similarity index 96%
rename from fxjs/include/cfxjse_value.h
rename to fxjs/cfxjse_value.h
index 9fd1bee..91819d8 100644
--- a/fxjs/include/cfxjse_value.h
+++ b/fxjs/cfxjse_value.h
@@ -4,15 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_VALUE_H_
-#define FXJS_INCLUDE_CFXJSE_VALUE_H_
-
-#include "v8/include/v8.h"
+#ifndef FXJS_CFXJSE_VALUE_H_
+#define FXJS_CFXJSE_VALUE_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "fxjs/cfxjse_isolatetracker.h"
 #include "fxjs/cfxjse_runtimedata.h"
+#include "v8/include/v8.h"
 
 class CFXJSE_Class;
 class CFXJSE_HostObject;
@@ -99,4 +98,4 @@
   v8::Global<v8::Value> m_hValue;
 };
 
-#endif  // FXJS_INCLUDE_CFXJSE_VALUE_H_
+#endif  // FXJS_CFXJSE_VALUE_H_
diff --git a/fxjs/fxjs_v8.cpp b/fxjs/fxjs_v8.cpp
index e967fee..d74d355 100644
--- a/fxjs/fxjs_v8.cpp
+++ b/fxjs/fxjs_v8.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 #include <vector>
 
diff --git a/fxjs/include/fxjs_v8.h b/fxjs/fxjs_v8.h
similarity index 98%
rename from fxjs/include/fxjs_v8.h
rename to fxjs/fxjs_v8.h
index a9064f3..5f65898 100644
--- a/fxjs/include/fxjs_v8.h
+++ b/fxjs/fxjs_v8.h
@@ -11,8 +11,8 @@
 // PDFium code should include this file rather than including V8 headers
 // directly.
 
-#ifndef FXJS_INCLUDE_FXJS_V8_H_
-#define FXJS_INCLUDE_FXJS_V8_H_
+#ifndef FXJS_FXJS_V8_H_
+#define FXJS_FXJS_V8_H_
 
 #include <v8-util.h>
 #include <v8.h>
@@ -259,4 +259,4 @@
   std::map<CFX_WideString, v8::Global<v8::Array>> m_ConstArrays;
 };
 
-#endif  // FXJS_INCLUDE_FXJS_V8_H_
+#endif  // FXJS_FXJS_V8_H_
diff --git a/fxjs/include/fxjse.h b/fxjs/fxjse.h
similarity index 95%
rename from fxjs/include/fxjse.h
rename to fxjs/fxjse.h
index eafae88..0ba285d 100644
--- a/fxjs/include/fxjse.h
+++ b/fxjs/fxjse.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_FXJSE_H_
-#define FXJS_INCLUDE_FXJSE_H_
+#ifndef FXJS_FXJSE_H_
+#define FXJS_FXJSE_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -71,4 +71,4 @@
 
 void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Message);
 
-#endif  // FXJS_INCLUDE_FXJSE_H_
+#endif  // FXJS_FXJSE_H_
diff --git a/testing/DEPS b/testing/DEPS
index 32b3100..4110b9b 100644
--- a/testing/DEPS
+++ b/testing/DEPS
@@ -2,9 +2,9 @@
   '+core/fpdfapi',
   '+core/fxcodec',
   '+core/fxcrt',
-  '+core/fxge/include',
-  '+core/include',
-  '+fxjs/include',
+  '+core/fxge',
+  '+core',
+  '+fxjs',
   '+public',
   '+v8',
   '+xfa/fde',
diff --git a/testing/js_embedder_test.h b/testing/js_embedder_test.h
index f0beb1e..fbec0ea 100644
--- a/testing/js_embedder_test.h
+++ b/testing/js_embedder_test.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <vector>
 
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 #include "testing/embedder_test.h"
 
 class JSEmbedderTest : public EmbedderTest {
diff --git a/xfa/fxfa/DEPS b/xfa/fxfa/DEPS
index 589b532..886ee8e 100644
--- a/xfa/fxfa/DEPS
+++ b/xfa/fxfa/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  '+fxjs/include',
+  '+fxjs',
 ]
diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp
index 859de5c..2be27ca 100644
--- a/xfa/fxfa/app/xfa_ffnotify.cpp
+++ b/xfa/fxfa/app/xfa_ffnotify.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 #include "xfa/fxfa/app/xfa_ffbarcode.h"
 #include "xfa/fxfa/app/xfa_ffcheckbutton.h"
 #include "xfa/fxfa/app/xfa_ffchoicelist.h"
diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
index 592074f..47ce096 100644
--- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp
+++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fxfa/app/xfa_ffcheckbutton.h"
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index d8d29ec..59bbc89 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -9,9 +9,9 @@
 #include <time.h>
 
 #include "core/fxcrt/fx_ext.h"
-#include "fxjs/include/cfxjse_arguments.h"
-#include "fxjs/include/cfxjse_class.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_arguments.h"
+#include "fxjs/cfxjse_class.h"
+#include "fxjs/cfxjse_value.h"
 #include "xfa/fgas/localization/fgas_locale.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/fm2js/xfa_program.h"
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
index 5f87b60..2a81c48 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
@@ -7,8 +7,8 @@
 #ifndef XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
 #define XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
-#include "fxjs/include/cfxjse_context.h"
+#include "fxjs/cfxjse_arguments.h"
+#include "fxjs/cfxjse_context.h"
 #include "xfa/fxfa/parser/xfa_resolvenode_rs.h"
 
 class CXFA_FM2JSContext : public CFXJSE_HostObject {
diff --git a/xfa/fxfa/include/fxfa_basic.h b/xfa/fxfa/include/fxfa_basic.h
index c4dcfca..e2d5330 100644
--- a/xfa/fxfa/include/fxfa_basic.h
+++ b/xfa/fxfa/include/fxfa_basic.h
@@ -7,8 +7,8 @@
 #ifndef XFA_FXFA_INCLUDE_FXFA_BASIC_H_
 #define XFA_FXFA_INCLUDE_FXFA_BASIC_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
-#include "fxjs/include/fxjse.h"
+#include "fxjs/cfxjse_arguments.h"
+#include "fxjs/fxjse.h"
 
 class CXFA_Measurement;
 enum class XFA_ObjectType;
diff --git a/xfa/fxfa/parser/cscript_datawindow.cpp b/xfa/fxfa/parser/cscript_datawindow.cpp
index fbf9704..50ed398 100644
--- a/xfa/fxfa/parser/cscript_datawindow.cpp
+++ b/xfa/fxfa/parser/cscript_datawindow.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cscript_datawindow.h"
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/xfa_localemgr.h"
 #include "xfa/fxfa/parser/xfa_object.h"
diff --git a/xfa/fxfa/parser/cscript_datawindow.h b/xfa/fxfa/parser/cscript_datawindow.h
index e1ee13a..b2b35e9 100644
--- a/xfa/fxfa/parser/cscript_datawindow.h
+++ b/xfa/fxfa/parser/cscript_datawindow.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_DATAWINDOW_H_
 #define XFA_FXFA_PARSER_CSCRIPT_DATAWINDOW_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 
 class CScript_DataWindow : public CXFA_Object {
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
index c961164..73356af 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cscript_eventpseudomodel.h"
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/xfa_ffwidgethandler.h"
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.h b/xfa/fxfa/parser/cscript_eventpseudomodel.h
index 41307d4..c747ad2 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_EVENTPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_EVENTPSEUDOMODEL_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 
 enum class XFA_Event {
diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
index d4fd19e..1525b06 100644
--- a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cscript_hostpseudomodel.h"
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.h b/xfa/fxfa/parser/cscript_hostpseudomodel.h
index 0cfb4f8..c2183ac 100644
--- a/xfa/fxfa/parser/cscript_hostpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_hostpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_HOSTPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_HOSTPSEUDOMODEL_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
index 7c451a9..b6ee367 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
@@ -8,7 +8,7 @@
 
 #include <set>
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_containerlayoutitem.h"
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.h b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
index 793e43c..d7661bc 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_LAYOUTPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_LAYOUTPSEUDOMODEL_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 
 enum XFA_LAYOUTMODEL_HWXY {
diff --git a/xfa/fxfa/parser/cscript_logpseudomodel.cpp b/xfa/fxfa/parser/cscript_logpseudomodel.cpp
index 96c61a9..48ccce0 100644
--- a/xfa/fxfa/parser/cscript_logpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_logpseudomodel.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cscript_logpseudomodel.h"
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/xfa_localemgr.h"
 #include "xfa/fxfa/parser/xfa_object.h"
diff --git a/xfa/fxfa/parser/cscript_logpseudomodel.h b/xfa/fxfa/parser/cscript_logpseudomodel.h
index 1da076e..18f9f51 100644
--- a/xfa/fxfa/parser/cscript_logpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_logpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_LOGPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_LOGPSEUDOMODEL_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 
 class CScript_LogPseudoModel : public CXFA_Object {
diff --git a/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp b/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
index 83e84b6..5a484ab 100644
--- a/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cscript_signaturepseudomodel.h"
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_scriptcontext.h"
diff --git a/xfa/fxfa/parser/cscript_signaturepseudomodel.h b/xfa/fxfa/parser/cscript_signaturepseudomodel.h
index f8478c2..4f9ded0 100644
--- a/xfa/fxfa/parser/cscript_signaturepseudomodel.h
+++ b/xfa/fxfa/parser/cscript_signaturepseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_SIGNATUREPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_SIGNATUREPSEUDOMODEL_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 
 class CScript_SignaturePseudoModel : public CXFA_Object {
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index dae40ac..5152436 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "core/fxcrt/fx_ext.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp
index 7f35c73..10e1b82 100644
--- a/xfa/fxfa/parser/cxfa_object.cpp
+++ b/xfa/fxfa/parser/cxfa_object.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fxfa/parser/xfa_object.h"
 
 #include "core/fxcrt/fx_ext.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 
diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp
index a1a45ab..0a0e5bd 100644
--- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp
+++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp
@@ -7,9 +7,9 @@
 #include "xfa/fxfa/parser/cxfa_scriptcontext.h"
 
 #include "core/fxcrt/fx_ext.h"
-#include "fxjs/include/cfxjse_arguments.h"
-#include "fxjs/include/cfxjse_class.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_arguments.h"
+#include "fxjs/cfxjse_class.h"
+#include "fxjs/cfxjse_value.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.h b/xfa/fxfa/parser/cxfa_scriptcontext.h
index a6737e6..2816d26 100644
--- a/xfa/fxfa/parser/cxfa_scriptcontext.h
+++ b/xfa/fxfa/parser/cxfa_scriptcontext.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <vector>
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
 #include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
diff --git a/xfa/fxfa/parser/cxfa_valuearray.h b/xfa/fxfa/parser/cxfa_valuearray.h
index 4bc59c7..c1af419 100644
--- a/xfa/fxfa/parser/cxfa_valuearray.h
+++ b/xfa/fxfa/parser/cxfa_valuearray.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
 #define XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
 
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 #include "xfa/fxfa/include/fxfa.h"
 
 class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> {
diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h
index 08eedee..5056f59 100644
--- a/xfa/fxfa/parser/xfa_object.h
+++ b/xfa/fxfa/parser/xfa_object.h
@@ -9,7 +9,7 @@
 
 #include <unordered_set>
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 #include "xfa/fde/xml/fde_xml.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 
diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h
index 809ba95..407352e 100644
--- a/xfa/fxfa/parser/xfa_resolvenode_rs.h
+++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_
 #define XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_
 
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 #include "xfa/fxfa/include/fxfa.h"
 #include "xfa/fxfa/parser/cxfa_valuearray.h"