diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 98f776abb7e..6bb695db68c 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -50,7 +50,7 @@ const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
 	buildfile.base,
 	buildfile.serviceWorker,
-	buildfile.workbench,
+	buildfile.workbenchDesktop,
 	buildfile.code
 ]);
 
diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
index 8f63d7b7d0b..f67c2a64a38 100644
--- a/build/gulpfile.vscode.web.js
+++ b/build/gulpfile.vscode.web.js
@@ -53,13 +53,14 @@ const vscodeWebResources = [
 
 const buildfile = require('../src/buildfile');
 
-const vscodeWebEntryPoints = [
-	buildfile.workbenchWeb,
+const vscodeWebEntryPoints = _.flatten([
+	buildfile.entrypoint('vs/workbench/workbench.web.api'),
+	buildfile.base,
 	buildfile.serviceWorker,
 	buildfile.workerExtensionHost,
 	buildfile.keyboardMaps,
-	buildfile.base
-];
+	buildfile.workbenchWeb
+]);
 
 const optimizeVSCodeWebTask = task.define('optimize-vscode-web', task.series(
 	util.rimraf('out-vscode-web'),
diff --git a/src/buildfile.js b/src/buildfile.js
index 746975249ed..684954a3219 100644
--- a/src/buildfile.js
+++ b/src/buildfile.js
@@ -25,8 +25,8 @@ exports.serviceWorker = [{
 
 exports.workerExtensionHost = [entrypoint('vs/workbench/services/extensions/worker/extensionHostWorker')];
 
-exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.desktop.main']);
-exports.workbenchWeb = entrypoint('vs/workbench/workbench.web.api');
+exports.workbenchDesktop = require('./vs/workbench/buildfile.desktop').collectModules();
+exports.workbenchWeb = require('./vs/workbench/buildfile.web').collectModules();
 
 exports.keyboardMaps = [
 	entrypoint('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
diff --git a/src/vs/workbench/buildfile.js b/src/vs/workbench/buildfile.desktop.js
similarity index 100%
rename from src/vs/workbench/buildfile.js
rename to src/vs/workbench/buildfile.desktop.js
diff --git a/src/vs/workbench/buildfile.web.js b/src/vs/workbench/buildfile.web.js
new file mode 100644
index 00000000000..47a84533025
--- /dev/null
+++ b/src/vs/workbench/buildfile.web.js
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+function createModuleDescription(name, exclude) {
+	const result = {};
+
+	let excludes = ['vs/css', 'vs/nls'];
+	result.name = name;
+	if (Array.isArray(exclude) && exclude.length > 0) {
+		excludes = excludes.concat(exclude);
+	}
+	result.exclude = excludes;
+
+	return result;
+}
+
+exports.collectModules = function () {
+	return [
+		createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer', ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']),
+	];
+};