11 files changed, 37 insertions, 22 deletions
diff --git a/ext/broadcast_channel/01_broadcast_channel.js b/ext/broadcast_channel/01_broadcast_channel.js
index e14b59779..0682a2d5a 100644
--- a/ext/broadcast_channel/01_broadcast_channel.js
+++ b/ext/broadcast_channel/01_broadcast_channel.js
@@ -8,7 +8,9 @@
   const core = window.Deno.core;
   const ops = core.ops;
   const webidl = window.__bootstrap.webidl;
-  const { defineEventHandler, setTarget } = window.__bootstrap.event;
+  const { MessageEvent, defineEventHandler, setTarget } =
+    window.__bootstrap.event;
+  const { EventTarget } = window.__bootstrap.eventTarget;
   const { DOMException } = window.__bootstrap.domException;
   const {
     ArrayPrototypeIndexOf,
diff --git a/ext/flash/01_http.js b/ext/flash/01_http.js
index 547b6d42e..5e6cb69aa 100644
--- a/ext/flash/01_http.js
+++ b/ext/flash/01_http.js
@@ -7,6 +7,7 @@
   const { fromFlashRequest, toInnerResponse, _flash } =
     window.__bootstrap.fetch;
   const core = window.Deno.core;
+  const { Event } = window.__bootstrap.event;
   const {
     ReadableStream,
     ReadableStreamPrototype,
diff --git a/ext/http/01_http.js b/ext/http/01_http.js
index 588a7da57..ab23cbec0 100644
--- a/ext/http/01_http.js
+++ b/ext/http/01_http.js
@@ -4,6 +4,7 @@
 ((window) => {
   const webidl = window.__bootstrap.webidl;
   const { InnerBody } = window.__bootstrap.fetchBody;
+  const { Event } = window.__bootstrap.event;
   const { setEventTargetData } = window.__bootstrap.eventTarget;
   const { BlobPrototype } = window.__bootstrap.file;
   const {
diff --git a/ext/web/02_event.js b/ext/web/02_event.js
index ee64b3719..d915b5f20 100644
--- a/ext/web/02_event.js
+++ b/ext/web/02_event.js
@@ -1471,19 +1471,6 @@
     reportException(error);
   }
 
-  window[webidl.brand] = webidl.brand;
-  window.Event = Event;
-  window.EventTarget = EventTarget;
-  window.ErrorEvent = ErrorEvent;
-  window.CloseEvent = CloseEvent;
-  window.MessageEvent = MessageEvent;
-  window.CustomEvent = CustomEvent;
-  window.ProgressEvent = ProgressEvent;
-  window.PromiseRejectionEvent = PromiseRejectionEvent;
-  window.dispatchEvent = EventTarget.prototype.dispatchEvent;
-  window.addEventListener = EventTarget.prototype.addEventListener;
-  window.removeEventListener = EventTarget.prototype.removeEventListener;
-  window.reportError = reportError;
   window.__bootstrap.eventTarget = {
     EventTarget,
     setEventTargetData,
@@ -1494,5 +1481,13 @@
     setIsTrusted,
     setTarget,
     defineEventHandler,
+    Event,
+    ErrorEvent,
+    CloseEvent,
+    MessageEvent,
+    CustomEvent,
+    ProgressEvent,
+    PromiseRejectionEvent,
+    reportError,
   };
 })(this);
diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js
index 39de8d0fc..2fa3c4bcf 100644
--- a/ext/web/03_abort_signal.js
+++ b/ext/web/03_abort_signal.js
@@ -6,8 +6,8 @@
 
 ((window) => {
   const webidl = window.__bootstrap.webidl;
-  const { setIsTrusted, defineEventHandler } = window.__bootstrap.event;
-  const { listenerCount } = window.__bootstrap.eventTarget;
+  const { Event, setIsTrusted, defineEventHandler } = window.__bootstrap.event;
+  const { EventTarget, listenerCount } = window.__bootstrap.eventTarget;
   const {
     Set,
     SetPrototypeAdd,
@@ -185,9 +185,9 @@
     }
   }
 
-  window.AbortSignal = AbortSignal;
-  window.AbortController = AbortController;
   window.__bootstrap.abortSignal = {
+    AbortSignal,
+    AbortController,
     AbortSignalPrototype,
     add,
     signalAbort,
diff --git a/ext/web/04_global_interfaces.js b/ext/web/04_global_interfaces.js
index fcf8caea5..503b8fd08 100644
--- a/ext/web/04_global_interfaces.js
+++ b/ext/web/04_global_interfaces.js
@@ -5,7 +5,7 @@
 /// <reference path="../../core/internal.d.ts" />
 
 ((window) => {
-  const { EventTarget } = window;
+  const { EventTarget } = window.__bootstrap.eventTarget;
   const {
     Symbol,
     SymbolToStringTag,
diff --git a/ext/web/10_filereader.js b/ext/web/10_filereader.js
index c50635ea8..8a76b2e0f 100644
--- a/ext/web/10_filereader.js
+++ b/ext/web/10_filereader.js
@@ -15,6 +15,8 @@
 ((window) => {
   const webidl = window.__bootstrap.webidl;
   const { forgivingBase64Encode } = window.__bootstrap.infra;
+  const { ProgressEvent } = window.__bootstrap.event;
+  const { EventTarget } = window.__bootstrap.eventTarget;
   const { decode, TextDecoder } = window.__bootstrap.encoding;
   const { parseMimeType } = window.__bootstrap.mimesniff;
   const { DOMException } = window.__bootstrap.domException;
diff --git a/ext/web/13_message_port.js b/ext/web/13_message_port.js
index 1fbeeaff7..253ed7ecd 100644
--- a/ext/web/13_message_port.js
+++ b/ext/web/13_message_port.js
@@ -12,8 +12,8 @@
   const core = window.Deno.core;
   const { InterruptedPrototype, ops } = core;
   const webidl = window.__bootstrap.webidl;
-  const { setEventTargetData } = window.__bootstrap.eventTarget;
-  const { defineEventHandler } = window.__bootstrap.event;
+  const { EventTarget, setEventTargetData } = window.__bootstrap.eventTarget;
+  const { MessageEvent, defineEventHandler } = window.__bootstrap.event;
   const { DOMException } = window.__bootstrap.domException;
   const {
     ArrayBufferPrototype,
diff --git a/ext/web/15_performance.js b/ext/web/15_performance.js
index e7eafd533..556cfa774 100644
--- a/ext/web/15_performance.js
+++ b/ext/web/15_performance.js
@@ -18,6 +18,7 @@
 
   const { webidl, structuredClone } = window.__bootstrap;
   const consoleInternal = window.__bootstrap.console;
+  const { EventTarget } = window.__bootstrap.eventTarget;
   const { opNow } = window.__bootstrap.timers;
   const { DOMException } = window.__bootstrap.domException;
 
diff --git a/ext/web/internal.d.ts b/ext/web/internal.d.ts
index 04309a77e..9e836aac0 100644
--- a/ext/web/internal.d.ts
+++ b/ext/web/internal.d.ts
@@ -70,6 +70,17 @@ declare namespace globalThis {
       EventTarget: typeof EventTarget;
     };
 
+    declare var event: {
+      Event: typeof event;
+      ErrorEvent: typeof ErrorEvent;
+      CloseEvent: typeof CloseEvent;
+      MessageEvent: typeof MessageEvent;
+      CustomEvent: typeof CustomEvent;
+      ProgressEvent: typeof ProgressEvent;
+      PromiseRejectionEvent: typeof PromiseRejectionEvent;
+      reportError: typeof reportError;
+    };
+
     declare var location: {
       getLocationHref(): string | undefined;
     };
diff --git a/ext/websocket/01_websocket.js b/ext/websocket/01_websocket.js
index 4b0b4e941..5b364f809 100644
--- a/ext/websocket/01_websocket.js
+++ b/ext/websocket/01_websocket.js
@@ -10,7 +10,9 @@
   const webidl = window.__bootstrap.webidl;
   const { HTTP_TOKEN_CODE_POINT_RE } = window.__bootstrap.infra;
   const { DOMException } = window.__bootstrap.domException;
-  const { defineEventHandler } = window.__bootstrap.event;
+  const { Event, ErrorEvent, CloseEvent, MessageEvent, defineEventHandler } =
+    window.__bootstrap.event;
+  const { EventTarget } = window.__bootstrap.eventTarget;
   const { Blob, BlobPrototype } = globalThis.__bootstrap.file;
   const {
     ArrayBufferPrototype,