diff --git a/fxjs/cjx_thisproxy.cpp b/fxjs/cjx_thisproxy.cpp
deleted file mode 100644
index 281bb44..0000000
--- a/fxjs/cjx_thisproxy.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/cjx_thisproxy.h"
-
-#include "xfa/fxfa/parser/cxfa_thisproxy.h"
-
-CJX_ThisProxy::CJX_ThisProxy(CXFA_ThisProxy* proxy) : CJX_Object(proxy) {}
-
-CJX_ThisProxy::~CJX_ThisProxy() {}
diff --git a/fxjs/cjx_thisproxy.h b/fxjs/cjx_thisproxy.h
deleted file mode 100644
index 397589b..0000000
--- a/fxjs/cjx_thisproxy.h
+++ /dev/null
@@ -1,20 +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_CJX_THISPROXY_H_
-#define FXJS_CJX_THISPROXY_H_
-
-#include "fxjs/cjx_object.h"
-
-class CXFA_ThisProxy;
-
-class CJX_ThisProxy : public CJX_Object {
- public:
-  explicit CJX_ThisProxy(CXFA_ThisProxy* proxy);
-  ~CJX_ThisProxy() override;
-};
-
-#endif  // FXJS_CJX_THISPROXY_H_
diff --git a/fxjs/xfa/cjx_container.h b/fxjs/xfa/cjx_container.h
index 41d11cf..0e2170f 100644
--- a/fxjs/xfa/cjx_container.h
+++ b/fxjs/xfa/cjx_container.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_CONTAINER_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/xfa/cjx_content.h b/fxjs/xfa/cjx_content.h
index cd2e71a..983a750 100644
--- a/fxjs/xfa/cjx_content.h
+++ b/fxjs/xfa/cjx_content.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_CONTENT_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Content;
 
diff --git a/fxjs/cjx_datawindow.cpp b/fxjs/xfa/cjx_datawindow.cpp
similarity index 97%
rename from fxjs/cjx_datawindow.cpp
rename to fxjs/xfa/cjx_datawindow.cpp
index b642356..54f3204 100644
--- a/fxjs/cjx_datawindow.cpp
+++ b/fxjs/xfa/cjx_datawindow.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_datawindow.h"
+#include "fxjs/xfa/cjx_datawindow.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_datawindow.h b/fxjs/xfa/cjx_datawindow.h
similarity index 89%
rename from fxjs/cjx_datawindow.h
rename to fxjs/xfa/cjx_datawindow.h
index e7c39ed..82c5b1a 100644
--- a/fxjs/cjx_datawindow.h
+++ b/fxjs/xfa/cjx_datawindow.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_DATAWINDOW_H_
-#define FXJS_CJX_DATAWINDOW_H_
+#ifndef FXJS_XFA_CJX_DATAWINDOW_H_
+#define FXJS_XFA_CJX_DATAWINDOW_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CFXJSE_Value;
@@ -39,4 +39,4 @@
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_DATAWINDOW_H_
+#endif  // FXJS_XFA_CJX_DATAWINDOW_H_
diff --git a/fxjs/xfa/cjx_delta.h b/fxjs/xfa/cjx_delta.h
index d9a2c62..29d3e8e 100644
--- a/fxjs/xfa/cjx_delta.h
+++ b/fxjs/xfa/cjx_delta.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_DELTA_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Delta;
 
diff --git a/fxjs/xfa/cjx_desc.h b/fxjs/xfa/cjx_desc.h
index 602633d..f3c9f46 100644
--- a/fxjs/xfa/cjx_desc.h
+++ b/fxjs/xfa/cjx_desc.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_DESC_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Desc;
 
diff --git a/fxjs/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
similarity index 99%
rename from fxjs/cjx_eventpseudomodel.cpp
rename to fxjs/xfa/cjx_eventpseudomodel.cpp
index 092d39f..a109d1c 100644
--- a/fxjs/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_eventpseudomodel.h"
+#include "fxjs/xfa/cjx_eventpseudomodel.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_eventpseudomodel.h b/fxjs/xfa/cjx_eventpseudomodel.h
similarity index 93%
rename from fxjs/cjx_eventpseudomodel.h
rename to fxjs/xfa/cjx_eventpseudomodel.h
index 08cca73..d9615c3 100644
--- a/fxjs/cjx_eventpseudomodel.h
+++ b/fxjs/xfa/cjx_eventpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_EVENTPSEUDOMODEL_H_
-#define FXJS_CJX_EVENTPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CFXJSE_Value;
 class CScript_EventPseudoModel;
@@ -72,4 +72,4 @@
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_EVENTPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_exclgroup.h b/fxjs/xfa/cjx_exclgroup.h
index 2ef280e..f444467 100644
--- a/fxjs/xfa/cjx_exclgroup.h
+++ b/fxjs/xfa/cjx_exclgroup.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_EXCLGROUP_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_ExclGroup;
 
diff --git a/fxjs/cjx_hostpseudomodel.cpp b/fxjs/xfa/cjx_hostpseudomodel.cpp
similarity index 99%
rename from fxjs/cjx_hostpseudomodel.cpp
rename to fxjs/xfa/cjx_hostpseudomodel.cpp
index c4467b8..20e3bfe 100644
--- a/fxjs/cjx_hostpseudomodel.cpp
+++ b/fxjs/xfa/cjx_hostpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_hostpseudomodel.h"
+#include "fxjs/xfa/cjx_hostpseudomodel.h"
 
 #include <memory>
 #include <vector>
diff --git a/fxjs/cjx_hostpseudomodel.h b/fxjs/xfa/cjx_hostpseudomodel.h
similarity index 93%
rename from fxjs/cjx_hostpseudomodel.h
rename to fxjs/xfa/cjx_hostpseudomodel.h
index e77a37e..fa3277a 100644
--- a/fxjs/cjx_hostpseudomodel.h
+++ b/fxjs/xfa/cjx_hostpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_HOSTPSEUDOMODEL_H_
-#define FXJS_CJX_HOSTPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CFXJSE_Value;
@@ -57,4 +57,4 @@
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_HOSTPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_instancemanager.h b/fxjs/xfa/cjx_instancemanager.h
index a312366..1fd41a6 100644
--- a/fxjs/xfa/cjx_instancemanager.h
+++ b/fxjs/xfa/cjx_instancemanager.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_INSTANCEMANAGER_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_InstanceManager;
 
diff --git a/fxjs/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp
similarity index 99%
rename from fxjs/cjx_layoutpseudomodel.cpp
rename to fxjs/xfa/cjx_layoutpseudomodel.cpp
index ed43de5..b80000a 100644
--- a/fxjs/cjx_layoutpseudomodel.cpp
+++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_layoutpseudomodel.h"
+#include "fxjs/xfa/cjx_layoutpseudomodel.h"
 
 #include <set>
 
diff --git a/fxjs/cjx_layoutpseudomodel.h b/fxjs/xfa/cjx_layoutpseudomodel.h
similarity index 93%
rename from fxjs/cjx_layoutpseudomodel.h
rename to fxjs/xfa/cjx_layoutpseudomodel.h
index e465d42..63dc789 100644
--- a/fxjs/cjx_layoutpseudomodel.h
+++ b/fxjs/xfa/cjx_layoutpseudomodel.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_LAYOUTPSEUDOMODEL_H_
-#define FXJS_CJX_LAYOUTPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_LAYOUTPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_LAYOUTPSEUDOMODEL_H_
 
 #include <vector>
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 enum XFA_LAYOUTMODEL_HWXY {
   XFA_LAYOUTMODEL_H,
@@ -67,4 +67,4 @@
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_LAYOUTPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_LAYOUTPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_list.h b/fxjs/xfa/cjx_list.h
index b4a0025..45d827c 100644
--- a/fxjs/xfa/cjx_list.h
+++ b/fxjs/xfa/cjx_list.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_LIST_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_List;
 
diff --git a/fxjs/cjx_logpseudomodel.cpp b/fxjs/xfa/cjx_logpseudomodel.cpp
similarity index 97%
rename from fxjs/cjx_logpseudomodel.cpp
rename to fxjs/xfa/cjx_logpseudomodel.cpp
index 54713fa..e0ed05d 100644
--- a/fxjs/cjx_logpseudomodel.cpp
+++ b/fxjs/xfa/cjx_logpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_logpseudomodel.h"
+#include "fxjs/xfa/cjx_logpseudomodel.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_logpseudomodel.h b/fxjs/xfa/cjx_logpseudomodel.h
similarity index 82%
rename from fxjs/cjx_logpseudomodel.h
rename to fxjs/xfa/cjx_logpseudomodel.h
index e22301e..2d98241 100644
--- a/fxjs/cjx_logpseudomodel.h
+++ b/fxjs/xfa/cjx_logpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_LOGPSEUDOMODEL_H_
-#define FXJS_CJX_LOGPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CScript_LogPseudoModel;
 
@@ -27,4 +27,4 @@
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_LOGPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_manifest.h b/fxjs/xfa/cjx_manifest.h
index 167ef46..fd28e40 100644
--- a/fxjs/xfa/cjx_manifest.h
+++ b/fxjs/xfa/cjx_manifest.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_MANIFEST_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Manifest;
 
diff --git a/fxjs/xfa/cjx_model.h b/fxjs/xfa/cjx_model.h
index f4e6ac9..17b8d3d 100644
--- a/fxjs/xfa/cjx_model.h
+++ b/fxjs/xfa/cjx_model.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_MODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp
similarity index 99%
rename from fxjs/cjx_node.cpp
rename to fxjs/xfa/cjx_node.cpp
index 1c476a2..dd22fb4 100644
--- a/fxjs/cjx_node.cpp
+++ b/fxjs/xfa/cjx_node.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 #include <map>
 #include <tuple>
diff --git a/fxjs/cjx_node.h b/fxjs/xfa/cjx_node.h
similarity index 98%
rename from fxjs/cjx_node.h
rename to fxjs/xfa/cjx_node.h
index 7ccf8b1..a18166f 100644
--- a/fxjs/cjx_node.h
+++ b/fxjs/xfa/cjx_node.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_NODE_H_
-#define FXJS_CJX_NODE_H_
+#ifndef FXJS_XFA_CJX_NODE_H_
+#define FXJS_XFA_CJX_NODE_H_
 
 #include <memory>
 #include <utility>
@@ -13,7 +13,7 @@
 
 #include "core/fxcrt/unowned_ptr.h"
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "fxjs/xfa/cjx_tree.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
@@ -263,4 +263,4 @@
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_NODE_H_
+#endif  // FXJS_XFA_CJX_NODE_H_
diff --git a/fxjs/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
similarity index 99%
rename from fxjs/cjx_object.cpp
rename to fxjs/xfa/cjx_object.cpp
index fbbcc00..81ba1ac 100644
--- a/fxjs/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 #include <utility>
 
diff --git a/fxjs/cjx_object.h b/fxjs/xfa/cjx_object.h
similarity index 98%
rename from fxjs/cjx_object.h
rename to fxjs/xfa/cjx_object.h
index fb6251e..cb8350d 100644
--- a/fxjs/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_OBJECT_H_
-#define FXJS_CJX_OBJECT_H_
+#ifndef FXJS_XFA_CJX_OBJECT_H_
+#define FXJS_XFA_CJX_OBJECT_H_
 
 #include <map>
 #include <memory>
@@ -43,6 +43,7 @@
 
 class CJX_Object {
  public:
+  explicit CJX_Object(CXFA_Object* obj);
   virtual ~CJX_Object();
 
   CXFA_Object* GetXFAObject() { return object_.Get(); }
@@ -115,8 +116,6 @@
   void ThrowParamCountMismatchException(const WideString& method) const;
 
  protected:
-  explicit CJX_Object(CXFA_Object* obj);
-
   void DefineMethods(const CJX_MethodSpec method_specs[]);
 
   void MoveBufferMapData(CXFA_Object* pSrcModule, CXFA_Object* pDstModule);
@@ -161,4 +160,4 @@
   std::map<ByteString, CJX_MethodCall> method_specs_;
 };
 
-#endif  // FXJS_CJX_OBJECT_H_
+#endif  // FXJS_XFA_CJX_OBJECT_H_
diff --git a/fxjs/xfa/cjx_packet.h b/fxjs/xfa/cjx_packet.h
index 80520e2..b014a9d 100644
--- a/fxjs/xfa/cjx_packet.h
+++ b/fxjs/xfa/cjx_packet.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_PACKET_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Packet;
 
diff --git a/fxjs/cjx_signaturepseudomodel.cpp b/fxjs/xfa/cjx_signaturepseudomodel.cpp
similarity index 97%
rename from fxjs/cjx_signaturepseudomodel.cpp
rename to fxjs/xfa/cjx_signaturepseudomodel.cpp
index 900116b..6b39ac2 100644
--- a/fxjs/cjx_signaturepseudomodel.cpp
+++ b/fxjs/xfa/cjx_signaturepseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_signaturepseudomodel.h"
+#include "fxjs/xfa/cjx_signaturepseudomodel.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_signaturepseudomodel.h b/fxjs/xfa/cjx_signaturepseudomodel.h
similarity index 81%
rename from fxjs/cjx_signaturepseudomodel.h
rename to fxjs/xfa/cjx_signaturepseudomodel.h
index d0508dd..88f90fb 100644
--- a/fxjs/cjx_signaturepseudomodel.h
+++ b/fxjs/xfa/cjx_signaturepseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_SIGNATUREPSEUDOMODEL_H_
-#define FXJS_CJX_SIGNATUREPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CScript_SignaturePseudoModel;
 
@@ -26,4 +26,4 @@
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_SIGNATUREPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_source.h b/fxjs/xfa/cjx_source.h
index 1502e0e..8b35fac 100644
--- a/fxjs/xfa/cjx_source.h
+++ b/fxjs/xfa/cjx_source.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_SOURCE_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Source;
 
diff --git a/fxjs/xfa/cjx_textnode.h b/fxjs/xfa/cjx_textnode.h
index 1fa84d8..c0a01d6 100644
--- a/fxjs/xfa/cjx_textnode.h
+++ b/fxjs/xfa/cjx_textnode.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_TEXTNODE_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/xfa/cjx_tree.h b/fxjs/xfa/cjx_tree.h
index 3008112..72468d6 100644
--- a/fxjs/xfa/cjx_tree.h
+++ b/fxjs/xfa/cjx_tree.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_TREE_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Object;
 class CXFA_Node;
diff --git a/fxjs/xfa/cjx_wsdlconnection.h b/fxjs/xfa/cjx_wsdlconnection.h
index 76533ce..8276017 100644
--- a/fxjs/xfa/cjx_wsdlconnection.h
+++ b/fxjs/xfa/cjx_wsdlconnection.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_WSDLCONNECTION_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_WsdlConnection;