diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index 4c4df16..a8d850d 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn
@@ -100,7 +100,6 @@
       "js_define.h",
       "js_resources.cpp",
       "js_resources.h",
-      "jse_define.h",
     ]
     deps += [
       "../core/fdrm",
@@ -439,6 +438,7 @@
         "xfa/cjx_xsdconnection.h",
         "xfa/fxjse.cpp",
         "xfa/fxjse.h",
+        "xfa/jse_define.h",
       ]
       deps += [ "../xfa/fxfa/fm2js" ]
     }
diff --git a/fxjs/jse_define.h b/fxjs/jse_define.h
deleted file mode 100644
index 669ecef..0000000
--- a/fxjs/jse_define.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2017 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef FXJS_JSE_DEFINE_H_
-#define FXJS_JSE_DEFINE_H_
-
-#include <vector>
-
-#include "fxjs/cjs_result.h"
-
-class CFX_V8;
-
-template <class C,
-          CJS_Result (C::*M)(CFX_V8* runtime,
-                             const std::vector<v8::Local<v8::Value>>& params)>
-CJS_Result JSMethod(C* node,
-                    CFX_V8* runtime,
-                    const std::vector<v8::Local<v8::Value>>& params) {
-  return (node->*M)(runtime, params);
-}
-
-#define JSE_METHOD(method_name, class_name)                \
-  static CJS_Result method_name##_static(                  \
-      CJX_Object* node, CFX_V8* runtime,                   \
-      const std::vector<v8::Local<v8::Value>>& params) {   \
-    return JSMethod<class_name, &class_name::method_name>( \
-        static_cast<class_name*>(node), runtime, params);  \
-  }                                                        \
-  CJS_Result method_name(CFX_V8* runtime,                  \
-                         const std::vector<v8::Local<v8::Value>>& params)
-
-#define JSE_PROP(prop_name) \
-  void prop_name(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute)
-
-#endif  // FXJS_JSE_DEFINE_H_
diff --git a/fxjs/xfa/cjx_arc.h b/fxjs/xfa/cjx_arc.h
index a62f683..8ab0e30 100644
--- a/fxjs/xfa/cjx_arc.h
+++ b/fxjs/xfa/cjx_arc.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ARC_H_
 #define FXJS_XFA_CJX_ARC_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Arc;
 
diff --git a/fxjs/xfa/cjx_area.h b/fxjs/xfa/cjx_area.h
index b71f673..bd6a79e 100644
--- a/fxjs/xfa/cjx_area.h
+++ b/fxjs/xfa/cjx_area.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_AREA_H_
 #define FXJS_XFA_CJX_AREA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Area;
 
diff --git a/fxjs/xfa/cjx_assist.h b/fxjs/xfa/cjx_assist.h
index 697d96c..370d005 100644
--- a/fxjs/xfa/cjx_assist.h
+++ b/fxjs/xfa/cjx_assist.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ASSIST_H_
 #define FXJS_XFA_CJX_ASSIST_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Assist;
 
diff --git a/fxjs/xfa/cjx_barcode.h b/fxjs/xfa/cjx_barcode.h
index 0e5c950..d7144db 100644
--- a/fxjs/xfa/cjx_barcode.h
+++ b/fxjs/xfa/cjx_barcode.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BARCODE_H_
 #define FXJS_XFA_CJX_BARCODE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Barcode;
 
diff --git a/fxjs/xfa/cjx_bind.h b/fxjs/xfa/cjx_bind.h
index b7166ba..2764183 100644
--- a/fxjs/xfa/cjx_bind.h
+++ b/fxjs/xfa/cjx_bind.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BIND_H_
 #define FXJS_XFA_CJX_BIND_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Bind;
 
diff --git a/fxjs/xfa/cjx_binditems.h b/fxjs/xfa/cjx_binditems.h
index bc97570..586ef8f 100644
--- a/fxjs/xfa/cjx_binditems.h
+++ b/fxjs/xfa/cjx_binditems.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BINDITEMS_H_
 #define FXJS_XFA_CJX_BINDITEMS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_BindItems;
 
diff --git a/fxjs/xfa/cjx_bookend.h b/fxjs/xfa/cjx_bookend.h
index 74872bb..132081d 100644
--- a/fxjs/xfa/cjx_bookend.h
+++ b/fxjs/xfa/cjx_bookend.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BOOKEND_H_
 #define FXJS_XFA_CJX_BOOKEND_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Bookend;
 
diff --git a/fxjs/xfa/cjx_boolean.h b/fxjs/xfa/cjx_boolean.h
index 9d35741..0945913 100644
--- a/fxjs/xfa/cjx_boolean.h
+++ b/fxjs/xfa/cjx_boolean.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BOOLEAN_H_
 #define FXJS_XFA_CJX_BOOLEAN_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Boolean;
 
diff --git a/fxjs/xfa/cjx_border.h b/fxjs/xfa/cjx_border.h
index 39d4186..84484ab 100644
--- a/fxjs/xfa/cjx_border.h
+++ b/fxjs/xfa/cjx_border.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BORDER_H_
 #define FXJS_XFA_CJX_BORDER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Border;
 
diff --git a/fxjs/xfa/cjx_break.h b/fxjs/xfa/cjx_break.h
index 644ec99..f0a4582 100644
--- a/fxjs/xfa/cjx_break.h
+++ b/fxjs/xfa/cjx_break.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BREAK_H_
 #define FXJS_XFA_CJX_BREAK_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Break;
 
diff --git a/fxjs/xfa/cjx_breakafter.h b/fxjs/xfa/cjx_breakafter.h
index b15ac78..4d5f8d9 100644
--- a/fxjs/xfa/cjx_breakafter.h
+++ b/fxjs/xfa/cjx_breakafter.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BREAKAFTER_H_
 #define FXJS_XFA_CJX_BREAKAFTER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_BreakAfter;
 
diff --git a/fxjs/xfa/cjx_breakbefore.h b/fxjs/xfa/cjx_breakbefore.h
index dbaf364..943fb0f 100644
--- a/fxjs/xfa/cjx_breakbefore.h
+++ b/fxjs/xfa/cjx_breakbefore.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BREAKBEFORE_H_
 #define FXJS_XFA_CJX_BREAKBEFORE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_BreakBefore;
 
diff --git a/fxjs/xfa/cjx_button.h b/fxjs/xfa/cjx_button.h
index 197ced1..80017d1 100644
--- a/fxjs/xfa/cjx_button.h
+++ b/fxjs/xfa/cjx_button.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_BUTTON_H_
 #define FXJS_XFA_CJX_BUTTON_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Button;
 
diff --git a/fxjs/xfa/cjx_calculate.h b/fxjs/xfa/cjx_calculate.h
index 604e849..aec1f8a 100644
--- a/fxjs/xfa/cjx_calculate.h
+++ b/fxjs/xfa/cjx_calculate.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CALCULATE_H_
 #define FXJS_XFA_CJX_CALCULATE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Calculate;
 
diff --git a/fxjs/xfa/cjx_caption.h b/fxjs/xfa/cjx_caption.h
index 5affe60..d33b81b 100644
--- a/fxjs/xfa/cjx_caption.h
+++ b/fxjs/xfa/cjx_caption.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CAPTION_H_
 #define FXJS_XFA_CJX_CAPTION_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Caption;
 
diff --git a/fxjs/xfa/cjx_certificate.h b/fxjs/xfa/cjx_certificate.h
index 0debebd..5661da7 100644
--- a/fxjs/xfa/cjx_certificate.h
+++ b/fxjs/xfa/cjx_certificate.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CERTIFICATE_H_
 #define FXJS_XFA_CJX_CERTIFICATE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Certificate;
 
diff --git a/fxjs/xfa/cjx_certificates.h b/fxjs/xfa/cjx_certificates.h
index 3948932..57b9ad6 100644
--- a/fxjs/xfa/cjx_certificates.h
+++ b/fxjs/xfa/cjx_certificates.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CERTIFICATES_H_
 #define FXJS_XFA_CJX_CERTIFICATES_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Certificates;
 
diff --git a/fxjs/xfa/cjx_checkbutton.h b/fxjs/xfa/cjx_checkbutton.h
index 1bcf726..d96b789 100644
--- a/fxjs/xfa/cjx_checkbutton.h
+++ b/fxjs/xfa/cjx_checkbutton.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CHECKBUTTON_H_
 #define FXJS_XFA_CJX_CHECKBUTTON_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_CheckButton;
 
diff --git a/fxjs/xfa/cjx_choicelist.h b/fxjs/xfa/cjx_choicelist.h
index aca3e1b..246d3a3 100644
--- a/fxjs/xfa/cjx_choicelist.h
+++ b/fxjs/xfa/cjx_choicelist.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CHOICELIST_H_
 #define FXJS_XFA_CJX_CHOICELIST_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ChoiceList;
 
diff --git a/fxjs/xfa/cjx_color.h b/fxjs/xfa/cjx_color.h
index 073e12d..6209bf0 100644
--- a/fxjs/xfa/cjx_color.h
+++ b/fxjs/xfa/cjx_color.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_COLOR_H_
 #define FXJS_XFA_CJX_COLOR_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Color;
 
diff --git a/fxjs/xfa/cjx_comb.h b/fxjs/xfa/cjx_comb.h
index 31dd917..f1e0f3d 100644
--- a/fxjs/xfa/cjx_comb.h
+++ b/fxjs/xfa/cjx_comb.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_COMB_H_
 #define FXJS_XFA_CJX_COMB_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Comb;
 
diff --git a/fxjs/xfa/cjx_command.h b/fxjs/xfa/cjx_command.h
index 4708449..f126d6f 100644
--- a/fxjs/xfa/cjx_command.h
+++ b/fxjs/xfa/cjx_command.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_COMMAND_H_
 #define FXJS_XFA_CJX_COMMAND_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Command;
 
diff --git a/fxjs/xfa/cjx_connect.h b/fxjs/xfa/cjx_connect.h
index 7893edf..2f2fe76 100644
--- a/fxjs/xfa/cjx_connect.h
+++ b/fxjs/xfa/cjx_connect.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CONNECT_H_
 #define FXJS_XFA_CJX_CONNECT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Connect;
 
diff --git a/fxjs/xfa/cjx_connectstring.h b/fxjs/xfa/cjx_connectstring.h
index b0cf4ca..b1c9c24 100644
--- a/fxjs/xfa/cjx_connectstring.h
+++ b/fxjs/xfa/cjx_connectstring.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CONNECTSTRING_H_
 #define FXJS_XFA_CJX_CONNECTSTRING_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ConnectString;
 
diff --git a/fxjs/xfa/cjx_container.h b/fxjs/xfa/cjx_container.h
index a35c8db..7bc6b0e 100644
--- a/fxjs/xfa/cjx_container.h
+++ b/fxjs/xfa/cjx_container.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CONTAINER_H_
 #define FXJS_XFA_CJX_CONTAINER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/xfa/cjx_contentarea.h b/fxjs/xfa/cjx_contentarea.h
index c9c45a9..1b1c02d 100644
--- a/fxjs/xfa/cjx_contentarea.h
+++ b/fxjs/xfa/cjx_contentarea.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CONTENTAREA_H_
 #define FXJS_XFA_CJX_CONTENTAREA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ContentArea;
 
diff --git a/fxjs/xfa/cjx_corner.h b/fxjs/xfa/cjx_corner.h
index 76a2bb1..ec04933 100644
--- a/fxjs/xfa/cjx_corner.h
+++ b/fxjs/xfa/cjx_corner.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_CORNER_H_
 #define FXJS_XFA_CJX_CORNER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Corner;
 
diff --git a/fxjs/xfa/cjx_datavalue.h b/fxjs/xfa/cjx_datavalue.h
index 8b307f9..a6f4474 100644
--- a/fxjs/xfa/cjx_datavalue.h
+++ b/fxjs/xfa/cjx_datavalue.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DATAVALUE_H_
 #define FXJS_XFA_CJX_DATAVALUE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_DataValue;
 
diff --git a/fxjs/xfa/cjx_datawindow.h b/fxjs/xfa/cjx_datawindow.h
index c148cb9..48cce93 100644
--- a/fxjs/xfa/cjx_datawindow.h
+++ b/fxjs/xfa/cjx_datawindow.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DATAWINDOW_H_
 #define FXJS_XFA_CJX_DATAWINDOW_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CFXJSE_Value;
diff --git a/fxjs/xfa/cjx_date.h b/fxjs/xfa/cjx_date.h
index 4466a94..5a65620 100644
--- a/fxjs/xfa/cjx_date.h
+++ b/fxjs/xfa/cjx_date.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DATE_H_
 #define FXJS_XFA_CJX_DATE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Date;
 
diff --git a/fxjs/xfa/cjx_datetime.h b/fxjs/xfa/cjx_datetime.h
index 382168a..8f508a1 100644
--- a/fxjs/xfa/cjx_datetime.h
+++ b/fxjs/xfa/cjx_datetime.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DATETIME_H_
 #define FXJS_XFA_CJX_DATETIME_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_DateTime;
 
diff --git a/fxjs/xfa/cjx_datetimeedit.h b/fxjs/xfa/cjx_datetimeedit.h
index daebdbf..deec852 100644
--- a/fxjs/xfa/cjx_datetimeedit.h
+++ b/fxjs/xfa/cjx_datetimeedit.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DATETIMEEDIT_H_
 #define FXJS_XFA_CJX_DATETIMEEDIT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_DateTimeEdit;
 
diff --git a/fxjs/xfa/cjx_decimal.h b/fxjs/xfa/cjx_decimal.h
index fd47a8a..e8f8af7 100644
--- a/fxjs/xfa/cjx_decimal.h
+++ b/fxjs/xfa/cjx_decimal.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DECIMAL_H_
 #define FXJS_XFA_CJX_DECIMAL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Decimal;
 
diff --git a/fxjs/xfa/cjx_defaultui.h b/fxjs/xfa/cjx_defaultui.h
index 320d09b..337cac4 100644
--- a/fxjs/xfa/cjx_defaultui.h
+++ b/fxjs/xfa/cjx_defaultui.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DEFAULTUI_H_
 #define FXJS_XFA_CJX_DEFAULTUI_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_DefaultUi;
 
diff --git a/fxjs/xfa/cjx_delete.h b/fxjs/xfa/cjx_delete.h
index e951ac7..fd3985d 100644
--- a/fxjs/xfa/cjx_delete.h
+++ b/fxjs/xfa/cjx_delete.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DELETE_H_
 #define FXJS_XFA_CJX_DELETE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Delete;
 
diff --git a/fxjs/xfa/cjx_delta.h b/fxjs/xfa/cjx_delta.h
index c499681..971774b 100644
--- a/fxjs/xfa/cjx_delta.h
+++ b/fxjs/xfa/cjx_delta.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DELTA_H_
 #define FXJS_XFA_CJX_DELTA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Delta;
 
diff --git a/fxjs/xfa/cjx_desc.h b/fxjs/xfa/cjx_desc.h
index 29572b3..99c78d8 100644
--- a/fxjs/xfa/cjx_desc.h
+++ b/fxjs/xfa/cjx_desc.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DESC_H_
 #define FXJS_XFA_CJX_DESC_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Desc;
 
diff --git a/fxjs/xfa/cjx_digestmethod.h b/fxjs/xfa/cjx_digestmethod.h
index 0d06349..ccddc52 100644
--- a/fxjs/xfa/cjx_digestmethod.h
+++ b/fxjs/xfa/cjx_digestmethod.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DIGESTMETHOD_H_
 #define FXJS_XFA_CJX_DIGESTMETHOD_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_DigestMethod;
 
diff --git a/fxjs/xfa/cjx_digestmethods.h b/fxjs/xfa/cjx_digestmethods.h
index 664cc89..214079b 100644
--- a/fxjs/xfa/cjx_digestmethods.h
+++ b/fxjs/xfa/cjx_digestmethods.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DIGESTMETHODS_H_
 #define FXJS_XFA_CJX_DIGESTMETHODS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_DigestMethods;
 
diff --git a/fxjs/xfa/cjx_draw.h b/fxjs/xfa/cjx_draw.h
index 0a02336..099b449 100644
--- a/fxjs/xfa/cjx_draw.h
+++ b/fxjs/xfa/cjx_draw.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_DRAW_H_
 #define FXJS_XFA_CJX_DRAW_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Draw;
 
diff --git a/fxjs/xfa/cjx_edge.h b/fxjs/xfa/cjx_edge.h
index 04b40aa..f3c4fd2 100644
--- a/fxjs/xfa/cjx_edge.h
+++ b/fxjs/xfa/cjx_edge.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EDGE_H_
 #define FXJS_XFA_CJX_EDGE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Edge;
 
diff --git a/fxjs/xfa/cjx_encoding.h b/fxjs/xfa/cjx_encoding.h
index 9c8a3d5..69f1d37 100644
--- a/fxjs/xfa/cjx_encoding.h
+++ b/fxjs/xfa/cjx_encoding.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ENCODING_H_
 #define FXJS_XFA_CJX_ENCODING_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Encoding;
 
diff --git a/fxjs/xfa/cjx_encodings.h b/fxjs/xfa/cjx_encodings.h
index b5f9b67..44a4e2e 100644
--- a/fxjs/xfa/cjx_encodings.h
+++ b/fxjs/xfa/cjx_encodings.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ENCODINGS_H_
 #define FXJS_XFA_CJX_ENCODINGS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Encodings;
 
diff --git a/fxjs/xfa/cjx_encrypt.h b/fxjs/xfa/cjx_encrypt.h
index fe9b619..2d34eca 100644
--- a/fxjs/xfa/cjx_encrypt.h
+++ b/fxjs/xfa/cjx_encrypt.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ENCRYPT_H_
 #define FXJS_XFA_CJX_ENCRYPT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Encrypt;
 
diff --git a/fxjs/xfa/cjx_event.h b/fxjs/xfa/cjx_event.h
index 9fabe22..30260b1 100644
--- a/fxjs/xfa/cjx_event.h
+++ b/fxjs/xfa/cjx_event.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EVENT_H_
 #define FXJS_XFA_CJX_EVENT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Event;
 
diff --git a/fxjs/xfa/cjx_eventpseudomodel.h b/fxjs/xfa/cjx_eventpseudomodel.h
index 3a51098..31d7dbe 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.h
+++ b/fxjs/xfa/cjx_eventpseudomodel.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CFXJSE_Value;
 class CScript_EventPseudoModel;
diff --git a/fxjs/xfa/cjx_exclgroup.h b/fxjs/xfa/cjx_exclgroup.h
index 60e56bc..f03e399 100644
--- a/fxjs/xfa/cjx_exclgroup.h
+++ b/fxjs/xfa/cjx_exclgroup.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EXCLGROUP_H_
 #define FXJS_XFA_CJX_EXCLGROUP_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ExclGroup;
 
diff --git a/fxjs/xfa/cjx_exdata.h b/fxjs/xfa/cjx_exdata.h
index e61cb47..42b49f6 100644
--- a/fxjs/xfa/cjx_exdata.h
+++ b/fxjs/xfa/cjx_exdata.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EXDATA_H_
 #define FXJS_XFA_CJX_EXDATA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ExData;
 
diff --git a/fxjs/xfa/cjx_execute.h b/fxjs/xfa/cjx_execute.h
index 3038a86..bbdd7d8 100644
--- a/fxjs/xfa/cjx_execute.h
+++ b/fxjs/xfa/cjx_execute.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EXECUTE_H_
 #define FXJS_XFA_CJX_EXECUTE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Execute;
 
diff --git a/fxjs/xfa/cjx_exobject.h b/fxjs/xfa/cjx_exobject.h
index 33b4e1c..016e05a 100644
--- a/fxjs/xfa/cjx_exobject.h
+++ b/fxjs/xfa/cjx_exobject.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EXOBJECT_H_
 #define FXJS_XFA_CJX_EXOBJECT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ExObject;
 
diff --git a/fxjs/xfa/cjx_extras.h b/fxjs/xfa/cjx_extras.h
index fa907ea..e6e2dc1 100644
--- a/fxjs/xfa/cjx_extras.h
+++ b/fxjs/xfa/cjx_extras.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_EXTRAS_H_
 #define FXJS_XFA_CJX_EXTRAS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Extras;
 
diff --git a/fxjs/xfa/cjx_field.h b/fxjs/xfa/cjx_field.h
index ac00613..fa68495 100644
--- a/fxjs/xfa/cjx_field.h
+++ b/fxjs/xfa/cjx_field.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_FIELD_H_
 #define FXJS_XFA_CJX_FIELD_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Field;
 
diff --git a/fxjs/xfa/cjx_fill.h b/fxjs/xfa/cjx_fill.h
index c7511d2..b155b2b 100644
--- a/fxjs/xfa/cjx_fill.h
+++ b/fxjs/xfa/cjx_fill.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_FILL_H_
 #define FXJS_XFA_CJX_FILL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Fill;
 
diff --git a/fxjs/xfa/cjx_filter.h b/fxjs/xfa/cjx_filter.h
index 6800ac1..d4d2955 100644
--- a/fxjs/xfa/cjx_filter.h
+++ b/fxjs/xfa/cjx_filter.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_FILTER_H_
 #define FXJS_XFA_CJX_FILTER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Filter;
 
diff --git a/fxjs/xfa/cjx_float.h b/fxjs/xfa/cjx_float.h
index f4f1645..bd0a10b 100644
--- a/fxjs/xfa/cjx_float.h
+++ b/fxjs/xfa/cjx_float.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_FLOAT_H_
 #define FXJS_XFA_CJX_FLOAT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Float;
 
diff --git a/fxjs/xfa/cjx_font.h b/fxjs/xfa/cjx_font.h
index 253de9f..873dd3d 100644
--- a/fxjs/xfa/cjx_font.h
+++ b/fxjs/xfa/cjx_font.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_FONT_H_
 #define FXJS_XFA_CJX_FONT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Font;
 
diff --git a/fxjs/xfa/cjx_form.h b/fxjs/xfa/cjx_form.h
index 67c7b10..9558ad5 100644
--- a/fxjs/xfa/cjx_form.h
+++ b/fxjs/xfa/cjx_form.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_FORM_H_
 #define FXJS_XFA_CJX_FORM_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_model.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Form;
 
diff --git a/fxjs/xfa/cjx_format.h b/fxjs/xfa/cjx_format.h
index 0e93c65..4e10491 100644
--- a/fxjs/xfa/cjx_format.h
+++ b/fxjs/xfa/cjx_format.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_FORMAT_H_
 #define FXJS_XFA_CJX_FORMAT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Format;
 
diff --git a/fxjs/xfa/cjx_handler.h b/fxjs/xfa/cjx_handler.h
index 32c00e3..55357c7 100644
--- a/fxjs/xfa/cjx_handler.h
+++ b/fxjs/xfa/cjx_handler.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_HANDLER_H_
 #define FXJS_XFA_CJX_HANDLER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Handler;
 
diff --git a/fxjs/xfa/cjx_hostpseudomodel.h b/fxjs/xfa/cjx_hostpseudomodel.h
index 0991aec..92b20f8 100644
--- a/fxjs/xfa/cjx_hostpseudomodel.h
+++ b/fxjs/xfa/cjx_hostpseudomodel.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CFXJSE_Value;
diff --git a/fxjs/xfa/cjx_image.h b/fxjs/xfa/cjx_image.h
index 8ea49ba..298f123 100644
--- a/fxjs/xfa/cjx_image.h
+++ b/fxjs/xfa/cjx_image.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_IMAGE_H_
 #define FXJS_XFA_CJX_IMAGE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Image;
 
diff --git a/fxjs/xfa/cjx_imageedit.h b/fxjs/xfa/cjx_imageedit.h
index 99688f9..79b01c5 100644
--- a/fxjs/xfa/cjx_imageedit.h
+++ b/fxjs/xfa/cjx_imageedit.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_IMAGEEDIT_H_
 #define FXJS_XFA_CJX_IMAGEEDIT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ImageEdit;
 
diff --git a/fxjs/xfa/cjx_insert.h b/fxjs/xfa/cjx_insert.h
index c84f663..aa5f74a 100644
--- a/fxjs/xfa/cjx_insert.h
+++ b/fxjs/xfa/cjx_insert.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_INSERT_H_
 #define FXJS_XFA_CJX_INSERT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Insert;
 
diff --git a/fxjs/xfa/cjx_instancemanager.h b/fxjs/xfa/cjx_instancemanager.h
index 139dbe3..9881f60 100644
--- a/fxjs/xfa/cjx_instancemanager.h
+++ b/fxjs/xfa/cjx_instancemanager.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_INSTANCEMANAGER_H_
 #define FXJS_XFA_CJX_INSTANCEMANAGER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_InstanceManager;
 
diff --git a/fxjs/xfa/cjx_integer.h b/fxjs/xfa/cjx_integer.h
index f8b3b3b..c647fb3 100644
--- a/fxjs/xfa/cjx_integer.h
+++ b/fxjs/xfa/cjx_integer.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_INTEGER_H_
 #define FXJS_XFA_CJX_INTEGER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Integer;
 
diff --git a/fxjs/xfa/cjx_issuers.h b/fxjs/xfa/cjx_issuers.h
index 1824fda..083dfc7 100644
--- a/fxjs/xfa/cjx_issuers.h
+++ b/fxjs/xfa/cjx_issuers.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ISSUERS_H_
 #define FXJS_XFA_CJX_ISSUERS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Issuers;
 
diff --git a/fxjs/xfa/cjx_items.h b/fxjs/xfa/cjx_items.h
index 18f2f8a..42d9039 100644
--- a/fxjs/xfa/cjx_items.h
+++ b/fxjs/xfa/cjx_items.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ITEMS_H_
 #define FXJS_XFA_CJX_ITEMS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Items;
 
diff --git a/fxjs/xfa/cjx_keep.h b/fxjs/xfa/cjx_keep.h
index 3db46f7..a805d97 100644
--- a/fxjs/xfa/cjx_keep.h
+++ b/fxjs/xfa/cjx_keep.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_KEEP_H_
 #define FXJS_XFA_CJX_KEEP_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Keep;
 
diff --git a/fxjs/xfa/cjx_keyusage.h b/fxjs/xfa/cjx_keyusage.h
index 99de533..760c26b 100644
--- a/fxjs/xfa/cjx_keyusage.h
+++ b/fxjs/xfa/cjx_keyusage.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_KEYUSAGE_H_
 #define FXJS_XFA_CJX_KEYUSAGE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_KeyUsage;
 
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.h b/fxjs/xfa/cjx_layoutpseudomodel.h
index a252eaa..9bd74bf 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.h
+++ b/fxjs/xfa/cjx_layoutpseudomodel.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 
 enum XFA_LAYOUTMODEL_HWXY {
   XFA_LAYOUTMODEL_H,
diff --git a/fxjs/xfa/cjx_line.h b/fxjs/xfa/cjx_line.h
index 34fffc6..f3ae6fe 100644
--- a/fxjs/xfa/cjx_line.h
+++ b/fxjs/xfa/cjx_line.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_LINE_H_
 #define FXJS_XFA_CJX_LINE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Line;
 
diff --git a/fxjs/xfa/cjx_linear.h b/fxjs/xfa/cjx_linear.h
index a01b0d1..ea07dd9 100644
--- a/fxjs/xfa/cjx_linear.h
+++ b/fxjs/xfa/cjx_linear.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_LINEAR_H_
 #define FXJS_XFA_CJX_LINEAR_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Linear;
 
diff --git a/fxjs/xfa/cjx_list.h b/fxjs/xfa/cjx_list.h
index 99661a4..8f2e39e 100644
--- a/fxjs/xfa/cjx_list.h
+++ b/fxjs/xfa/cjx_list.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_LIST_H_
 #define FXJS_XFA_CJX_LIST_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_List;
 
diff --git a/fxjs/xfa/cjx_logpseudomodel.h b/fxjs/xfa/cjx_logpseudomodel.h
index dbf097f..4e9cb35 100644
--- a/fxjs/xfa/cjx_logpseudomodel.h
+++ b/fxjs/xfa/cjx_logpseudomodel.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CScript_LogPseudoModel;
 
diff --git a/fxjs/xfa/cjx_manifest.h b/fxjs/xfa/cjx_manifest.h
index 813691c..b60911f 100644
--- a/fxjs/xfa/cjx_manifest.h
+++ b/fxjs/xfa/cjx_manifest.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_MANIFEST_H_
 #define FXJS_XFA_CJX_MANIFEST_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Manifest;
 
diff --git a/fxjs/xfa/cjx_map.h b/fxjs/xfa/cjx_map.h
index 2ba5d4e..7ab8f49 100644
--- a/fxjs/xfa/cjx_map.h
+++ b/fxjs/xfa/cjx_map.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_MAP_H_
 #define FXJS_XFA_CJX_MAP_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Map;
 
diff --git a/fxjs/xfa/cjx_margin.h b/fxjs/xfa/cjx_margin.h
index 90371ed..03fe825 100644
--- a/fxjs/xfa/cjx_margin.h
+++ b/fxjs/xfa/cjx_margin.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_MARGIN_H_
 #define FXJS_XFA_CJX_MARGIN_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Margin;
 
diff --git a/fxjs/xfa/cjx_mdp.h b/fxjs/xfa/cjx_mdp.h
index 263d56b..0c2a73e 100644
--- a/fxjs/xfa/cjx_mdp.h
+++ b/fxjs/xfa/cjx_mdp.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_MDP_H_
 #define FXJS_XFA_CJX_MDP_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Mdp;
 
diff --git a/fxjs/xfa/cjx_medium.h b/fxjs/xfa/cjx_medium.h
index 9407304..fee656c 100644
--- a/fxjs/xfa/cjx_medium.h
+++ b/fxjs/xfa/cjx_medium.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_MEDIUM_H_
 #define FXJS_XFA_CJX_MEDIUM_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Medium;
 
diff --git a/fxjs/xfa/cjx_message.h b/fxjs/xfa/cjx_message.h
index e68d9fe..147c958 100644
--- a/fxjs/xfa/cjx_message.h
+++ b/fxjs/xfa/cjx_message.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_MESSAGE_H_
 #define FXJS_XFA_CJX_MESSAGE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Message;
 
diff --git a/fxjs/xfa/cjx_model.h b/fxjs/xfa/cjx_model.h
index e517c74..c2f2f7c 100644
--- a/fxjs/xfa/cjx_model.h
+++ b/fxjs/xfa/cjx_model.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_MODEL_H_
 #define FXJS_XFA_CJX_MODEL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/xfa/cjx_node.h b/fxjs/xfa/cjx_node.h
index 4b026b4..dc4ba0b 100644
--- a/fxjs/xfa/cjx_node.h
+++ b/fxjs/xfa/cjx_node.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_NODE_H_
 #define FXJS_XFA_CJX_NODE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_tree.h"
+#include "fxjs/xfa/jse_define.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CXFA_Node;
diff --git a/fxjs/xfa/cjx_numericedit.h b/fxjs/xfa/cjx_numericedit.h
index b03c68c..89269ee 100644
--- a/fxjs/xfa/cjx_numericedit.h
+++ b/fxjs/xfa/cjx_numericedit.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_NUMERICEDIT_H_
 #define FXJS_XFA_CJX_NUMERICEDIT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_NumericEdit;
 
diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index 197638f..4bbd35f 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -14,7 +14,7 @@
 
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxcrt/widestring.h"
-#include "fxjs/jse_define.h"
+#include "fxjs/xfa/jse_define.h"
 #include "third_party/base/optional.h"
 #include "third_party/base/span.h"
 #include "xfa/fxfa/fxfa_basic.h"
diff --git a/fxjs/xfa/cjx_occur.h b/fxjs/xfa/cjx_occur.h
index 19899a6..b6745a5 100644
--- a/fxjs/xfa/cjx_occur.h
+++ b/fxjs/xfa/cjx_occur.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_OCCUR_H_
 #define FXJS_XFA_CJX_OCCUR_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Occur;
 
diff --git a/fxjs/xfa/cjx_oid.h b/fxjs/xfa/cjx_oid.h
index 62b9c54..2586949 100644
--- a/fxjs/xfa/cjx_oid.h
+++ b/fxjs/xfa/cjx_oid.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_OID_H_
 #define FXJS_XFA_CJX_OID_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Oid;
 
diff --git a/fxjs/xfa/cjx_oids.h b/fxjs/xfa/cjx_oids.h
index b7eff1f..4d19603 100644
--- a/fxjs/xfa/cjx_oids.h
+++ b/fxjs/xfa/cjx_oids.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_OIDS_H_
 #define FXJS_XFA_CJX_OIDS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Oids;
 
diff --git a/fxjs/xfa/cjx_operation.h b/fxjs/xfa/cjx_operation.h
index 655f395..2b84199 100644
--- a/fxjs/xfa/cjx_operation.h
+++ b/fxjs/xfa/cjx_operation.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_OPERATION_H_
 #define FXJS_XFA_CJX_OPERATION_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Operation;
 
diff --git a/fxjs/xfa/cjx_overflow.h b/fxjs/xfa/cjx_overflow.h
index 1caeefb..46faf42 100644
--- a/fxjs/xfa/cjx_overflow.h
+++ b/fxjs/xfa/cjx_overflow.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_OVERFLOW_H_
 #define FXJS_XFA_CJX_OVERFLOW_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Overflow;
 
diff --git a/fxjs/xfa/cjx_packet.h b/fxjs/xfa/cjx_packet.h
index f1ad920..0becac6 100644
--- a/fxjs/xfa/cjx_packet.h
+++ b/fxjs/xfa/cjx_packet.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PACKET_H_
 #define FXJS_XFA_CJX_PACKET_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Packet;
 
diff --git a/fxjs/xfa/cjx_pagearea.h b/fxjs/xfa/cjx_pagearea.h
index 35c017c..a635237 100644
--- a/fxjs/xfa/cjx_pagearea.h
+++ b/fxjs/xfa/cjx_pagearea.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PAGEAREA_H_
 #define FXJS_XFA_CJX_PAGEAREA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_PageArea;
 
diff --git a/fxjs/xfa/cjx_pageset.h b/fxjs/xfa/cjx_pageset.h
index 5d2eb21..41a03e4 100644
--- a/fxjs/xfa/cjx_pageset.h
+++ b/fxjs/xfa/cjx_pageset.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PAGESET_H_
 #define FXJS_XFA_CJX_PAGESET_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_PageSet;
 
diff --git a/fxjs/xfa/cjx_para.h b/fxjs/xfa/cjx_para.h
index 70604ac..1e33ca5 100644
--- a/fxjs/xfa/cjx_para.h
+++ b/fxjs/xfa/cjx_para.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PARA_H_
 #define FXJS_XFA_CJX_PARA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Para;
 
diff --git a/fxjs/xfa/cjx_password.h b/fxjs/xfa/cjx_password.h
index 9af175f..aaccb9a 100644
--- a/fxjs/xfa/cjx_password.h
+++ b/fxjs/xfa/cjx_password.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PASSWORD_H_
 #define FXJS_XFA_CJX_PASSWORD_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Password;
 
diff --git a/fxjs/xfa/cjx_passwordedit.h b/fxjs/xfa/cjx_passwordedit.h
index d55abf6..87253db 100644
--- a/fxjs/xfa/cjx_passwordedit.h
+++ b/fxjs/xfa/cjx_passwordedit.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PASSWORDEDIT_H_
 #define FXJS_XFA_CJX_PASSWORDEDIT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_PasswordEdit;
 
diff --git a/fxjs/xfa/cjx_pattern.h b/fxjs/xfa/cjx_pattern.h
index f9ebb11..b2f4592 100644
--- a/fxjs/xfa/cjx_pattern.h
+++ b/fxjs/xfa/cjx_pattern.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PATTERN_H_
 #define FXJS_XFA_CJX_PATTERN_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Pattern;
 
diff --git a/fxjs/xfa/cjx_picture.h b/fxjs/xfa/cjx_picture.h
index 43e8c8f..fe3afb8 100644
--- a/fxjs/xfa/cjx_picture.h
+++ b/fxjs/xfa/cjx_picture.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_PICTURE_H_
 #define FXJS_XFA_CJX_PICTURE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Picture;
 
diff --git a/fxjs/xfa/cjx_query.h b/fxjs/xfa/cjx_query.h
index 44aaff4..dff3822 100644
--- a/fxjs/xfa/cjx_query.h
+++ b/fxjs/xfa/cjx_query.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_QUERY_H_
 #define FXJS_XFA_CJX_QUERY_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Query;
 
diff --git a/fxjs/xfa/cjx_radial.h b/fxjs/xfa/cjx_radial.h
index bd56239..761b3b1 100644
--- a/fxjs/xfa/cjx_radial.h
+++ b/fxjs/xfa/cjx_radial.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_RADIAL_H_
 #define FXJS_XFA_CJX_RADIAL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Radial;
 
diff --git a/fxjs/xfa/cjx_reason.h b/fxjs/xfa/cjx_reason.h
index 7b89d95..2b5b1d4 100644
--- a/fxjs/xfa/cjx_reason.h
+++ b/fxjs/xfa/cjx_reason.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_REASON_H_
 #define FXJS_XFA_CJX_REASON_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Reason;
 
diff --git a/fxjs/xfa/cjx_reasons.h b/fxjs/xfa/cjx_reasons.h
index 633bea5..cc4af12 100644
--- a/fxjs/xfa/cjx_reasons.h
+++ b/fxjs/xfa/cjx_reasons.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_REASONS_H_
 #define FXJS_XFA_CJX_REASONS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Reasons;
 
diff --git a/fxjs/xfa/cjx_recordset.h b/fxjs/xfa/cjx_recordset.h
index ee30961..d30d32f 100644
--- a/fxjs/xfa/cjx_recordset.h
+++ b/fxjs/xfa/cjx_recordset.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_RECORDSET_H_
 #define FXJS_XFA_CJX_RECORDSET_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_RecordSet;
 
diff --git a/fxjs/xfa/cjx_rectangle.h b/fxjs/xfa/cjx_rectangle.h
index ae7e0aa..05e3015 100644
--- a/fxjs/xfa/cjx_rectangle.h
+++ b/fxjs/xfa/cjx_rectangle.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_RECTANGLE_H_
 #define FXJS_XFA_CJX_RECTANGLE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Rectangle;
 
diff --git a/fxjs/xfa/cjx_ref.h b/fxjs/xfa/cjx_ref.h
index dc231c1..8a924ef 100644
--- a/fxjs/xfa/cjx_ref.h
+++ b/fxjs/xfa/cjx_ref.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_REF_H_
 #define FXJS_XFA_CJX_REF_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Ref;
 
diff --git a/fxjs/xfa/cjx_rootelement.h b/fxjs/xfa/cjx_rootelement.h
index 601a26f..64dca78 100644
--- a/fxjs/xfa/cjx_rootelement.h
+++ b/fxjs/xfa/cjx_rootelement.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_ROOTELEMENT_H_
 #define FXJS_XFA_CJX_ROOTELEMENT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_RootElement;
 
diff --git a/fxjs/xfa/cjx_script.h b/fxjs/xfa/cjx_script.h
index 3d4504a..52fc6fc 100644
--- a/fxjs/xfa/cjx_script.h
+++ b/fxjs/xfa/cjx_script.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SCRIPT_H_
 #define FXJS_XFA_CJX_SCRIPT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Script;
 
diff --git a/fxjs/xfa/cjx_select.h b/fxjs/xfa/cjx_select.h
index 9629660..11ce276 100644
--- a/fxjs/xfa/cjx_select.h
+++ b/fxjs/xfa/cjx_select.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SELECT_H_
 #define FXJS_XFA_CJX_SELECT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Select;
 
diff --git a/fxjs/xfa/cjx_setproperty.h b/fxjs/xfa/cjx_setproperty.h
index d602aaa..83e7f6d 100644
--- a/fxjs/xfa/cjx_setproperty.h
+++ b/fxjs/xfa/cjx_setproperty.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SETPROPERTY_H_
 #define FXJS_XFA_CJX_SETPROPERTY_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SetProperty;
 
diff --git a/fxjs/xfa/cjx_signature.h b/fxjs/xfa/cjx_signature.h
index e3b9c84..67f6888 100644
--- a/fxjs/xfa/cjx_signature.h
+++ b/fxjs/xfa/cjx_signature.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SIGNATURE_H_
 #define FXJS_XFA_CJX_SIGNATURE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Signature;
 
diff --git a/fxjs/xfa/cjx_signatureproperties.h b/fxjs/xfa/cjx_signatureproperties.h
index cc3e6d8..aa98fd9 100644
--- a/fxjs/xfa/cjx_signatureproperties.h
+++ b/fxjs/xfa/cjx_signatureproperties.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SIGNATUREPROPERTIES_H_
 #define FXJS_XFA_CJX_SIGNATUREPROPERTIES_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SignatureProperties;
 
diff --git a/fxjs/xfa/cjx_signaturepseudomodel.h b/fxjs/xfa/cjx_signaturepseudomodel.h
index 84a8751..865e27a 100644
--- a/fxjs/xfa/cjx_signaturepseudomodel.h
+++ b/fxjs/xfa/cjx_signaturepseudomodel.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CScript_SignaturePseudoModel;
 
diff --git a/fxjs/xfa/cjx_signdata.h b/fxjs/xfa/cjx_signdata.h
index e087f94..2ed0844 100644
--- a/fxjs/xfa/cjx_signdata.h
+++ b/fxjs/xfa/cjx_signdata.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SIGNDATA_H_
 #define FXJS_XFA_CJX_SIGNDATA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SignData;
 
diff --git a/fxjs/xfa/cjx_signing.h b/fxjs/xfa/cjx_signing.h
index 9c4cbeb..7618e44 100644
--- a/fxjs/xfa/cjx_signing.h
+++ b/fxjs/xfa/cjx_signing.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SIGNING_H_
 #define FXJS_XFA_CJX_SIGNING_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Signing;
 
diff --git a/fxjs/xfa/cjx_soapaction.h b/fxjs/xfa/cjx_soapaction.h
index dc61c76..738dd03 100644
--- a/fxjs/xfa/cjx_soapaction.h
+++ b/fxjs/xfa/cjx_soapaction.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SOAPACTION_H_
 #define FXJS_XFA_CJX_SOAPACTION_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SoapAction;
 
diff --git a/fxjs/xfa/cjx_soapaddress.h b/fxjs/xfa/cjx_soapaddress.h
index bd63bd0..4d011c6 100644
--- a/fxjs/xfa/cjx_soapaddress.h
+++ b/fxjs/xfa/cjx_soapaddress.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SOAPADDRESS_H_
 #define FXJS_XFA_CJX_SOAPADDRESS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SoapAddress;
 
diff --git a/fxjs/xfa/cjx_solid.h b/fxjs/xfa/cjx_solid.h
index b6c6c08..cf087ef 100644
--- a/fxjs/xfa/cjx_solid.h
+++ b/fxjs/xfa/cjx_solid.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SOLID_H_
 #define FXJS_XFA_CJX_SOLID_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Solid;
 
diff --git a/fxjs/xfa/cjx_source.h b/fxjs/xfa/cjx_source.h
index 0e72336..e2dd405 100644
--- a/fxjs/xfa/cjx_source.h
+++ b/fxjs/xfa/cjx_source.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SOURCE_H_
 #define FXJS_XFA_CJX_SOURCE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Source;
 
diff --git a/fxjs/xfa/cjx_sourceset.h b/fxjs/xfa/cjx_sourceset.h
index f18cd2e..88f4d98 100644
--- a/fxjs/xfa/cjx_sourceset.h
+++ b/fxjs/xfa/cjx_sourceset.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SOURCESET_H_
 #define FXJS_XFA_CJX_SOURCESET_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_model.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SourceSet;
 
diff --git a/fxjs/xfa/cjx_speak.h b/fxjs/xfa/cjx_speak.h
index e867b53..a1e3b5a 100644
--- a/fxjs/xfa/cjx_speak.h
+++ b/fxjs/xfa/cjx_speak.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SPEAK_H_
 #define FXJS_XFA_CJX_SPEAK_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Speak;
 
diff --git a/fxjs/xfa/cjx_stipple.h b/fxjs/xfa/cjx_stipple.h
index 87fb0b9..3f1ca5d 100644
--- a/fxjs/xfa/cjx_stipple.h
+++ b/fxjs/xfa/cjx_stipple.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_STIPPLE_H_
 #define FXJS_XFA_CJX_STIPPLE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Stipple;
 
diff --git a/fxjs/xfa/cjx_subform.h b/fxjs/xfa/cjx_subform.h
index d631e91..96a1f2b 100644
--- a/fxjs/xfa/cjx_subform.h
+++ b/fxjs/xfa/cjx_subform.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SUBFORM_H_
 #define FXJS_XFA_CJX_SUBFORM_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Delta;
 
diff --git a/fxjs/xfa/cjx_subformset.h b/fxjs/xfa/cjx_subformset.h
index 37cbc21..f71f7c3 100644
--- a/fxjs/xfa/cjx_subformset.h
+++ b/fxjs/xfa/cjx_subformset.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SUBFORMSET_H_
 #define FXJS_XFA_CJX_SUBFORMSET_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SubformSet;
 
diff --git a/fxjs/xfa/cjx_subjectdn.h b/fxjs/xfa/cjx_subjectdn.h
index 4f4e728..a675722 100644
--- a/fxjs/xfa/cjx_subjectdn.h
+++ b/fxjs/xfa/cjx_subjectdn.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SUBJECTDN_H_
 #define FXJS_XFA_CJX_SUBJECTDN_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SubjectDN;
 
diff --git a/fxjs/xfa/cjx_subjectdns.h b/fxjs/xfa/cjx_subjectdns.h
index c128f7c..71df2d9 100644
--- a/fxjs/xfa/cjx_subjectdns.h
+++ b/fxjs/xfa/cjx_subjectdns.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SUBJECTDNS_H_
 #define FXJS_XFA_CJX_SUBJECTDNS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_SubjectDNs;
 
diff --git a/fxjs/xfa/cjx_submit.h b/fxjs/xfa/cjx_submit.h
index 668ecd4..ef0c001 100644
--- a/fxjs/xfa/cjx_submit.h
+++ b/fxjs/xfa/cjx_submit.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_SUBMIT_H_
 #define FXJS_XFA_CJX_SUBMIT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Submit;
 
diff --git a/fxjs/xfa/cjx_template.h b/fxjs/xfa/cjx_template.h
index ccaf084..6d5f50b 100644
--- a/fxjs/xfa/cjx_template.h
+++ b/fxjs/xfa/cjx_template.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TEMPLATE_H_
 #define FXJS_XFA_CJX_TEMPLATE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_model.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Template;
 
diff --git a/fxjs/xfa/cjx_text.h b/fxjs/xfa/cjx_text.h
index c4e7e7e..49ec35e 100644
--- a/fxjs/xfa/cjx_text.h
+++ b/fxjs/xfa/cjx_text.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TEXT_H_
 #define FXJS_XFA_CJX_TEXT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Text;
 
diff --git a/fxjs/xfa/cjx_textedit.h b/fxjs/xfa/cjx_textedit.h
index 00beabb..479294c 100644
--- a/fxjs/xfa/cjx_textedit.h
+++ b/fxjs/xfa/cjx_textedit.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TEXTEDIT_H_
 #define FXJS_XFA_CJX_TEXTEDIT_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_TextEdit;
 
diff --git a/fxjs/xfa/cjx_textnode.h b/fxjs/xfa/cjx_textnode.h
index 3024a2f..9ef8a3f 100644
--- a/fxjs/xfa/cjx_textnode.h
+++ b/fxjs/xfa/cjx_textnode.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TEXTNODE_H_
 #define FXJS_XFA_CJX_TEXTNODE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/xfa/cjx_time.h b/fxjs/xfa/cjx_time.h
index 4ec70c6..6d9fe61 100644
--- a/fxjs/xfa/cjx_time.h
+++ b/fxjs/xfa/cjx_time.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TIME_H_
 #define FXJS_XFA_CJX_TIME_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_content.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Time;
 
diff --git a/fxjs/xfa/cjx_timestamp.h b/fxjs/xfa/cjx_timestamp.h
index 9b814a8..ca7595e 100644
--- a/fxjs/xfa/cjx_timestamp.h
+++ b/fxjs/xfa/cjx_timestamp.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TIMESTAMP_H_
 #define FXJS_XFA_CJX_TIMESTAMP_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_TimeStamp;
 
diff --git a/fxjs/xfa/cjx_tooltip.h b/fxjs/xfa/cjx_tooltip.h
index 8a96bf8..b0a8f47 100644
--- a/fxjs/xfa/cjx_tooltip.h
+++ b/fxjs/xfa/cjx_tooltip.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TOOLTIP_H_
 #define FXJS_XFA_CJX_TOOLTIP_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_ToolTip;
 
diff --git a/fxjs/xfa/cjx_traversal.h b/fxjs/xfa/cjx_traversal.h
index fb4014e..09af969 100644
--- a/fxjs/xfa/cjx_traversal.h
+++ b/fxjs/xfa/cjx_traversal.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TRAVERSAL_H_
 #define FXJS_XFA_CJX_TRAVERSAL_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Traversal;
 
diff --git a/fxjs/xfa/cjx_traverse.h b/fxjs/xfa/cjx_traverse.h
index 8ad204e..a7b8b16 100644
--- a/fxjs/xfa/cjx_traverse.h
+++ b/fxjs/xfa/cjx_traverse.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TRAVERSE_H_
 #define FXJS_XFA_CJX_TRAVERSE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Traverse;
 
diff --git a/fxjs/xfa/cjx_tree.h b/fxjs/xfa/cjx_tree.h
index a090db8..a30464f 100644
--- a/fxjs/xfa/cjx_tree.h
+++ b/fxjs/xfa/cjx_tree.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TREE_H_
 #define FXJS_XFA_CJX_TREE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_object.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Object;
 class CXFA_Node;
diff --git a/fxjs/xfa/cjx_treelist.h b/fxjs/xfa/cjx_treelist.h
index 729a6d5..6ae9518 100644
--- a/fxjs/xfa/cjx_treelist.h
+++ b/fxjs/xfa/cjx_treelist.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_TREELIST_H_
 #define FXJS_XFA_CJX_TREELIST_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_list.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_TreeList;
 
diff --git a/fxjs/xfa/cjx_ui.h b/fxjs/xfa/cjx_ui.h
index e986854..9ed8c5c 100644
--- a/fxjs/xfa/cjx_ui.h
+++ b/fxjs/xfa/cjx_ui.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_UI_H_
 #define FXJS_XFA_CJX_UI_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Ui;
 
diff --git a/fxjs/xfa/cjx_update.h b/fxjs/xfa/cjx_update.h
index d5e5fb1..ca6466f 100644
--- a/fxjs/xfa/cjx_update.h
+++ b/fxjs/xfa/cjx_update.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_UPDATE_H_
 #define FXJS_XFA_CJX_UPDATE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Update;
 
diff --git a/fxjs/xfa/cjx_uri.h b/fxjs/xfa/cjx_uri.h
index a53fc82..5486941 100644
--- a/fxjs/xfa/cjx_uri.h
+++ b/fxjs/xfa/cjx_uri.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_URI_H_
 #define FXJS_XFA_CJX_URI_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Uri;
 
diff --git a/fxjs/xfa/cjx_user.h b/fxjs/xfa/cjx_user.h
index 7a727f1..4662cde 100644
--- a/fxjs/xfa/cjx_user.h
+++ b/fxjs/xfa/cjx_user.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_USER_H_
 #define FXJS_XFA_CJX_USER_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_User;
 
diff --git a/fxjs/xfa/cjx_validate.h b/fxjs/xfa/cjx_validate.h
index 2130f29..628d241 100644
--- a/fxjs/xfa/cjx_validate.h
+++ b/fxjs/xfa/cjx_validate.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_VALIDATE_H_
 #define FXJS_XFA_CJX_VALIDATE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Validate;
 
diff --git a/fxjs/xfa/cjx_value.h b/fxjs/xfa/cjx_value.h
index 68f9434..23ee567 100644
--- a/fxjs/xfa/cjx_value.h
+++ b/fxjs/xfa/cjx_value.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_VALUE_H_
 #define FXJS_XFA_CJX_VALUE_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Value;
 
diff --git a/fxjs/xfa/cjx_variables.h b/fxjs/xfa/cjx_variables.h
index 97df623..895768b 100644
--- a/fxjs/xfa/cjx_variables.h
+++ b/fxjs/xfa/cjx_variables.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_VARIABLES_H_
 #define FXJS_XFA_CJX_VARIABLES_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_container.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Variables;
 
diff --git a/fxjs/xfa/cjx_wsdladdress.h b/fxjs/xfa/cjx_wsdladdress.h
index 4c15b84..bbf8ce2 100644
--- a/fxjs/xfa/cjx_wsdladdress.h
+++ b/fxjs/xfa/cjx_wsdladdress.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_WSDLADDRESS_H_
 #define FXJS_XFA_CJX_WSDLADDRESS_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_textnode.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_WsdlAddress;
 
diff --git a/fxjs/xfa/cjx_wsdlconnection.h b/fxjs/xfa/cjx_wsdlconnection.h
index 25df1ac..5b563b8 100644
--- a/fxjs/xfa/cjx_wsdlconnection.h
+++ b/fxjs/xfa/cjx_wsdlconnection.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_WSDLCONNECTION_H_
 #define FXJS_XFA_CJX_WSDLCONNECTION_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_WsdlConnection;
 
diff --git a/fxjs/xfa/cjx_xfa.h b/fxjs/xfa/cjx_xfa.h
index 4565195..882ee52 100644
--- a/fxjs/xfa/cjx_xfa.h
+++ b/fxjs/xfa/cjx_xfa.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_XFA_H_
 #define FXJS_XFA_CJX_XFA_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_model.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_Xfa;
 
diff --git a/fxjs/xfa/cjx_xmlconnection.h b/fxjs/xfa/cjx_xmlconnection.h
index 52f1c8b..b69390b 100644
--- a/fxjs/xfa/cjx_xmlconnection.h
+++ b/fxjs/xfa/cjx_xmlconnection.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_XMLCONNECTION_H_
 #define FXJS_XFA_CJX_XMLCONNECTION_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_XmlConnection;
 
diff --git a/fxjs/xfa/cjx_xsdconnection.h b/fxjs/xfa/cjx_xsdconnection.h
index e879806..63244ca 100644
--- a/fxjs/xfa/cjx_xsdconnection.h
+++ b/fxjs/xfa/cjx_xsdconnection.h
@@ -7,8 +7,8 @@
 #ifndef FXJS_XFA_CJX_XSDCONNECTION_H_
 #define FXJS_XFA_CJX_XSDCONNECTION_H_
 
-#include "fxjs/jse_define.h"
 #include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/jse_define.h"
 
 class CXFA_XsdConnection;
 
diff --git a/fxjs/xfa/jse_define.h b/fxjs/xfa/jse_define.h
new file mode 100644
index 0000000..73f246d
--- /dev/null
+++ b/fxjs/xfa/jse_define.h
@@ -0,0 +1,38 @@
+// Copyright 2017 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef FXJS_XFA_JSE_DEFINE_H_
+#define FXJS_XFA_JSE_DEFINE_H_
+
+#include <vector>
+
+#include "fxjs/cjs_result.h"
+
+class CFX_V8;
+
+template <class C,
+          CJS_Result (C::*M)(CFX_V8* runtime,
+                             const std::vector<v8::Local<v8::Value>>& params)>
+CJS_Result JSEMethod(C* node,
+                     CFX_V8* runtime,
+                     const std::vector<v8::Local<v8::Value>>& params) {
+  return (node->*M)(runtime, params);
+}
+
+#define JSE_METHOD(method_name, class_name)                 \
+  static CJS_Result method_name##_static(                   \
+      CJX_Object* node, CFX_V8* runtime,                    \
+      const std::vector<v8::Local<v8::Value>>& params) {    \
+    return JSEMethod<class_name, &class_name::method_name>( \
+        static_cast<class_name*>(node), runtime, params);   \
+  }                                                         \
+  CJS_Result method_name(CFX_V8* runtime,                   \
+                         const std::vector<v8::Local<v8::Value>>& params)
+
+#define JSE_PROP(prop_name) \
+  void prop_name(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute)
+
+#endif  // FXJS_XFA_JSE_DEFINE_H_