diff --git a/sdk/keyvault/keyvault-certificates/src/core/index.ts b/sdk/keyvault/keyvault-certificates/src/core/index.ts
index 243ccb945040..61677c1ca9b4 100644
--- a/sdk/keyvault/keyvault-certificates/src/core/index.ts
+++ b/sdk/keyvault/keyvault-certificates/src/core/index.ts
@@ -1,6 +1,3 @@
-///
-///
-
export { RestError } from '@azure/core-http';
export * from "./clientOptions";
diff --git a/sdk/keyvault/keyvault-certificates/src/index.ts b/sdk/keyvault/keyvault-certificates/src/index.ts
index f2e846063579..8d03596b42a2 100644
--- a/sdk/keyvault/keyvault-certificates/src/index.ts
+++ b/sdk/keyvault/keyvault-certificates/src/index.ts
@@ -7,8 +7,6 @@
// This file makes more sense if ordered based on how meaningful are some methods in relation to others.
/* eslint-disable @typescript-eslint/member-ordering */
-///
-
import {
TokenCredential,
isTokenCredential,
diff --git a/sdk/keyvault/keyvault-certificates/src/shims-internal.d.ts b/sdk/keyvault/keyvault-certificates/src/shims-internal.d.ts
new file mode 100644
index 000000000000..bae74c937c2d
--- /dev/null
+++ b/sdk/keyvault/keyvault-certificates/src/shims-internal.d.ts
@@ -0,0 +1,5 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+///
+///
diff --git a/sdk/keyvault/keyvault-certificates/tsconfig.json b/sdk/keyvault/keyvault-certificates/tsconfig.json
index 7a5252578c4f..9fde2e4ebf2e 100644
--- a/sdk/keyvault/keyvault-certificates/tsconfig.json
+++ b/sdk/keyvault/keyvault-certificates/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"declarationDir": "./types",
"outDir": "./dist-esm",
- "lib": ["dom"],
+ "lib": [],
"resolveJsonModule": true
},
"exclude": ["node_modules", "../keyvault-common/node_modules", "./samples/**/*.ts"],
diff --git a/sdk/keyvault/keyvault-keys/src/core/index.ts b/sdk/keyvault/keyvault-keys/src/core/index.ts
index 5fc2833fbf4d..fdbf621634a5 100644
--- a/sdk/keyvault/keyvault-keys/src/core/index.ts
+++ b/sdk/keyvault/keyvault-keys/src/core/index.ts
@@ -1,6 +1,3 @@
-///
-///
-
export { RestError } from "@azure/core-http";
export * from "./keyVaultBase";
diff --git a/sdk/keyvault/keyvault-keys/src/index.ts b/sdk/keyvault/keyvault-keys/src/index.ts
index 97ac11ef42e1..6f514eae9e42 100644
--- a/sdk/keyvault/keyvault-keys/src/index.ts
+++ b/sdk/keyvault/keyvault-keys/src/index.ts
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.
/* eslint @typescript-eslint/member-ordering: 0 */
-///
import {
PipelineOptions,
diff --git a/sdk/keyvault/keyvault-keys/src/shims-internal.d.ts b/sdk/keyvault/keyvault-keys/src/shims-internal.d.ts
new file mode 100644
index 000000000000..bae74c937c2d
--- /dev/null
+++ b/sdk/keyvault/keyvault-keys/src/shims-internal.d.ts
@@ -0,0 +1,5 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+///
+///
diff --git a/sdk/keyvault/keyvault-keys/tsconfig.json b/sdk/keyvault/keyvault-keys/tsconfig.json
index 7a5252578c4f..9fde2e4ebf2e 100644
--- a/sdk/keyvault/keyvault-keys/tsconfig.json
+++ b/sdk/keyvault/keyvault-keys/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"declarationDir": "./types",
"outDir": "./dist-esm",
- "lib": ["dom"],
+ "lib": [],
"resolveJsonModule": true
},
"exclude": ["node_modules", "../keyvault-common/node_modules", "./samples/**/*.ts"],
diff --git a/sdk/keyvault/keyvault-secrets/dom-shim.d.ts b/sdk/keyvault/keyvault-secrets/dom-shim.d.ts
new file mode 100644
index 000000000000..81a5d7e7e9b3
--- /dev/null
+++ b/sdk/keyvault/keyvault-secrets/dom-shim.d.ts
@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+// d.ts shims provide types for things we use internally but are not part
+// of this package's surface area.
+
+interface URL {}
diff --git a/sdk/keyvault/keyvault-secrets/src/dom.d.ts b/sdk/keyvault/keyvault-secrets/src/dom.d.ts
new file mode 100644
index 000000000000..88bcf1442b2f
--- /dev/null
+++ b/sdk/keyvault/keyvault-secrets/src/dom.d.ts
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+///
diff --git a/sdk/keyvault/keyvault-secrets/src/index.ts b/sdk/keyvault/keyvault-secrets/src/index.ts
index 915452b7659f..5051d8674f9e 100644
--- a/sdk/keyvault/keyvault-secrets/src/index.ts
+++ b/sdk/keyvault/keyvault-secrets/src/index.ts
@@ -1,7 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.
/* eslint @typescript-eslint/member-ordering: 0 */
-///
+
+///
import {
TokenCredential,
diff --git a/sdk/keyvault/keyvault-secrets/tsconfig.json b/sdk/keyvault/keyvault-secrets/tsconfig.json
index 7a5252578c4f..92be66767961 100644
--- a/sdk/keyvault/keyvault-secrets/tsconfig.json
+++ b/sdk/keyvault/keyvault-secrets/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"declarationDir": "./types",
"outDir": "./dist-esm",
- "lib": ["dom"],
+ "lib": ["dom", "esnext.asynciterable"],
"resolveJsonModule": true
},
"exclude": ["node_modules", "../keyvault-common/node_modules", "./samples/**/*.ts"],