diff --git a/dom/events/nsJSEventListener.cpp b/dom/events/JSEventHandler.cpp
similarity index 99%
rename from dom/events/nsJSEventListener.cpp
rename to dom/events/JSEventHandler.cpp
index ec5485fefec..1f9355a9eee 100644
--- a/dom/events/nsJSEventListener.cpp
+++ b/dom/events/JSEventHandler.cpp
@@ -2,7 +2,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "nsJSEventListener.h"
 #include "nsJSUtils.h"
 #include "nsString.h"
 #include "nsIServiceManager.h"
@@ -19,6 +18,7 @@
 #include "nsDOMJSUtils.h"
 #include "WorkerPrivate.h"
 #include "mozilla/ContentEvents.h"
+#include "mozilla/JSEventHandler.h"
 #include "mozilla/Likely.h"
 #include "mozilla/dom/ErrorEvent.h"
 #include "mozilla/dom/UnionTypes.h"
diff --git a/dom/events/nsJSEventListener.h b/dom/events/JSEventHandler.h
similarity index 92%
rename from dom/events/nsJSEventListener.h
rename to dom/events/JSEventHandler.h
index 8144bb08084..079c3d0c3c2 100644
--- a/dom/events/nsJSEventListener.h
+++ b/dom/events/JSEventHandler.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef nsJSEventListener_h__
-#define nsJSEventListener_h__
+#ifndef mozilla_JSEventHandler_h_
+#define mozilla_JSEventHandler_h_
 
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
@@ -41,5 +41,5 @@ public:
   bool IsBlackForCC();
 };
 
-#endif //nsJSEventListener_h__
+#endif // mozilla_JSEventHandler_h_
 
diff --git a/dom/events/moz.build b/dom/events/moz.build
index 1f99ccc971d..5be3dc0a913 100644
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -27,6 +27,7 @@ EXPORTS.mozilla += [
     'EventStateManager.h',
     'IMEStateManager.h',
     'InternalMutationEvent.h',
+    'JSEventHandler.h',
     'KeyNameList.h',
     'VirtualKeyCodeList.h',
 ]
@@ -86,6 +87,7 @@ UNIFIED_SOURCES += [
     'FocusEvent.cpp',
     'IMEContentObserver.cpp',
     'IMEStateManager.cpp',
+    'JSEventHandler.cpp',
     'KeyboardEvent.cpp',
     'MessageEvent.cpp',
     'MouseEvent.cpp',
@@ -93,7 +95,6 @@ UNIFIED_SOURCES += [
     'MutationEvent.cpp',
     'NotifyAudioAvailableEvent.cpp',
     'NotifyPaintEvent.cpp',
-    'nsJSEventListener.cpp',
     'nsPaintRequest.cpp',
     'PointerEvent.cpp',
     'ScrollAreaEvent.cpp',