diff --git a/src/vs/workbench/buildfile.js b/src/vs/workbench/buildfile.js
index 4c3491a852674313b77a5d82c3ef1a89e944a598..26e06604633460df70c62b430c0d46c14e8e1db7 100644
--- a/src/vs/workbench/buildfile.js
+++ b/src/vs/workbench/buildfile.js
@@ -17,26 +17,13 @@ function createModuleDescription(name, exclude) {
 
 exports.collectModules = function(excludes) {
 	var modules = [
-		createModuleDescription('vs/workbench/parts/search/browser/searchViewlet', excludes),
-		createModuleDescription('vs/workbench/parts/search/browser/openAnythingHandler', excludes),
-
-		createModuleDescription('vs/workbench/parts/git/browser/gitViewlet', excludes),
 		createModuleDescription('vs/workbench/parts/git/node/gitApp', []),
 		createModuleDescription('vs/workbench/parts/git/node/askpass', []),
 
 		createModuleDescription('vs/workbench/parts/output/common/outputLinkComputer', ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']),
-		createModuleDescription('vs/workbench/parts/output/browser/outputPanel', excludes),
 
-		createModuleDescription('vs/workbench/parts/debug/browser/debugViewlet', excludes),
-		createModuleDescription('vs/workbench/parts/debug/electron-browser/repl', excludes),
 		createModuleDescription('vs/workbench/parts/debug/node/telemetryApp', []),
 
-		createModuleDescription('vs/workbench/parts/extensions/electron-browser/extensionsViewlet', excludes),
-
-		createModuleDescription('vs/workbench/parts/markers/browser/markersPanel', excludes),
-
-		createModuleDescription('vs/workbench/parts/terminal/electron-browser/terminalPanel', excludes),
-
 		createModuleDescription('vs/workbench/services/search/node/searchApp', []),
 		createModuleDescription('vs/workbench/services/files/node/watcher/unix/watcherApp', []),
 
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 64b6960b8c929ff455414d928eaf3fdcec3daea2..c082033d39ecc105bcae487cb5d0cec994db7e18 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -38,24 +38,32 @@ import 'vs/workbench/parts/files/browser/files.contribution';
 import 'vs/workbench/parts/files/electron-browser/files.electron.contribution';
 
 import 'vs/workbench/parts/search/browser/search.contribution';
+import 'vs/workbench/parts/search/browser/searchViewlet'; // can be packaged separately
+import 'vs/workbench/parts/search/browser/openAnythingHandler'; // can be packaged separately
 
 import 'vs/workbench/parts/git/electron-browser/git.contribution';
 import 'vs/workbench/parts/git/browser/gitQuickOpen';
 import 'vs/workbench/parts/git/browser/gitActions.contribution';
+import 'vs/workbench/parts/git/browser/gitViewlet'; // can be packaged separately
 
 import 'vs/workbench/parts/debug/electron-browser/debug.contribution';
 import 'vs/workbench/parts/debug/electron-browser/repl';
+import 'vs/workbench/parts/debug/browser/debugViewlet'; // can be packaged separately
 
 import 'vs/workbench/parts/markers/markers.contribution';
+import 'vs/workbench/parts/markers/browser/markersPanel'; // can be packaged separately
 
 import 'vs/workbench/parts/html/browser/html.contribution';
 
 import 'vs/workbench/parts/extensions/electron-browser/extensions.contribution';
 import 'vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen';
+import 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet'; // can be packaged separately
 
 import 'vs/workbench/parts/output/browser/output.contribution';
+import 'vs/workbench/parts/output/browser/outputPanel'; // can be packaged separately
 
 import 'vs/workbench/parts/terminal/electron-browser/terminal.contribution';
+import 'vs/workbench/parts/terminal/electron-browser/terminalPanel'; // can be packaged separately
 
 import 'vs/workbench/electron-browser/workbench';