Remove CJX_ classes that do not meaningfully extend CJX_Node.

One step towards getting CJX_Object::TypeTag enum to correspond 1:1
with CJX_ classes. May or may not improve binary size, depending
on how effective "Identical Code Folding" is on a given platform.

Three of these classes were never getting instantiated in the first
place as it turns out.

Change-Id: Icb940ae4ff952acbf07aa353e41d38f9b8feb97f
Reviewed-on: https://pdfium-review.googlesource.com/c/48871
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index 706884b..ca1f9e8 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn
@@ -136,52 +136,14 @@
         "xfa/cfxjse_runtimedata.h",
         "xfa/cfxjse_value.cpp",
         "xfa/cfxjse_value.h",
-        "xfa/cjx_arc.cpp",
-        "xfa/cjx_arc.h",
         "xfa/cjx_area.cpp",
         "xfa/cjx_area.h",
-        "xfa/cjx_assist.cpp",
-        "xfa/cjx_assist.h",
-        "xfa/cjx_barcode.cpp",
-        "xfa/cjx_barcode.h",
-        "xfa/cjx_bind.cpp",
-        "xfa/cjx_bind.h",
-        "xfa/cjx_binditems.cpp",
-        "xfa/cjx_binditems.h",
-        "xfa/cjx_bookend.cpp",
-        "xfa/cjx_bookend.h",
         "xfa/cjx_boolean.cpp",
         "xfa/cjx_boolean.h",
-        "xfa/cjx_border.cpp",
-        "xfa/cjx_border.h",
-        "xfa/cjx_break.cpp",
-        "xfa/cjx_break.h",
-        "xfa/cjx_breakafter.cpp",
-        "xfa/cjx_breakafter.h",
-        "xfa/cjx_breakbefore.cpp",
-        "xfa/cjx_breakbefore.h",
-        "xfa/cjx_button.cpp",
-        "xfa/cjx_button.h",
-        "xfa/cjx_calculate.cpp",
-        "xfa/cjx_calculate.h",
-        "xfa/cjx_caption.cpp",
-        "xfa/cjx_caption.h",
         "xfa/cjx_certificate.cpp",
         "xfa/cjx_certificate.h",
-        "xfa/cjx_certificates.cpp",
-        "xfa/cjx_certificates.h",
-        "xfa/cjx_checkbutton.cpp",
-        "xfa/cjx_checkbutton.h",
-        "xfa/cjx_choicelist.cpp",
-        "xfa/cjx_choicelist.h",
-        "xfa/cjx_color.cpp",
-        "xfa/cjx_color.h",
         "xfa/cjx_comb.cpp",
         "xfa/cjx_comb.h",
-        "xfa/cjx_command.cpp",
-        "xfa/cjx_command.h",
-        "xfa/cjx_connect.cpp",
-        "xfa/cjx_connect.h",
         "xfa/cjx_connectstring.cpp",
         "xfa/cjx_connectstring.h",
         "xfa/cjx_container.cpp",
@@ -190,8 +152,6 @@
         "xfa/cjx_content.h",
         "xfa/cjx_contentarea.cpp",
         "xfa/cjx_contentarea.h",
-        "xfa/cjx_corner.cpp",
-        "xfa/cjx_corner.h",
         "xfa/cjx_datavalue.cpp",
         "xfa/cjx_datavalue.h",
         "xfa/cjx_datawindow.cpp",
@@ -200,12 +160,8 @@
         "xfa/cjx_date.h",
         "xfa/cjx_datetime.cpp",
         "xfa/cjx_datetime.h",
-        "xfa/cjx_datetimeedit.cpp",
-        "xfa/cjx_datetimeedit.h",
         "xfa/cjx_decimal.cpp",
         "xfa/cjx_decimal.h",
-        "xfa/cjx_defaultui.cpp",
-        "xfa/cjx_defaultui.h",
         "xfa/cjx_delete.cpp",
         "xfa/cjx_delete.h",
         "xfa/cjx_delta.cpp",
@@ -214,138 +170,68 @@
         "xfa/cjx_deltas.h",
         "xfa/cjx_desc.cpp",
         "xfa/cjx_desc.h",
-        "xfa/cjx_digestmethod.cpp",
-        "xfa/cjx_digestmethod.h",
-        "xfa/cjx_digestmethods.cpp",
-        "xfa/cjx_digestmethods.h",
         "xfa/cjx_draw.cpp",
         "xfa/cjx_draw.h",
-        "xfa/cjx_edge.cpp",
-        "xfa/cjx_edge.h",
-        "xfa/cjx_encoding.cpp",
-        "xfa/cjx_encoding.h",
-        "xfa/cjx_encodings.cpp",
-        "xfa/cjx_encodings.h",
         "xfa/cjx_encrypt.cpp",
         "xfa/cjx_encrypt.h",
-        "xfa/cjx_event.cpp",
-        "xfa/cjx_event.h",
         "xfa/cjx_eventpseudomodel.cpp",
         "xfa/cjx_eventpseudomodel.h",
         "xfa/cjx_exclgroup.cpp",
         "xfa/cjx_exclgroup.h",
         "xfa/cjx_exdata.cpp",
         "xfa/cjx_exdata.h",
-        "xfa/cjx_execute.cpp",
-        "xfa/cjx_execute.h",
-        "xfa/cjx_exobject.cpp",
-        "xfa/cjx_exobject.h",
         "xfa/cjx_extras.cpp",
         "xfa/cjx_extras.h",
         "xfa/cjx_field.cpp",
         "xfa/cjx_field.h",
-        "xfa/cjx_fill.cpp",
-        "xfa/cjx_fill.h",
-        "xfa/cjx_filter.cpp",
-        "xfa/cjx_filter.h",
         "xfa/cjx_float.cpp",
         "xfa/cjx_float.h",
-        "xfa/cjx_font.cpp",
-        "xfa/cjx_font.h",
         "xfa/cjx_form.cpp",
         "xfa/cjx_form.h",
-        "xfa/cjx_format.cpp",
-        "xfa/cjx_format.h",
         "xfa/cjx_handler.cpp",
         "xfa/cjx_handler.h",
         "xfa/cjx_hostpseudomodel.cpp",
         "xfa/cjx_hostpseudomodel.h",
         "xfa/cjx_image.cpp",
         "xfa/cjx_image.h",
-        "xfa/cjx_imageedit.cpp",
-        "xfa/cjx_imageedit.h",
         "xfa/cjx_insert.cpp",
         "xfa/cjx_insert.h",
         "xfa/cjx_instancemanager.cpp",
         "xfa/cjx_instancemanager.h",
         "xfa/cjx_integer.cpp",
         "xfa/cjx_integer.h",
-        "xfa/cjx_issuers.cpp",
-        "xfa/cjx_issuers.h",
-        "xfa/cjx_items.cpp",
-        "xfa/cjx_items.h",
-        "xfa/cjx_keep.cpp",
-        "xfa/cjx_keep.h",
-        "xfa/cjx_keyusage.cpp",
-        "xfa/cjx_keyusage.h",
         "xfa/cjx_layoutpseudomodel.cpp",
         "xfa/cjx_layoutpseudomodel.h",
-        "xfa/cjx_line.cpp",
-        "xfa/cjx_line.h",
-        "xfa/cjx_linear.cpp",
-        "xfa/cjx_linear.h",
         "xfa/cjx_list.cpp",
         "xfa/cjx_list.h",
         "xfa/cjx_logpseudomodel.cpp",
         "xfa/cjx_logpseudomodel.h",
         "xfa/cjx_manifest.cpp",
         "xfa/cjx_manifest.h",
-        "xfa/cjx_map.cpp",
-        "xfa/cjx_map.h",
-        "xfa/cjx_margin.cpp",
-        "xfa/cjx_margin.h",
-        "xfa/cjx_mdp.cpp",
-        "xfa/cjx_mdp.h",
-        "xfa/cjx_medium.cpp",
-        "xfa/cjx_medium.h",
-        "xfa/cjx_message.cpp",
-        "xfa/cjx_message.h",
         "xfa/cjx_model.cpp",
         "xfa/cjx_model.h",
         "xfa/cjx_node.cpp",
         "xfa/cjx_node.h",
-        "xfa/cjx_numericedit.cpp",
-        "xfa/cjx_numericedit.h",
         "xfa/cjx_object.cpp",
         "xfa/cjx_object.h",
         "xfa/cjx_occur.cpp",
         "xfa/cjx_occur.h",
         "xfa/cjx_oid.cpp",
         "xfa/cjx_oid.h",
-        "xfa/cjx_oids.cpp",
-        "xfa/cjx_oids.h",
         "xfa/cjx_operation.cpp",
         "xfa/cjx_operation.h",
-        "xfa/cjx_overflow.cpp",
-        "xfa/cjx_overflow.h",
         "xfa/cjx_packet.cpp",
         "xfa/cjx_packet.h",
         "xfa/cjx_pagearea.cpp",
         "xfa/cjx_pagearea.h",
         "xfa/cjx_pageset.cpp",
         "xfa/cjx_pageset.h",
-        "xfa/cjx_para.cpp",
-        "xfa/cjx_para.h",
         "xfa/cjx_password.cpp",
         "xfa/cjx_password.h",
-        "xfa/cjx_passwordedit.cpp",
-        "xfa/cjx_passwordedit.h",
-        "xfa/cjx_pattern.cpp",
-        "xfa/cjx_pattern.h",
         "xfa/cjx_picture.cpp",
         "xfa/cjx_picture.h",
-        "xfa/cjx_query.cpp",
-        "xfa/cjx_query.h",
-        "xfa/cjx_radial.cpp",
-        "xfa/cjx_radial.h",
         "xfa/cjx_reason.cpp",
         "xfa/cjx_reason.h",
-        "xfa/cjx_reasons.cpp",
-        "xfa/cjx_reasons.h",
-        "xfa/cjx_recordset.cpp",
-        "xfa/cjx_recordset.h",
-        "xfa/cjx_rectangle.cpp",
-        "xfa/cjx_rectangle.h",
         "xfa/cjx_ref.cpp",
         "xfa/cjx_ref.h",
         "xfa/cjx_rootelement.cpp",
@@ -354,74 +240,42 @@
         "xfa/cjx_script.h",
         "xfa/cjx_select.cpp",
         "xfa/cjx_select.h",
-        "xfa/cjx_setproperty.cpp",
-        "xfa/cjx_setproperty.h",
-        "xfa/cjx_signature.cpp",
-        "xfa/cjx_signature.h",
-        "xfa/cjx_signatureproperties.cpp",
-        "xfa/cjx_signatureproperties.h",
         "xfa/cjx_signaturepseudomodel.cpp",
         "xfa/cjx_signaturepseudomodel.h",
-        "xfa/cjx_signdata.cpp",
-        "xfa/cjx_signdata.h",
-        "xfa/cjx_signing.cpp",
-        "xfa/cjx_signing.h",
         "xfa/cjx_soapaction.cpp",
         "xfa/cjx_soapaction.h",
         "xfa/cjx_soapaddress.cpp",
         "xfa/cjx_soapaddress.h",
-        "xfa/cjx_solid.cpp",
-        "xfa/cjx_solid.h",
         "xfa/cjx_source.cpp",
         "xfa/cjx_source.h",
         "xfa/cjx_sourceset.cpp",
         "xfa/cjx_sourceset.h",
         "xfa/cjx_speak.cpp",
         "xfa/cjx_speak.h",
-        "xfa/cjx_stipple.cpp",
-        "xfa/cjx_stipple.h",
         "xfa/cjx_subform.cpp",
         "xfa/cjx_subform.h",
         "xfa/cjx_subformset.cpp",
         "xfa/cjx_subformset.h",
-        "xfa/cjx_subjectdn.cpp",
-        "xfa/cjx_subjectdn.h",
-        "xfa/cjx_subjectdns.cpp",
-        "xfa/cjx_subjectdns.h",
-        "xfa/cjx_submit.cpp",
-        "xfa/cjx_submit.h",
         "xfa/cjx_template.cpp",
         "xfa/cjx_template.h",
         "xfa/cjx_text.cpp",
         "xfa/cjx_text.h",
-        "xfa/cjx_textedit.cpp",
-        "xfa/cjx_textedit.h",
         "xfa/cjx_textnode.cpp",
         "xfa/cjx_textnode.h",
         "xfa/cjx_time.cpp",
         "xfa/cjx_time.h",
-        "xfa/cjx_timestamp.cpp",
-        "xfa/cjx_timestamp.h",
         "xfa/cjx_tooltip.cpp",
         "xfa/cjx_tooltip.h",
-        "xfa/cjx_traversal.cpp",
-        "xfa/cjx_traversal.h",
-        "xfa/cjx_traverse.cpp",
-        "xfa/cjx_traverse.h",
         "xfa/cjx_tree.cpp",
         "xfa/cjx_tree.h",
         "xfa/cjx_treelist.cpp",
         "xfa/cjx_treelist.h",
-        "xfa/cjx_ui.cpp",
-        "xfa/cjx_ui.h",
         "xfa/cjx_update.cpp",
         "xfa/cjx_update.h",
         "xfa/cjx_uri.cpp",
         "xfa/cjx_uri.h",
         "xfa/cjx_user.cpp",
         "xfa/cjx_user.h",
-        "xfa/cjx_validate.cpp",
-        "xfa/cjx_validate.h",
         "xfa/cjx_value.cpp",
         "xfa/cjx_value.h",
         "xfa/cjx_variables.cpp",
@@ -432,10 +286,6 @@
         "xfa/cjx_wsdlconnection.h",
         "xfa/cjx_xfa.cpp",
         "xfa/cjx_xfa.h",
-        "xfa/cjx_xmlconnection.cpp",
-        "xfa/cjx_xmlconnection.h",
-        "xfa/cjx_xsdconnection.cpp",
-        "xfa/cjx_xsdconnection.h",
         "xfa/fxjse.cpp",
         "xfa/fxjse.h",
         "xfa/jse_define.h",
diff --git a/fxjs/xfa/cjx_arc.cpp b/fxjs/xfa/cjx_arc.cpp
deleted file mode 100644
index 6379ec0..0000000
--- a/fxjs/xfa/cjx_arc.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_arc.h"
-
-#include "xfa/fxfa/parser/cxfa_arc.h"
-
-CJX_Arc::CJX_Arc(CXFA_Arc* node) : CJX_Node(node) {}
-
-CJX_Arc::~CJX_Arc() = default;
diff --git a/fxjs/xfa/cjx_arc.h b/fxjs/xfa/cjx_arc.h
deleted file mode 100644
index 8ab0e30..0000000
--- a/fxjs/xfa/cjx_arc.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_ARC_H_
-#define FXJS_XFA_CJX_ARC_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Arc;
-
-class CJX_Arc final : public CJX_Node {
- public:
-  explicit CJX_Arc(CXFA_Arc* node);
-  ~CJX_Arc() override;
-};
-
-#endif  // FXJS_XFA_CJX_ARC_H_
diff --git a/fxjs/xfa/cjx_assist.cpp b/fxjs/xfa/cjx_assist.cpp
deleted file mode 100644
index 8c87cca..0000000
--- a/fxjs/xfa/cjx_assist.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_assist.h"
-
-#include "xfa/fxfa/parser/cxfa_assist.h"
-
-CJX_Assist::CJX_Assist(CXFA_Assist* node) : CJX_Node(node) {}
-
-CJX_Assist::~CJX_Assist() = default;
diff --git a/fxjs/xfa/cjx_assist.h b/fxjs/xfa/cjx_assist.h
deleted file mode 100644
index 370d005..0000000
--- a/fxjs/xfa/cjx_assist.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_ASSIST_H_
-#define FXJS_XFA_CJX_ASSIST_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Assist;
-
-class CJX_Assist final : public CJX_Node {
- public:
-  explicit CJX_Assist(CXFA_Assist* node);
-  ~CJX_Assist() override;
-};
-
-#endif  // FXJS_XFA_CJX_ASSIST_H_
diff --git a/fxjs/xfa/cjx_barcode.cpp b/fxjs/xfa/cjx_barcode.cpp
deleted file mode 100644
index eab9d59..0000000
--- a/fxjs/xfa/cjx_barcode.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_barcode.h"
-
-#include "xfa/fxfa/parser/cxfa_barcode.h"
-
-CJX_Barcode::CJX_Barcode(CXFA_Barcode* node) : CJX_Node(node) {}
-
-CJX_Barcode::~CJX_Barcode() = default;
diff --git a/fxjs/xfa/cjx_barcode.h b/fxjs/xfa/cjx_barcode.h
deleted file mode 100644
index d7144db..0000000
--- a/fxjs/xfa/cjx_barcode.h
+++ /dev/null
@@ -1,22 +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_XFA_CJX_BARCODE_H_
-#define FXJS_XFA_CJX_BARCODE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Barcode;
-
-class CJX_Barcode final : public CJX_Node {
- public:
-  explicit CJX_Barcode(CXFA_Barcode* arc);
-  ~CJX_Barcode() override;
-
-};
-
-#endif  // FXJS_XFA_CJX_BARCODE_H_
diff --git a/fxjs/xfa/cjx_bind.cpp b/fxjs/xfa/cjx_bind.cpp
deleted file mode 100644
index 81de7bd..0000000
--- a/fxjs/xfa/cjx_bind.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_bind.h"
-
-#include "xfa/fxfa/parser/cxfa_bind.h"
-
-CJX_Bind::CJX_Bind(CXFA_Bind* node) : CJX_Node(node) {}
-
-CJX_Bind::~CJX_Bind() = default;
diff --git a/fxjs/xfa/cjx_bind.h b/fxjs/xfa/cjx_bind.h
deleted file mode 100644
index 2764183..0000000
--- a/fxjs/xfa/cjx_bind.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BIND_H_
-#define FXJS_XFA_CJX_BIND_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Bind;
-
-class CJX_Bind final : public CJX_Node {
- public:
-  explicit CJX_Bind(CXFA_Bind* node);
-  ~CJX_Bind() override;
-};
-
-#endif  // FXJS_XFA_CJX_BIND_H_
diff --git a/fxjs/xfa/cjx_binditems.cpp b/fxjs/xfa/cjx_binditems.cpp
deleted file mode 100644
index 4d1439e..0000000
--- a/fxjs/xfa/cjx_binditems.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_binditems.h"
-
-#include "xfa/fxfa/parser/cxfa_binditems.h"
-
-CJX_BindItems::CJX_BindItems(CXFA_BindItems* node) : CJX_Node(node) {}
-
-CJX_BindItems::~CJX_BindItems() = default;
diff --git a/fxjs/xfa/cjx_binditems.h b/fxjs/xfa/cjx_binditems.h
deleted file mode 100644
index 586ef8f..0000000
--- a/fxjs/xfa/cjx_binditems.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BINDITEMS_H_
-#define FXJS_XFA_CJX_BINDITEMS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_BindItems;
-
-class CJX_BindItems final : public CJX_Node {
- public:
-  explicit CJX_BindItems(CXFA_BindItems* node);
-  ~CJX_BindItems() override;
-};
-
-#endif  // FXJS_XFA_CJX_BINDITEMS_H_
diff --git a/fxjs/xfa/cjx_bookend.cpp b/fxjs/xfa/cjx_bookend.cpp
deleted file mode 100644
index 936adaf..0000000
--- a/fxjs/xfa/cjx_bookend.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_bookend.h"
-
-#include "xfa/fxfa/parser/cxfa_bookend.h"
-
-CJX_Bookend::CJX_Bookend(CXFA_Bookend* node) : CJX_Node(node) {}
-
-CJX_Bookend::~CJX_Bookend() = default;
diff --git a/fxjs/xfa/cjx_bookend.h b/fxjs/xfa/cjx_bookend.h
deleted file mode 100644
index 132081d..0000000
--- a/fxjs/xfa/cjx_bookend.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BOOKEND_H_
-#define FXJS_XFA_CJX_BOOKEND_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Bookend;
-
-class CJX_Bookend final : public CJX_Node {
- public:
-  explicit CJX_Bookend(CXFA_Bookend* node);
-  ~CJX_Bookend() override;
-};
-
-#endif  // FXJS_XFA_CJX_BOOKEND_H_
diff --git a/fxjs/xfa/cjx_border.cpp b/fxjs/xfa/cjx_border.cpp
deleted file mode 100644
index c759fb8..0000000
--- a/fxjs/xfa/cjx_border.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_border.h"
-
-#include "xfa/fxfa/parser/cxfa_border.h"
-
-CJX_Border::CJX_Border(CXFA_Border* node) : CJX_Node(node) {}
-
-CJX_Border::~CJX_Border() = default;
diff --git a/fxjs/xfa/cjx_border.h b/fxjs/xfa/cjx_border.h
deleted file mode 100644
index 84484ab..0000000
--- a/fxjs/xfa/cjx_border.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BORDER_H_
-#define FXJS_XFA_CJX_BORDER_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Border;
-
-class CJX_Border final : public CJX_Node {
- public:
-  explicit CJX_Border(CXFA_Border* node);
-  ~CJX_Border() override;
-};
-
-#endif  // FXJS_XFA_CJX_BORDER_H_
diff --git a/fxjs/xfa/cjx_break.cpp b/fxjs/xfa/cjx_break.cpp
deleted file mode 100644
index c018701..0000000
--- a/fxjs/xfa/cjx_break.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_break.h"
-
-#include "xfa/fxfa/parser/cxfa_break.h"
-
-CJX_Break::CJX_Break(CXFA_Break* node) : CJX_Node(node) {}
-
-CJX_Break::~CJX_Break() = default;
diff --git a/fxjs/xfa/cjx_break.h b/fxjs/xfa/cjx_break.h
deleted file mode 100644
index f0a4582..0000000
--- a/fxjs/xfa/cjx_break.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BREAK_H_
-#define FXJS_XFA_CJX_BREAK_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Break;
-
-class CJX_Break final : public CJX_Node {
- public:
-  explicit CJX_Break(CXFA_Break* node);
-  ~CJX_Break() override;
-};
-
-#endif  // FXJS_XFA_CJX_BREAK_H_
diff --git a/fxjs/xfa/cjx_breakafter.cpp b/fxjs/xfa/cjx_breakafter.cpp
deleted file mode 100644
index 50b50d9..0000000
--- a/fxjs/xfa/cjx_breakafter.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_breakafter.h"
-
-#include "xfa/fxfa/parser/cxfa_breakafter.h"
-
-CJX_BreakAfter::CJX_BreakAfter(CXFA_BreakAfter* node) : CJX_Node(node) {}
-
-CJX_BreakAfter::~CJX_BreakAfter() = default;
diff --git a/fxjs/xfa/cjx_breakafter.h b/fxjs/xfa/cjx_breakafter.h
deleted file mode 100644
index 4d5f8d9..0000000
--- a/fxjs/xfa/cjx_breakafter.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BREAKAFTER_H_
-#define FXJS_XFA_CJX_BREAKAFTER_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_BreakAfter;
-
-class CJX_BreakAfter final : public CJX_Node {
- public:
-  explicit CJX_BreakAfter(CXFA_BreakAfter* node);
-  ~CJX_BreakAfter() override;
-};
-
-#endif  // FXJS_XFA_CJX_BREAKAFTER_H_
diff --git a/fxjs/xfa/cjx_breakbefore.cpp b/fxjs/xfa/cjx_breakbefore.cpp
deleted file mode 100644
index 9ed2e2f..0000000
--- a/fxjs/xfa/cjx_breakbefore.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_breakbefore.h"
-
-#include "xfa/fxfa/parser/cxfa_breakbefore.h"
-
-CJX_BreakBefore::CJX_BreakBefore(CXFA_BreakBefore* node) : CJX_Node(node) {}
-
-CJX_BreakBefore::~CJX_BreakBefore() = default;
diff --git a/fxjs/xfa/cjx_breakbefore.h b/fxjs/xfa/cjx_breakbefore.h
deleted file mode 100644
index 943fb0f..0000000
--- a/fxjs/xfa/cjx_breakbefore.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BREAKBEFORE_H_
-#define FXJS_XFA_CJX_BREAKBEFORE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_BreakBefore;
-
-class CJX_BreakBefore final : public CJX_Node {
- public:
-  explicit CJX_BreakBefore(CXFA_BreakBefore* node);
-  ~CJX_BreakBefore() override;
-};
-
-#endif  // FXJS_XFA_CJX_BREAKBEFORE_H_
diff --git a/fxjs/xfa/cjx_button.cpp b/fxjs/xfa/cjx_button.cpp
deleted file mode 100644
index 917396a..0000000
--- a/fxjs/xfa/cjx_button.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_button.h"
-
-#include "xfa/fxfa/parser/cxfa_button.h"
-
-CJX_Button::CJX_Button(CXFA_Button* node) : CJX_Node(node) {}
-
-CJX_Button::~CJX_Button() = default;
diff --git a/fxjs/xfa/cjx_button.h b/fxjs/xfa/cjx_button.h
deleted file mode 100644
index 80017d1..0000000
--- a/fxjs/xfa/cjx_button.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_BUTTON_H_
-#define FXJS_XFA_CJX_BUTTON_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Button;
-
-class CJX_Button final : public CJX_Node {
- public:
-  explicit CJX_Button(CXFA_Button* node);
-  ~CJX_Button() override;
-};
-
-#endif  // FXJS_XFA_CJX_BUTTON_H_
diff --git a/fxjs/xfa/cjx_calculate.cpp b/fxjs/xfa/cjx_calculate.cpp
deleted file mode 100644
index a9e6982..0000000
--- a/fxjs/xfa/cjx_calculate.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_calculate.h"
-
-#include "xfa/fxfa/parser/cxfa_calculate.h"
-
-CJX_Calculate::CJX_Calculate(CXFA_Calculate* node) : CJX_Node(node) {}
-
-CJX_Calculate::~CJX_Calculate() = default;
diff --git a/fxjs/xfa/cjx_calculate.h b/fxjs/xfa/cjx_calculate.h
deleted file mode 100644
index aec1f8a..0000000
--- a/fxjs/xfa/cjx_calculate.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_CALCULATE_H_
-#define FXJS_XFA_CJX_CALCULATE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Calculate;
-
-class CJX_Calculate final : public CJX_Node {
- public:
-  explicit CJX_Calculate(CXFA_Calculate* node);
-  ~CJX_Calculate() override;
-};
-
-#endif  // FXJS_XFA_CJX_CALCULATE_H_
diff --git a/fxjs/xfa/cjx_caption.cpp b/fxjs/xfa/cjx_caption.cpp
deleted file mode 100644
index 90920d1..0000000
--- a/fxjs/xfa/cjx_caption.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_caption.h"
-
-#include "xfa/fxfa/parser/cxfa_caption.h"
-
-CJX_Caption::CJX_Caption(CXFA_Caption* node) : CJX_Node(node) {}
-
-CJX_Caption::~CJX_Caption() = default;
diff --git a/fxjs/xfa/cjx_caption.h b/fxjs/xfa/cjx_caption.h
deleted file mode 100644
index d33b81b..0000000
--- a/fxjs/xfa/cjx_caption.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_CAPTION_H_
-#define FXJS_XFA_CJX_CAPTION_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Caption;
-
-class CJX_Caption final : public CJX_Node {
- public:
-  explicit CJX_Caption(CXFA_Caption* node);
-  ~CJX_Caption() override;
-};
-
-#endif  // FXJS_XFA_CJX_CAPTION_H_
diff --git a/fxjs/xfa/cjx_certificates.cpp b/fxjs/xfa/cjx_certificates.cpp
deleted file mode 100644
index f431340..0000000
--- a/fxjs/xfa/cjx_certificates.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_certificates.h"
-
-#include "xfa/fxfa/parser/cxfa_certificates.h"
-
-CJX_Certificates::CJX_Certificates(CXFA_Certificates* node) : CJX_Node(node) {}
-
-CJX_Certificates::~CJX_Certificates() = default;
diff --git a/fxjs/xfa/cjx_certificates.h b/fxjs/xfa/cjx_certificates.h
deleted file mode 100644
index 57b9ad6..0000000
--- a/fxjs/xfa/cjx_certificates.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_CERTIFICATES_H_
-#define FXJS_XFA_CJX_CERTIFICATES_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Certificates;
-
-class CJX_Certificates final : public CJX_Node {
- public:
-  explicit CJX_Certificates(CXFA_Certificates* node);
-  ~CJX_Certificates() override;
-};
-
-#endif  // FXJS_XFA_CJX_CERTIFICATES_H_
diff --git a/fxjs/xfa/cjx_checkbutton.cpp b/fxjs/xfa/cjx_checkbutton.cpp
deleted file mode 100644
index d47d9f9..0000000
--- a/fxjs/xfa/cjx_checkbutton.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_checkbutton.h"
-
-#include "xfa/fxfa/parser/cxfa_checkbutton.h"
-
-CJX_CheckButton::CJX_CheckButton(CXFA_CheckButton* node) : CJX_Node(node) {}
-
-CJX_CheckButton::~CJX_CheckButton() = default;
diff --git a/fxjs/xfa/cjx_checkbutton.h b/fxjs/xfa/cjx_checkbutton.h
deleted file mode 100644
index d96b789..0000000
--- a/fxjs/xfa/cjx_checkbutton.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_CHECKBUTTON_H_
-#define FXJS_XFA_CJX_CHECKBUTTON_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_CheckButton;
-
-class CJX_CheckButton final : public CJX_Node {
- public:
-  explicit CJX_CheckButton(CXFA_CheckButton* node);
-  ~CJX_CheckButton() override;
-};
-
-#endif  // FXJS_XFA_CJX_CHECKBUTTON_H_
diff --git a/fxjs/xfa/cjx_choicelist.cpp b/fxjs/xfa/cjx_choicelist.cpp
deleted file mode 100644
index 8e60195..0000000
--- a/fxjs/xfa/cjx_choicelist.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_choicelist.h"
-
-#include "xfa/fxfa/parser/cxfa_choicelist.h"
-
-CJX_ChoiceList::CJX_ChoiceList(CXFA_ChoiceList* node) : CJX_Node(node) {}
-
-CJX_ChoiceList::~CJX_ChoiceList() = default;
diff --git a/fxjs/xfa/cjx_choicelist.h b/fxjs/xfa/cjx_choicelist.h
deleted file mode 100644
index 246d3a3..0000000
--- a/fxjs/xfa/cjx_choicelist.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_CHOICELIST_H_
-#define FXJS_XFA_CJX_CHOICELIST_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_ChoiceList;
-
-class CJX_ChoiceList final : public CJX_Node {
- public:
-  explicit CJX_ChoiceList(CXFA_ChoiceList* node);
-  ~CJX_ChoiceList() override;
-};
-
-#endif  // FXJS_XFA_CJX_CHOICELIST_H_
diff --git a/fxjs/xfa/cjx_color.cpp b/fxjs/xfa/cjx_color.cpp
deleted file mode 100644
index 845053c..0000000
--- a/fxjs/xfa/cjx_color.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_color.h"
-
-#include "xfa/fxfa/parser/cxfa_color.h"
-
-CJX_Color::CJX_Color(CXFA_Color* node) : CJX_Node(node) {}
-
-CJX_Color::~CJX_Color() = default;
diff --git a/fxjs/xfa/cjx_color.h b/fxjs/xfa/cjx_color.h
deleted file mode 100644
index 6209bf0..0000000
--- a/fxjs/xfa/cjx_color.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_COLOR_H_
-#define FXJS_XFA_CJX_COLOR_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Color;
-
-class CJX_Color final : public CJX_Node {
- public:
-  explicit CJX_Color(CXFA_Color* node);
-  ~CJX_Color() override;
-};
-
-#endif  // FXJS_XFA_CJX_COLOR_H_
diff --git a/fxjs/xfa/cjx_command.cpp b/fxjs/xfa/cjx_command.cpp
deleted file mode 100644
index acf259d..0000000
--- a/fxjs/xfa/cjx_command.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_command.h"
-
-#include "xfa/fxfa/parser/cxfa_command.h"
-
-CJX_Command::CJX_Command(CXFA_Command* node) : CJX_Node(node) {}
-
-CJX_Command::~CJX_Command() = default;
diff --git a/fxjs/xfa/cjx_command.h b/fxjs/xfa/cjx_command.h
deleted file mode 100644
index f126d6f..0000000
--- a/fxjs/xfa/cjx_command.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_COMMAND_H_
-#define FXJS_XFA_CJX_COMMAND_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Command;
-
-class CJX_Command final : public CJX_Node {
- public:
-  explicit CJX_Command(CXFA_Command* node);
-  ~CJX_Command() override;
-};
-
-#endif  // FXJS_XFA_CJX_COMMAND_H_
diff --git a/fxjs/xfa/cjx_connect.cpp b/fxjs/xfa/cjx_connect.cpp
deleted file mode 100644
index 3b8dd7fb..0000000
--- a/fxjs/xfa/cjx_connect.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_connect.h"
-
-#include "xfa/fxfa/parser/cxfa_connect.h"
-
-CJX_Connect::CJX_Connect(CXFA_Connect* node) : CJX_Node(node) {}
-
-CJX_Connect::~CJX_Connect() = default;
diff --git a/fxjs/xfa/cjx_connect.h b/fxjs/xfa/cjx_connect.h
deleted file mode 100644
index 2f2fe76..0000000
--- a/fxjs/xfa/cjx_connect.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_CONNECT_H_
-#define FXJS_XFA_CJX_CONNECT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Connect;
-
-class CJX_Connect final : public CJX_Node {
- public:
-  explicit CJX_Connect(CXFA_Connect* node);
-  ~CJX_Connect() override;
-};
-
-#endif  // FXJS_XFA_CJX_CONNECT_H_
diff --git a/fxjs/xfa/cjx_corner.cpp b/fxjs/xfa/cjx_corner.cpp
deleted file mode 100644
index a7fc5c7..0000000
--- a/fxjs/xfa/cjx_corner.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_corner.h"
-
-#include "xfa/fxfa/parser/cxfa_corner.h"
-
-CJX_Corner::CJX_Corner(CXFA_Corner* node) : CJX_Node(node) {}
-
-CJX_Corner::~CJX_Corner() = default;
diff --git a/fxjs/xfa/cjx_corner.h b/fxjs/xfa/cjx_corner.h
deleted file mode 100644
index ec04933..0000000
--- a/fxjs/xfa/cjx_corner.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_CORNER_H_
-#define FXJS_XFA_CJX_CORNER_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Corner;
-
-class CJX_Corner final : public CJX_Node {
- public:
-  explicit CJX_Corner(CXFA_Corner* node);
-  ~CJX_Corner() override;
-};
-
-#endif  // FXJS_XFA_CJX_CORNER_H_
diff --git a/fxjs/xfa/cjx_datetimeedit.cpp b/fxjs/xfa/cjx_datetimeedit.cpp
deleted file mode 100644
index b6affed..0000000
--- a/fxjs/xfa/cjx_datetimeedit.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_datetimeedit.h"
-
-#include "xfa/fxfa/parser/cxfa_datetimeedit.h"
-
-CJX_DateTimeEdit::CJX_DateTimeEdit(CXFA_DateTimeEdit* node) : CJX_Node(node) {}
-
-CJX_DateTimeEdit::~CJX_DateTimeEdit() = default;
diff --git a/fxjs/xfa/cjx_datetimeedit.h b/fxjs/xfa/cjx_datetimeedit.h
deleted file mode 100644
index deec852..0000000
--- a/fxjs/xfa/cjx_datetimeedit.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_DATETIMEEDIT_H_
-#define FXJS_XFA_CJX_DATETIMEEDIT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_DateTimeEdit;
-
-class CJX_DateTimeEdit final : public CJX_Node {
- public:
-  explicit CJX_DateTimeEdit(CXFA_DateTimeEdit* node);
-  ~CJX_DateTimeEdit() override;
-};
-
-#endif  // FXJS_XFA_CJX_DATETIMEEDIT_H_
diff --git a/fxjs/xfa/cjx_defaultui.cpp b/fxjs/xfa/cjx_defaultui.cpp
deleted file mode 100644
index 0073037..0000000
--- a/fxjs/xfa/cjx_defaultui.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_defaultui.h"
-
-#include "xfa/fxfa/parser/cxfa_defaultui.h"
-
-CJX_DefaultUi::CJX_DefaultUi(CXFA_DefaultUi* node) : CJX_Node(node) {}
-
-CJX_DefaultUi::~CJX_DefaultUi() = default;
diff --git a/fxjs/xfa/cjx_defaultui.h b/fxjs/xfa/cjx_defaultui.h
deleted file mode 100644
index 337cac4..0000000
--- a/fxjs/xfa/cjx_defaultui.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_DEFAULTUI_H_
-#define FXJS_XFA_CJX_DEFAULTUI_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_DefaultUi;
-
-class CJX_DefaultUi final : public CJX_Node {
- public:
-  explicit CJX_DefaultUi(CXFA_DefaultUi* node);
-  ~CJX_DefaultUi() override;
-};
-
-#endif  // FXJS_XFA_CJX_DEFAULTUI_H_
diff --git a/fxjs/xfa/cjx_digestmethod.cpp b/fxjs/xfa/cjx_digestmethod.cpp
deleted file mode 100644
index 5a32c6b..0000000
--- a/fxjs/xfa/cjx_digestmethod.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_digestmethod.h"
-
-#include "xfa/fxfa/parser/cxfa_digestmethod.h"
-
-CJX_DigestMethod::CJX_DigestMethod(CXFA_DigestMethod* node) : CJX_Node(node) {}
-
-CJX_DigestMethod::~CJX_DigestMethod() = default;
diff --git a/fxjs/xfa/cjx_digestmethod.h b/fxjs/xfa/cjx_digestmethod.h
deleted file mode 100644
index ccddc52..0000000
--- a/fxjs/xfa/cjx_digestmethod.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_DIGESTMETHOD_H_
-#define FXJS_XFA_CJX_DIGESTMETHOD_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_DigestMethod;
-
-class CJX_DigestMethod final : public CJX_Node {
- public:
-  explicit CJX_DigestMethod(CXFA_DigestMethod* node);
-  ~CJX_DigestMethod() override;
-};
-
-#endif  // FXJS_XFA_CJX_DIGESTMETHOD_H_
diff --git a/fxjs/xfa/cjx_digestmethods.cpp b/fxjs/xfa/cjx_digestmethods.cpp
deleted file mode 100644
index 1de951b..0000000
--- a/fxjs/xfa/cjx_digestmethods.cpp
+++ /dev/null
@@ -1,14 +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
-
-#include "fxjs/xfa/cjx_digestmethods.h"
-
-#include "xfa/fxfa/parser/cxfa_digestmethods.h"
-
-CJX_DigestMethods::CJX_DigestMethods(CXFA_DigestMethods* node)
-    : CJX_Node(node) {}
-
-CJX_DigestMethods::~CJX_DigestMethods() = default;
diff --git a/fxjs/xfa/cjx_digestmethods.h b/fxjs/xfa/cjx_digestmethods.h
deleted file mode 100644
index 214079b..0000000
--- a/fxjs/xfa/cjx_digestmethods.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_DIGESTMETHODS_H_
-#define FXJS_XFA_CJX_DIGESTMETHODS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_DigestMethods;
-
-class CJX_DigestMethods final : public CJX_Node {
- public:
-  explicit CJX_DigestMethods(CXFA_DigestMethods* node);
-  ~CJX_DigestMethods() override;
-};
-
-#endif  // FXJS_XFA_CJX_DIGESTMETHODS_H_
diff --git a/fxjs/xfa/cjx_edge.cpp b/fxjs/xfa/cjx_edge.cpp
deleted file mode 100644
index c940b55..0000000
--- a/fxjs/xfa/cjx_edge.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_edge.h"
-
-#include "xfa/fxfa/parser/cxfa_edge.h"
-
-CJX_Edge::CJX_Edge(CXFA_Edge* node) : CJX_Node(node) {}
-
-CJX_Edge::~CJX_Edge() = default;
diff --git a/fxjs/xfa/cjx_edge.h b/fxjs/xfa/cjx_edge.h
deleted file mode 100644
index f3c4fd2..0000000
--- a/fxjs/xfa/cjx_edge.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_EDGE_H_
-#define FXJS_XFA_CJX_EDGE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Edge;
-
-class CJX_Edge final : public CJX_Node {
- public:
-  explicit CJX_Edge(CXFA_Edge* node);
-  ~CJX_Edge() override;
-};
-
-#endif  // FXJS_XFA_CJX_EDGE_H_
diff --git a/fxjs/xfa/cjx_encoding.cpp b/fxjs/xfa/cjx_encoding.cpp
deleted file mode 100644
index f961be1..0000000
--- a/fxjs/xfa/cjx_encoding.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_encoding.h"
-
-#include "xfa/fxfa/parser/cxfa_encoding.h"
-
-CJX_Encoding::CJX_Encoding(CXFA_Encoding* node) : CJX_Node(node) {}
-
-CJX_Encoding::~CJX_Encoding() = default;
diff --git a/fxjs/xfa/cjx_encoding.h b/fxjs/xfa/cjx_encoding.h
deleted file mode 100644
index 69f1d37..0000000
--- a/fxjs/xfa/cjx_encoding.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_ENCODING_H_
-#define FXJS_XFA_CJX_ENCODING_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Encoding;
-
-class CJX_Encoding final : public CJX_Node {
- public:
-  explicit CJX_Encoding(CXFA_Encoding* node);
-  ~CJX_Encoding() override;
-};
-
-#endif  // FXJS_XFA_CJX_ENCODING_H_
diff --git a/fxjs/xfa/cjx_encodings.cpp b/fxjs/xfa/cjx_encodings.cpp
deleted file mode 100644
index ec08c0e..0000000
--- a/fxjs/xfa/cjx_encodings.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_encodings.h"
-
-#include "xfa/fxfa/parser/cxfa_encodings.h"
-
-CJX_Encodings::CJX_Encodings(CXFA_Encodings* node) : CJX_Node(node) {}
-
-CJX_Encodings::~CJX_Encodings() = default;
diff --git a/fxjs/xfa/cjx_encodings.h b/fxjs/xfa/cjx_encodings.h
deleted file mode 100644
index 44a4e2e..0000000
--- a/fxjs/xfa/cjx_encodings.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_ENCODINGS_H_
-#define FXJS_XFA_CJX_ENCODINGS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Encodings;
-
-class CJX_Encodings final : public CJX_Node {
- public:
-  explicit CJX_Encodings(CXFA_Encodings* node);
-  ~CJX_Encodings() override;
-};
-
-#endif  // FXJS_XFA_CJX_ENCODINGS_H_
diff --git a/fxjs/xfa/cjx_event.cpp b/fxjs/xfa/cjx_event.cpp
deleted file mode 100644
index f5505d6..0000000
--- a/fxjs/xfa/cjx_event.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_event.h"
-
-#include "xfa/fxfa/parser/cxfa_event.h"
-
-CJX_Event::CJX_Event(CXFA_Event* node) : CJX_Node(node) {}
-
-CJX_Event::~CJX_Event() = default;
diff --git a/fxjs/xfa/cjx_event.h b/fxjs/xfa/cjx_event.h
deleted file mode 100644
index 30260b1..0000000
--- a/fxjs/xfa/cjx_event.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_EVENT_H_
-#define FXJS_XFA_CJX_EVENT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Event;
-
-class CJX_Event final : public CJX_Node {
- public:
-  explicit CJX_Event(CXFA_Event* node);
-  ~CJX_Event() override;
-};
-
-#endif  // FXJS_XFA_CJX_EVENT_H_
diff --git a/fxjs/xfa/cjx_execute.cpp b/fxjs/xfa/cjx_execute.cpp
deleted file mode 100644
index 90aed53..0000000
--- a/fxjs/xfa/cjx_execute.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_execute.h"
-
-#include "xfa/fxfa/parser/cxfa_execute.h"
-
-CJX_Execute::CJX_Execute(CXFA_Execute* node) : CJX_Node(node) {}
-
-CJX_Execute::~CJX_Execute() = default;
diff --git a/fxjs/xfa/cjx_execute.h b/fxjs/xfa/cjx_execute.h
deleted file mode 100644
index bbdd7d8..0000000
--- a/fxjs/xfa/cjx_execute.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_EXECUTE_H_
-#define FXJS_XFA_CJX_EXECUTE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Execute;
-
-class CJX_Execute final : public CJX_Node {
- public:
-  explicit CJX_Execute(CXFA_Execute* node);
-  ~CJX_Execute() override;
-};
-
-#endif  // FXJS_XFA_CJX_EXECUTE_H_
diff --git a/fxjs/xfa/cjx_exobject.cpp b/fxjs/xfa/cjx_exobject.cpp
deleted file mode 100644
index 9daf72f..0000000
--- a/fxjs/xfa/cjx_exobject.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_exobject.h"
-
-#include "xfa/fxfa/parser/cxfa_exobject.h"
-
-CJX_ExObject::CJX_ExObject(CXFA_ExObject* node) : CJX_Node(node) {}
-
-CJX_ExObject::~CJX_ExObject() = default;
diff --git a/fxjs/xfa/cjx_exobject.h b/fxjs/xfa/cjx_exobject.h
deleted file mode 100644
index 016e05a..0000000
--- a/fxjs/xfa/cjx_exobject.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_EXOBJECT_H_
-#define FXJS_XFA_CJX_EXOBJECT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_ExObject;
-
-class CJX_ExObject final : public CJX_Node {
- public:
-  explicit CJX_ExObject(CXFA_ExObject* node);
-  ~CJX_ExObject() override;
-};
-
-#endif  // FXJS_XFA_CJX_EXOBJECT_H_
diff --git a/fxjs/xfa/cjx_fill.cpp b/fxjs/xfa/cjx_fill.cpp
deleted file mode 100644
index 8a87841..0000000
--- a/fxjs/xfa/cjx_fill.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_fill.h"
-
-#include "xfa/fxfa/parser/cxfa_fill.h"
-
-CJX_Fill::CJX_Fill(CXFA_Fill* node) : CJX_Node(node) {}
-
-CJX_Fill::~CJX_Fill() = default;
diff --git a/fxjs/xfa/cjx_fill.h b/fxjs/xfa/cjx_fill.h
deleted file mode 100644
index b155b2b..0000000
--- a/fxjs/xfa/cjx_fill.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_FILL_H_
-#define FXJS_XFA_CJX_FILL_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Fill;
-
-class CJX_Fill final : public CJX_Node {
- public:
-  explicit CJX_Fill(CXFA_Fill* node);
-  ~CJX_Fill() override;
-};
-
-#endif  // FXJS_XFA_CJX_FILL_H_
diff --git a/fxjs/xfa/cjx_filter.cpp b/fxjs/xfa/cjx_filter.cpp
deleted file mode 100644
index 8457c04..0000000
--- a/fxjs/xfa/cjx_filter.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_filter.h"
-
-#include "xfa/fxfa/parser/cxfa_filter.h"
-
-CJX_Filter::CJX_Filter(CXFA_Filter* node) : CJX_Node(node) {}
-
-CJX_Filter::~CJX_Filter() = default;
diff --git a/fxjs/xfa/cjx_filter.h b/fxjs/xfa/cjx_filter.h
deleted file mode 100644
index d4d2955..0000000
--- a/fxjs/xfa/cjx_filter.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_FILTER_H_
-#define FXJS_XFA_CJX_FILTER_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Filter;
-
-class CJX_Filter final : public CJX_Node {
- public:
-  explicit CJX_Filter(CXFA_Filter* node);
-  ~CJX_Filter() override;
-};
-
-#endif  // FXJS_XFA_CJX_FILTER_H_
diff --git a/fxjs/xfa/cjx_font.cpp b/fxjs/xfa/cjx_font.cpp
deleted file mode 100644
index 14fd922..0000000
--- a/fxjs/xfa/cjx_font.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_font.h"
-
-#include "xfa/fxfa/parser/cxfa_font.h"
-
-CJX_Font::CJX_Font(CXFA_Font* node) : CJX_Node(node) {}
-
-CJX_Font::~CJX_Font() = default;
diff --git a/fxjs/xfa/cjx_font.h b/fxjs/xfa/cjx_font.h
deleted file mode 100644
index 873dd3d..0000000
--- a/fxjs/xfa/cjx_font.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_FONT_H_
-#define FXJS_XFA_CJX_FONT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Font;
-
-class CJX_Font final : public CJX_Node {
- public:
-  explicit CJX_Font(CXFA_Font* node);
-  ~CJX_Font() override;
-};
-
-#endif  // FXJS_XFA_CJX_FONT_H_
diff --git a/fxjs/xfa/cjx_format.cpp b/fxjs/xfa/cjx_format.cpp
deleted file mode 100644
index 5718e02..0000000
--- a/fxjs/xfa/cjx_format.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_format.h"
-
-#include "xfa/fxfa/parser/cxfa_format.h"
-
-CJX_Format::CJX_Format(CXFA_Format* node) : CJX_Node(node) {}
-
-CJX_Format::~CJX_Format() = default;
diff --git a/fxjs/xfa/cjx_format.h b/fxjs/xfa/cjx_format.h
deleted file mode 100644
index 4e10491..0000000
--- a/fxjs/xfa/cjx_format.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_FORMAT_H_
-#define FXJS_XFA_CJX_FORMAT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Format;
-
-class CJX_Format final : public CJX_Node {
- public:
-  explicit CJX_Format(CXFA_Format* node);
-  ~CJX_Format() override;
-};
-
-#endif  // FXJS_XFA_CJX_FORMAT_H_
diff --git a/fxjs/xfa/cjx_imageedit.cpp b/fxjs/xfa/cjx_imageedit.cpp
deleted file mode 100644
index 5d01a21..0000000
--- a/fxjs/xfa/cjx_imageedit.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_imageedit.h"
-
-#include "xfa/fxfa/parser/cxfa_imageedit.h"
-
-CJX_ImageEdit::CJX_ImageEdit(CXFA_ImageEdit* node) : CJX_Node(node) {}
-
-CJX_ImageEdit::~CJX_ImageEdit() = default;
diff --git a/fxjs/xfa/cjx_imageedit.h b/fxjs/xfa/cjx_imageedit.h
deleted file mode 100644
index 79b01c5..0000000
--- a/fxjs/xfa/cjx_imageedit.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_IMAGEEDIT_H_
-#define FXJS_XFA_CJX_IMAGEEDIT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_ImageEdit;
-
-class CJX_ImageEdit final : public CJX_Node {
- public:
-  explicit CJX_ImageEdit(CXFA_ImageEdit* node);
-  ~CJX_ImageEdit() override;
-};
-
-#endif  // FXJS_XFA_CJX_IMAGEEDIT_H_
diff --git a/fxjs/xfa/cjx_issuers.cpp b/fxjs/xfa/cjx_issuers.cpp
deleted file mode 100644
index b1ec2fd..0000000
--- a/fxjs/xfa/cjx_issuers.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_issuers.h"
-
-#include "xfa/fxfa/parser/cxfa_issuers.h"
-
-CJX_Issuers::CJX_Issuers(CXFA_Issuers* node) : CJX_Node(node) {}
-
-CJX_Issuers::~CJX_Issuers() = default;
diff --git a/fxjs/xfa/cjx_issuers.h b/fxjs/xfa/cjx_issuers.h
deleted file mode 100644
index 083dfc7..0000000
--- a/fxjs/xfa/cjx_issuers.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_ISSUERS_H_
-#define FXJS_XFA_CJX_ISSUERS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Issuers;
-
-class CJX_Issuers final : public CJX_Node {
- public:
-  explicit CJX_Issuers(CXFA_Issuers* node);
-  ~CJX_Issuers() override;
-};
-
-#endif  // FXJS_XFA_CJX_ISSUERS_H_
diff --git a/fxjs/xfa/cjx_items.cpp b/fxjs/xfa/cjx_items.cpp
deleted file mode 100644
index 4fa73ea..0000000
--- a/fxjs/xfa/cjx_items.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_items.h"
-
-#include "xfa/fxfa/parser/cxfa_items.h"
-
-CJX_Items::CJX_Items(CXFA_Items* node) : CJX_Node(node) {}
-
-CJX_Items::~CJX_Items() = default;
diff --git a/fxjs/xfa/cjx_items.h b/fxjs/xfa/cjx_items.h
deleted file mode 100644
index 42d9039..0000000
--- a/fxjs/xfa/cjx_items.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_ITEMS_H_
-#define FXJS_XFA_CJX_ITEMS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Items;
-
-class CJX_Items final : public CJX_Node {
- public:
-  explicit CJX_Items(CXFA_Items* node);
-  ~CJX_Items() override;
-};
-
-#endif  // FXJS_XFA_CJX_ITEMS_H_
diff --git a/fxjs/xfa/cjx_keep.cpp b/fxjs/xfa/cjx_keep.cpp
deleted file mode 100644
index 5060cf9..0000000
--- a/fxjs/xfa/cjx_keep.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_keep.h"
-
-#include "xfa/fxfa/parser/cxfa_keep.h"
-
-CJX_Keep::CJX_Keep(CXFA_Keep* node) : CJX_Node(node) {}
-
-CJX_Keep::~CJX_Keep() = default;
diff --git a/fxjs/xfa/cjx_keep.h b/fxjs/xfa/cjx_keep.h
deleted file mode 100644
index a805d97..0000000
--- a/fxjs/xfa/cjx_keep.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_KEEP_H_
-#define FXJS_XFA_CJX_KEEP_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Keep;
-
-class CJX_Keep final : public CJX_Node {
- public:
-  explicit CJX_Keep(CXFA_Keep* node);
-  ~CJX_Keep() override;
-};
-
-#endif  // FXJS_XFA_CJX_KEEP_H_
diff --git a/fxjs/xfa/cjx_keyusage.cpp b/fxjs/xfa/cjx_keyusage.cpp
deleted file mode 100644
index 5984215..0000000
--- a/fxjs/xfa/cjx_keyusage.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_keyusage.h"
-
-#include "xfa/fxfa/parser/cxfa_keyusage.h"
-
-CJX_KeyUsage::CJX_KeyUsage(CXFA_KeyUsage* node) : CJX_Node(node) {}
-
-CJX_KeyUsage::~CJX_KeyUsage() = default;
diff --git a/fxjs/xfa/cjx_keyusage.h b/fxjs/xfa/cjx_keyusage.h
deleted file mode 100644
index 760c26b..0000000
--- a/fxjs/xfa/cjx_keyusage.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_KEYUSAGE_H_
-#define FXJS_XFA_CJX_KEYUSAGE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_KeyUsage;
-
-class CJX_KeyUsage final : public CJX_Node {
- public:
-  explicit CJX_KeyUsage(CXFA_KeyUsage* node);
-  ~CJX_KeyUsage() override;
-};
-
-#endif  // FXJS_XFA_CJX_KEYUSAGE_H_
diff --git a/fxjs/xfa/cjx_line.cpp b/fxjs/xfa/cjx_line.cpp
deleted file mode 100644
index 1237b9f..0000000
--- a/fxjs/xfa/cjx_line.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_line.h"
-
-#include "xfa/fxfa/parser/cxfa_line.h"
-
-CJX_Line::CJX_Line(CXFA_Line* node) : CJX_Node(node) {}
-
-CJX_Line::~CJX_Line() = default;
diff --git a/fxjs/xfa/cjx_line.h b/fxjs/xfa/cjx_line.h
deleted file mode 100644
index f3ae6fe..0000000
--- a/fxjs/xfa/cjx_line.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_LINE_H_
-#define FXJS_XFA_CJX_LINE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Line;
-
-class CJX_Line final : public CJX_Node {
- public:
-  explicit CJX_Line(CXFA_Line* node);
-  ~CJX_Line() override;
-};
-
-#endif  // FXJS_XFA_CJX_LINE_H_
diff --git a/fxjs/xfa/cjx_linear.cpp b/fxjs/xfa/cjx_linear.cpp
deleted file mode 100644
index 17bb572..0000000
--- a/fxjs/xfa/cjx_linear.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_linear.h"
-
-#include "xfa/fxfa/parser/cxfa_linear.h"
-
-CJX_Linear::CJX_Linear(CXFA_Linear* node) : CJX_Node(node) {}
-
-CJX_Linear::~CJX_Linear() = default;
diff --git a/fxjs/xfa/cjx_linear.h b/fxjs/xfa/cjx_linear.h
deleted file mode 100644
index ea07dd9..0000000
--- a/fxjs/xfa/cjx_linear.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_LINEAR_H_
-#define FXJS_XFA_CJX_LINEAR_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Linear;
-
-class CJX_Linear final : public CJX_Node {
- public:
-  explicit CJX_Linear(CXFA_Linear* node);
-  ~CJX_Linear() override;
-};
-
-#endif  // FXJS_XFA_CJX_LINEAR_H_
diff --git a/fxjs/xfa/cjx_map.cpp b/fxjs/xfa/cjx_map.cpp
deleted file mode 100644
index f02cc8b..0000000
--- a/fxjs/xfa/cjx_map.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_map.h"
-
-#include "xfa/fxfa/parser/cxfa_map.h"
-
-CJX_Map::CJX_Map(CXFA_Map* node) : CJX_Node(node) {}
-
-CJX_Map::~CJX_Map() = default;
diff --git a/fxjs/xfa/cjx_map.h b/fxjs/xfa/cjx_map.h
deleted file mode 100644
index 7ab8f49..0000000
--- a/fxjs/xfa/cjx_map.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_MAP_H_
-#define FXJS_XFA_CJX_MAP_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Map;
-
-class CJX_Map final : public CJX_Node {
- public:
-  explicit CJX_Map(CXFA_Map* node);
-  ~CJX_Map() override;
-};
-
-#endif  // FXJS_XFA_CJX_MAP_H_
diff --git a/fxjs/xfa/cjx_margin.cpp b/fxjs/xfa/cjx_margin.cpp
deleted file mode 100644
index 4e6e7a3..0000000
--- a/fxjs/xfa/cjx_margin.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_margin.h"
-
-#include "xfa/fxfa/parser/cxfa_margin.h"
-
-CJX_Margin::CJX_Margin(CXFA_Margin* node) : CJX_Node(node) {}
-
-CJX_Margin::~CJX_Margin() = default;
diff --git a/fxjs/xfa/cjx_margin.h b/fxjs/xfa/cjx_margin.h
deleted file mode 100644
index 03fe825..0000000
--- a/fxjs/xfa/cjx_margin.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_MARGIN_H_
-#define FXJS_XFA_CJX_MARGIN_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Margin;
-
-class CJX_Margin final : public CJX_Node {
- public:
-  explicit CJX_Margin(CXFA_Margin* node);
-  ~CJX_Margin() override;
-};
-
-#endif  // FXJS_XFA_CJX_MARGIN_H_
diff --git a/fxjs/xfa/cjx_mdp.cpp b/fxjs/xfa/cjx_mdp.cpp
deleted file mode 100644
index cbf87e6..0000000
--- a/fxjs/xfa/cjx_mdp.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_mdp.h"
-
-#include "xfa/fxfa/parser/cxfa_mdp.h"
-
-CJX_Mdp::CJX_Mdp(CXFA_Mdp* node) : CJX_Node(node) {}
-
-CJX_Mdp::~CJX_Mdp() = default;
diff --git a/fxjs/xfa/cjx_mdp.h b/fxjs/xfa/cjx_mdp.h
deleted file mode 100644
index 0c2a73e..0000000
--- a/fxjs/xfa/cjx_mdp.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_MDP_H_
-#define FXJS_XFA_CJX_MDP_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Mdp;
-
-class CJX_Mdp final : public CJX_Node {
- public:
-  explicit CJX_Mdp(CXFA_Mdp* node);
-  ~CJX_Mdp() override;
-};
-
-#endif  // FXJS_XFA_CJX_MDP_H_
diff --git a/fxjs/xfa/cjx_medium.cpp b/fxjs/xfa/cjx_medium.cpp
deleted file mode 100644
index 7354190..0000000
--- a/fxjs/xfa/cjx_medium.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_medium.h"
-
-#include "xfa/fxfa/parser/cxfa_medium.h"
-
-CJX_Medium::CJX_Medium(CXFA_Medium* node) : CJX_Node(node) {}
-
-CJX_Medium::~CJX_Medium() = default;
diff --git a/fxjs/xfa/cjx_medium.h b/fxjs/xfa/cjx_medium.h
deleted file mode 100644
index fee656c..0000000
--- a/fxjs/xfa/cjx_medium.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_MEDIUM_H_
-#define FXJS_XFA_CJX_MEDIUM_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Medium;
-
-class CJX_Medium final : public CJX_Node {
- public:
-  explicit CJX_Medium(CXFA_Medium* node);
-  ~CJX_Medium() override;
-};
-
-#endif  // FXJS_XFA_CJX_MEDIUM_H_
diff --git a/fxjs/xfa/cjx_message.cpp b/fxjs/xfa/cjx_message.cpp
deleted file mode 100644
index 1f1f7f1..0000000
--- a/fxjs/xfa/cjx_message.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_message.h"
-
-#include "xfa/fxfa/parser/cxfa_message.h"
-
-CJX_Message::CJX_Message(CXFA_Message* node) : CJX_Node(node) {}
-
-CJX_Message::~CJX_Message() = default;
diff --git a/fxjs/xfa/cjx_message.h b/fxjs/xfa/cjx_message.h
deleted file mode 100644
index 147c958..0000000
--- a/fxjs/xfa/cjx_message.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_MESSAGE_H_
-#define FXJS_XFA_CJX_MESSAGE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Message;
-
-class CJX_Message final : public CJX_Node {
- public:
-  explicit CJX_Message(CXFA_Message* node);
-  ~CJX_Message() override;
-};
-
-#endif  // FXJS_XFA_CJX_MESSAGE_H_
diff --git a/fxjs/xfa/cjx_numericedit.cpp b/fxjs/xfa/cjx_numericedit.cpp
deleted file mode 100644
index f8c76db..0000000
--- a/fxjs/xfa/cjx_numericedit.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_numericedit.h"
-
-#include "xfa/fxfa/parser/cxfa_numericedit.h"
-
-CJX_NumericEdit::CJX_NumericEdit(CXFA_NumericEdit* node) : CJX_Node(node) {}
-
-CJX_NumericEdit::~CJX_NumericEdit() = default;
diff --git a/fxjs/xfa/cjx_numericedit.h b/fxjs/xfa/cjx_numericedit.h
deleted file mode 100644
index 89269ee..0000000
--- a/fxjs/xfa/cjx_numericedit.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_NUMERICEDIT_H_
-#define FXJS_XFA_CJX_NUMERICEDIT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_NumericEdit;
-
-class CJX_NumericEdit final : public CJX_Node {
- public:
-  explicit CJX_NumericEdit(CXFA_NumericEdit* node);
-  ~CJX_NumericEdit() override;
-};
-
-#endif  // FXJS_XFA_CJX_NUMERICEDIT_H_
diff --git a/fxjs/xfa/cjx_oids.cpp b/fxjs/xfa/cjx_oids.cpp
deleted file mode 100644
index 225eb43..0000000
--- a/fxjs/xfa/cjx_oids.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_oids.h"
-
-#include "xfa/fxfa/parser/cxfa_oids.h"
-
-CJX_Oids::CJX_Oids(CXFA_Oids* node) : CJX_Node(node) {}
-
-CJX_Oids::~CJX_Oids() = default;
diff --git a/fxjs/xfa/cjx_oids.h b/fxjs/xfa/cjx_oids.h
deleted file mode 100644
index 4d19603..0000000
--- a/fxjs/xfa/cjx_oids.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_OIDS_H_
-#define FXJS_XFA_CJX_OIDS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Oids;
-
-class CJX_Oids final : public CJX_Node {
- public:
-  explicit CJX_Oids(CXFA_Oids* node);
-  ~CJX_Oids() override;
-};
-
-#endif  // FXJS_XFA_CJX_OIDS_H_
diff --git a/fxjs/xfa/cjx_overflow.cpp b/fxjs/xfa/cjx_overflow.cpp
deleted file mode 100644
index 041ae5b..0000000
--- a/fxjs/xfa/cjx_overflow.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_overflow.h"
-
-#include "xfa/fxfa/parser/cxfa_overflow.h"
-
-CJX_Overflow::CJX_Overflow(CXFA_Overflow* node) : CJX_Node(node) {}
-
-CJX_Overflow::~CJX_Overflow() = default;
diff --git a/fxjs/xfa/cjx_overflow.h b/fxjs/xfa/cjx_overflow.h
deleted file mode 100644
index 46faf42..0000000
--- a/fxjs/xfa/cjx_overflow.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_OVERFLOW_H_
-#define FXJS_XFA_CJX_OVERFLOW_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Overflow;
-
-class CJX_Overflow final : public CJX_Node {
- public:
-  explicit CJX_Overflow(CXFA_Overflow* node);
-  ~CJX_Overflow() override;
-};
-
-#endif  // FXJS_XFA_CJX_OVERFLOW_H_
diff --git a/fxjs/xfa/cjx_para.cpp b/fxjs/xfa/cjx_para.cpp
deleted file mode 100644
index 6970ec9..0000000
--- a/fxjs/xfa/cjx_para.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_para.h"
-
-#include "xfa/fxfa/parser/cxfa_para.h"
-
-CJX_Para::CJX_Para(CXFA_Para* node) : CJX_Node(node) {}
-
-CJX_Para::~CJX_Para() = default;
diff --git a/fxjs/xfa/cjx_para.h b/fxjs/xfa/cjx_para.h
deleted file mode 100644
index 1e33ca5..0000000
--- a/fxjs/xfa/cjx_para.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_PARA_H_
-#define FXJS_XFA_CJX_PARA_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Para;
-
-class CJX_Para final : public CJX_Node {
- public:
-  explicit CJX_Para(CXFA_Para* node);
-  ~CJX_Para() override;
-};
-
-#endif  // FXJS_XFA_CJX_PARA_H_
diff --git a/fxjs/xfa/cjx_passwordedit.cpp b/fxjs/xfa/cjx_passwordedit.cpp
deleted file mode 100644
index 427ad19..0000000
--- a/fxjs/xfa/cjx_passwordedit.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_passwordedit.h"
-
-#include "xfa/fxfa/parser/cxfa_passwordedit.h"
-
-CJX_PasswordEdit::CJX_PasswordEdit(CXFA_PasswordEdit* node) : CJX_Node(node) {}
-
-CJX_PasswordEdit::~CJX_PasswordEdit() = default;
diff --git a/fxjs/xfa/cjx_passwordedit.h b/fxjs/xfa/cjx_passwordedit.h
deleted file mode 100644
index 87253db..0000000
--- a/fxjs/xfa/cjx_passwordedit.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_PASSWORDEDIT_H_
-#define FXJS_XFA_CJX_PASSWORDEDIT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_PasswordEdit;
-
-class CJX_PasswordEdit final : public CJX_Node {
- public:
-  explicit CJX_PasswordEdit(CXFA_PasswordEdit* node);
-  ~CJX_PasswordEdit() override;
-};
-
-#endif  // FXJS_XFA_CJX_PASSWORDEDIT_H_
diff --git a/fxjs/xfa/cjx_pattern.cpp b/fxjs/xfa/cjx_pattern.cpp
deleted file mode 100644
index f4a1603..0000000
--- a/fxjs/xfa/cjx_pattern.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_pattern.h"
-
-#include "xfa/fxfa/parser/cxfa_pattern.h"
-
-CJX_Pattern::CJX_Pattern(CXFA_Pattern* node) : CJX_Node(node) {}
-
-CJX_Pattern::~CJX_Pattern() = default;
diff --git a/fxjs/xfa/cjx_pattern.h b/fxjs/xfa/cjx_pattern.h
deleted file mode 100644
index b2f4592..0000000
--- a/fxjs/xfa/cjx_pattern.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_PATTERN_H_
-#define FXJS_XFA_CJX_PATTERN_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Pattern;
-
-class CJX_Pattern final : public CJX_Node {
- public:
-  explicit CJX_Pattern(CXFA_Pattern* node);
-  ~CJX_Pattern() override;
-};
-
-#endif  // FXJS_XFA_CJX_PATTERN_H_
diff --git a/fxjs/xfa/cjx_query.cpp b/fxjs/xfa/cjx_query.cpp
deleted file mode 100644
index 49119f8..0000000
--- a/fxjs/xfa/cjx_query.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_query.h"
-
-#include "xfa/fxfa/parser/cxfa_query.h"
-
-CJX_Query::CJX_Query(CXFA_Query* node) : CJX_Node(node) {}
-
-CJX_Query::~CJX_Query() = default;
diff --git a/fxjs/xfa/cjx_query.h b/fxjs/xfa/cjx_query.h
deleted file mode 100644
index dff3822..0000000
--- a/fxjs/xfa/cjx_query.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_QUERY_H_
-#define FXJS_XFA_CJX_QUERY_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Query;
-
-class CJX_Query final : public CJX_Node {
- public:
-  explicit CJX_Query(CXFA_Query* node);
-  ~CJX_Query() override;
-};
-
-#endif  // FXJS_XFA_CJX_QUERY_H_
diff --git a/fxjs/xfa/cjx_radial.cpp b/fxjs/xfa/cjx_radial.cpp
deleted file mode 100644
index 71609d9..0000000
--- a/fxjs/xfa/cjx_radial.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_radial.h"
-
-#include "xfa/fxfa/parser/cxfa_radial.h"
-
-CJX_Radial::CJX_Radial(CXFA_Radial* node) : CJX_Node(node) {}
-
-CJX_Radial::~CJX_Radial() = default;
diff --git a/fxjs/xfa/cjx_radial.h b/fxjs/xfa/cjx_radial.h
deleted file mode 100644
index 761b3b1..0000000
--- a/fxjs/xfa/cjx_radial.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_RADIAL_H_
-#define FXJS_XFA_CJX_RADIAL_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Radial;
-
-class CJX_Radial final : public CJX_Node {
- public:
-  explicit CJX_Radial(CXFA_Radial* node);
-  ~CJX_Radial() override;
-};
-
-#endif  // FXJS_XFA_CJX_RADIAL_H_
diff --git a/fxjs/xfa/cjx_reasons.cpp b/fxjs/xfa/cjx_reasons.cpp
deleted file mode 100644
index 99ccfe3..0000000
--- a/fxjs/xfa/cjx_reasons.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_reasons.h"
-
-#include "xfa/fxfa/parser/cxfa_reasons.h"
-
-CJX_Reasons::CJX_Reasons(CXFA_Reasons* node) : CJX_Node(node) {}
-
-CJX_Reasons::~CJX_Reasons() = default;
diff --git a/fxjs/xfa/cjx_reasons.h b/fxjs/xfa/cjx_reasons.h
deleted file mode 100644
index cc4af12..0000000
--- a/fxjs/xfa/cjx_reasons.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_REASONS_H_
-#define FXJS_XFA_CJX_REASONS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Reasons;
-
-class CJX_Reasons final : public CJX_Node {
- public:
-  explicit CJX_Reasons(CXFA_Reasons* node);
-  ~CJX_Reasons() override;
-};
-
-#endif  // FXJS_XFA_CJX_REASONS_H_
diff --git a/fxjs/xfa/cjx_recordset.cpp b/fxjs/xfa/cjx_recordset.cpp
deleted file mode 100644
index 94f0ee7..0000000
--- a/fxjs/xfa/cjx_recordset.cpp
+++ /dev/null
@@ -1,15 +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
-
-#include "fxjs/xfa/cjx_recordset.h"
-
-#include <algorithm>
-
-#include "xfa/fxfa/parser/cxfa_recordset.h"
-
-CJX_RecordSet::CJX_RecordSet(CXFA_RecordSet* node) : CJX_Node(node) {}
-
-CJX_RecordSet::~CJX_RecordSet() = default;
diff --git a/fxjs/xfa/cjx_recordset.h b/fxjs/xfa/cjx_recordset.h
deleted file mode 100644
index d30d32f..0000000
--- a/fxjs/xfa/cjx_recordset.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_RECORDSET_H_
-#define FXJS_XFA_CJX_RECORDSET_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_RecordSet;
-
-class CJX_RecordSet final : public CJX_Node {
- public:
-  explicit CJX_RecordSet(CXFA_RecordSet* node);
-  ~CJX_RecordSet() override;
-};
-
-#endif  // FXJS_XFA_CJX_RECORDSET_H_
diff --git a/fxjs/xfa/cjx_rectangle.cpp b/fxjs/xfa/cjx_rectangle.cpp
deleted file mode 100644
index f715098..0000000
--- a/fxjs/xfa/cjx_rectangle.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_rectangle.h"
-
-#include "xfa/fxfa/parser/cxfa_rectangle.h"
-
-CJX_Rectangle::CJX_Rectangle(CXFA_Rectangle* node) : CJX_Node(node) {}
-
-CJX_Rectangle::~CJX_Rectangle() = default;
diff --git a/fxjs/xfa/cjx_rectangle.h b/fxjs/xfa/cjx_rectangle.h
deleted file mode 100644
index 05e3015..0000000
--- a/fxjs/xfa/cjx_rectangle.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_RECTANGLE_H_
-#define FXJS_XFA_CJX_RECTANGLE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Rectangle;
-
-class CJX_Rectangle final : public CJX_Node {
- public:
-  explicit CJX_Rectangle(CXFA_Rectangle* node);
-  ~CJX_Rectangle() override;
-};
-
-#endif  // FXJS_XFA_CJX_RECTANGLE_H_
diff --git a/fxjs/xfa/cjx_setproperty.cpp b/fxjs/xfa/cjx_setproperty.cpp
deleted file mode 100644
index 88ddf68..0000000
--- a/fxjs/xfa/cjx_setproperty.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_setproperty.h"
-
-#include "xfa/fxfa/parser/cxfa_setproperty.h"
-
-CJX_SetProperty::CJX_SetProperty(CXFA_SetProperty* node) : CJX_Node(node) {}
-
-CJX_SetProperty::~CJX_SetProperty() = default;
diff --git a/fxjs/xfa/cjx_setproperty.h b/fxjs/xfa/cjx_setproperty.h
deleted file mode 100644
index 83e7f6d..0000000
--- a/fxjs/xfa/cjx_setproperty.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SETPROPERTY_H_
-#define FXJS_XFA_CJX_SETPROPERTY_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_SetProperty;
-
-class CJX_SetProperty final : public CJX_Node {
- public:
-  explicit CJX_SetProperty(CXFA_SetProperty* node);
-  ~CJX_SetProperty() override;
-};
-
-#endif  // FXJS_XFA_CJX_SETPROPERTY_H_
diff --git a/fxjs/xfa/cjx_signature.cpp b/fxjs/xfa/cjx_signature.cpp
deleted file mode 100644
index 7c51b06..0000000
--- a/fxjs/xfa/cjx_signature.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_signature.h"
-
-#include "xfa/fxfa/parser/cxfa_signature.h"
-
-CJX_Signature::CJX_Signature(CXFA_Signature* node) : CJX_Node(node) {}
-
-CJX_Signature::~CJX_Signature() = default;
diff --git a/fxjs/xfa/cjx_signature.h b/fxjs/xfa/cjx_signature.h
deleted file mode 100644
index 67f6888..0000000
--- a/fxjs/xfa/cjx_signature.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SIGNATURE_H_
-#define FXJS_XFA_CJX_SIGNATURE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Signature;
-
-class CJX_Signature final : public CJX_Node {
- public:
-  explicit CJX_Signature(CXFA_Signature* node);
-  ~CJX_Signature() override;
-};
-
-#endif  // FXJS_XFA_CJX_SIGNATURE_H_
diff --git a/fxjs/xfa/cjx_signatureproperties.cpp b/fxjs/xfa/cjx_signatureproperties.cpp
deleted file mode 100644
index ae2d8df..0000000
--- a/fxjs/xfa/cjx_signatureproperties.cpp
+++ /dev/null
@@ -1,14 +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
-
-#include "fxjs/xfa/cjx_signatureproperties.h"
-
-#include "xfa/fxfa/parser/cxfa_signatureproperties.h"
-
-CJX_SignatureProperties::CJX_SignatureProperties(CXFA_SignatureProperties* node)
-    : CJX_Node(node) {}
-
-CJX_SignatureProperties::~CJX_SignatureProperties() = default;
diff --git a/fxjs/xfa/cjx_signatureproperties.h b/fxjs/xfa/cjx_signatureproperties.h
deleted file mode 100644
index aa98fd9..0000000
--- a/fxjs/xfa/cjx_signatureproperties.h
+++ /dev/null
@@ -1,22 +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_XFA_CJX_SIGNATUREPROPERTIES_H_
-#define FXJS_XFA_CJX_SIGNATUREPROPERTIES_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_SignatureProperties;
-
-/* Deprecated */
-class CJX_SignatureProperties final : public CJX_Node {
- public:
-  explicit CJX_SignatureProperties(CXFA_SignatureProperties* node);
-  ~CJX_SignatureProperties() override;
-};
-
-#endif  // FXJS_XFA_CJX_SIGNATUREPROPERTIES_H_
diff --git a/fxjs/xfa/cjx_signdata.cpp b/fxjs/xfa/cjx_signdata.cpp
deleted file mode 100644
index b1578e8..0000000
--- a/fxjs/xfa/cjx_signdata.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_signdata.h"
-
-#include "xfa/fxfa/parser/cxfa_signdata.h"
-
-CJX_SignData::CJX_SignData(CXFA_SignData* node) : CJX_Node(node) {}
-
-CJX_SignData::~CJX_SignData() = default;
diff --git a/fxjs/xfa/cjx_signdata.h b/fxjs/xfa/cjx_signdata.h
deleted file mode 100644
index 2ed0844..0000000
--- a/fxjs/xfa/cjx_signdata.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SIGNDATA_H_
-#define FXJS_XFA_CJX_SIGNDATA_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_SignData;
-
-class CJX_SignData final : public CJX_Node {
- public:
-  explicit CJX_SignData(CXFA_SignData* node);
-  ~CJX_SignData() override;
-};
-
-#endif  // FXJS_XFA_CJX_SIGNDATA_H_
diff --git a/fxjs/xfa/cjx_signing.cpp b/fxjs/xfa/cjx_signing.cpp
deleted file mode 100644
index fbb82ee..0000000
--- a/fxjs/xfa/cjx_signing.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_signing.h"
-
-#include "xfa/fxfa/parser/cxfa_signing.h"
-
-CJX_Signing::CJX_Signing(CXFA_Signing* node) : CJX_Node(node) {}
-
-CJX_Signing::~CJX_Signing() = default;
diff --git a/fxjs/xfa/cjx_signing.h b/fxjs/xfa/cjx_signing.h
deleted file mode 100644
index 7618e44..0000000
--- a/fxjs/xfa/cjx_signing.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SIGNING_H_
-#define FXJS_XFA_CJX_SIGNING_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Signing;
-
-class CJX_Signing final : public CJX_Node {
- public:
-  explicit CJX_Signing(CXFA_Signing* node);
-  ~CJX_Signing() override;
-};
-
-#endif  // FXJS_XFA_CJX_SIGNING_H_
diff --git a/fxjs/xfa/cjx_solid.cpp b/fxjs/xfa/cjx_solid.cpp
deleted file mode 100644
index 2d3f708..0000000
--- a/fxjs/xfa/cjx_solid.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_solid.h"
-
-#include "xfa/fxfa/parser/cxfa_solid.h"
-
-CJX_Solid::CJX_Solid(CXFA_Solid* node) : CJX_Node(node) {}
-
-CJX_Solid::~CJX_Solid() = default;
diff --git a/fxjs/xfa/cjx_solid.h b/fxjs/xfa/cjx_solid.h
deleted file mode 100644
index cf087ef..0000000
--- a/fxjs/xfa/cjx_solid.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SOLID_H_
-#define FXJS_XFA_CJX_SOLID_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Solid;
-
-class CJX_Solid final : public CJX_Node {
- public:
-  explicit CJX_Solid(CXFA_Solid* node);
-  ~CJX_Solid() override;
-};
-
-#endif  // FXJS_XFA_CJX_SOLID_H_
diff --git a/fxjs/xfa/cjx_stipple.cpp b/fxjs/xfa/cjx_stipple.cpp
deleted file mode 100644
index 773f142..0000000
--- a/fxjs/xfa/cjx_stipple.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_stipple.h"
-
-#include "xfa/fxfa/parser/cxfa_stipple.h"
-
-CJX_Stipple::CJX_Stipple(CXFA_Stipple* node) : CJX_Node(node) {}
-
-CJX_Stipple::~CJX_Stipple() = default;
diff --git a/fxjs/xfa/cjx_stipple.h b/fxjs/xfa/cjx_stipple.h
deleted file mode 100644
index 3f1ca5d..0000000
--- a/fxjs/xfa/cjx_stipple.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_STIPPLE_H_
-#define FXJS_XFA_CJX_STIPPLE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Stipple;
-
-class CJX_Stipple final : public CJX_Node {
- public:
-  explicit CJX_Stipple(CXFA_Stipple* node);
-  ~CJX_Stipple() override;
-};
-
-#endif  // FXJS_XFA_CJX_STIPPLE_H_
diff --git a/fxjs/xfa/cjx_subjectdn.cpp b/fxjs/xfa/cjx_subjectdn.cpp
deleted file mode 100644
index 8224d8f..0000000
--- a/fxjs/xfa/cjx_subjectdn.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_subjectdn.h"
-
-#include "xfa/fxfa/parser/cxfa_subjectdn.h"
-
-CJX_SubjectDN::CJX_SubjectDN(CXFA_SubjectDN* node) : CJX_Node(node) {}
-
-CJX_SubjectDN::~CJX_SubjectDN() = default;
diff --git a/fxjs/xfa/cjx_subjectdn.h b/fxjs/xfa/cjx_subjectdn.h
deleted file mode 100644
index a675722..0000000
--- a/fxjs/xfa/cjx_subjectdn.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SUBJECTDN_H_
-#define FXJS_XFA_CJX_SUBJECTDN_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_SubjectDN;
-
-class CJX_SubjectDN final : public CJX_Node {
- public:
-  explicit CJX_SubjectDN(CXFA_SubjectDN* node);
-  ~CJX_SubjectDN() override;
-};
-
-#endif  // FXJS_XFA_CJX_SUBJECTDN_H_
diff --git a/fxjs/xfa/cjx_subjectdns.cpp b/fxjs/xfa/cjx_subjectdns.cpp
deleted file mode 100644
index 5dc9aaf..0000000
--- a/fxjs/xfa/cjx_subjectdns.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_subjectdns.h"
-
-#include "xfa/fxfa/parser/cxfa_subjectdns.h"
-
-CJX_SubjectDNs::CJX_SubjectDNs(CXFA_SubjectDNs* node) : CJX_Node(node) {}
-
-CJX_SubjectDNs::~CJX_SubjectDNs() = default;
diff --git a/fxjs/xfa/cjx_subjectdns.h b/fxjs/xfa/cjx_subjectdns.h
deleted file mode 100644
index 71df2d9..0000000
--- a/fxjs/xfa/cjx_subjectdns.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SUBJECTDNS_H_
-#define FXJS_XFA_CJX_SUBJECTDNS_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_SubjectDNs;
-
-class CJX_SubjectDNs final : public CJX_Node {
- public:
-  explicit CJX_SubjectDNs(CXFA_SubjectDNs* node);
-  ~CJX_SubjectDNs() override;
-};
-
-#endif  // FXJS_XFA_CJX_SUBJECTDNS_H_
diff --git a/fxjs/xfa/cjx_submit.cpp b/fxjs/xfa/cjx_submit.cpp
deleted file mode 100644
index c703117..0000000
--- a/fxjs/xfa/cjx_submit.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_submit.h"
-
-#include "xfa/fxfa/parser/cxfa_submit.h"
-
-CJX_Submit::CJX_Submit(CXFA_Submit* node) : CJX_Node(node) {}
-
-CJX_Submit::~CJX_Submit() = default;
diff --git a/fxjs/xfa/cjx_submit.h b/fxjs/xfa/cjx_submit.h
deleted file mode 100644
index ef0c001..0000000
--- a/fxjs/xfa/cjx_submit.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_SUBMIT_H_
-#define FXJS_XFA_CJX_SUBMIT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Submit;
-
-class CJX_Submit final : public CJX_Node {
- public:
-  explicit CJX_Submit(CXFA_Submit* node);
-  ~CJX_Submit() override;
-};
-
-#endif  // FXJS_XFA_CJX_SUBMIT_H_
diff --git a/fxjs/xfa/cjx_textedit.cpp b/fxjs/xfa/cjx_textedit.cpp
deleted file mode 100644
index d483658..0000000
--- a/fxjs/xfa/cjx_textedit.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_textedit.h"
-
-#include "xfa/fxfa/parser/cxfa_textedit.h"
-
-CJX_TextEdit::CJX_TextEdit(CXFA_TextEdit* node) : CJX_Node(node) {}
-
-CJX_TextEdit::~CJX_TextEdit() = default;
diff --git a/fxjs/xfa/cjx_textedit.h b/fxjs/xfa/cjx_textedit.h
deleted file mode 100644
index 479294c..0000000
--- a/fxjs/xfa/cjx_textedit.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_TEXTEDIT_H_
-#define FXJS_XFA_CJX_TEXTEDIT_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_TextEdit;
-
-class CJX_TextEdit final : public CJX_Node {
- public:
-  explicit CJX_TextEdit(CXFA_TextEdit* node);
-  ~CJX_TextEdit() override;
-};
-
-#endif  // FXJS_XFA_CJX_TEXTEDIT_H_
diff --git a/fxjs/xfa/cjx_timestamp.cpp b/fxjs/xfa/cjx_timestamp.cpp
deleted file mode 100644
index 5e28752..0000000
--- a/fxjs/xfa/cjx_timestamp.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_timestamp.h"
-
-#include "xfa/fxfa/parser/cxfa_timestamp.h"
-
-CJX_TimeStamp::CJX_TimeStamp(CXFA_TimeStamp* node) : CJX_Node(node) {}
-
-CJX_TimeStamp::~CJX_TimeStamp() = default;
diff --git a/fxjs/xfa/cjx_timestamp.h b/fxjs/xfa/cjx_timestamp.h
deleted file mode 100644
index ca7595e..0000000
--- a/fxjs/xfa/cjx_timestamp.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_TIMESTAMP_H_
-#define FXJS_XFA_CJX_TIMESTAMP_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_TimeStamp;
-
-class CJX_TimeStamp final : public CJX_Node {
- public:
-  explicit CJX_TimeStamp(CXFA_TimeStamp* node);
-  ~CJX_TimeStamp() override;
-};
-
-#endif  // FXJS_XFA_CJX_TIMESTAMP_H_
diff --git a/fxjs/xfa/cjx_traversal.cpp b/fxjs/xfa/cjx_traversal.cpp
deleted file mode 100644
index 3c46c7d..0000000
--- a/fxjs/xfa/cjx_traversal.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_traversal.h"
-
-#include "xfa/fxfa/parser/cxfa_traversal.h"
-
-CJX_Traversal::CJX_Traversal(CXFA_Traversal* node) : CJX_Node(node) {}
-
-CJX_Traversal::~CJX_Traversal() = default;
diff --git a/fxjs/xfa/cjx_traversal.h b/fxjs/xfa/cjx_traversal.h
deleted file mode 100644
index 09af969..0000000
--- a/fxjs/xfa/cjx_traversal.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_TRAVERSAL_H_
-#define FXJS_XFA_CJX_TRAVERSAL_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Traversal;
-
-class CJX_Traversal final : public CJX_Node {
- public:
-  explicit CJX_Traversal(CXFA_Traversal* node);
-  ~CJX_Traversal() override;
-};
-
-#endif  // FXJS_XFA_CJX_TRAVERSAL_H_
diff --git a/fxjs/xfa/cjx_traverse.cpp b/fxjs/xfa/cjx_traverse.cpp
deleted file mode 100644
index 6364104..0000000
--- a/fxjs/xfa/cjx_traverse.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_traverse.h"
-
-#include "xfa/fxfa/parser/cxfa_traverse.h"
-
-CJX_Traverse::CJX_Traverse(CXFA_Traverse* node) : CJX_Node(node) {}
-
-CJX_Traverse::~CJX_Traverse() = default;
diff --git a/fxjs/xfa/cjx_traverse.h b/fxjs/xfa/cjx_traverse.h
deleted file mode 100644
index a7b8b16..0000000
--- a/fxjs/xfa/cjx_traverse.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_TRAVERSE_H_
-#define FXJS_XFA_CJX_TRAVERSE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Traverse;
-
-class CJX_Traverse final : public CJX_Node {
- public:
-  explicit CJX_Traverse(CXFA_Traverse* node);
-  ~CJX_Traverse() override;
-};
-
-#endif  // FXJS_XFA_CJX_TRAVERSE_H_
diff --git a/fxjs/xfa/cjx_ui.cpp b/fxjs/xfa/cjx_ui.cpp
deleted file mode 100644
index c995947..0000000
--- a/fxjs/xfa/cjx_ui.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_ui.h"
-
-#include "xfa/fxfa/parser/cxfa_ui.h"
-
-CJX_Ui::CJX_Ui(CXFA_Ui* node) : CJX_Node(node) {}
-
-CJX_Ui::~CJX_Ui() = default;
diff --git a/fxjs/xfa/cjx_ui.h b/fxjs/xfa/cjx_ui.h
deleted file mode 100644
index 9ed8c5c..0000000
--- a/fxjs/xfa/cjx_ui.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_UI_H_
-#define FXJS_XFA_CJX_UI_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Ui;
-
-class CJX_Ui final : public CJX_Node {
- public:
-  explicit CJX_Ui(CXFA_Ui* node);
-  ~CJX_Ui() override;
-};
-
-#endif  // FXJS_XFA_CJX_UI_H_
diff --git a/fxjs/xfa/cjx_validate.cpp b/fxjs/xfa/cjx_validate.cpp
deleted file mode 100644
index b66969e..0000000
--- a/fxjs/xfa/cjx_validate.cpp
+++ /dev/null
@@ -1,13 +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
-
-#include "fxjs/xfa/cjx_validate.h"
-
-#include "xfa/fxfa/parser/cxfa_validate.h"
-
-CJX_Validate::CJX_Validate(CXFA_Validate* node) : CJX_Node(node) {}
-
-CJX_Validate::~CJX_Validate() = default;
diff --git a/fxjs/xfa/cjx_validate.h b/fxjs/xfa/cjx_validate.h
deleted file mode 100644
index 628d241..0000000
--- a/fxjs/xfa/cjx_validate.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_VALIDATE_H_
-#define FXJS_XFA_CJX_VALIDATE_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_Validate;
-
-class CJX_Validate final : public CJX_Node {
- public:
-  explicit CJX_Validate(CXFA_Validate* node);
-  ~CJX_Validate() override;
-};
-
-#endif  // FXJS_XFA_CJX_VALIDATE_H_
diff --git a/fxjs/xfa/cjx_xmlconnection.cpp b/fxjs/xfa/cjx_xmlconnection.cpp
deleted file mode 100644
index 0af4c11..0000000
--- a/fxjs/xfa/cjx_xmlconnection.cpp
+++ /dev/null
@@ -1,14 +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
-
-#include "fxjs/xfa/cjx_xmlconnection.h"
-
-#include "xfa/fxfa/parser/cxfa_xmlconnection.h"
-
-CJX_XmlConnection::CJX_XmlConnection(CXFA_XmlConnection* node)
-    : CJX_Node(node) {}
-
-CJX_XmlConnection::~CJX_XmlConnection() = default;
diff --git a/fxjs/xfa/cjx_xmlconnection.h b/fxjs/xfa/cjx_xmlconnection.h
deleted file mode 100644
index b69390b..0000000
--- a/fxjs/xfa/cjx_xmlconnection.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_XMLCONNECTION_H_
-#define FXJS_XFA_CJX_XMLCONNECTION_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_XmlConnection;
-
-class CJX_XmlConnection final : public CJX_Node {
- public:
-  explicit CJX_XmlConnection(CXFA_XmlConnection* node);
-  ~CJX_XmlConnection() override;
-};
-
-#endif  // FXJS_XFA_CJX_XMLCONNECTION_H_
diff --git a/fxjs/xfa/cjx_xsdconnection.cpp b/fxjs/xfa/cjx_xsdconnection.cpp
deleted file mode 100644
index 3d4c121..0000000
--- a/fxjs/xfa/cjx_xsdconnection.cpp
+++ /dev/null
@@ -1,14 +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
-
-#include "fxjs/xfa/cjx_xsdconnection.h"
-
-#include "xfa/fxfa/parser/cxfa_xsdconnection.h"
-
-CJX_XsdConnection::CJX_XsdConnection(CXFA_XsdConnection* node)
-    : CJX_Node(node) {}
-
-CJX_XsdConnection::~CJX_XsdConnection() = default;
diff --git a/fxjs/xfa/cjx_xsdconnection.h b/fxjs/xfa/cjx_xsdconnection.h
deleted file mode 100644
index 63244ca..0000000
--- a/fxjs/xfa/cjx_xsdconnection.h
+++ /dev/null
@@ -1,21 +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_XFA_CJX_XSDCONNECTION_H_
-#define FXJS_XFA_CJX_XSDCONNECTION_H_
-
-#include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/jse_define.h"
-
-class CXFA_XsdConnection;
-
-class CJX_XsdConnection final : public CJX_Node {
- public:
-  explicit CJX_XsdConnection(CXFA_XsdConnection* node);
-  ~CJX_XsdConnection() override;
-};
-
-#endif  // FXJS_XFA_CJX_XSDCONNECTION_H_
diff --git a/xfa/fxfa/parser/cxfa_arc.cpp b/xfa/fxfa/parser/cxfa_arc.cpp
index 03c427c..2e1a00d 100644
--- a/xfa/fxfa/parser/cxfa_arc.cpp
+++ b/xfa/fxfa/parser/cxfa_arc.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_arc.h"
 
-#include "fxjs/xfa/cjx_arc.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -38,6 +38,6 @@
                XFA_Element::Arc,
                kArcPropertyData,
                kArcAttributeData,
-               pdfium::MakeUnique<CJX_Arc>(this)) {}
+               pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Arc::~CXFA_Arc() = default;
diff --git a/xfa/fxfa/parser/cxfa_assist.cpp b/xfa/fxfa/parser/cxfa_assist.cpp
index 4119ec7..127184b 100644
--- a/xfa/fxfa/parser/cxfa_assist.cpp
+++ b/xfa/fxfa/parser/cxfa_assist.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_assist.h"
 
-#include "fxjs/xfa/cjx_assist.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -33,6 +33,6 @@
                 XFA_Element::Assist,
                 kAssistPropertyData,
                 kAssistAttributeData,
-                pdfium::MakeUnique<CJX_Assist>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Assist::~CXFA_Assist() = default;
diff --git a/xfa/fxfa/parser/cxfa_barcode.cpp b/xfa/fxfa/parser/cxfa_barcode.cpp
index 316b169..2427e09 100644
--- a/xfa/fxfa/parser/cxfa_barcode.cpp
+++ b/xfa/fxfa/parser/cxfa_barcode.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_barcode.h"
 
-#include "fxjs/xfa/cjx_barcode.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
 
@@ -50,7 +50,7 @@
                 XFA_Element::Barcode,
                 nullptr,
                 kBarcodeAttributeData,
-                pdfium::MakeUnique<CJX_Barcode>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Barcode::~CXFA_Barcode() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_bind.cpp b/xfa/fxfa/parser/cxfa_bind.cpp
index 6315d88..8a3bdbc 100644
--- a/xfa/fxfa/parser/cxfa_bind.cpp
+++ b/xfa/fxfa/parser/cxfa_bind.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_bind.h"
 
-#include "fxjs/xfa/cjx_bind.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_picture.h"
@@ -41,7 +41,7 @@
                 XFA_Element::Bind,
                 kBindPropertyData,
                 kBindAttributeData,
-                pdfium::MakeUnique<CJX_Bind>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Bind::~CXFA_Bind() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_binditems.cpp b/xfa/fxfa/parser/cxfa_binditems.cpp
index d29165b..c765e0f 100644
--- a/xfa/fxfa/parser/cxfa_binditems.cpp
+++ b/xfa/fxfa/parser/cxfa_binditems.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_binditems.h"
 
-#include "fxjs/xfa/cjx_binditems.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -28,7 +28,7 @@
                 XFA_Element::BindItems,
                 nullptr,
                 kBindItemsAttributeData,
-                pdfium::MakeUnique<CJX_BindItems>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_BindItems::~CXFA_BindItems() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_bookend.cpp b/xfa/fxfa/parser/cxfa_bookend.cpp
index 6434478..647e439 100644
--- a/xfa/fxfa/parser/cxfa_bookend.cpp
+++ b/xfa/fxfa/parser/cxfa_bookend.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_bookend.h"
 
-#include "fxjs/xfa/cjx_bookend.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -30,6 +30,6 @@
                 XFA_Element::Bookend,
                 nullptr,
                 kBookendAttributeData,
-                pdfium::MakeUnique<CJX_Bookend>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Bookend::~CXFA_Bookend() = default;
diff --git a/xfa/fxfa/parser/cxfa_border.cpp b/xfa/fxfa/parser/cxfa_border.cpp
index 0e50a08..2042d2e 100644
--- a/xfa/fxfa/parser/cxfa_border.cpp
+++ b/xfa/fxfa/parser/cxfa_border.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_border.h"
 
-#include "fxjs/xfa/cjx_border.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -39,6 +39,6 @@
                      XFA_Element::Border,
                      kBorderPropertyData,
                      kBorderAttributeData,
-                     pdfium::MakeUnique<CJX_Border>(this)) {}
+                     pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Border::~CXFA_Border() = default;
diff --git a/xfa/fxfa/parser/cxfa_break.cpp b/xfa/fxfa/parser/cxfa_break.cpp
index 398d62b..1c388d2 100644
--- a/xfa/fxfa/parser/cxfa_break.cpp
+++ b/xfa/fxfa/parser/cxfa_break.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_break.h"
 
-#include "fxjs/xfa/cjx_break.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -43,6 +43,6 @@
                 XFA_Element::Break,
                 kBreakPropertyData,
                 kBreakAttributeData,
-                pdfium::MakeUnique<CJX_Break>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Break::~CXFA_Break() = default;
diff --git a/xfa/fxfa/parser/cxfa_breakafter.cpp b/xfa/fxfa/parser/cxfa_breakafter.cpp
index c55e5c0..2804631 100644
--- a/xfa/fxfa/parser/cxfa_breakafter.cpp
+++ b/xfa/fxfa/parser/cxfa_breakafter.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_breakafter.h"
 
-#include "fxjs/xfa/cjx_breakafter.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -37,6 +37,6 @@
                 XFA_Element::BreakAfter,
                 kBreakAfterPropertyData,
                 kBreakAfterAttributeData,
-                pdfium::MakeUnique<CJX_BreakAfter>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_BreakAfter::~CXFA_BreakAfter() = default;
diff --git a/xfa/fxfa/parser/cxfa_breakbefore.cpp b/xfa/fxfa/parser/cxfa_breakbefore.cpp
index ff3e59e..bccef9a 100644
--- a/xfa/fxfa/parser/cxfa_breakbefore.cpp
+++ b/xfa/fxfa/parser/cxfa_breakbefore.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_breakbefore.h"
 
-#include "fxjs/xfa/cjx_breakbefore.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -37,6 +37,6 @@
                 XFA_Element::BreakBefore,
                 kBreakBeforePropertyData,
                 kBreakBeforeAttributeData,
-                pdfium::MakeUnique<CJX_BreakBefore>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_BreakBefore::~CXFA_BreakBefore() = default;
diff --git a/xfa/fxfa/parser/cxfa_button.cpp b/xfa/fxfa/parser/cxfa_button.cpp
index 38a61bd..651230f 100644
--- a/xfa/fxfa/parser/cxfa_button.cpp
+++ b/xfa/fxfa/parser/cxfa_button.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_button.h"
 
-#include "fxjs/xfa/cjx_button.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -33,7 +33,7 @@
                 XFA_Element::Button,
                 kButtonPropertyData,
                 kButtonAttributeData,
-                pdfium::MakeUnique<CJX_Button>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Button::~CXFA_Button() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_calculate.cpp b/xfa/fxfa/parser/cxfa_calculate.cpp
index 0a34760..8368b77 100644
--- a/xfa/fxfa/parser/cxfa_calculate.cpp
+++ b/xfa/fxfa/parser/cxfa_calculate.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_calculate.h"
 
-#include "fxjs/xfa/cjx_calculate.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_message.h"
 #include "xfa/fxfa/parser/cxfa_script.h"
@@ -38,7 +38,7 @@
                 XFA_Element::Calculate,
                 kCalculatePropertyData,
                 kCalculateAttributeData,
-                pdfium::MakeUnique<CJX_Calculate>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Calculate::~CXFA_Calculate() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_caption.cpp b/xfa/fxfa/parser/cxfa_caption.cpp
index 8d6b89e..bc6af21 100644
--- a/xfa/fxfa/parser/cxfa_caption.cpp
+++ b/xfa/fxfa/parser/cxfa_caption.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_caption.h"
 
-#include "fxjs/xfa/cjx_caption.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_font.h"
 #include "xfa/fxfa/parser/cxfa_margin.h"
@@ -41,7 +41,7 @@
                 XFA_Element::Caption,
                 kCaptionPropertyData,
                 kCaptionAttributeData,
-                pdfium::MakeUnique<CJX_Caption>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Caption::~CXFA_Caption() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_certificates.cpp b/xfa/fxfa/parser/cxfa_certificates.cpp
index b0d8add..ae32779 100644
--- a/xfa/fxfa/parser/cxfa_certificates.cpp
+++ b/xfa/fxfa/parser/cxfa_certificates.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_certificates.h"
 
-#include "fxjs/xfa/cjx_certificates.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -36,6 +36,6 @@
                 XFA_Element::Certificates,
                 kCertificatesPropertyData,
                 kCertificatesAttributeData,
-                pdfium::MakeUnique<CJX_Certificates>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Certificates::~CXFA_Certificates() = default;
diff --git a/xfa/fxfa/parser/cxfa_checkbutton.cpp b/xfa/fxfa/parser/cxfa_checkbutton.cpp
index 301a23c..dd1c4ac 100644
--- a/xfa/fxfa/parser/cxfa_checkbutton.cpp
+++ b/xfa/fxfa/parser/cxfa_checkbutton.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_checkbutton.h"
 
-#include "fxjs/xfa/cjx_checkbutton.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -39,7 +39,7 @@
                 XFA_Element::CheckButton,
                 kCheckButtonPropertyData,
                 kCheckButtonAttributeData,
-                pdfium::MakeUnique<CJX_CheckButton>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_CheckButton::~CXFA_CheckButton() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_choicelist.cpp b/xfa/fxfa/parser/cxfa_choicelist.cpp
index 3d7b98c..381c55c 100644
--- a/xfa/fxfa/parser/cxfa_choicelist.cpp
+++ b/xfa/fxfa/parser/cxfa_choicelist.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_choicelist.h"
 
-#include "fxjs/xfa/cjx_choicelist.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -38,7 +38,7 @@
                 XFA_Element::ChoiceList,
                 kChoiceListPropertyData,
                 kChoiceListAttributeData,
-                pdfium::MakeUnique<CJX_ChoiceList>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_ChoiceList::~CXFA_ChoiceList() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_color.cpp b/xfa/fxfa/parser/cxfa_color.cpp
index 3e52419..c0324e2 100644
--- a/xfa/fxfa/parser/cxfa_color.cpp
+++ b/xfa/fxfa/parser/cxfa_color.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_color.h"
 
-#include "fxjs/xfa/cjx_color.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -33,7 +33,7 @@
                 XFA_Element::Color,
                 kColorPropertyData,
                 kColorAttributeData,
-                pdfium::MakeUnique<CJX_Color>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Color::~CXFA_Color() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_command.cpp b/xfa/fxfa/parser/cxfa_command.cpp
index 08929a7..6a28c59 100644
--- a/xfa/fxfa/parser/cxfa_command.cpp
+++ b/xfa/fxfa/parser/cxfa_command.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_command.h"
 
-#include "fxjs/xfa/cjx_command.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -36,6 +36,6 @@
                 XFA_Element::Command,
                 kCommandPropertyData,
                 kCommandAttributeData,
-                pdfium::MakeUnique<CJX_Command>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Command::~CXFA_Command() = default;
diff --git a/xfa/fxfa/parser/cxfa_connect.cpp b/xfa/fxfa/parser/cxfa_connect.cpp
index 088659e..aa22092 100644
--- a/xfa/fxfa/parser/cxfa_connect.cpp
+++ b/xfa/fxfa/parser/cxfa_connect.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_connect.h"
 
-#include "fxjs/xfa/cjx_connect.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -42,6 +42,6 @@
                 XFA_Element::Connect,
                 kConnectPropertyData,
                 kConnectAttributeData,
-                pdfium::MakeUnique<CJX_Connect>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Connect::~CXFA_Connect() = default;
diff --git a/xfa/fxfa/parser/cxfa_corner.cpp b/xfa/fxfa/parser/cxfa_corner.cpp
index 1c29a10..7af3094 100644
--- a/xfa/fxfa/parser/cxfa_corner.cpp
+++ b/xfa/fxfa/parser/cxfa_corner.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_corner.h"
 
-#include "fxjs/xfa/cjx_corner.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -41,6 +41,6 @@
                   XFA_Element::Corner,
                   kCornerPropertyData,
                   kCornerAttributeData,
-                  pdfium::MakeUnique<CJX_Corner>(this)) {}
+                  pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Corner::~CXFA_Corner() = default;
diff --git a/xfa/fxfa/parser/cxfa_datetimeedit.cpp b/xfa/fxfa/parser/cxfa_datetimeedit.cpp
index e257b9d..98b22d0 100644
--- a/xfa/fxfa/parser/cxfa_datetimeedit.cpp
+++ b/xfa/fxfa/parser/cxfa_datetimeedit.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_datetimeedit.h"
 
-#include "fxjs/xfa/cjx_datetimeedit.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -38,7 +38,7 @@
                 XFA_Element::DateTimeEdit,
                 kDateTimeEditPropertyData,
                 kDateTimeEditAttributeData,
-                pdfium::MakeUnique<CJX_DateTimeEdit>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_DateTimeEdit::~CXFA_DateTimeEdit() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_defaultui.cpp b/xfa/fxfa/parser/cxfa_defaultui.cpp
index e132bee..a29499c 100644
--- a/xfa/fxfa/parser/cxfa_defaultui.cpp
+++ b/xfa/fxfa/parser/cxfa_defaultui.cpp
@@ -6,7 +6,8 @@
 
 #include "xfa/fxfa/parser/cxfa_defaultui.h"
 
-#include "fxjs/xfa/cjx_defaultui.h"
+#include "fxjs/xfa/cjx_node.h"
+#include "third_party/base/ptr_util.h"
 
 namespace {
 
@@ -29,7 +30,8 @@
                 XFA_ObjectType::Node,
                 XFA_Element::DefaultUi,
                 kDefaultUiPropertyData,
-                kDefaultUiAttributeData) {}
+                kDefaultUiAttributeData,
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_DefaultUi::~CXFA_DefaultUi() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_digestmethod.cpp b/xfa/fxfa/parser/cxfa_digestmethod.cpp
index ac4ed84..d62b881 100644
--- a/xfa/fxfa/parser/cxfa_digestmethod.cpp
+++ b/xfa/fxfa/parser/cxfa_digestmethod.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_digestmethod.h"
 
-#include "fxjs/xfa/cjx_digestmethod.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -27,6 +27,6 @@
                 XFA_Element::DigestMethod,
                 nullptr,
                 kDigestMethodAttributeData,
-                pdfium::MakeUnique<CJX_DigestMethod>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_DigestMethod::~CXFA_DigestMethod() = default;
diff --git a/xfa/fxfa/parser/cxfa_digestmethods.cpp b/xfa/fxfa/parser/cxfa_digestmethods.cpp
index 0ee6fce..517099b 100644
--- a/xfa/fxfa/parser/cxfa_digestmethods.cpp
+++ b/xfa/fxfa/parser/cxfa_digestmethods.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_digestmethods.h"
 
-#include "fxjs/xfa/cjx_digestmethods.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -30,6 +30,6 @@
                 XFA_Element::DigestMethods,
                 nullptr,
                 kDigestMethodsAttributeData,
-                pdfium::MakeUnique<CJX_DigestMethods>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_DigestMethods::~CXFA_DigestMethods() = default;
diff --git a/xfa/fxfa/parser/cxfa_edge.cpp b/xfa/fxfa/parser/cxfa_edge.cpp
index 6afb6c1..8928eb2 100644
--- a/xfa/fxfa/parser/cxfa_edge.cpp
+++ b/xfa/fxfa/parser/cxfa_edge.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_edge.h"
 
-#include "fxjs/xfa/cjx_edge.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -39,6 +39,6 @@
                   XFA_Element::Edge,
                   kEdgePropertyData,
                   kEdgeAttributeData,
-                  pdfium::MakeUnique<CJX_Edge>(this)) {}
+                  pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Edge::~CXFA_Edge() = default;
diff --git a/xfa/fxfa/parser/cxfa_encoding.cpp b/xfa/fxfa/parser/cxfa_encoding.cpp
index 818e654..139e21a 100644
--- a/xfa/fxfa/parser/cxfa_encoding.cpp
+++ b/xfa/fxfa/parser/cxfa_encoding.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_encoding.h"
 
-#include "fxjs/xfa/cjx_encoding.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -27,6 +27,6 @@
                 XFA_Element::Encoding,
                 nullptr,
                 kEncodingAttributeData,
-                pdfium::MakeUnique<CJX_Encoding>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Encoding::~CXFA_Encoding() = default;
diff --git a/xfa/fxfa/parser/cxfa_encodings.cpp b/xfa/fxfa/parser/cxfa_encodings.cpp
index b40c9b4..be0e2d6 100644
--- a/xfa/fxfa/parser/cxfa_encodings.cpp
+++ b/xfa/fxfa/parser/cxfa_encodings.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_encodings.h"
 
-#include "fxjs/xfa/cjx_encodings.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -29,6 +29,6 @@
                 XFA_Element::Encodings,
                 nullptr,
                 kEncodingsAttributeData,
-                pdfium::MakeUnique<CJX_Encodings>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Encodings::~CXFA_Encodings() = default;
diff --git a/xfa/fxfa/parser/cxfa_event.cpp b/xfa/fxfa/parser/cxfa_event.cpp
index 5abf611..578ab73 100644
--- a/xfa/fxfa/parser/cxfa_event.cpp
+++ b/xfa/fxfa/parser/cxfa_event.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_event.h"
 
-#include "fxjs/xfa/cjx_event.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_script.h"
 #include "xfa/fxfa/parser/cxfa_submit.h"
@@ -43,7 +43,7 @@
                 XFA_Element::Event,
                 kEventPropertyData,
                 kEventAttributeData,
-                pdfium::MakeUnique<CJX_Event>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Event::~CXFA_Event() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_execute.cpp b/xfa/fxfa/parser/cxfa_execute.cpp
index 2f40f7d..9d3c886 100644
--- a/xfa/fxfa/parser/cxfa_execute.cpp
+++ b/xfa/fxfa/parser/cxfa_execute.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_execute.h"
 
-#include "fxjs/xfa/cjx_execute.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -32,6 +32,6 @@
                 XFA_Element::Execute,
                 nullptr,
                 kExecuteAttributeData,
-                pdfium::MakeUnique<CJX_Execute>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Execute::~CXFA_Execute() = default;
diff --git a/xfa/fxfa/parser/cxfa_exobject.cpp b/xfa/fxfa/parser/cxfa_exobject.cpp
index a43ed48..2a7564a 100644
--- a/xfa/fxfa/parser/cxfa_exobject.cpp
+++ b/xfa/fxfa/parser/cxfa_exobject.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_exobject.h"
 
-#include "fxjs/xfa/cjx_exobject.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -36,6 +36,6 @@
                 XFA_Element::ExObject,
                 kExObjectPropertyData,
                 kExObjectAttributeData,
-                pdfium::MakeUnique<CJX_ExObject>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_ExObject::~CXFA_ExObject() = default;
diff --git a/xfa/fxfa/parser/cxfa_fill.cpp b/xfa/fxfa/parser/cxfa_fill.cpp
index 04972af..6a63ac2 100644
--- a/xfa/fxfa/parser/cxfa_fill.cpp
+++ b/xfa/fxfa/parser/cxfa_fill.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_fill.h"
 
-#include "fxjs/xfa/cjx_fill.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_color.h"
 #include "xfa/fxfa/parser/cxfa_linear.h"
@@ -46,7 +46,7 @@
                 XFA_Element::Fill,
                 kFillPropertyData,
                 kFillAttributeData,
-                pdfium::MakeUnique<CJX_Fill>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Fill::~CXFA_Fill() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_filter.cpp b/xfa/fxfa/parser/cxfa_filter.cpp
index 09483c6..cef5ab0 100644
--- a/xfa/fxfa/parser/cxfa_filter.cpp
+++ b/xfa/fxfa/parser/cxfa_filter.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_filter.h"
 
-#include "fxjs/xfa/cjx_filter.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -37,6 +37,6 @@
                 XFA_Element::Filter,
                 kFilterPropertyData,
                 kFilterAttributeData,
-                pdfium::MakeUnique<CJX_Filter>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Filter::~CXFA_Filter() = default;
diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp
index fd10d76..4994a42 100644
--- a/xfa/fxfa/parser/cxfa_font.cpp
+++ b/xfa/fxfa/parser/cxfa_font.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_font.h"
 
-#include "fxjs/xfa/cjx_font.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_fill.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
@@ -61,7 +61,7 @@
           XFA_Element::Font,
           kFontPropertyData,
           kFontAttributeData,
-          pdfium::MakeUnique<CJX_Font>(this)) {}
+          pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Font::~CXFA_Font() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_format.cpp b/xfa/fxfa/parser/cxfa_format.cpp
index c972c83..4be961f 100644
--- a/xfa/fxfa/parser/cxfa_format.cpp
+++ b/xfa/fxfa/parser/cxfa_format.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_format.h"
 
-#include "fxjs/xfa/cjx_format.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -32,6 +32,6 @@
                 XFA_Element::Format,
                 kFormatPropertyData,
                 kFormatAttributeData,
-                pdfium::MakeUnique<CJX_Format>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Format::~CXFA_Format() = default;
diff --git a/xfa/fxfa/parser/cxfa_imageedit.cpp b/xfa/fxfa/parser/cxfa_imageedit.cpp
index b90aee0..9d64a31 100644
--- a/xfa/fxfa/parser/cxfa_imageedit.cpp
+++ b/xfa/fxfa/parser/cxfa_imageedit.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_imageedit.h"
 
-#include "fxjs/xfa/cjx_imageedit.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -35,7 +35,7 @@
                 XFA_Element::ImageEdit,
                 kImageEditPropertyData,
                 kImageEditAttributeData,
-                pdfium::MakeUnique<CJX_ImageEdit>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_ImageEdit::~CXFA_ImageEdit() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_issuers.cpp b/xfa/fxfa/parser/cxfa_issuers.cpp
index fb28215..4e3c542 100644
--- a/xfa/fxfa/parser/cxfa_issuers.cpp
+++ b/xfa/fxfa/parser/cxfa_issuers.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_issuers.h"
 
-#include "fxjs/xfa/cjx_issuers.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -29,6 +29,6 @@
                 XFA_Element::Issuers,
                 nullptr,
                 kIssuersAttributeData,
-                pdfium::MakeUnique<CJX_Issuers>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Issuers::~CXFA_Issuers() = default;
diff --git a/xfa/fxfa/parser/cxfa_items.cpp b/xfa/fxfa/parser/cxfa_items.cpp
index 6a7aa84..30ceb5f 100644
--- a/xfa/fxfa/parser/cxfa_items.cpp
+++ b/xfa/fxfa/parser/cxfa_items.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_items.h"
 
-#include "fxjs/xfa/cjx_items.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -32,6 +32,6 @@
                 XFA_Element::Items,
                 nullptr,
                 kItemsAttributeData,
-                pdfium::MakeUnique<CJX_Items>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Items::~CXFA_Items() = default;
diff --git a/xfa/fxfa/parser/cxfa_keep.cpp b/xfa/fxfa/parser/cxfa_keep.cpp
index 8135d97..2b88059 100644
--- a/xfa/fxfa/parser/cxfa_keep.cpp
+++ b/xfa/fxfa/parser/cxfa_keep.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_keep.h"
 
-#include "fxjs/xfa/cjx_keep.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -37,6 +37,6 @@
                 XFA_Element::Keep,
                 kKeepPropertyData,
                 kKeepAttributeData,
-                pdfium::MakeUnique<CJX_Keep>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Keep::~CXFA_Keep() = default;
diff --git a/xfa/fxfa/parser/cxfa_keyusage.cpp b/xfa/fxfa/parser/cxfa_keyusage.cpp
index 62d11d2..de5292c 100644
--- a/xfa/fxfa/parser/cxfa_keyusage.cpp
+++ b/xfa/fxfa/parser/cxfa_keyusage.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_keyusage.h"
 
-#include "fxjs/xfa/cjx_keyusage.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -38,6 +38,6 @@
                 XFA_Element::KeyUsage,
                 nullptr,
                 kKeyUsageAttributeData,
-                pdfium::MakeUnique<CJX_KeyUsage>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_KeyUsage::~CXFA_KeyUsage() = default;
diff --git a/xfa/fxfa/parser/cxfa_line.cpp b/xfa/fxfa/parser/cxfa_line.cpp
index 65e4b08..2664c14 100644
--- a/xfa/fxfa/parser/cxfa_line.cpp
+++ b/xfa/fxfa/parser/cxfa_line.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_line.h"
 
-#include "fxjs/xfa/cjx_line.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_edge.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
@@ -37,7 +37,7 @@
                 XFA_Element::Line,
                 kLinePropertyData,
                 kLineAttributeData,
-                pdfium::MakeUnique<CJX_Line>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Line::~CXFA_Line() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_linear.cpp b/xfa/fxfa/parser/cxfa_linear.cpp
index 0f79b49..fc814c7 100644
--- a/xfa/fxfa/parser/cxfa_linear.cpp
+++ b/xfa/fxfa/parser/cxfa_linear.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_linear.h"
 
-#include "fxjs/xfa/cjx_linear.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_color.h"
 #include "xfa/fxgraphics/cxfa_geshading.h"
@@ -36,7 +36,7 @@
                 XFA_Element::Linear,
                 kLinearPropertyData,
                 kLinearAttributeData,
-                pdfium::MakeUnique<CJX_Linear>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Linear::~CXFA_Linear() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_map.cpp b/xfa/fxfa/parser/cxfa_map.cpp
index 36909d0..00b9b8f 100644
--- a/xfa/fxfa/parser/cxfa_map.cpp
+++ b/xfa/fxfa/parser/cxfa_map.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_map.h"
 
-#include "fxjs/xfa/cjx_map.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -32,6 +32,6 @@
                 XFA_Element::Map,
                 nullptr,
                 kMapAttributeData,
-                pdfium::MakeUnique<CJX_Map>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Map::~CXFA_Map() = default;
diff --git a/xfa/fxfa/parser/cxfa_margin.cpp b/xfa/fxfa/parser/cxfa_margin.cpp
index 27277a9..b217678 100644
--- a/xfa/fxfa/parser/cxfa_margin.cpp
+++ b/xfa/fxfa/parser/cxfa_margin.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_margin.h"
 
-#include "fxjs/xfa/cjx_margin.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -35,7 +35,7 @@
                 XFA_Element::Margin,
                 kMarginPropertyData,
                 kMarginAttributeData,
-                pdfium::MakeUnique<CJX_Margin>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Margin::~CXFA_Margin() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_mdp.cpp b/xfa/fxfa/parser/cxfa_mdp.cpp
index ab3b0f7..f7f122a 100644
--- a/xfa/fxfa/parser/cxfa_mdp.cpp
+++ b/xfa/fxfa/parser/cxfa_mdp.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_mdp.h"
 
-#include "fxjs/xfa/cjx_mdp.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -30,6 +30,6 @@
                 XFA_Element::Mdp,
                 nullptr,
                 kMdpAttributeData,
-                pdfium::MakeUnique<CJX_Mdp>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Mdp::~CXFA_Mdp() = default;
diff --git a/xfa/fxfa/parser/cxfa_medium.cpp b/xfa/fxfa/parser/cxfa_medium.cpp
index 45c2a54..60b6f39 100644
--- a/xfa/fxfa/parser/cxfa_medium.cpp
+++ b/xfa/fxfa/parser/cxfa_medium.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_medium.h"
 
-#include "fxjs/xfa/cjx_medium.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -37,6 +37,6 @@
                 XFA_Element::Medium,
                 nullptr,
                 kMediumAttributeData,
-                pdfium::MakeUnique<CJX_Medium>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Medium::~CXFA_Medium() = default;
diff --git a/xfa/fxfa/parser/cxfa_message.cpp b/xfa/fxfa/parser/cxfa_message.cpp
index 529ddf4..117805a 100644
--- a/xfa/fxfa/parser/cxfa_message.cpp
+++ b/xfa/fxfa/parser/cxfa_message.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_message.h"
 
-#include "fxjs/xfa/cjx_message.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -35,6 +35,6 @@
           XFA_Element::Message,
           kMessagePropertyData,
           kMessageAttributeData,
-          pdfium::MakeUnique<CJX_Message>(this)) {}
+          pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Message::~CXFA_Message() = default;
diff --git a/xfa/fxfa/parser/cxfa_numericedit.cpp b/xfa/fxfa/parser/cxfa_numericedit.cpp
index 6914594..193daac 100644
--- a/xfa/fxfa/parser/cxfa_numericedit.cpp
+++ b/xfa/fxfa/parser/cxfa_numericedit.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_numericedit.h"
 
-#include "fxjs/xfa/cjx_numericedit.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -36,7 +36,7 @@
                 XFA_Element::NumericEdit,
                 kNumericEditPropertyData,
                 kNumericEditAttributeData,
-                pdfium::MakeUnique<CJX_NumericEdit>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_NumericEdit::~CXFA_NumericEdit() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_oids.cpp b/xfa/fxfa/parser/cxfa_oids.cpp
index 46c419f..fe37e3e 100644
--- a/xfa/fxfa/parser/cxfa_oids.cpp
+++ b/xfa/fxfa/parser/cxfa_oids.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_oids.h"
 
-#include "fxjs/xfa/cjx_oids.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -29,6 +29,6 @@
                 XFA_Element::Oids,
                 nullptr,
                 kOidsAttributeData,
-                pdfium::MakeUnique<CJX_Oids>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Oids::~CXFA_Oids() = default;
diff --git a/xfa/fxfa/parser/cxfa_overflow.cpp b/xfa/fxfa/parser/cxfa_overflow.cpp
index 5686595..9341569 100644
--- a/xfa/fxfa/parser/cxfa_overflow.cpp
+++ b/xfa/fxfa/parser/cxfa_overflow.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_overflow.h"
 
-#include "fxjs/xfa/cjx_overflow.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -30,6 +30,6 @@
                 XFA_Element::Overflow,
                 nullptr,
                 kOverflowAttributeData,
-                pdfium::MakeUnique<CJX_Overflow>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Overflow::~CXFA_Overflow() = default;
diff --git a/xfa/fxfa/parser/cxfa_para.cpp b/xfa/fxfa/parser/cxfa_para.cpp
index 5ed6a51..e5069d3 100644
--- a/xfa/fxfa/parser/cxfa_para.cpp
+++ b/xfa/fxfa/parser/cxfa_para.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_para.h"
 
-#include "fxjs/xfa/cjx_para.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
 
@@ -48,7 +48,7 @@
                 XFA_Element::Para,
                 kParaPropertyData,
                 kParaAttributeData,
-                pdfium::MakeUnique<CJX_Para>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Para::~CXFA_Para() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_passwordedit.cpp b/xfa/fxfa/parser/cxfa_passwordedit.cpp
index 475cc16..a6bc569 100644
--- a/xfa/fxfa/parser/cxfa_passwordedit.cpp
+++ b/xfa/fxfa/parser/cxfa_passwordedit.cpp
@@ -6,7 +6,8 @@
 
 #include "xfa/fxfa/parser/cxfa_passwordedit.h"
 
-#include "fxjs/xfa/cjx_passwordedit.h"
+#include "fxjs/xfa/cjx_node.h"
+#include "third_party/base/ptr_util.h"
 
 namespace {
 
@@ -34,7 +35,8 @@
                 XFA_ObjectType::Node,
                 XFA_Element::PasswordEdit,
                 kPasswordEditPropertyData,
-                kPasswordEditAttributeData) {}
+                kPasswordEditAttributeData,
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_PasswordEdit::~CXFA_PasswordEdit() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_pattern.cpp b/xfa/fxfa/parser/cxfa_pattern.cpp
index 6bd8420..17cfba0 100644
--- a/xfa/fxfa/parser/cxfa_pattern.cpp
+++ b/xfa/fxfa/parser/cxfa_pattern.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_pattern.h"
 
-#include "fxjs/xfa/cjx_pattern.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_color.h"
 #include "xfa/fxgraphics/cxfa_gepattern.h"
@@ -36,7 +36,7 @@
                 XFA_Element::Pattern,
                 kPatternPropertyData,
                 kPatternAttributeData,
-                pdfium::MakeUnique<CJX_Pattern>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Pattern::~CXFA_Pattern() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_query.cpp b/xfa/fxfa/parser/cxfa_query.cpp
index 3f6444b..c965b3c 100644
--- a/xfa/fxfa/parser/cxfa_query.cpp
+++ b/xfa/fxfa/parser/cxfa_query.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_query.h"
 
-#include "fxjs/xfa/cjx_query.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -35,6 +35,6 @@
                 XFA_Element::Query,
                 kQueryPropertyData,
                 kQueryAttributeData,
-                pdfium::MakeUnique<CJX_Query>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Query::~CXFA_Query() = default;
diff --git a/xfa/fxfa/parser/cxfa_radial.cpp b/xfa/fxfa/parser/cxfa_radial.cpp
index dbc8319..e7ab3e6 100644
--- a/xfa/fxfa/parser/cxfa_radial.cpp
+++ b/xfa/fxfa/parser/cxfa_radial.cpp
@@ -8,7 +8,7 @@
 
 #include <utility>
 
-#include "fxjs/xfa/cjx_radial.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_color.h"
 #include "xfa/fxgraphics/cxfa_geshading.h"
@@ -38,7 +38,7 @@
                 XFA_Element::Radial,
                 kRadialPropertyData,
                 kRadialAttributeData,
-                pdfium::MakeUnique<CJX_Radial>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Radial::~CXFA_Radial() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_reasons.cpp b/xfa/fxfa/parser/cxfa_reasons.cpp
index 67c7516..97817be8 100644
--- a/xfa/fxfa/parser/cxfa_reasons.cpp
+++ b/xfa/fxfa/parser/cxfa_reasons.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_reasons.h"
 
-#include "fxjs/xfa/cjx_reasons.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -29,6 +29,6 @@
                 XFA_Element::Reasons,
                 nullptr,
                 kReasonsAttributeData,
-                pdfium::MakeUnique<CJX_Reasons>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Reasons::~CXFA_Reasons() = default;
diff --git a/xfa/fxfa/parser/cxfa_recordset.cpp b/xfa/fxfa/parser/cxfa_recordset.cpp
index 7a5cbec..a33b9b5 100644
--- a/xfa/fxfa/parser/cxfa_recordset.cpp
+++ b/xfa/fxfa/parser/cxfa_recordset.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_recordset.h"
 
-#include "fxjs/xfa/cjx_recordset.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -39,6 +39,6 @@
                 XFA_Element::RecordSet,
                 nullptr,
                 kRecordSetAttributeData,
-                pdfium::MakeUnique<CJX_RecordSet>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_RecordSet::~CXFA_RecordSet() = default;
diff --git a/xfa/fxfa/parser/cxfa_rectangle.cpp b/xfa/fxfa/parser/cxfa_rectangle.cpp
index 93bae1e..654ab23 100644
--- a/xfa/fxfa/parser/cxfa_rectangle.cpp
+++ b/xfa/fxfa/parser/cxfa_rectangle.cpp
@@ -8,7 +8,7 @@
 
 #include <utility>
 
-#include "fxjs/xfa/cjx_rectangle.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_corner.h"
 #include "xfa/fxfa/parser/cxfa_stroke.h"
@@ -39,7 +39,7 @@
                XFA_Element::Rectangle,
                kRectanglePropertyData,
                kRectangleAttributeData,
-               pdfium::MakeUnique<CJX_Rectangle>(this)) {}
+               pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Rectangle::CXFA_Rectangle(CXFA_Document* pDoc,
                                XFA_PacketType ePacket,
diff --git a/xfa/fxfa/parser/cxfa_setproperty.cpp b/xfa/fxfa/parser/cxfa_setproperty.cpp
index 6a5fc05..2389888 100644
--- a/xfa/fxfa/parser/cxfa_setproperty.cpp
+++ b/xfa/fxfa/parser/cxfa_setproperty.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_setproperty.h"
 
-#include "fxjs/xfa/cjx_setproperty.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -27,6 +27,6 @@
                 XFA_Element::SetProperty,
                 nullptr,
                 kSetPropertyAttributeData,
-                pdfium::MakeUnique<CJX_SetProperty>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_SetProperty::~CXFA_SetProperty() = default;
diff --git a/xfa/fxfa/parser/cxfa_signature.cpp b/xfa/fxfa/parser/cxfa_signature.cpp
index ce50d61..f16f205 100644
--- a/xfa/fxfa/parser/cxfa_signature.cpp
+++ b/xfa/fxfa/parser/cxfa_signature.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_signature.h"
 
-#include "fxjs/xfa/cjx_signature.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -34,7 +34,7 @@
                 XFA_Element::Signature,
                 kSignaturePropertyData,
                 kSignatureAttributeData,
-                pdfium::MakeUnique<CJX_Signature>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Signature::~CXFA_Signature() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_signatureproperties.cpp b/xfa/fxfa/parser/cxfa_signatureproperties.cpp
index 27844e9..5da3bc8 100644
--- a/xfa/fxfa/parser/cxfa_signatureproperties.cpp
+++ b/xfa/fxfa/parser/cxfa_signatureproperties.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_signatureproperties.h"
 
-#include "fxjs/xfa/cjx_signatureproperties.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -27,6 +27,6 @@
                 XFA_Element::SignatureProperties,
                 nullptr,
                 kSignaturePropertiesAttributeData,
-                pdfium::MakeUnique<CJX_SignatureProperties>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_SignatureProperties::~CXFA_SignatureProperties() = default;
diff --git a/xfa/fxfa/parser/cxfa_signdata.cpp b/xfa/fxfa/parser/cxfa_signdata.cpp
index 183db3d..fda58cd 100644
--- a/xfa/fxfa/parser/cxfa_signdata.cpp
+++ b/xfa/fxfa/parser/cxfa_signdata.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_signdata.h"
 
-#include "fxjs/xfa/cjx_signdata.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -36,6 +36,6 @@
                 XFA_Element::SignData,
                 kSignDataPropertyData,
                 kSignDataAttributeData,
-                pdfium::MakeUnique<CJX_SignData>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_SignData::~CXFA_SignData() = default;
diff --git a/xfa/fxfa/parser/cxfa_signing.cpp b/xfa/fxfa/parser/cxfa_signing.cpp
index a96de6f..68525cc 100644
--- a/xfa/fxfa/parser/cxfa_signing.cpp
+++ b/xfa/fxfa/parser/cxfa_signing.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_signing.h"
 
-#include "fxjs/xfa/cjx_signing.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -29,6 +29,6 @@
                 XFA_Element::Signing,
                 nullptr,
                 kSigningAttributeData,
-                pdfium::MakeUnique<CJX_Signing>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Signing::~CXFA_Signing() = default;
diff --git a/xfa/fxfa/parser/cxfa_solid.cpp b/xfa/fxfa/parser/cxfa_solid.cpp
index 0d06a63..525557b 100644
--- a/xfa/fxfa/parser/cxfa_solid.cpp
+++ b/xfa/fxfa/parser/cxfa_solid.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_solid.h"
 
-#include "fxjs/xfa/cjx_solid.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -31,6 +31,6 @@
                 XFA_Element::Solid,
                 kSolidPropertyData,
                 kSolidAttributeData,
-                pdfium::MakeUnique<CJX_Solid>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Solid::~CXFA_Solid() = default;
diff --git a/xfa/fxfa/parser/cxfa_stipple.cpp b/xfa/fxfa/parser/cxfa_stipple.cpp
index 9d14146..8e109c9 100644
--- a/xfa/fxfa/parser/cxfa_stipple.cpp
+++ b/xfa/fxfa/parser/cxfa_stipple.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_stipple.h"
 
-#include "fxjs/xfa/cjx_stipple.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_color.h"
 
@@ -34,7 +34,7 @@
                 XFA_Element::Stipple,
                 kStipplePropertyData,
                 kStippleAttributeData,
-                pdfium::MakeUnique<CJX_Stipple>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Stipple::~CXFA_Stipple() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_subjectdn.cpp b/xfa/fxfa/parser/cxfa_subjectdn.cpp
index 0698823..23e1259 100644
--- a/xfa/fxfa/parser/cxfa_subjectdn.cpp
+++ b/xfa/fxfa/parser/cxfa_subjectdn.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_subjectdn.h"
 
-#include "fxjs/xfa/cjx_subjectdn.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -29,6 +29,6 @@
                 XFA_Element::SubjectDN,
                 nullptr,
                 kSubjectDNAttributeData,
-                pdfium::MakeUnique<CJX_SubjectDN>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_SubjectDN::~CXFA_SubjectDN() = default;
diff --git a/xfa/fxfa/parser/cxfa_subjectdns.cpp b/xfa/fxfa/parser/cxfa_subjectdns.cpp
index c927c94..ed4af2a 100644
--- a/xfa/fxfa/parser/cxfa_subjectdns.cpp
+++ b/xfa/fxfa/parser/cxfa_subjectdns.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_subjectdns.h"
 
-#include "fxjs/xfa/cjx_subjectdns.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -29,6 +29,6 @@
                 XFA_Element::SubjectDNs,
                 nullptr,
                 kSubjectDNsAttributeData,
-                pdfium::MakeUnique<CJX_SubjectDNs>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_SubjectDNs::~CXFA_SubjectDNs() = default;
diff --git a/xfa/fxfa/parser/cxfa_submit.cpp b/xfa/fxfa/parser/cxfa_submit.cpp
index 6b77df7..4f18db9 100644
--- a/xfa/fxfa/parser/cxfa_submit.cpp
+++ b/xfa/fxfa/parser/cxfa_submit.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_submit.h"
 
-#include "fxjs/xfa/cjx_submit.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -37,7 +37,7 @@
                 XFA_Element::Submit,
                 kSubmitPropertyData,
                 kSubmitAttributeData,
-                pdfium::MakeUnique<CJX_Submit>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Submit::~CXFA_Submit() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_textedit.cpp b/xfa/fxfa/parser/cxfa_textedit.cpp
index 0f64dc1..778ec43 100644
--- a/xfa/fxfa/parser/cxfa_textedit.cpp
+++ b/xfa/fxfa/parser/cxfa_textedit.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_textedit.h"
 
-#include "fxjs/xfa/cjx_textedit.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -40,7 +40,7 @@
                 XFA_Element::TextEdit,
                 kTextEditPropertyData,
                 kTextEditAttributeData,
-                pdfium::MakeUnique<CJX_TextEdit>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_TextEdit::~CXFA_TextEdit() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_timestamp.cpp b/xfa/fxfa/parser/cxfa_timestamp.cpp
index 3bfef61..c0feda4 100644
--- a/xfa/fxfa/parser/cxfa_timestamp.cpp
+++ b/xfa/fxfa/parser/cxfa_timestamp.cpp
@@ -6,7 +6,8 @@
 
 #include "xfa/fxfa/parser/cxfa_timestamp.h"
 
-#include "fxjs/xfa/cjx_timestamp.h"
+#include "fxjs/xfa/cjx_node.h"
+#include "third_party/base/ptr_util.h"
 
 namespace {
 
@@ -28,6 +29,7 @@
                 XFA_ObjectType::Node,
                 XFA_Element::TimeStamp,
                 nullptr,
-                kTimeStampAttributeData) {}
+                kTimeStampAttributeData,
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_TimeStamp::~CXFA_TimeStamp() = default;
diff --git a/xfa/fxfa/parser/cxfa_traversal.cpp b/xfa/fxfa/parser/cxfa_traversal.cpp
index 158d346..5844ff5 100644
--- a/xfa/fxfa/parser/cxfa_traversal.cpp
+++ b/xfa/fxfa/parser/cxfa_traversal.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_traversal.h"
 
-#include "fxjs/xfa/cjx_traversal.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -31,6 +31,6 @@
                 XFA_Element::Traversal,
                 kTraversalPropertyData,
                 kTraversalAttributeData,
-                pdfium::MakeUnique<CJX_Traversal>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Traversal::~CXFA_Traversal() = default;
diff --git a/xfa/fxfa/parser/cxfa_traverse.cpp b/xfa/fxfa/parser/cxfa_traverse.cpp
index 59f0415..8483b03 100644
--- a/xfa/fxfa/parser/cxfa_traverse.cpp
+++ b/xfa/fxfa/parser/cxfa_traverse.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_traverse.h"
 
-#include "fxjs/xfa/cjx_traverse.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -35,6 +35,6 @@
                 XFA_Element::Traverse,
                 kTraversePropertyData,
                 kTraverseAttributeData,
-                pdfium::MakeUnique<CJX_Traverse>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Traverse::~CXFA_Traverse() {}
diff --git a/xfa/fxfa/parser/cxfa_ui.cpp b/xfa/fxfa/parser/cxfa_ui.cpp
index 134703f..9f72533 100644
--- a/xfa/fxfa/parser/cxfa_ui.cpp
+++ b/xfa/fxfa/parser/cxfa_ui.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_ui.h"
 
-#include "fxjs/xfa/cjx_ui.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -43,7 +43,7 @@
                 XFA_Element::Ui,
                 kUiPropertyData,
                 kUiAttributeData,
-                pdfium::MakeUnique<CJX_Ui>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Ui::~CXFA_Ui() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validate.cpp
index 7b3f611..93cdd6f 100644
--- a/xfa/fxfa/parser/cxfa_validate.cpp
+++ b/xfa/fxfa/parser/cxfa_validate.cpp
@@ -6,8 +6,8 @@
 
 #include "xfa/fxfa/parser/cxfa_validate.h"
 
+#include "fxjs/xfa/cjx_node.h"
 #include "fxjs/xfa/cjx_object.h"
-#include "fxjs/xfa/cjx_validate.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_message.h"
 #include "xfa/fxfa/parser/cxfa_picture.h"
@@ -51,7 +51,7 @@
           XFA_Element::Validate,
           kValidatePropertyData,
           kValidateAttributeData,
-          pdfium::MakeUnique<CJX_Validate>(this)) {}
+          pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_Validate::~CXFA_Validate() = default;
 
diff --git a/xfa/fxfa/parser/cxfa_xmlconnection.cpp b/xfa/fxfa/parser/cxfa_xmlconnection.cpp
index 41e1816..05775b8 100644
--- a/xfa/fxfa/parser/cxfa_xmlconnection.cpp
+++ b/xfa/fxfa/parser/cxfa_xmlconnection.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_xmlconnection.h"
 
-#include "fxjs/xfa/cjx_xmlconnection.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -31,6 +31,6 @@
                 XFA_Element::XmlConnection,
                 kXmlConnectionPropertyData,
                 kXmlConnectionAttributeData,
-                pdfium::MakeUnique<CJX_XmlConnection>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_XmlConnection::~CXFA_XmlConnection() = default;
diff --git a/xfa/fxfa/parser/cxfa_xsdconnection.cpp b/xfa/fxfa/parser/cxfa_xsdconnection.cpp
index 68c3319..ddaad47 100644
--- a/xfa/fxfa/parser/cxfa_xsdconnection.cpp
+++ b/xfa/fxfa/parser/cxfa_xsdconnection.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_xsdconnection.h"
 
-#include "fxjs/xfa/cjx_xsdconnection.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -32,6 +32,6 @@
                 XFA_Element::XsdConnection,
                 kXsdConnectionPropertyData,
                 kXsdConnectionAttributeData,
-                pdfium::MakeUnique<CJX_XsdConnection>(this)) {}
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
 CXFA_XsdConnection::~CXFA_XsdConnection() = default;
diff --git a/xfa/fxfa/parser/xfa_basic_data.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp
index 950d6b9..3bede6a 100644
--- a/xfa/fxfa/parser/xfa_basic_data.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data.cpp
@@ -8,147 +8,72 @@
 
 #include <utility>
 
-#include "fxjs/xfa/cjx_arc.h"
 #include "fxjs/xfa/cjx_area.h"
-#include "fxjs/xfa/cjx_assist.h"
-#include "fxjs/xfa/cjx_barcode.h"
-#include "fxjs/xfa/cjx_bind.h"
-#include "fxjs/xfa/cjx_binditems.h"
-#include "fxjs/xfa/cjx_bookend.h"
 #include "fxjs/xfa/cjx_boolean.h"
-#include "fxjs/xfa/cjx_border.h"
-#include "fxjs/xfa/cjx_break.h"
-#include "fxjs/xfa/cjx_breakafter.h"
-#include "fxjs/xfa/cjx_breakbefore.h"
-#include "fxjs/xfa/cjx_button.h"
-#include "fxjs/xfa/cjx_calculate.h"
-#include "fxjs/xfa/cjx_caption.h"
 #include "fxjs/xfa/cjx_certificate.h"
-#include "fxjs/xfa/cjx_certificates.h"
-#include "fxjs/xfa/cjx_checkbutton.h"
-#include "fxjs/xfa/cjx_choicelist.h"
-#include "fxjs/xfa/cjx_color.h"
 #include "fxjs/xfa/cjx_comb.h"
-#include "fxjs/xfa/cjx_command.h"
-#include "fxjs/xfa/cjx_connect.h"
 #include "fxjs/xfa/cjx_connectstring.h"
 #include "fxjs/xfa/cjx_contentarea.h"
-#include "fxjs/xfa/cjx_corner.h"
 #include "fxjs/xfa/cjx_datavalue.h"
 #include "fxjs/xfa/cjx_datawindow.h"
 #include "fxjs/xfa/cjx_date.h"
 #include "fxjs/xfa/cjx_datetime.h"
-#include "fxjs/xfa/cjx_datetimeedit.h"
 #include "fxjs/xfa/cjx_decimal.h"
-#include "fxjs/xfa/cjx_defaultui.h"
 #include "fxjs/xfa/cjx_delete.h"
 #include "fxjs/xfa/cjx_delta.h"
 #include "fxjs/xfa/cjx_desc.h"
-#include "fxjs/xfa/cjx_digestmethod.h"
-#include "fxjs/xfa/cjx_digestmethods.h"
 #include "fxjs/xfa/cjx_draw.h"
-#include "fxjs/xfa/cjx_edge.h"
-#include "fxjs/xfa/cjx_encoding.h"
-#include "fxjs/xfa/cjx_encodings.h"
 #include "fxjs/xfa/cjx_encrypt.h"
-#include "fxjs/xfa/cjx_event.h"
 #include "fxjs/xfa/cjx_eventpseudomodel.h"
 #include "fxjs/xfa/cjx_exclgroup.h"
 #include "fxjs/xfa/cjx_exdata.h"
-#include "fxjs/xfa/cjx_execute.h"
-#include "fxjs/xfa/cjx_exobject.h"
 #include "fxjs/xfa/cjx_extras.h"
 #include "fxjs/xfa/cjx_field.h"
-#include "fxjs/xfa/cjx_fill.h"
-#include "fxjs/xfa/cjx_filter.h"
 #include "fxjs/xfa/cjx_float.h"
-#include "fxjs/xfa/cjx_font.h"
-#include "fxjs/xfa/cjx_format.h"
 #include "fxjs/xfa/cjx_handler.h"
 #include "fxjs/xfa/cjx_hostpseudomodel.h"
 #include "fxjs/xfa/cjx_image.h"
-#include "fxjs/xfa/cjx_imageedit.h"
 #include "fxjs/xfa/cjx_insert.h"
 #include "fxjs/xfa/cjx_instancemanager.h"
 #include "fxjs/xfa/cjx_integer.h"
-#include "fxjs/xfa/cjx_issuers.h"
-#include "fxjs/xfa/cjx_items.h"
-#include "fxjs/xfa/cjx_keep.h"
-#include "fxjs/xfa/cjx_keyusage.h"
 #include "fxjs/xfa/cjx_layoutpseudomodel.h"
-#include "fxjs/xfa/cjx_line.h"
-#include "fxjs/xfa/cjx_linear.h"
 #include "fxjs/xfa/cjx_logpseudomodel.h"
 #include "fxjs/xfa/cjx_manifest.h"
-#include "fxjs/xfa/cjx_map.h"
-#include "fxjs/xfa/cjx_margin.h"
-#include "fxjs/xfa/cjx_mdp.h"
-#include "fxjs/xfa/cjx_medium.h"
-#include "fxjs/xfa/cjx_message.h"
 #include "fxjs/xfa/cjx_node.h"
-#include "fxjs/xfa/cjx_numericedit.h"
 #include "fxjs/xfa/cjx_occur.h"
 #include "fxjs/xfa/cjx_oid.h"
-#include "fxjs/xfa/cjx_oids.h"
 #include "fxjs/xfa/cjx_operation.h"
-#include "fxjs/xfa/cjx_overflow.h"
 #include "fxjs/xfa/cjx_packet.h"
 #include "fxjs/xfa/cjx_pagearea.h"
 #include "fxjs/xfa/cjx_pageset.h"
-#include "fxjs/xfa/cjx_para.h"
 #include "fxjs/xfa/cjx_password.h"
-#include "fxjs/xfa/cjx_passwordedit.h"
-#include "fxjs/xfa/cjx_pattern.h"
 #include "fxjs/xfa/cjx_picture.h"
-#include "fxjs/xfa/cjx_query.h"
-#include "fxjs/xfa/cjx_radial.h"
 #include "fxjs/xfa/cjx_reason.h"
-#include "fxjs/xfa/cjx_reasons.h"
-#include "fxjs/xfa/cjx_recordset.h"
-#include "fxjs/xfa/cjx_rectangle.h"
 #include "fxjs/xfa/cjx_ref.h"
 #include "fxjs/xfa/cjx_rootelement.h"
 #include "fxjs/xfa/cjx_script.h"
 #include "fxjs/xfa/cjx_select.h"
-#include "fxjs/xfa/cjx_setproperty.h"
-#include "fxjs/xfa/cjx_signature.h"
-#include "fxjs/xfa/cjx_signatureproperties.h"
 #include "fxjs/xfa/cjx_signaturepseudomodel.h"
-#include "fxjs/xfa/cjx_signdata.h"
-#include "fxjs/xfa/cjx_signing.h"
 #include "fxjs/xfa/cjx_soapaction.h"
 #include "fxjs/xfa/cjx_soapaddress.h"
-#include "fxjs/xfa/cjx_solid.h"
 #include "fxjs/xfa/cjx_source.h"
 #include "fxjs/xfa/cjx_sourceset.h"
 #include "fxjs/xfa/cjx_speak.h"
-#include "fxjs/xfa/cjx_stipple.h"
 #include "fxjs/xfa/cjx_subform.h"
 #include "fxjs/xfa/cjx_subformset.h"
-#include "fxjs/xfa/cjx_subjectdn.h"
-#include "fxjs/xfa/cjx_subjectdns.h"
-#include "fxjs/xfa/cjx_submit.h"
 #include "fxjs/xfa/cjx_text.h"
-#include "fxjs/xfa/cjx_textedit.h"
 #include "fxjs/xfa/cjx_time.h"
-#include "fxjs/xfa/cjx_timestamp.h"
 #include "fxjs/xfa/cjx_tooltip.h"
-#include "fxjs/xfa/cjx_traversal.h"
-#include "fxjs/xfa/cjx_traverse.h"
 #include "fxjs/xfa/cjx_tree.h"
 #include "fxjs/xfa/cjx_treelist.h"
-#include "fxjs/xfa/cjx_ui.h"
 #include "fxjs/xfa/cjx_update.h"
 #include "fxjs/xfa/cjx_uri.h"
 #include "fxjs/xfa/cjx_user.h"
-#include "fxjs/xfa/cjx_validate.h"
 #include "fxjs/xfa/cjx_value.h"
 #include "fxjs/xfa/cjx_variables.h"
 #include "fxjs/xfa/cjx_wsdladdress.h"
 #include "fxjs/xfa/cjx_wsdlconnection.h"
 #include "fxjs/xfa/cjx_xfa.h"
-#include "fxjs/xfa/cjx_xmlconnection.h"
-#include "fxjs/xfa/cjx_xsdconnection.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 namespace {