12 files changed, 19 insertions, 16 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 67f2a166ca..cedfbca4fe 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1258,8 +1258,8 @@ static_library("javascript") {
       "fpdfsdk/javascript/cjs_zoomtype.h",
       "fpdfsdk/javascript/global_timer.cpp",
       "fpdfsdk/javascript/global_timer.h",
-      "fpdfsdk/javascript/resource.cpp",
-      "fpdfsdk/javascript/resource.h",
+      "fpdfsdk/javascript/js_resources.cpp",
+      "fpdfsdk/javascript/js_resources.h",
       "fpdfsdk/javascript/util.cpp",
       "fpdfsdk/javascript/util.h",
     ]
diff --git a/fpdfsdk/javascript/JS_Define.h b/fpdfsdk/javascript/JS_Define.h
index 4f82a74b0d..41dccc6c8c 100644
--- a/fpdfsdk/javascript/JS_Define.h
+++ b/fpdfsdk/javascript/JS_Define.h
@@ -11,7 +11,7 @@
 
 #include "fpdfsdk/javascript/cjs_object.h"
 #include "fpdfsdk/javascript/cjs_return.h"
-#include "fpdfsdk/javascript/resource.h"
+#include "fpdfsdk/javascript/js_resources.h"
 #include "fxjs/fxjs_v8.h"
 
 double JS_GetDateTime();
diff --git a/fpdfsdk/javascript/cjs_annot.cpp b/fpdfsdk/javascript/cjs_annot.cpp
index 8ff0d2c72e..586e4629aa 100644
--- a/fpdfsdk/javascript/cjs_annot.cpp
+++ b/fpdfsdk/javascript/cjs_annot.cpp
@@ -9,6 +9,7 @@
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/cjs_event_context.h"
 #include "fpdfsdk/javascript/cjs_object.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_app.cpp b/fpdfsdk/javascript/cjs_app.cpp
index bd28fefc4e..df590976d8 100644
--- a/fpdfsdk/javascript/cjs_app.cpp
+++ b/fpdfsdk/javascript/cjs_app.cpp
@@ -11,6 +11,7 @@
 #include "fpdfsdk/javascript/cjs_timerobj.h"
 #include "fpdfsdk/javascript/global_timer.h"
 #include "fpdfsdk/javascript/ijs_event_context.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_document.cpp b/fpdfsdk/javascript/cjs_document.cpp
index 1791db563b..8b0afa8eff 100644
--- a/fpdfsdk/javascript/cjs_document.cpp
+++ b/fpdfsdk/javascript/cjs_document.cpp
@@ -25,6 +25,7 @@
 #include "fpdfsdk/javascript/cjs_field.h"
 #include "fpdfsdk/javascript/cjs_icon.h"
 #include "fpdfsdk/javascript/cjs_printparamsobj.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 const JSPropertySpec CJS_Document::PropertySpecs[] = {
     {"ADBE", get_ADBE_static, set_ADBE_static},
diff --git a/fpdfsdk/javascript/cjs_event_context.cpp b/fpdfsdk/javascript/cjs_event_context.cpp
index e02149d176..98f3c6d14a 100644
--- a/fpdfsdk/javascript/cjs_event_context.cpp
+++ b/fpdfsdk/javascript/cjs_event_context.cpp
@@ -7,9 +7,10 @@
 #include "fpdfsdk/javascript/cjs_event_context.h"
 
 #include "core/fxcrt/autorestorer.h"
+#include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/cjs_eventhandler.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fpdfsdk/javascript/resource.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 CJS_EventContext::CJS_EventContext(CJS_Runtime* pRuntime)
     : m_pRuntime(pRuntime),
diff --git a/fpdfsdk/javascript/cjs_field.cpp b/fpdfsdk/javascript/cjs_field.cpp
index 84c0d6ab10..1c50f8ec98 100644
--- a/fpdfsdk/javascript/cjs_field.cpp
+++ b/fpdfsdk/javascript/cjs_field.cpp
@@ -19,6 +19,7 @@
 #include "fpdfsdk/javascript/cjs_delaydata.h"
 #include "fpdfsdk/javascript/cjs_document.h"
 #include "fpdfsdk/javascript/cjs_icon.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_global.cpp b/fpdfsdk/javascript/cjs_global.cpp
index d89005d2af..3d605b23ab 100644
--- a/fpdfsdk/javascript/cjs_global.cpp
+++ b/fpdfsdk/javascript/cjs_global.cpp
@@ -18,7 +18,7 @@
 #include "fpdfsdk/javascript/cjs_event_context.h"
 #include "fpdfsdk/javascript/cjs_eventhandler.h"
 #include "fpdfsdk/javascript/cjs_object.h"
-#include "fpdfsdk/javascript/resource.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 namespace {
 
diff --git a/fpdfsdk/javascript/cjs_publicmethods.cpp b/fpdfsdk/javascript/cjs_publicmethods.cpp
index 27bb869f0d..fb4cc2c3ee 100644
--- a/fpdfsdk/javascript/cjs_publicmethods.cpp
+++ b/fpdfsdk/javascript/cjs_publicmethods.cpp
@@ -26,7 +26,7 @@
 #include "fpdfsdk/javascript/cjs_field.h"
 #include "fpdfsdk/javascript/cjs_object.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fpdfsdk/javascript/resource.h"
+#include "fpdfsdk/javascript/js_resources.h"
 #include "fpdfsdk/javascript/util.h"
 
 #define DOUBLE_CORRECT 0.000000000000001
diff --git a/fpdfsdk/javascript/resource.cpp b/fpdfsdk/javascript/js_resources.cpp
index 8ca5b2a3b7..39f59a6a63 100644
--- a/fpdfsdk/javascript/resource.cpp
+++ b/fpdfsdk/javascript/js_resources.cpp
@@ -1,10 +1,10 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
+// 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/resource.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 WideString JSGetStringFromID(uint32_t id) {
   switch (id) {
diff --git a/fpdfsdk/javascript/resource.h b/fpdfsdk/javascript/js_resources.h
index 3891918259..e1c3d6ea18 100644
--- a/fpdfsdk/javascript/resource.h
+++ b/fpdfsdk/javascript/js_resources.h
@@ -1,15 +1,13 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
+// 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_RESOURCE_H_
-#define FPDFSDK_JAVASCRIPT_RESOURCE_H_
+#ifndef FPDFSDK_JAVASCRIPT_JS_RESOURCES_H_
+#define FPDFSDK_JAVASCRIPT_JS_RESOURCES_H_
 
-#include "core/fxcrt/fx_string.h"
-
-class CJS_EventContext;
+#include "core/fxcrt/widestring.h"
 
 #define IDS_STRING_JSALERT 25613
 #define IDS_STRING_JSPARAMERROR 25614
@@ -37,4 +35,4 @@ WideString JSFormatErrorString(const char* class_name,
                                const char* property_name,
                                const WideString& details);
 
-#endif  // FPDFSDK_JAVASCRIPT_RESOURCE_H_
+#endif  // FPDFSDK_JAVASCRIPT_JS_RESOURCES_H_
diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp
index 29e3fd5fbc..3dd5eb6d91 100644
--- a/fpdfsdk/javascript/util.cpp
+++ b/fpdfsdk/javascript/util.cpp
@@ -21,7 +21,7 @@
 #include "fpdfsdk/javascript/cjs_object.h"
 #include "fpdfsdk/javascript/cjs_publicmethods.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
-#include "fpdfsdk/javascript/resource.h"
+#include "fpdfsdk/javascript/js_resources.h"
 
 #if _FX_OS_ == _FX_OS_ANDROID_
 #include <ctype.h>