diff --git a/custom/idl/event-handlers.idl b/custom/idl/event-handlers.idl
index 34c860c95..e74a3debc 100644
--- a/custom/idl/event-handlers.idl
+++ b/custom/idl/event-handlers.idl
@@ -1,122 +1,26 @@
 partial interface Document {
-  attribute EventHandler onscroll;
-  attribute EventHandler onscrollend;
   attribute EventHandler onscrollsnapchange;
   attribute EventHandler onscrollsnapchanging;
-  attribute EventHandler onsecuritypolicyviolation;
-  attribute EventHandler onselectionchange;
 };
 
-partial interface Element {
+partial interface HTMLElement {
   attribute EventHandler onafterscriptexecute;
-  attribute EventHandler onanimationcancel;
-  attribute EventHandler onanimationend;
-  attribute EventHandler onanimationiteration;
-  attribute EventHandler onanimationstart;
-  attribute EventHandler onauxclick;
-  attribute EventHandler onbeforeinput;
-  attribute EventHandler onbeforematch;
   attribute EventHandler onbeforescriptexecute;
-  attribute EventHandler onbeforexrselect;
-  attribute EventHandler onblur;
-  attribute EventHandler onclick;
   attribute EventHandler oncompositionend;
   attribute EventHandler oncompositionstart;
   attribute EventHandler oncompositionupdate;
   attribute EventHandler oncontentvisibilityautostatechange;
-  attribute EventHandler oncontextmenu;
-  attribute EventHandler oncopy;
-  attribute EventHandler oncut;
-  attribute EventHandler ondblclick;
-  attribute EventHandler onfocus;
-  attribute EventHandler ongotpointercapture;
-  attribute EventHandler oninput;
-  attribute EventHandler onkeydown;
-  attribute EventHandler onkeypress;
-  attribute EventHandler onkeyup;
-  attribute EventHandler onlostpointercapture;
-  attribute EventHandler onmousedown;
-  attribute EventHandler onmouseenter;
-  attribute EventHandler onmouseleave;
-  attribute EventHandler onmousemove;
-  attribute EventHandler onmouseout;
-  attribute EventHandler onmouseover;
-  attribute EventHandler onmouseup;
-  attribute EventHandler onmousewheel;
-  attribute EventHandler onpaste;
-  attribute EventHandler onpointercancel;
-  attribute EventHandler onpointerdown;
-  attribute EventHandler onpointerenter;
-  attribute EventHandler onpointerleave;
-  attribute EventHandler onpointermove;
-  attribute EventHandler onpointerout;
-  attribute EventHandler onpointerover;
-  attribute EventHandler onpointerrawupdate;
-  attribute EventHandler onpointerup;
-  attribute EventHandler onscroll;
-  attribute EventHandler onscrollend;
   attribute EventHandler onscrollsnapchange;
   attribute EventHandler onscrollsnapchanging;
-  attribute EventHandler onsecuritypolicyviolation;
-  attribute EventHandler ontouchcancel;
-  attribute EventHandler ontouchend;
-  attribute EventHandler ontouchmove;
-  attribute EventHandler ontouchstart;
-  attribute EventHandler ontransitioncancel;
-  attribute EventHandler ontransitionend;
-  attribute EventHandler ontransitionrun;
-  attribute EventHandler ontransitionstart;
   attribute EventHandler onwebkitmouseforcechanged;
   attribute EventHandler onwebkitmouseforcedown;
   attribute EventHandler onwebkitmouseforceup;
   attribute EventHandler onwebkitmouseforcewillbegin;
-  attribute EventHandler onwheel;
 };
 
 partial interface Window {
-  attribute EventHandler onafterprint;
-  attribute EventHandler onbeforeprint;
-  attribute EventHandler onbeforeunload;
-  attribute EventHandler onblur;
-  attribute EventHandler onerror;
-  attribute EventHandler onfocus;
-  attribute EventHandler ongamepadconnected;
-  attribute EventHandler ongamepaddisconnected;
-  attribute EventHandler onhashchange;
-  attribute EventHandler onlanguagechange;
-  attribute EventHandler onload;
-  attribute EventHandler onmessage;
-  attribute EventHandler onmessageerror;
-  attribute EventHandler onoffline;
-  attribute EventHandler ononline;
-  attribute EventHandler onpagehide;
-  attribute EventHandler onpagereveal;
-  attribute EventHandler onpageshow;
-  attribute EventHandler onpageswap;
-  attribute EventHandler onpopstate;
-  attribute EventHandler onrejectionhandled;
-  attribute EventHandler onresize;
   attribute EventHandler onscrollsnapchange;
   attribute EventHandler onscrollsnapchanging;
-  attribute EventHandler onstorage;
-  attribute EventHandler onunhandledrejection;
-  attribute EventHandler onunload;
-};
-
-partial interface HTMLElement {
-  attribute EventHandler onbeforetoggle;
-  attribute EventHandler onchange;
-  attribute EventHandler oncommand;
-  attribute EventHandler ondrag;
-  attribute EventHandler ondragend;
-  attribute EventHandler ondragenter;
-  attribute EventHandler ondragexit;
-  attribute EventHandler ondragleave;
-  attribute EventHandler ondragover;
-  attribute EventHandler ondragstart;
-  attribute EventHandler ondrop;
-  attribute EventHandler onerror;
-  attribute EventHandler ontoggle;
 };
 
 partial interface HTMLCanvasElement {
@@ -196,11 +100,6 @@ partial interface SVGAnimationElement {
   attribute EventHandler onrepeatEvent;
 };
 
-partial interface SVGElement {
-  attribute EventHandler onerror;
-  attribute EventHandler onload;
-};
-
 partial interface WorkerGlobalScope {
   attribute EventHandler onsecuritypolicyviolation;
 };
diff --git a/test-builder/api.ts b/test-builder/api.ts
index 442e3673d..80e82cbf0 100644
--- a/test-builder/api.ts
+++ b/test-builder/api.ts
@@ -94,8 +94,6 @@ const flattenIDL = (specIDLs: IDLFiles, customIDLs: IDLFiles) => {
     if (dfn.type === "includes") {
       const skipIncludes = [
         "WindowOrWorkerGlobalScope", // handled separately as globals
-        "GlobalEventHandlers", // XXX needs special handling
-        "WindowEventHandlers", // XXX needs special handling
       ];
       if (skipIncludes.includes(dfn.includes)) {
         continue;