diff --git a/Gulpfile.js b/Gulpfile.js
index cf80668cbd0bd..3aed88d3a7070 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -138,7 +138,7 @@ gulp.task(typescriptServicesProject, /*help*/ false, () => {
         compilerOptions: {
             "removeComments": false,
             "stripInternal": true,
-            "declarationMap": false,
+            "declaration": true,
             "outFile": "typescriptServices.out.js" // must align with same task in jakefile. We fix this name below.
         }
     });
diff --git a/Jakefile.js b/Jakefile.js
index 1413230c07961..1a38e4d09e2e7 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -361,7 +361,7 @@ file(ConfigFileFor.tsserverLibrary, [], function () {
         compilerOptions: {
             "removeComments": false,
             "stripInternal": true,
-            "declarationMap": false,
+            "declaration": true,
             "outFile": "tsserverlibrary.out.js"
         }
     })
diff --git a/src/cancellationToken/tsconfig.json b/src/cancellationToken/tsconfig.json
index e16ce22120e48..6d9e0af772410 100644
--- a/src/cancellationToken/tsconfig.json
+++ b/src/cancellationToken/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "outDir": "../../built/local/",
         "rootDir": ".",
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index 2e5341732b567..3b3a477511ed1 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "outFile": "../../built/local/run.js",
         "composite": false,
diff --git a/src/tsc/tsconfig.json b/src/tsc/tsconfig.json
index 8bc02279930ba..e97cedc5de2c7 100644
--- a/src/tsc/tsconfig.json
+++ b/src/tsc/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "outFile": "../../built/local/tsc.js"
     },
diff --git a/src/tsconfig-noncomposite-base.json b/src/tsconfig-noncomposite-base.json
new file mode 100644
index 0000000000000..569269f756254
--- /dev/null
+++ b/src/tsconfig-noncomposite-base.json
@@ -0,0 +1,8 @@
+{
+    "extends": "./tsconfig-base",
+    "compilerOptions": {
+        "declaration": false,
+        "declarationMap": false,
+        "composite":  false
+    }
+}
diff --git a/src/tsserver/tsconfig.json b/src/tsserver/tsconfig.json
index 8f14785cd4793..16ffd722f2d63 100644
--- a/src/tsserver/tsconfig.json
+++ b/src/tsserver/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
  
     "compilerOptions": {
         "outFile": "../../built/local/tsserver.js",
diff --git a/src/typingsInstaller/tsconfig.json b/src/typingsInstaller/tsconfig.json
index 675c045ba0003..143409e9e9a98 100644
--- a/src/typingsInstaller/tsconfig.json
+++ b/src/typingsInstaller/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "removeComments": true,
         "outFile": "../../built/local/typingsInstaller.js",
diff --git a/src/watchGuard/tsconfig.json b/src/watchGuard/tsconfig.json
index 7262a5db58e8a..aafa227029708 100644
--- a/src/watchGuard/tsconfig.json
+++ b/src/watchGuard/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "removeComments": true,
         "outFile": "../../built/local/watchGuard.js",
@@ -13,4 +13,4 @@
     "files": [
         "watchGuard.ts"
     ]
-}
\ No newline at end of file
+}