diff --git a/src/converters/base64_url.ts b/src/converters/base64_url.ts
index 7cb969c..6f2d72a 100644
--- a/src/converters/base64_url.ts
+++ b/src/converters/base64_url.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { IJsonConverter } from "@peculiar/json-schema";
 import { Convert } from "pvtsutils";
 
diff --git a/src/crypto.ts b/src/crypto.ts
index 513d9a3..104860d 100644
--- a/src/crypto.ts
+++ b/src/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import * as core from "webcrypto-core";
 import { SubtleCrypto } from "./subtle";
diff --git a/src/keys/key.ts b/src/keys/key.ts
index a00c344..25dfe5e 100644
--- a/src/keys/key.ts
+++ b/src/keys/key.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { JsonProp, JsonPropTypes } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
 
diff --git a/src/mechs/aes/aes_cmac.ts b/src/mechs/aes/aes_cmac.ts
index 9032e8b..8cfcf0d 100644
--- a/src/mechs/aes/aes_cmac.ts
+++ b/src/mechs/aes/aes_cmac.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import * as crypto from "crypto";
 import * as core from "webcrypto-core";
 import { AesCrypto } from "./crypto";
diff --git a/src/mechs/aes/crypto.ts b/src/mechs/aes/crypto.ts
index 3cbfed4..15f3869 100644
--- a/src/mechs/aes/crypto.ts
+++ b/src/mechs/aes/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto, { CipherGCM, DecipherGCM } from "crypto";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
diff --git a/src/mechs/aes/key.ts b/src/mechs/aes/key.ts
index d652a29..b4a3da4 100644
--- a/src/mechs/aes/key.ts
+++ b/src/mechs/aes/key.ts
@@ -1,3 +1,4 @@
+import type { Buffer } from "buffer";
 import { JsonProp } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
 import { JsonBase64UrlConverter } from "../../converters";
diff --git a/src/mechs/des/crypto.ts b/src/mechs/des/crypto.ts
index 5f76048..6dd0cdc 100644
--- a/src/mechs/des/crypto.ts
+++ b/src/mechs/des/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
diff --git a/src/mechs/des/key.ts b/src/mechs/des/key.ts
index 65910da..6b791a9 100644
--- a/src/mechs/des/key.ts
+++ b/src/mechs/des/key.ts
@@ -1,3 +1,4 @@
+import type { Buffer } from "buffer";
 import { JsonProp } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
 import { JsonBase64UrlConverter } from "../../converters";
diff --git a/src/mechs/ec/crypto.ts b/src/mechs/ec/crypto.ts
index 69a84dc..0acd7a1 100644
--- a/src/mechs/ec/crypto.ts
+++ b/src/mechs/ec/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
diff --git a/src/mechs/ec/private_key.ts b/src/mechs/ec/private_key.ts
index c1bd013..da68f99 100644
--- a/src/mechs/ec/private_key.ts
+++ b/src/mechs/ec/private_key.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { IJsonConvertible, JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
diff --git a/src/mechs/ed/crypto.ts b/src/mechs/ed/crypto.ts
index 5089f73..7dfa83a 100644
--- a/src/mechs/ed/crypto.ts
+++ b/src/mechs/ed/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import { AsnParser } from "@peculiar/asn1-schema";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
@@ -141,14 +142,14 @@ export class EdCrypto {
       crv: algorithm.namedCurve,
       d: Convert.ToBase64Url(asnKey.d),
     });
-    
+
     key.algorithm = Object.assign({}, algorithm) as EcKeyAlgorithm;
     key.extractable = extractable;
     key.usages = keyUsages;
-    
+
     return key;
   }
-  
+
   protected static async importPublicKey(asnKey: ArrayBuffer, algorithm: EcKeyImportParams, extractable: boolean, keyUsages: KeyUsage[]) {
     const key = new EdPublicKey();
     key.fromJSON({
diff --git a/src/mechs/ed/private_key.ts b/src/mechs/ed/private_key.ts
index 443f208..d3a5e34 100644
--- a/src/mechs/ed/private_key.ts
+++ b/src/mechs/ed/private_key.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { IJsonConvertible, JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
diff --git a/src/mechs/ed/public_key.ts b/src/mechs/ed/public_key.ts
index ae9ffa6..23ea0e6 100644
--- a/src/mechs/ed/public_key.ts
+++ b/src/mechs/ed/public_key.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { IJsonConvertible } from "@peculiar/json-schema";
 import { Convert } from "pvtsutils";
diff --git a/src/mechs/hkdf/hkdf.ts b/src/mechs/hkdf/hkdf.ts
index 553b550..88f676b 100644
--- a/src/mechs/hkdf/hkdf.ts
+++ b/src/mechs/hkdf/hkdf.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import * as core from "webcrypto-core";
 import { BufferSourceConverter, CryptoKey } from "webcrypto-core";
diff --git a/src/mechs/hkdf/key.ts b/src/mechs/hkdf/key.ts
index 222b4e3..2e20ea2 100644
--- a/src/mechs/hkdf/key.ts
+++ b/src/mechs/hkdf/key.ts
@@ -1,3 +1,4 @@
+import type { Buffer } from "buffer";
 import { CryptoKey } from "../../keys";
 
 export class HkdfCryptoKey extends CryptoKey {
diff --git a/src/mechs/hmac/hmac.ts b/src/mechs/hmac/hmac.ts
index 340a4c5..c381c66 100644
--- a/src/mechs/hmac/hmac.ts
+++ b/src/mechs/hmac/hmac.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
diff --git a/src/mechs/hmac/key.ts b/src/mechs/hmac/key.ts
index 15aa9f3..c55bae3 100644
--- a/src/mechs/hmac/key.ts
+++ b/src/mechs/hmac/key.ts
@@ -1,3 +1,4 @@
+import type { Buffer } from "buffer";
 import { JsonProp } from "@peculiar/json-schema";
 import { JsonBase64UrlConverter } from "../../converters";
 import { CryptoKey } from "../../keys";
diff --git a/src/mechs/pbkdf/pbkdf2.ts b/src/mechs/pbkdf/pbkdf2.ts
index c707e92..8514aa2 100644
--- a/src/mechs/pbkdf/pbkdf2.ts
+++ b/src/mechs/pbkdf/pbkdf2.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import * as core from "webcrypto-core";
 import { PbkdfCryptoKey } from "./key";
diff --git a/src/mechs/rsa/crypto.ts b/src/mechs/rsa/crypto.ts
index 0b80282..52a5d6f 100644
--- a/src/mechs/rsa/crypto.ts
+++ b/src/mechs/rsa/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
diff --git a/src/mechs/rsa/private_key.ts b/src/mechs/rsa/private_key.ts
index c3a7559..1c583ed 100644
--- a/src/mechs/rsa/private_key.ts
+++ b/src/mechs/rsa/private_key.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
diff --git a/src/mechs/rsa/public_key.ts b/src/mechs/rsa/public_key.ts
index 0cc6ec1..61bf1cb 100644
--- a/src/mechs/rsa/public_key.ts
+++ b/src/mechs/rsa/public_key.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";
diff --git a/src/mechs/rsa/rsa_oaep.ts b/src/mechs/rsa/rsa_oaep.ts
index 81fac3b..8323940 100644
--- a/src/mechs/rsa/rsa_oaep.ts
+++ b/src/mechs/rsa/rsa_oaep.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import * as core from "webcrypto-core";
 import { RsaCrypto } from "./crypto";
diff --git a/src/mechs/sha/crypto.ts b/src/mechs/sha/crypto.ts
index 8cc13d8..c9a144b 100644
--- a/src/mechs/sha/crypto.ts
+++ b/src/mechs/sha/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 
 export class ShaCrypto {
diff --git a/src/mechs/shake/crypto.ts b/src/mechs/shake/crypto.ts
index 11594cd..491fdac 100644
--- a/src/mechs/shake/crypto.ts
+++ b/src/mechs/shake/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import crypto from "crypto";
 import * as core from "webcrypto-core";
 
diff --git a/test/crypto.ts b/test/crypto.ts
index 1f0fa9c..80dfcae 100644
--- a/test/crypto.ts
+++ b/test/crypto.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import assert from "node:assert";
 import nodeCrypto from "node:crypto";
 import process from "node:process";