16 files changed, 107 insertions, 110 deletions

diff --git a/ext/node/polyfills/internal_binding/_timingSafeEqual.ts b/ext/node/polyfills/internal_binding/_timingSafeEqual.ts
index 9002300d1..a1cc093d6 100644
--- a/ext/node/polyfills/internal_binding/_timingSafeEqual.ts
+++ b/ext/node/polyfills/internal_binding/_timingSafeEqual.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 
 function assert(cond) {
   if (!cond) {
diff --git a/ext/node/polyfills/internal_binding/buffer.ts b/ext/node/polyfills/internal_binding/buffer.ts
index 58e104481..5d0af81ca 100644
--- a/ext/node/polyfills/internal_binding/buffer.ts
+++ b/ext/node/polyfills/internal_binding/buffer.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { Encodings } from "internal:deno_node/polyfills/internal_binding/_node.ts";
+import { Encodings } from "internal:deno_node/internal_binding/_node.ts";
 
 export function indexOfNeedle(
   source: Uint8Array,
diff --git a/ext/node/polyfills/internal_binding/cares_wrap.ts b/ext/node/polyfills/internal_binding/cares_wrap.ts
index 1345e9463..b09af3728 100644
--- a/ext/node/polyfills/internal_binding/cares_wrap.ts
+++ b/ext/node/polyfills/internal_binding/cares_wrap.ts
@@ -24,17 +24,17 @@
 // - https://github.com/nodejs/node/blob/master/src/cares_wrap.cc
 // - https://github.com/nodejs/node/blob/master/src/cares_wrap.h
 
-import type { ErrnoException } from "internal:deno_node/polyfills/internal/errors.ts";
-import { isIPv4 } from "internal:deno_node/polyfills/internal/net.ts";
-import { codeMap } from "internal:deno_node/polyfills/internal_binding/uv.ts";
+import type { ErrnoException } from "internal:deno_node/internal/errors.ts";
+import { isIPv4 } from "internal:deno_node/internal/net.ts";
+import { codeMap } from "internal:deno_node/internal_binding/uv.ts";
 import {
   AsyncWrap,
   providerType,
-} from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
+} from "internal:deno_node/internal_binding/async_wrap.ts";
 // deno-lint-ignore camelcase
-import { ares_strerror } from "internal:deno_node/polyfills/internal_binding/ares.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { isWindows } from "internal:deno_node/polyfills/_util/os.ts";
+import { ares_strerror } from "internal:deno_node/internal_binding/ares.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { isWindows } from "internal:deno_node/_util/os.ts";
 
 interface LookupAddress {
   address: string;
diff --git a/ext/node/polyfills/internal_binding/connection_wrap.ts b/ext/node/polyfills/internal_binding/connection_wrap.ts
index 1ce95cc1b..d4d85d99a 100644
--- a/ext/node/polyfills/internal_binding/connection_wrap.ts
+++ b/ext/node/polyfills/internal_binding/connection_wrap.ts
@@ -24,11 +24,11 @@
 // - https://github.com/nodejs/node/blob/master/src/connection_wrap.cc
 // - https://github.com/nodejs/node/blob/master/src/connection_wrap.h
 
-import { LibuvStreamWrap } from "internal:deno_node/polyfills/internal_binding/stream_wrap.ts";
+import { LibuvStreamWrap } from "internal:deno_node/internal_binding/stream_wrap.ts";
 import {
   AsyncWrap,
   providerType,
-} from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
+} from "internal:deno_node/internal_binding/async_wrap.ts";
 
 interface Reader {
   read(p: Uint8Array): Promise<number | null>;
diff --git a/ext/node/polyfills/internal_binding/crypto.ts b/ext/node/polyfills/internal_binding/crypto.ts
index ce4739b3d..97b6990c9 100644
--- a/ext/node/polyfills/internal_binding/crypto.ts
+++ b/ext/node/polyfills/internal_binding/crypto.ts
@@ -1,9 +1,9 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
 
-export { timingSafeEqual } from "internal:deno_node/polyfills/internal_binding/_timingSafeEqual.ts";
+export { timingSafeEqual } from "internal:deno_node/internal_binding/_timingSafeEqual.ts";
 
 export function getFipsCrypto(): boolean {
   notImplemented("crypto.getFipsCrypto");
diff --git a/ext/node/polyfills/internal_binding/handle_wrap.ts b/ext/node/polyfills/internal_binding/handle_wrap.ts
index 98c6a9f16..9b037e302 100644
--- a/ext/node/polyfills/internal_binding/handle_wrap.ts
+++ b/ext/node/polyfills/internal_binding/handle_wrap.ts
@@ -24,11 +24,11 @@
 // - https://github.com/nodejs/node/blob/master/src/handle_wrap.cc
 // - https://github.com/nodejs/node/blob/master/src/handle_wrap.h
 
-import { unreachable } from "internal:deno_node/polyfills/_util/asserts.ts";
+import { unreachable } from "internal:deno_node/_util/asserts.ts";
 import {
   AsyncWrap,
   providerType,
-} from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
+} from "internal:deno_node/internal_binding/async_wrap.ts";
 
 export class HandleWrap extends AsyncWrap {
   constructor(provider: providerType) {
diff --git a/ext/node/polyfills/internal_binding/mod.ts b/ext/node/polyfills/internal_binding/mod.ts
index 6273b263b..e8c2d3722 100644
--- a/ext/node/polyfills/internal_binding/mod.ts
+++ b/ext/node/polyfills/internal_binding/mod.ts
@@ -1,51 +1,51 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import * as asyncWrap from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
-import * as buffer from "internal:deno_node/polyfills/internal_binding/buffer.ts";
-import * as config from "internal:deno_node/polyfills/internal_binding/config.ts";
-import * as caresWrap from "internal:deno_node/polyfills/internal_binding/cares_wrap.ts";
-import * as constants from "internal:deno_node/polyfills/internal_binding/constants.ts";
-import * as contextify from "internal:deno_node/polyfills/internal_binding/contextify.ts";
-import * as crypto from "internal:deno_node/polyfills/internal_binding/crypto.ts";
-import * as credentials from "internal:deno_node/polyfills/internal_binding/credentials.ts";
-import * as errors from "internal:deno_node/polyfills/internal_binding/errors.ts";
-import * as fs from "internal:deno_node/polyfills/internal_binding/fs.ts";
-import * as fsDir from "internal:deno_node/polyfills/internal_binding/fs_dir.ts";
-import * as fsEventWrap from "internal:deno_node/polyfills/internal_binding/fs_event_wrap.ts";
-import * as heapUtils from "internal:deno_node/polyfills/internal_binding/heap_utils.ts";
-import * as httpParser from "internal:deno_node/polyfills/internal_binding/http_parser.ts";
-import * as icu from "internal:deno_node/polyfills/internal_binding/icu.ts";
-import * as inspector from "internal:deno_node/polyfills/internal_binding/inspector.ts";
-import * as jsStream from "internal:deno_node/polyfills/internal_binding/js_stream.ts";
-import * as messaging from "internal:deno_node/polyfills/internal_binding/messaging.ts";
-import * as moduleWrap from "internal:deno_node/polyfills/internal_binding/module_wrap.ts";
-import * as nativeModule from "internal:deno_node/polyfills/internal_binding/native_module.ts";
-import * as natives from "internal:deno_node/polyfills/internal_binding/natives.ts";
-import * as options from "internal:deno_node/polyfills/internal_binding/options.ts";
-import * as os from "internal:deno_node/polyfills/internal_binding/os.ts";
-import * as pipeWrap from "internal:deno_node/polyfills/internal_binding/pipe_wrap.ts";
-import * as performance from "internal:deno_node/polyfills/internal_binding/performance.ts";
-import * as processMethods from "internal:deno_node/polyfills/internal_binding/process_methods.ts";
-import * as report from "internal:deno_node/polyfills/internal_binding/report.ts";
-import * as serdes from "internal:deno_node/polyfills/internal_binding/serdes.ts";
-import * as signalWrap from "internal:deno_node/polyfills/internal_binding/signal_wrap.ts";
-import * as spawnSync from "internal:deno_node/polyfills/internal_binding/spawn_sync.ts";
-import * as streamWrap from "internal:deno_node/polyfills/internal_binding/stream_wrap.ts";
-import * as stringDecoder from "internal:deno_node/polyfills/internal_binding/string_decoder.ts";
-import * as symbols from "internal:deno_node/polyfills/internal_binding/symbols.ts";
-import * as taskQueue from "internal:deno_node/polyfills/internal_binding/task_queue.ts";
-import * as tcpWrap from "internal:deno_node/polyfills/internal_binding/tcp_wrap.ts";
-import * as timers from "internal:deno_node/polyfills/internal_binding/timers.ts";
-import * as tlsWrap from "internal:deno_node/polyfills/internal_binding/tls_wrap.ts";
-import * as traceEvents from "internal:deno_node/polyfills/internal_binding/trace_events.ts";
-import * as ttyWrap from "internal:deno_node/polyfills/internal_binding/tty_wrap.ts";
-import * as types from "internal:deno_node/polyfills/internal_binding/types.ts";
-import * as udpWrap from "internal:deno_node/polyfills/internal_binding/udp_wrap.ts";
-import * as url from "internal:deno_node/polyfills/internal_binding/url.ts";
-import * as util from "internal:deno_node/polyfills/internal_binding/util.ts";
-import * as uv from "internal:deno_node/polyfills/internal_binding/uv.ts";
-import * as v8 from "internal:deno_node/polyfills/internal_binding/v8.ts";
-import * as worker from "internal:deno_node/polyfills/internal_binding/worker.ts";
-import * as zlib from "internal:deno_node/polyfills/internal_binding/zlib.ts";
+import * as asyncWrap from "internal:deno_node/internal_binding/async_wrap.ts";
+import * as buffer from "internal:deno_node/internal_binding/buffer.ts";
+import * as config from "internal:deno_node/internal_binding/config.ts";
+import * as caresWrap from "internal:deno_node/internal_binding/cares_wrap.ts";
+import * as constants from "internal:deno_node/internal_binding/constants.ts";
+import * as contextify from "internal:deno_node/internal_binding/contextify.ts";
+import * as crypto from "internal:deno_node/internal_binding/crypto.ts";
+import * as credentials from "internal:deno_node/internal_binding/credentials.ts";
+import * as errors from "internal:deno_node/internal_binding/errors.ts";
+import * as fs from "internal:deno_node/internal_binding/fs.ts";
+import * as fsDir from "internal:deno_node/internal_binding/fs_dir.ts";
+import * as fsEventWrap from "internal:deno_node/internal_binding/fs_event_wrap.ts";
+import * as heapUtils from "internal:deno_node/internal_binding/heap_utils.ts";
+import * as httpParser from "internal:deno_node/internal_binding/http_parser.ts";
+import * as icu from "internal:deno_node/internal_binding/icu.ts";
+import * as inspector from "internal:deno_node/internal_binding/inspector.ts";
+import * as jsStream from "internal:deno_node/internal_binding/js_stream.ts";
+import * as messaging from "internal:deno_node/internal_binding/messaging.ts";
+import * as moduleWrap from "internal:deno_node/internal_binding/module_wrap.ts";
+import * as nativeModule from "internal:deno_node/internal_binding/native_module.ts";
+import * as natives from "internal:deno_node/internal_binding/natives.ts";
+import * as options from "internal:deno_node/internal_binding/options.ts";
+import * as os from "internal:deno_node/internal_binding/os.ts";
+import * as pipeWrap from "internal:deno_node/internal_binding/pipe_wrap.ts";
+import * as performance from "internal:deno_node/internal_binding/performance.ts";
+import * as processMethods from "internal:deno_node/internal_binding/process_methods.ts";
+import * as report from "internal:deno_node/internal_binding/report.ts";
+import * as serdes from "internal:deno_node/internal_binding/serdes.ts";
+import * as signalWrap from "internal:deno_node/internal_binding/signal_wrap.ts";
+import * as spawnSync from "internal:deno_node/internal_binding/spawn_sync.ts";
+import * as streamWrap from "internal:deno_node/internal_binding/stream_wrap.ts";
+import * as stringDecoder from "internal:deno_node/internal_binding/string_decoder.ts";
+import * as symbols from "internal:deno_node/internal_binding/symbols.ts";
+import * as taskQueue from "internal:deno_node/internal_binding/task_queue.ts";
+import * as tcpWrap from "internal:deno_node/internal_binding/tcp_wrap.ts";
+import * as timers from "internal:deno_node/internal_binding/timers.ts";
+import * as tlsWrap from "internal:deno_node/internal_binding/tls_wrap.ts";
+import * as traceEvents from "internal:deno_node/internal_binding/trace_events.ts";
+import * as ttyWrap from "internal:deno_node/internal_binding/tty_wrap.ts";
+import * as types from "internal:deno_node/internal_binding/types.ts";
+import * as udpWrap from "internal:deno_node/internal_binding/udp_wrap.ts";
+import * as url from "internal:deno_node/internal_binding/url.ts";
+import * as util from "internal:deno_node/internal_binding/util.ts";
+import * as uv from "internal:deno_node/internal_binding/uv.ts";
+import * as v8 from "internal:deno_node/internal_binding/v8.ts";
+import * as worker from "internal:deno_node/internal_binding/worker.ts";
+import * as zlib from "internal:deno_node/internal_binding/zlib.ts";
 
 const modules = {
   "async_wrap": asyncWrap,
diff --git a/ext/node/polyfills/internal_binding/node_file.ts b/ext/node/polyfills/internal_binding/node_file.ts
index 742217b19..1c45f91ff 100644
--- a/ext/node/polyfills/internal_binding/node_file.ts
+++ b/ext/node/polyfills/internal_binding/node_file.ts
@@ -25,7 +25,7 @@
 // - https://github.com/nodejs/node/blob/master/src/node_file.cc
 // - https://github.com/nodejs/node/blob/master/src/node_file.h
 
-import { assert } from "internal:deno_node/polyfills/_util/asserts.ts";
+import { assert } from "internal:deno_node/_util/asserts.ts";
 
 /**
  * Write to the given file from the given buffer synchronously.
diff --git a/ext/node/polyfills/internal_binding/pipe_wrap.ts b/ext/node/polyfills/internal_binding/pipe_wrap.ts
index 1e0d551a4..9a1571dd3 100644
--- a/ext/node/polyfills/internal_binding/pipe_wrap.ts
+++ b/ext/node/polyfills/internal_binding/pipe_wrap.ts
@@ -24,24 +24,24 @@
 // - https://github.com/nodejs/node/blob/master/src/pipe_wrap.cc
 // - https://github.com/nodejs/node/blob/master/src/pipe_wrap.h
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { unreachable } from "internal:deno_node/polyfills/_util/asserts.ts";
-import { ConnectionWrap } from "internal:deno_node/polyfills/internal_binding/connection_wrap.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { unreachable } from "internal:deno_node/_util/asserts.ts";
+import { ConnectionWrap } from "internal:deno_node/internal_binding/connection_wrap.ts";
 import {
   AsyncWrap,
   providerType,
-} from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
-import { LibuvStreamWrap } from "internal:deno_node/polyfills/internal_binding/stream_wrap.ts";
-import { codeMap } from "internal:deno_node/polyfills/internal_binding/uv.ts";
-import { delay } from "internal:deno_node/polyfills/_util/async.ts";
-import { kStreamBaseField } from "internal:deno_node/polyfills/internal_binding/stream_wrap.ts";
+} from "internal:deno_node/internal_binding/async_wrap.ts";
+import { LibuvStreamWrap } from "internal:deno_node/internal_binding/stream_wrap.ts";
+import { codeMap } from "internal:deno_node/internal_binding/uv.ts";
+import { delay } from "internal:deno_node/_util/async.ts";
+import { kStreamBaseField } from "internal:deno_node/internal_binding/stream_wrap.ts";
 import {
   ceilPowOf2,
   INITIAL_ACCEPT_BACKOFF_DELAY,
   MAX_ACCEPT_BACKOFF_DELAY,
-} from "internal:deno_node/polyfills/internal_binding/_listen.ts";
-import { isWindows } from "internal:deno_node/polyfills/_util/os.ts";
-import { fs } from "internal:deno_node/polyfills/internal_binding/constants.ts";
+} from "internal:deno_node/internal_binding/_listen.ts";
+import { isWindows } from "internal:deno_node/_util/os.ts";
+import { fs } from "internal:deno_node/internal_binding/constants.ts";
 
 export enum socketType {
   SOCKET,
diff --git a/ext/node/polyfills/internal_binding/stream_wrap.ts b/ext/node/polyfills/internal_binding/stream_wrap.ts
index 3aee3b9da..1f7d9f6c5 100644
--- a/ext/node/polyfills/internal_binding/stream_wrap.ts
+++ b/ext/node/polyfills/internal_binding/stream_wrap.ts
@@ -28,14 +28,14 @@
 // - https://github.com/nodejs/node/blob/master/src/stream_wrap.cc
 
 import { TextEncoder } from "internal:deno_web/08_text_encoding.js";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { HandleWrap } from "internal:deno_node/polyfills/internal_binding/handle_wrap.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { HandleWrap } from "internal:deno_node/internal_binding/handle_wrap.ts";
 import {
   AsyncWrap,
   providerType,
-} from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
-import { codeMap } from "internal:deno_node/polyfills/internal_binding/uv.ts";
+} from "internal:deno_node/internal_binding/async_wrap.ts";
+import { codeMap } from "internal:deno_node/internal_binding/uv.ts";
 
 interface Reader {
   read(p: Uint8Array): Promise<number | null>;
diff --git a/ext/node/polyfills/internal_binding/string_decoder.ts b/ext/node/polyfills/internal_binding/string_decoder.ts
index 3df230aee..f1307f562 100644
--- a/ext/node/polyfills/internal_binding/string_decoder.ts
+++ b/ext/node/polyfills/internal_binding/string_decoder.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { Encodings } from "internal:deno_node/polyfills/internal_binding/_node.ts";
+import { Encodings } from "internal:deno_node/internal_binding/_node.ts";
 
 const encodings = [];
 encodings[Encodings.ASCII] = "ascii";
diff --git a/ext/node/polyfills/internal_binding/tcp_wrap.ts b/ext/node/polyfills/internal_binding/tcp_wrap.ts
index d0da3e10c..029e39048 100644
--- a/ext/node/polyfills/internal_binding/tcp_wrap.ts
+++ b/ext/node/polyfills/internal_binding/tcp_wrap.ts
@@ -24,24 +24,24 @@
 // - https://github.com/nodejs/node/blob/master/src/tcp_wrap.cc
 // - https://github.com/nodejs/node/blob/master/src/tcp_wrap.h
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { unreachable } from "internal:deno_node/polyfills/_util/asserts.ts";
-import { ConnectionWrap } from "internal:deno_node/polyfills/internal_binding/connection_wrap.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { unreachable } from "internal:deno_node/_util/asserts.ts";
+import { ConnectionWrap } from "internal:deno_node/internal_binding/connection_wrap.ts";
 import {
   AsyncWrap,
   providerType,
-} from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
-import { LibuvStreamWrap } from "internal:deno_node/polyfills/internal_binding/stream_wrap.ts";
-import { ownerSymbol } from "internal:deno_node/polyfills/internal_binding/symbols.ts";
-import { codeMap } from "internal:deno_node/polyfills/internal_binding/uv.ts";
-import { delay } from "internal:deno_node/polyfills/_util/async.ts";
-import { kStreamBaseField } from "internal:deno_node/polyfills/internal_binding/stream_wrap.ts";
-import { isIP } from "internal:deno_node/polyfills/internal/net.ts";
+} from "internal:deno_node/internal_binding/async_wrap.ts";
+import { LibuvStreamWrap } from "internal:deno_node/internal_binding/stream_wrap.ts";
+import { ownerSymbol } from "internal:deno_node/internal_binding/symbols.ts";
+import { codeMap } from "internal:deno_node/internal_binding/uv.ts";
+import { delay } from "internal:deno_node/_util/async.ts";
+import { kStreamBaseField } from "internal:deno_node/internal_binding/stream_wrap.ts";
+import { isIP } from "internal:deno_node/internal/net.ts";
 import {
   ceilPowOf2,
   INITIAL_ACCEPT_BACKOFF_DELAY,
   MAX_ACCEPT_BACKOFF_DELAY,
-} from "internal:deno_node/polyfills/internal_binding/_listen.ts";
+} from "internal:deno_node/internal_binding/_listen.ts";
 
 /** The type of TCP socket. */
 enum socketType {
diff --git a/ext/node/polyfills/internal_binding/types.ts b/ext/node/polyfills/internal_binding/types.ts
index 6b8b3d6e4..f79f4132e 100644
--- a/ext/node/polyfills/internal_binding/types.ts
+++ b/ext/node/polyfills/internal_binding/types.ts
@@ -21,7 +21,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { core } from "internal:deno_node/polyfills/_core.ts";
+import { core } from "internal:deno_node/_core.ts";
 
 // https://tc39.es/ecma262/#sec-object.prototype.tostring
 const _toString = Object.prototype.toString;
diff --git a/ext/node/polyfills/internal_binding/udp_wrap.ts b/ext/node/polyfills/internal_binding/udp_wrap.ts
index 54173e3ba..eb499eb50 100644
--- a/ext/node/polyfills/internal_binding/udp_wrap.ts
+++ b/ext/node/polyfills/internal_binding/udp_wrap.ts
@@ -23,20 +23,17 @@
 import {
   AsyncWrap,
   providerType,
-} from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
-import { GetAddrInfoReqWrap } from "internal:deno_node/polyfills/internal_binding/cares_wrap.ts";
-import { HandleWrap } from "internal:deno_node/polyfills/internal_binding/handle_wrap.ts";
-import { ownerSymbol } from "internal:deno_node/polyfills/internal_binding/symbols.ts";
-import {
-  codeMap,
-  errorMap,
-} from "internal:deno_node/polyfills/internal_binding/uv.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import type { ErrnoException } from "internal:deno_node/polyfills/internal/errors.ts";
-import { isIP } from "internal:deno_node/polyfills/internal/net.ts";
-
-import { isLinux, isWindows } from "internal:deno_node/polyfills/_util/os.ts";
+} from "internal:deno_node/internal_binding/async_wrap.ts";
+import { GetAddrInfoReqWrap } from "internal:deno_node/internal_binding/cares_wrap.ts";
+import { HandleWrap } from "internal:deno_node/internal_binding/handle_wrap.ts";
+import { ownerSymbol } from "internal:deno_node/internal_binding/symbols.ts";
+import { codeMap, errorMap } from "internal:deno_node/internal_binding/uv.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import type { ErrnoException } from "internal:deno_node/internal/errors.ts";
+import { isIP } from "internal:deno_node/internal/net.ts";
+
+import { isLinux, isWindows } from "internal:deno_node/_util/os.ts";
 
 // @ts-ignore Deno[Deno.internal] is used on purpose here
 const DenoListenDatagram = Deno[Deno.internal]?.nodeUnstable?.listenDatagram ||
diff --git a/ext/node/polyfills/internal_binding/util.ts b/ext/node/polyfills/internal_binding/util.ts
index 21d3cb3dd..79084c694 100644
--- a/ext/node/polyfills/internal_binding/util.ts
+++ b/ext/node/polyfills/internal_binding/util.ts
@@ -25,7 +25,7 @@
 // - https://github.com/nodejs/node/blob/master/src/util.cc
 // - https://github.com/nodejs/node/blob/master/src/util.h
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
 
 export function guessHandleType(_fd: number): string {
   notImplemented("util.guessHandleType");
diff --git a/ext/node/polyfills/internal_binding/uv.ts b/ext/node/polyfills/internal_binding/uv.ts
index 4ef1b9c41..b760560bf 100644
--- a/ext/node/polyfills/internal_binding/uv.ts
+++ b/ext/node/polyfills/internal_binding/uv.ts
@@ -26,9 +26,9 @@
 //
 // See also: http://docs.libuv.org/en/v1.x/errors.html#error-constants
 
-import { unreachable } from "internal:deno_node/polyfills/_util/asserts.ts";
-import { osType } from "internal:deno_node/polyfills/_util/os.ts";
-import { uvTranslateSysError } from "internal:deno_node/polyfills/internal_binding/_libuv_winerror.ts";
+import { unreachable } from "internal:deno_node/_util/asserts.ts";
+import { osType } from "internal:deno_node/_util/os.ts";
+import { uvTranslateSysError } from "internal:deno_node/internal_binding/_libuv_winerror.ts";
 
 // In Node these values are coming from libuv:
 // Ref: https://github.com/libuv/libuv/blob/v1.x/include/uv/errno.h