diff --git a/BUILD.gn b/BUILD.gn
index e546543..d9db5a7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1205,9 +1205,6 @@
 
   if (pdf_enable_v8) {
     sources += [
-      "fxjs/CJX_Define.h",
-      "fxjs/JS_Define.cpp",
-      "fxjs/JS_Define.h",
       "fxjs/cfx_v8.cpp",
       "fxjs/cfx_v8.h",
       "fxjs/cfxjs_engine.cpp",
@@ -1280,8 +1277,11 @@
       "fxjs/cjs_util.h",
       "fxjs/cjs_zoomtype.cpp",
       "fxjs/cjs_zoomtype.h",
+      "fxjs/cjx_define.h",
       "fxjs/global_timer.cpp",
       "fxjs/global_timer.h",
+      "fxjs/js_define.cpp",
+      "fxjs/js_define.h",
       "fxjs/js_resources.cpp",
       "fxjs/js_resources.h",
     ]
diff --git a/fxjs/cjs_annot.cpp b/fxjs/cjs_annot.cpp
index 4cb126d..b226621 100644
--- a/fxjs/cjs_annot.cpp
+++ b/fxjs/cjs_annot.cpp
@@ -6,9 +6,9 @@
 
 #include "fxjs/cjs_annot.h"
 
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_event_context.h"
 #include "fxjs/cjs_object.h"
+#include "fxjs/js_define.h"
 #include "fxjs/js_resources.h"
 
 namespace {
diff --git a/fxjs/cjs_annot.h b/fxjs/cjs_annot.h
index cdb884f..d313d56 100644
--- a/fxjs/cjs_annot.h
+++ b/fxjs/cjs_annot.h
@@ -8,7 +8,7 @@
 #define FXJS_CJS_ANNOT_H_
 
 #include "fpdfsdk/cpdfsdk_baannot.h"
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Annot : public CJS_Object {
  public:
diff --git a/fxjs/cjs_app.h b/fxjs/cjs_app.h
index 3c3a129..f1701ae 100644
--- a/fxjs/cjs_app.h
+++ b/fxjs/cjs_app.h
@@ -11,7 +11,7 @@
 #include <set>
 #include <vector>
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Runtime;
 class GlobalTimer;
diff --git a/fxjs/cjs_border.h b/fxjs/cjs_border.h
index 49e9325..0d10a1f 100644
--- a/fxjs/cjs_border.h
+++ b/fxjs/cjs_border.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_BORDER_H_
 #define FXJS_CJS_BORDER_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Border : public CJS_Object {
  public:
diff --git a/fxjs/cjs_color.cpp b/fxjs/cjs_color.cpp
index 66cb972..e46ddce 100644
--- a/fxjs/cjs_color.cpp
+++ b/fxjs/cjs_color.cpp
@@ -8,11 +8,11 @@
 
 #include <vector>
 
-#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"
+#include "fxjs/js_define.h"
 
 const JSPropertySpec CJS_Color::PropertySpecs[] = {
     {"black", get_black_static, set_black_static},
diff --git a/fxjs/cjs_color.h b/fxjs/cjs_color.h
index 00b9546..581fea0 100644
--- a/fxjs/cjs_color.h
+++ b/fxjs/cjs_color.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "fpdfsdk/pwl/cpwl_wnd.h"
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Color : public CJS_Object {
  public:
diff --git a/fxjs/cjs_console.cpp b/fxjs/cjs_console.cpp
index 8ed3472..867913c 100644
--- a/fxjs/cjs_console.cpp
+++ b/fxjs/cjs_console.cpp
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_event_context.h"
 #include "fxjs/cjs_eventhandler.h"
 #include "fxjs/cjs_object.h"
+#include "fxjs/js_define.h"
 
 const JSMethodSpec CJS_Console::MethodSpecs[] = {{"clear", clear_static},
                                                  {"hide", hide_static},
diff --git a/fxjs/cjs_console.h b/fxjs/cjs_console.h
index c25bc4b..7ed39bb 100644
--- a/fxjs/cjs_console.h
+++ b/fxjs/cjs_console.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Console : public CJS_Object {
  public:
diff --git a/fxjs/cjs_display.h b/fxjs/cjs_display.h
index e5806b0..2336952 100644
--- a/fxjs/cjs_display.h
+++ b/fxjs/cjs_display.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_DISPLAY_H_
 #define FXJS_CJS_DISPLAY_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Display : public CJS_Object {
  public:
diff --git a/fxjs/cjs_document.h b/fxjs/cjs_document.h
index 5172df0..6727f4e 100644
--- a/fxjs/cjs_document.h
+++ b/fxjs/cjs_document.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <vector>
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Document;
 class CPDF_TextObject;
diff --git a/fxjs/cjs_event.cpp b/fxjs/cjs_event.cpp
index d2537b9..ca0671d 100644
--- a/fxjs/cjs_event.cpp
+++ b/fxjs/cjs_event.cpp
@@ -6,11 +6,11 @@
 
 #include "fxjs/cjs_event.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"
+#include "fxjs/js_define.h"
 
 const JSPropertySpec CJS_Event::PropertySpecs[] = {
     {"change", get_change_static, set_change_static},
diff --git a/fxjs/cjs_event.h b/fxjs/cjs_event.h
index 434f259..39d9cdb 100644
--- a/fxjs/cjs_event.h
+++ b/fxjs/cjs_event.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_EVENT_H_
 #define FXJS_CJS_EVENT_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Event : public CJS_Object {
  public:
diff --git a/fxjs/cjs_event_context.cpp b/fxjs/cjs_event_context.cpp
index 0d9ba34..50149c4 100644
--- a/fxjs/cjs_event_context.cpp
+++ b/fxjs/cjs_event_context.cpp
@@ -7,9 +7,9 @@
 #include "fxjs/cjs_event_context.h"
 
 #include "core/fxcrt/autorestorer.h"
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_eventhandler.h"
 #include "fxjs/cjs_runtime.h"
+#include "fxjs/js_define.h"
 #include "fxjs/js_resources.h"
 
 CJS_EventContext::CJS_EventContext(CJS_Runtime* pRuntime)
diff --git a/fxjs/cjs_eventhandler.cpp b/fxjs/cjs_eventhandler.cpp
index 5b20ce7..2f42d41 100644
--- a/fxjs/cjs_eventhandler.cpp
+++ b/fxjs/cjs_eventhandler.cpp
@@ -7,12 +7,12 @@
 #include "fxjs/cjs_eventhandler.h"
 
 #include "core/fpdfdoc/cpdf_formfield.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"
+#include "fxjs/js_define.h"
 
 CJS_EventHandler::CJS_EventHandler(CJS_EventContext* pContext)
     : m_pJSEventContext(pContext) {}
diff --git a/fxjs/cjs_field.h b/fxjs/cjs_field.h
index ba47613..0f089d0 100644
--- a/fxjs/cjs_field.h
+++ b/fxjs/cjs_field.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CPDF_FormControl;
 class CPDFSDK_Widget;
diff --git a/fxjs/cjs_font.h b/fxjs/cjs_font.h
index 8e52778..be677d4 100644
--- a/fxjs/cjs_font.h
+++ b/fxjs/cjs_font.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_FONT_H_
 #define FXJS_CJS_FONT_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Font : public CJS_Object {
  public:
diff --git a/fxjs/cjs_global.cpp b/fxjs/cjs_global.cpp
index 2a91bdd..9a1f541 100644
--- a/fxjs/cjs_global.cpp
+++ b/fxjs/cjs_global.cpp
@@ -12,12 +12,12 @@
 #include <vector>
 
 #include "core/fxcrt/fx_extension.h"
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_event_context.h"
 #include "fxjs/cjs_eventhandler.h"
 #include "fxjs/cjs_globaldata.h"
 #include "fxjs/cjs_keyvalue.h"
 #include "fxjs/cjs_object.h"
+#include "fxjs/js_define.h"
 #include "fxjs/js_resources.h"
 
 namespace {
diff --git a/fxjs/cjs_global.h b/fxjs/cjs_global.h
index 8a2fdab..e0d41b8 100644
--- a/fxjs/cjs_global.h
+++ b/fxjs/cjs_global.h
@@ -11,8 +11,8 @@
 #include <memory>
 #include <vector>
 
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_keyvalue.h"
+#include "fxjs/js_define.h"
 
 class CJS_GlobalData;
 
diff --git a/fxjs/cjs_globalarrays.h b/fxjs/cjs_globalarrays.h
index 297b97b..8e97273 100644
--- a/fxjs/cjs_globalarrays.h
+++ b/fxjs/cjs_globalarrays.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_GLOBALARRAYS_H_
 #define FXJS_CJS_GLOBALARRAYS_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_GlobalArrays : public CJS_Object {
  public:
diff --git a/fxjs/cjs_globalconsts.h b/fxjs/cjs_globalconsts.h
index 8c6618e..1bef384 100644
--- a/fxjs/cjs_globalconsts.h
+++ b/fxjs/cjs_globalconsts.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_GLOBALCONSTS_H_
 #define FXJS_CJS_GLOBALCONSTS_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_GlobalConsts : public CJS_Object {
  public:
diff --git a/fxjs/cjs_highlight.h b/fxjs/cjs_highlight.h
index 2815c88..a5fc21d 100644
--- a/fxjs/cjs_highlight.h
+++ b/fxjs/cjs_highlight.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_HIGHLIGHT_H_
 #define FXJS_CJS_HIGHLIGHT_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Highlight : public CJS_Object {
  public:
diff --git a/fxjs/cjs_icon.h b/fxjs/cjs_icon.h
index 2f3ee3f..05fa430 100644
--- a/fxjs/cjs_icon.h
+++ b/fxjs/cjs_icon.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_ICON_H_
 #define FXJS_CJS_ICON_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Icon : public CJS_Object {
  public:
diff --git a/fxjs/cjs_position.h b/fxjs/cjs_position.h
index 0f54c2b..3e62bc9 100644
--- a/fxjs/cjs_position.h
+++ b/fxjs/cjs_position.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_POSITION_H_
 #define FXJS_CJS_POSITION_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Position : public CJS_Object {
  public:
diff --git a/fxjs/cjs_printparamsobj.h b/fxjs/cjs_printparamsobj.h
index 90bc9b8..572d7d8 100644
--- a/fxjs/cjs_printparamsobj.h
+++ b/fxjs/cjs_printparamsobj.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_PRINTPARAMSOBJ_H_
 #define FXJS_CJS_PRINTPARAMSOBJ_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_PrintParamsObj : public CJS_Object {
  public:
diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp
index b8d62b1..d37706c 100644
--- a/fxjs/cjs_publicmethods.cpp
+++ b/fxjs/cjs_publicmethods.cpp
@@ -20,7 +20,6 @@
 #include "core/fxcrt/fx_extension.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_color.h"
 #include "fxjs/cjs_event_context.h"
 #include "fxjs/cjs_eventhandler.h"
@@ -28,6 +27,7 @@
 #include "fxjs/cjs_object.h"
 #include "fxjs/cjs_runtime.h"
 #include "fxjs/cjs_util.h"
+#include "fxjs/js_define.h"
 #include "fxjs/js_resources.h"
 
 // static
diff --git a/fxjs/cjs_publicmethods.h b/fxjs/cjs_publicmethods.h
index df23eb1..89603ca 100644
--- a/fxjs/cjs_publicmethods.h
+++ b/fxjs/cjs_publicmethods.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_PublicMethods : public CJS_Object {
  public:
diff --git a/fxjs/cjs_report.cpp b/fxjs/cjs_report.cpp
index 89737e6..3a91276 100644
--- a/fxjs/cjs_report.cpp
+++ b/fxjs/cjs_report.cpp
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_object.h"
+#include "fxjs/js_define.h"
 
 const JSMethodSpec CJS_Report::MethodSpecs[] = {
     {"save", save_static},
diff --git a/fxjs/cjs_report.h b/fxjs/cjs_report.h
index 8de0991..36a00ce 100644
--- a/fxjs/cjs_report.h
+++ b/fxjs/cjs_report.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Report : public CJS_Object {
  public:
diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp
index b47c595..22dc904 100644
--- a/fxjs/cjs_runtime.cpp
+++ b/fxjs/cjs_runtime.cpp
@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
-#include "fxjs/JS_Define.h"
 #include "fxjs/cjs_annot.h"
 #include "fxjs/cjs_app.h"
 #include "fxjs/cjs_border.h"
@@ -39,6 +38,7 @@
 #include "fxjs/cjs_timerobj.h"
 #include "fxjs/cjs_util.h"
 #include "fxjs/cjs_zoomtype.h"
+#include "fxjs/js_define.h"
 #include "public/fpdf_formfill.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fxjs/cjs_scalehow.h b/fxjs/cjs_scalehow.h
index bbff20a..a0d16b3 100644
--- a/fxjs/cjs_scalehow.h
+++ b/fxjs/cjs_scalehow.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_SCALEHOW_H_
 #define FXJS_CJS_SCALEHOW_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_ScaleHow : public CJS_Object {
  public:
diff --git a/fxjs/cjs_scalewhen.h b/fxjs/cjs_scalewhen.h
index d068a38..f30a3bd 100644
--- a/fxjs/cjs_scalewhen.h
+++ b/fxjs/cjs_scalewhen.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_SCALEWHEN_H_
 #define FXJS_CJS_SCALEWHEN_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_ScaleWhen : public CJS_Object {
  public:
diff --git a/fxjs/cjs_style.h b/fxjs/cjs_style.h
index ba7eefa..dade59f 100644
--- a/fxjs/cjs_style.h
+++ b/fxjs/cjs_style.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_STYLE_H_
 #define FXJS_CJS_STYLE_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Style : public CJS_Object {
  public:
diff --git a/fxjs/cjs_timerobj.h b/fxjs/cjs_timerobj.h
index 810b1b3..d9dc881 100644
--- a/fxjs/cjs_timerobj.h
+++ b/fxjs/cjs_timerobj.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_TIMEROBJ_H_
 #define FXJS_CJS_TIMEROBJ_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class GlobalTimer;
 
diff --git a/fxjs/cjs_util.cpp b/fxjs/cjs_util.cpp
index ee96395..8da9a07 100644
--- a/fxjs/cjs_util.cpp
+++ b/fxjs/cjs_util.cpp
@@ -15,12 +15,12 @@
 #include <vector>
 
 #include "core/fxcrt/fx_extension.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_define.h"
 #include "fxjs/js_resources.h"
 
 #if _FX_OS_ == _FX_OS_ANDROID_
diff --git a/fxjs/cjs_util.h b/fxjs/cjs_util.h
index 03e1b08..a601d82 100644
--- a/fxjs/cjs_util.h
+++ b/fxjs/cjs_util.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 // Return values for ParseDataType() below.
 #define UTIL_INT 0
diff --git a/fxjs/cjs_zoomtype.h b/fxjs/cjs_zoomtype.h
index a5f6fda..5dda997 100644
--- a/fxjs/cjs_zoomtype.h
+++ b/fxjs/cjs_zoomtype.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CJS_ZOOMTYPE_H_
 #define FXJS_CJS_ZOOMTYPE_H_
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 class CJS_Zoomtype : public CJS_Object {
  public:
diff --git a/fxjs/CJX_Define.h b/fxjs/cjx_define.h
similarity index 100%
rename from fxjs/CJX_Define.h
rename to fxjs/cjx_define.h
diff --git a/fxjs/JS_Define.cpp b/fxjs/js_define.cpp
similarity index 99%
rename from fxjs/JS_Define.cpp
rename to fxjs/js_define.cpp
index d5b1cef..3e14a3d 100644
--- a/fxjs/JS_Define.cpp
+++ b/fxjs/js_define.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/JS_Define.h"
+#include "fxjs/js_define.h"
 
 #include <time.h>
 
diff --git a/fxjs/JS_Define.h b/fxjs/js_define.h
similarity index 100%
rename from fxjs/JS_Define.h
rename to fxjs/js_define.h
diff --git a/fxjs/xfa/cjx_container.h b/fxjs/xfa/cjx_container.h
index 0e2170f..e116358 100644
--- a/fxjs/xfa/cjx_container.h
+++ b/fxjs/xfa/cjx_container.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_CONTAINER_H_
 #define FXJS_XFA_CJX_CONTAINER_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
diff --git a/fxjs/xfa/cjx_content.h b/fxjs/xfa/cjx_content.h
index 983a750..351728e 100644
--- a/fxjs/xfa/cjx_content.h
+++ b/fxjs/xfa/cjx_content.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_CONTENT_H_
 #define FXJS_XFA_CJX_CONTENT_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Content;
diff --git a/fxjs/xfa/cjx_datawindow.h b/fxjs/xfa/cjx_datawindow.h
index dfaa6a4..0541ef1 100644
--- a/fxjs/xfa/cjx_datawindow.h
+++ b/fxjs/xfa/cjx_datawindow.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_DATAWINDOW_H_
 #define FXJS_XFA_CJX_DATAWINDOW_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
diff --git a/fxjs/xfa/cjx_delta.h b/fxjs/xfa/cjx_delta.h
index 2b981cd..4d67763 100644
--- a/fxjs/xfa/cjx_delta.h
+++ b/fxjs/xfa/cjx_delta.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_DELTA_H_
 #define FXJS_XFA_CJX_DELTA_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Delta;
diff --git a/fxjs/xfa/cjx_desc.h b/fxjs/xfa/cjx_desc.h
index 4d21c7b..4218ed2 100644
--- a/fxjs/xfa/cjx_desc.h
+++ b/fxjs/xfa/cjx_desc.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_DESC_H_
 #define FXJS_XFA_CJX_DESC_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Desc;
diff --git a/fxjs/xfa/cjx_eventpseudomodel.h b/fxjs/xfa/cjx_eventpseudomodel.h
index 5d8bcc3..b30c659 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.h
+++ b/fxjs/xfa/cjx_eventpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 class CFXJSE_Value;
diff --git a/fxjs/xfa/cjx_exclgroup.h b/fxjs/xfa/cjx_exclgroup.h
index a972fba..fc65400 100644
--- a/fxjs/xfa/cjx_exclgroup.h
+++ b/fxjs/xfa/cjx_exclgroup.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_EXCLGROUP_H_
 #define FXJS_XFA_CJX_EXCLGROUP_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_ExclGroup;
diff --git a/fxjs/xfa/cjx_field.h b/fxjs/xfa/cjx_field.h
index 4f7238f..697aca3 100644
--- a/fxjs/xfa/cjx_field.h
+++ b/fxjs/xfa/cjx_field.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_FIELD_H_
 #define FXJS_XFA_CJX_FIELD_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_container.h"
 
 class CXFA_Field;
diff --git a/fxjs/xfa/cjx_form.h b/fxjs/xfa/cjx_form.h
index e4d64da..235dc14 100644
--- a/fxjs/xfa/cjx_form.h
+++ b/fxjs/xfa/cjx_form.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_FORM_H_
 #define FXJS_XFA_CJX_FORM_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_model.h"
 
 class CXFA_Form;
diff --git a/fxjs/xfa/cjx_hostpseudomodel.h b/fxjs/xfa/cjx_hostpseudomodel.h
index b4d6fe6..7b9279a 100644
--- a/fxjs/xfa/cjx_hostpseudomodel.h
+++ b/fxjs/xfa/cjx_hostpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
diff --git a/fxjs/xfa/cjx_instancemanager.h b/fxjs/xfa/cjx_instancemanager.h
index 74efad5..c869ec3 100644
--- a/fxjs/xfa/cjx_instancemanager.h
+++ b/fxjs/xfa/cjx_instancemanager.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_INSTANCEMANAGER_H_
 #define FXJS_XFA_CJX_INSTANCEMANAGER_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_InstanceManager;
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.h b/fxjs/xfa/cjx_layoutpseudomodel.h
index ecacdd1..b57c80c 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.h
+++ b/fxjs/xfa/cjx_layoutpseudomodel.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 enum XFA_LAYOUTMODEL_HWXY {
diff --git a/fxjs/xfa/cjx_list.h b/fxjs/xfa/cjx_list.h
index 83801b7..90ecf69 100644
--- a/fxjs/xfa/cjx_list.h
+++ b/fxjs/xfa/cjx_list.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_LIST_H_
 #define FXJS_XFA_CJX_LIST_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 class CXFA_List;
diff --git a/fxjs/xfa/cjx_logpseudomodel.h b/fxjs/xfa/cjx_logpseudomodel.h
index 772bf30..a6ef871 100644
--- a/fxjs/xfa/cjx_logpseudomodel.h
+++ b/fxjs/xfa/cjx_logpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 class CScript_LogPseudoModel;
diff --git a/fxjs/xfa/cjx_manifest.h b/fxjs/xfa/cjx_manifest.h
index 75fcacd..78aa5bc 100644
--- a/fxjs/xfa/cjx_manifest.h
+++ b/fxjs/xfa/cjx_manifest.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_MANIFEST_H_
 #define FXJS_XFA_CJX_MANIFEST_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Manifest;
diff --git a/fxjs/xfa/cjx_model.h b/fxjs/xfa/cjx_model.h
index fae1cc7..6071235 100644
--- a/fxjs/xfa/cjx_model.h
+++ b/fxjs/xfa/cjx_model.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_MODEL_H_
 #define FXJS_XFA_CJX_MODEL_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
diff --git a/fxjs/xfa/cjx_node.h b/fxjs/xfa/cjx_node.h
index f7cbce8..224f44c 100644
--- a/fxjs/xfa/cjx_node.h
+++ b/fxjs/xfa/cjx_node.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_NODE_H_
 #define FXJS_XFA_CJX_NODE_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "fxjs/xfa/cjx_tree.h"
 #include "xfa/fxfa/fxfa_basic.h"
diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index 1fcd753..ac17a04 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -15,7 +15,7 @@
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxcrt/widestring.h"
 #include "core/fxcrt/xml/cfx_xmlelement.h"
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "third_party/base/optional.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
diff --git a/fxjs/xfa/cjx_packet.h b/fxjs/xfa/cjx_packet.h
index ac1c170..573ea3a 100644
--- a/fxjs/xfa/cjx_packet.h
+++ b/fxjs/xfa/cjx_packet.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_PACKET_H_
 #define FXJS_XFA_CJX_PACKET_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Packet;
diff --git a/fxjs/xfa/cjx_signaturepseudomodel.h b/fxjs/xfa/cjx_signaturepseudomodel.h
index 88f90fb..0aecfa5 100644
--- a/fxjs/xfa/cjx_signaturepseudomodel.h
+++ b/fxjs/xfa/cjx_signaturepseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
 #define FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 class CScript_SignaturePseudoModel;
diff --git a/fxjs/xfa/cjx_source.h b/fxjs/xfa/cjx_source.h
index de84912..dcbdfde 100644
--- a/fxjs/xfa/cjx_source.h
+++ b/fxjs/xfa/cjx_source.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_SOURCE_H_
 #define FXJS_XFA_CJX_SOURCE_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Source;
diff --git a/fxjs/xfa/cjx_subform.h b/fxjs/xfa/cjx_subform.h
index a1c535b..e982fa5 100644
--- a/fxjs/xfa/cjx_subform.h
+++ b/fxjs/xfa/cjx_subform.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_SUBFORM_H_
 #define FXJS_XFA_CJX_SUBFORM_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_container.h"
 
 class CXFA_Delta;
diff --git a/fxjs/xfa/cjx_template.h b/fxjs/xfa/cjx_template.h
index 2c82788..e67b1b7 100644
--- a/fxjs/xfa/cjx_template.h
+++ b/fxjs/xfa/cjx_template.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_TEMPLATE_H_
 #define FXJS_XFA_CJX_TEMPLATE_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_model.h"
 
 class CXFA_Template;
diff --git a/fxjs/xfa/cjx_textnode.h b/fxjs/xfa/cjx_textnode.h
index 12d44d7..f3dbe19 100644
--- a/fxjs/xfa/cjx_textnode.h
+++ b/fxjs/xfa/cjx_textnode.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_TEXTNODE_H_
 #define FXJS_XFA_CJX_TEXTNODE_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
diff --git a/fxjs/xfa/cjx_tree.h b/fxjs/xfa/cjx_tree.h
index 9389d2e..22b3aca 100644
--- a/fxjs/xfa/cjx_tree.h
+++ b/fxjs/xfa/cjx_tree.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_TREE_H_
 #define FXJS_XFA_CJX_TREE_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Object;
diff --git a/fxjs/xfa/cjx_treelist.h b/fxjs/xfa/cjx_treelist.h
index 29a95e6..b3f1daf 100644
--- a/fxjs/xfa/cjx_treelist.h
+++ b/fxjs/xfa/cjx_treelist.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_TREELIST_H_
 #define FXJS_XFA_CJX_TREELIST_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_list.h"
 
 class CXFA_TreeList;
diff --git a/fxjs/xfa/cjx_wsdlconnection.h b/fxjs/xfa/cjx_wsdlconnection.h
index d755b5d..eb729c2 100644
--- a/fxjs/xfa/cjx_wsdlconnection.h
+++ b/fxjs/xfa/cjx_wsdlconnection.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_XFA_CJX_WSDLCONNECTION_H_
 #define FXJS_XFA_CJX_WSDLCONNECTION_H_
 
-#include "fxjs/CJX_Define.h"
+#include "fxjs/cjx_define.h"
 #include "fxjs/xfa/cjx_node.h"
 
 class CXFA_WsdlConnection;