diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index ebda38f7bb2..cbd9da2541f 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -72,21 +72,6 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			apiusages,
 			extrausages
 		],
-		libs: [
-			`lib.es5.d.ts`,
-			`lib.es2015.core.d.ts`,
-			`lib.es2015.collection.d.ts`,
-			`lib.es2015.generator.d.ts`,
-			`lib.es2015.promise.d.ts`,
-			`lib.es2015.iterable.d.ts`,
-			`lib.es2015.proxy.d.ts`,
-			`lib.es2015.reflect.d.ts`,
-			`lib.es2015.symbol.d.ts`,
-			`lib.es2015.symbol.wellknown.d.ts`,
-			`lib.dom.d.ts`,
-			`lib.dom.iterable.d.ts`,
-			`lib.webworker.importscripts.d.ts`
-		],
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
 		importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,
 		destRoot: path.join(root, 'out-editor-src'),
diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js
index 8c95751347f..eeb954c4fcf 100644
--- a/build/lib/treeshaking.js
+++ b/build/lib/treeshaking.js
@@ -76,11 +76,7 @@ function createTypeScriptLanguageService(options) {
         FILES[typing] = fs.readFileSync(filePath).toString();
     });
     // Resolve libs
-    const RESOLVED_LIBS = {};
-    options.libs.forEach((filename) => {
-        const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
-        RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
-    });
+    const RESOLVED_LIBS = processLibFiles(options);
     const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
     const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, compilerOptions);
     return ts.createLanguageService(host);
@@ -138,6 +134,29 @@ function discoverAndReadFiles(options) {
     }
     return FILES;
 }
+/**
+ * Read lib files and follow lib references
+ */
+function processLibFiles(options) {
+    const stack = [...options.compilerOptions.lib];
+    const result = {};
+    while (stack.length > 0) {
+        const filename = `lib.${stack.shift().toLowerCase()}.d.ts`;
+        const key = `defaultLib:${filename}`;
+        if (!result[key]) {
+            // add this file
+            const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+            const sourceText = fs.readFileSync(filepath).toString();
+            result[key] = sourceText;
+            // precess dependencies and "recurse"
+            const info = ts.preProcessFile(sourceText);
+            for (let ref of info.libReferenceDirectives) {
+                stack.push(ref.fileName);
+            }
+        }
+    }
+    return result;
+}
 /**
  * A TypeScript language service host
  */
diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts
index 89f562ad1b8..19e0dc8bb4d 100644
--- a/build/lib/treeshaking.ts
+++ b/build/lib/treeshaking.ts
@@ -18,7 +18,7 @@ export const enum ShakeLevel {
 }
 
 export function toStringShakeLevel(shakeLevel: ShakeLevel): string {
-	switch(shakeLevel) {
+	switch (shakeLevel) {
 		case ShakeLevel.Files:
 			return 'Files (0)';
 		case ShakeLevel.InnerFile:
@@ -42,11 +42,6 @@ export interface ITreeShakingOptions {
 	 * Inline usages.
 	 */
 	inlineEntryPoints: string[];
-	/**
-	 * TypeScript libs.
-	 * e.g. `lib.d.ts`, `lib.es2015.collection.d.ts`
-	 */
-	libs: string[];
 	/**
 	 * Other .d.ts files
 	 */
@@ -130,11 +125,7 @@ function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.Langu
 	});
 
 	// Resolve libs
-	const RESOLVED_LIBS: ILibMap = {};
-	options.libs.forEach((filename) => {
-		const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
-		RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
-	});
+	const RESOLVED_LIBS = processLibFiles(options);
 
 	const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
 
@@ -205,6 +196,34 @@ function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
 	return FILES;
 }
 
+/**
+ * Read lib files and follow lib references
+ */
+function processLibFiles(options: ITreeShakingOptions): ILibMap {
+
+	const stack: string[] = [...options.compilerOptions.lib];
+	const result: ILibMap = {};
+
+	while (stack.length > 0) {
+		const filename = `lib.${stack.shift()!.toLowerCase()}.d.ts`;
+		const key = `defaultLib:${filename}`;
+		if (!result[key]) {
+			// add this file
+			const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+			const sourceText = fs.readFileSync(filepath).toString();
+			result[key] = sourceText;
+
+			// precess dependencies and "recurse"
+			const info = ts.preProcessFile(sourceText);
+			for (let ref of info.libReferenceDirectives) {
+				stack.push(ref.fileName);
+			}
+		}
+	}
+
+	return result;
+}
+
 interface ILibMap { [libName: string]: string; }
 interface IFileMap { [fileName: string]: string; }
 
@@ -475,7 +494,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 		}
 
 		if (black_queue.length === 0) {
-			for (let i = 0; i< gray_queue.length; i++) {
+			for (let i = 0; i < gray_queue.length; i++) {
 				const node = gray_queue[i];
 				const nodeParent = node.parent;
 				if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {