diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index acd01bb..b4cc7bf 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -19,12 +19,12 @@
 #include "core/fxcrt/fx_extension.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
-#include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_Object.h"
 #include "fpdfsdk/javascript/JS_Value.h"
 #include "fpdfsdk/javascript/cjs_event_context.h"
 #include "fpdfsdk/javascript/cjs_eventhandler.h"
+#include "fpdfsdk/javascript/cjs_field.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
 #include "fpdfsdk/javascript/color.h"
 #include "fpdfsdk/javascript/resource.h"
diff --git a/fpdfsdk/javascript/cjs_delaydata.cpp b/fpdfsdk/javascript/cjs_delaydata.cpp
new file mode 100644
index 0000000..bf5e346
--- /dev/null
+++ b/fpdfsdk/javascript/cjs_delaydata.cpp
@@ -0,0 +1,12 @@
+// 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 "fpdfsdk/javascript/cjs_delaydata.h"
+
+CJS_DelayData::CJS_DelayData(FIELD_PROP prop, int idx, const WideString& name)
+    : eProp(prop), nControlIndex(idx), sFieldName(name) {}
+
+CJS_DelayData::~CJS_DelayData() {}
diff --git a/fpdfsdk/javascript/cjs_delaydata.h b/fpdfsdk/javascript/cjs_delaydata.h
new file mode 100644
index 0000000..3aa9e27
--- /dev/null
+++ b/fpdfsdk/javascript/cjs_delaydata.h
@@ -0,0 +1,35 @@
+// 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 FPDFSDK_JAVASCRIPT_CJS_DELAYDATA_H_
+#define FPDFSDK_JAVASCRIPT_CJS_DELAYDATA_H_
+
+#include <string>
+#include <vector>
+
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/widestring.h"
+#include "core/fxge/cfx_color.h"
+#include "fpdfsdk/javascript/cjs_field.h"
+
+struct CJS_DelayData {
+  CJS_DelayData(FIELD_PROP prop, int idx, const WideString& name);
+  ~CJS_DelayData();
+
+  FIELD_PROP eProp;
+  int nControlIndex;
+  WideString sFieldName;
+  int32_t num;
+  bool b;
+  ByteString string;
+  WideString widestring;
+  CFX_FloatRect rect;
+  CFX_Color color;
+  std::vector<uint32_t> wordarray;
+  std::vector<WideString> widestringarray;
+};
+
+#endif  // FPDFSDK_JAVASCRIPT_CJS_DELAYDATA_H_
diff --git a/fpdfsdk/javascript/cjs_document.cpp b/fpdfsdk/javascript/cjs_document.cpp
index 5726d24..abbc61b 100644
--- a/fpdfsdk/javascript/cjs_document.cpp
+++ b/fpdfsdk/javascript/cjs_document.cpp
@@ -19,10 +19,11 @@
 #include "fpdfsdk/cpdfsdk_annotiteration.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/Icon.h"
 #include "fpdfsdk/javascript/app.h"
 #include "fpdfsdk/javascript/cjs_annot.h"
+#include "fpdfsdk/javascript/cjs_delaydata.h"
+#include "fpdfsdk/javascript/cjs_field.h"
 #include "fpdfsdk/javascript/cjs_printparamsobj.h"
 
 const JSPropertySpec CJS_Document::PropertySpecs[] = {
diff --git a/fpdfsdk/javascript/cjs_eventhandler.cpp b/fpdfsdk/javascript/cjs_eventhandler.cpp
index ada365a..9dcc029 100644
--- a/fpdfsdk/javascript/cjs_eventhandler.cpp
+++ b/fpdfsdk/javascript/cjs_eventhandler.cpp
@@ -6,12 +6,13 @@
 
 #include "fpdfsdk/javascript/cjs_eventhandler.h"
 
-#include "fpdfsdk/javascript/Field.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_Object.h"
 #include "fpdfsdk/javascript/JS_Value.h"
 #include "fpdfsdk/javascript/cjs_document.h"
 #include "fpdfsdk/javascript/cjs_event_context.h"
+#include "fpdfsdk/javascript/cjs_field.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
 
 CJS_EventHandler::CJS_EventHandler(CJS_EventContext* pContext)
diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/cjs_field.cpp
similarity index 99%
rename from fpdfsdk/javascript/Field.cpp
rename to fpdfsdk/javascript/cjs_field.cpp
index c0c52aa..110c8ee 100644
--- a/fpdfsdk/javascript/Field.cpp
+++ b/fpdfsdk/javascript/cjs_field.cpp
@@ -4,30 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/Field.h"
+#include "fpdfsdk/javascript/cjs_field.h"
 
 #include <algorithm>
 #include <memory>
-#include <string>
-#include <vector>
 
 #include "core/fpdfapi/font/cpdf_font.h"
-#include "core/fpdfapi/page/cpdf_page.h"
-#include "core/fpdfapi/parser/cpdf_document.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fpdfdoc/cpdf_interform.h"
-#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
 #include "fpdfsdk/javascript/Icon.h"
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/JS_Object.h"
-#include "fpdfsdk/javascript/JS_Value.h"
-#include "fpdfsdk/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/cjs_delaydata.h"
 #include "fpdfsdk/javascript/cjs_document.h"
-#include "fpdfsdk/javascript/cjs_event_context.h"
-#include "fpdfsdk/javascript/cjs_eventhandler.h"
-#include "fpdfsdk/javascript/cjs_runtime.h"
 #include "fpdfsdk/javascript/color.h"
 
 namespace {
@@ -181,11 +171,6 @@
   DefineMethods(pEngine, ObjDefnID, MethodSpecs);
 }
 
-CJS_DelayData::CJS_DelayData(FIELD_PROP prop, int idx, const WideString& name)
-    : eProp(prop), nControlIndex(idx), sFieldName(name) {}
-
-CJS_DelayData::~CJS_DelayData() {}
-
 void CJS_Field::InitInstance(IJS_Runtime* pIRuntime) {}
 
 Field::Field(CJS_Object* pJSObject)
diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/cjs_field.h
similarity index 96%
rename from fpdfsdk/javascript/Field.h
rename to fpdfsdk/javascript/cjs_field.h
index 6c16c5e..11786ff 100644
--- a/fpdfsdk/javascript/Field.h
+++ b/fpdfsdk/javascript/cjs_field.h
@@ -4,19 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_FIELD_H_
-#define FPDFSDK_JAVASCRIPT_FIELD_H_
+#ifndef FPDFSDK_JAVASCRIPT_CJS_FIELD_H_
+#define FPDFSDK_JAVASCRIPT_CJS_FIELD_H_
 
 #include <string>
 #include <vector>
 
-#include "core/fxcrt/observable.h"
-#include "core/fxge/cfx_color.h"
-#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 
+class CPDF_FormControl;
 class CPDFSDK_Widget;
 class Document;
+struct CJS_DelayData;
 
 enum FIELD_PROP {
   FP_BORDERSTYLE,
@@ -28,23 +27,6 @@
   FP_VALUE
 };
 
-struct CJS_DelayData {
-  CJS_DelayData(FIELD_PROP prop, int idx, const WideString& name);
-  ~CJS_DelayData();
-
-  FIELD_PROP eProp;
-  int nControlIndex;
-  WideString sFieldName;
-  int32_t num;
-  bool b;
-  ByteString string;
-  WideString widestring;
-  CFX_FloatRect rect;
-  CFX_Color color;
-  std::vector<uint32_t> wordarray;
-  std::vector<WideString> widestringarray;
-};
-
 class Field : public CJS_EmbedObj {
  public:
   static void DoDelay(CPDFSDK_FormFillEnvironment* pFormFillEnv,
@@ -453,4 +435,4 @@
   static const JSMethodSpec MethodSpecs[];
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_FIELD_H_
+#endif  // FPDFSDK_JAVASCRIPT_CJS_FIELD_H_
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 7419ab1..9421d3d 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
-#include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/Icon.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_GlobalData.h"
@@ -23,6 +22,7 @@
 #include "fpdfsdk/javascript/cjs_document.h"
 #include "fpdfsdk/javascript/cjs_event_context.h"
 #include "fpdfsdk/javascript/cjs_eventhandler.h"
+#include "fpdfsdk/javascript/cjs_field.h"
 #include "fpdfsdk/javascript/cjs_font.h"
 #include "fpdfsdk/javascript/cjs_global.h"
 #include "fpdfsdk/javascript/cjs_globalarrays.h"
diff --git a/fpdfsdk/javascript/event.cpp b/fpdfsdk/javascript/event.cpp
index fcb5b04..cd40c20 100644
--- a/fpdfsdk/javascript/event.cpp
+++ b/fpdfsdk/javascript/event.cpp
@@ -6,12 +6,12 @@
 
 #include "fpdfsdk/javascript/event.h"
 
-#include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_Object.h"
 #include "fpdfsdk/javascript/JS_Value.h"
 #include "fpdfsdk/javascript/cjs_event_context.h"
 #include "fpdfsdk/javascript/cjs_eventhandler.h"
+#include "fpdfsdk/javascript/cjs_field.h"
 
 const JSPropertySpec CJS_Event::PropertySpecs[] = {
     {"change", get_change_static, set_change_static},