diff --git a/dom/webidl/EventHandler.webidl b/dom/webidl/EventHandler.webidl
index fc7faf7c7dff..79d7775c7acf 100644
--- a/dom/webidl/EventHandler.webidl
+++ b/dom/webidl/EventHandler.webidl
@@ -153,3 +153,41 @@ interface NodeEventHandlers {
            [SetterThrows]
            attribute EventHandler onscroll;
 };
+
+[NoInterfaceObject]
+interface WindowEventHandlers {
+           [SetterThrows]
+           attribute EventHandler onafterprint;
+           [SetterThrows]
+           attribute EventHandler onbeforeprint;
+           [SetterThrows]
+           attribute BeforeUnloadEventHandler onbeforeunload;
+  //       For now, onerror comes from NodeEventHandlers
+  //       When we convert Window to WebIDL this may need to change.
+  //       [SetterThrows]
+  //       attribute OnErrorEventHandler onerror;
+           //(Not implemented)[SetterThrows]
+           //(Not implemented)attribute EventHandler onfullscreenchange;
+           //(Not implemented)[SetterThrows]
+           //(Not implemented)attribute EventHandler onfullscreenerror;
+           [SetterThrows]
+           attribute EventHandler onhashchange;
+           [SetterThrows]
+           attribute EventHandler onmessage;
+           [SetterThrows]
+           attribute EventHandler onoffline;
+           [SetterThrows]
+           attribute EventHandler ononline;
+           [SetterThrows]
+           attribute EventHandler onpagehide;
+           [SetterThrows]
+           attribute EventHandler onpageshow;
+           [SetterThrows]
+           attribute EventHandler onpopstate;
+           [SetterThrows]
+           attribute EventHandler onresize;
+           //(Not implemented)[SetterThrows]
+           //(Not implemented)attribute EventHandler onstorage;
+           [SetterThrows]
+           attribute EventHandler onunload;
+};
diff --git a/dom/webidl/HTMLBodyElement.webidl b/dom/webidl/HTMLBodyElement.webidl
index 81b9398ecd33..95df2d43a7b1 100644
--- a/dom/webidl/HTMLBodyElement.webidl
+++ b/dom/webidl/HTMLBodyElement.webidl
@@ -12,42 +12,6 @@
  */
 
 interface HTMLBodyElement : HTMLElement {
-  [SetterThrows]
-  attribute EventHandler onafterprint;
-  [SetterThrows]
-  attribute EventHandler onbeforeprint;
-  [SetterThrows]
-  attribute BeforeUnloadEventHandler onbeforeunload;
-  //[SetterThrows]
-  //attribute EventHandler onblur;
-  //[SetterThrows]
-  //attribute OnErrorEventHandler onerror;
-  //[SetterThrows]
-  //attribute EventHandler onfocus;
-  [SetterThrows]
-  attribute EventHandler onhashchange;
-  //[SetterThrows]
-  //attribute EventHandler onload;
-  [SetterThrows]
-  attribute EventHandler onmessage;
-  [SetterThrows]
-  attribute EventHandler onoffline;
-  [SetterThrows]
-  attribute EventHandler ononline;
-  [SetterThrows]
-  attribute EventHandler onpopstate;
-  [SetterThrows]
-  attribute EventHandler onpagehide;
-  [SetterThrows]
-  attribute EventHandler onpageshow;
-  [SetterThrows]
-  attribute EventHandler onresize;
-  //[SetterThrows]
-  //attribute EventHandler onscroll;
-  //[SetterThrows]
-  //attribute EventHandler onstorage;
-  [SetterThrows]
-  attribute EventHandler onunload;
 };
 
 partial interface HTMLBodyElement {
@@ -58,3 +22,5 @@ partial interface HTMLBodyElement {
   [TreatNullAs=EmptyString, SetterThrows] attribute DOMString bgColor;
   [SetterThrows]                          attribute DOMString background;
 };
+
+HTMLBodyElement implements WindowEventHandlers;
diff --git a/dom/webidl/HTMLFrameSetElement.webidl b/dom/webidl/HTMLFrameSetElement.webidl
index 8ae61387247b..ce00d487fa63 100644
--- a/dom/webidl/HTMLFrameSetElement.webidl
+++ b/dom/webidl/HTMLFrameSetElement.webidl
@@ -16,39 +16,6 @@ interface HTMLFrameSetElement : HTMLElement {
   attribute DOMString cols;
   [SetterThrows]
   attribute DOMString rows;
-  [SetterThrows]
-  attribute EventHandler onafterprint;
-  [SetterThrows]
-  attribute EventHandler onbeforeprint;
-  [SetterThrows]
-  attribute BeforeUnloadEventHandler onbeforeunload;
-  //[SetterThrows]
-  //attribute EventHandler onblur;
-  //[SetterThrows]
-  //attribute EventHandler onerror;
-  //[SetterThrows]
-  //attribute EventHandler onfocus;
-  [SetterThrows]
-  attribute EventHandler onhashchange;
-  //attribute EventHandler onload;
-  [SetterThrows]
-  attribute EventHandler onmessage;
-  [SetterThrows]
-  attribute EventHandler onoffline;
-  [SetterThrows]
-  attribute EventHandler ononline;
-  [SetterThrows]
-  attribute EventHandler onpagehide;
-  [SetterThrows]
-  attribute EventHandler onpageshow;
-  [SetterThrows]
-  attribute EventHandler onpopstate;
-  [SetterThrows]
-  attribute EventHandler onresize;
-  //[SetterThrows]
-  //attribute EventHandler onscroll;
-  //[SetterThrows]
-  //attribute EventHandler onstorage;
-  [SetterThrows]
-  attribute EventHandler onunload;
 };
+
+HTMLFrameSetElement implements WindowEventHandlers;