diff --git a/.eslintrc.json b/.eslintrc.json
index 07dda5f2e3b..ea857b6f023 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -462,7 +462,6 @@
 							"vs/workbench/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
-							"vs/workbench/contrib/terminal/contrib/*/~",
 							"vscode-notebook-renderer", // Type only import
 							{
 								"when": "hasBrowser",
@@ -541,6 +540,34 @@
 							"vs/server/~"
 						]
 					},
+					{
+						"target": "src/vs/workbench/contrib/terminal/terminal.all.ts",
+						"layer": "browser",
+						"restrictions": [
+							"vs/base/~",
+							"vs/base/parts/*/~",
+							"vs/platform/*/~",
+							"vs/editor/~",
+							"vs/editor/contrib/*/~",
+							"vs/workbench/~",
+							"vs/workbench/services/*/~",
+							"vs/workbench/contrib/*/~",
+							"vs/workbench/contrib/terminal/contrib/*/~",
+							"vscode-notebook-renderer", // Type only import
+							{
+								"when": "hasBrowser",
+								"pattern": "xterm"
+							}, // node module allowed even in /browser/
+							{
+								"when": "hasBrowser",
+								"pattern": "xterm-addon-*"
+							}, // node module allowed even in /browser/
+							{
+								"when": "hasBrowser",
+								"pattern": "vscode-textmate"
+							} // node module allowed even in /browser/
+						]
+					},
 					{
 						"target": "src/vs/workbench/workbench.common.main.ts",
 						"layer": "browser",
@@ -554,7 +581,8 @@
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~"
+							"vs/workbench/contrib/*/~",
+							"vs/workbench/contrib/terminal/terminal.all"
 						]
 					},
 					{
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 8ec902fbdc1..bdf29476940 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -286,7 +286,3 @@ setupTerminalCommands();
 setupTerminalMenus();
 
 registerColors();
-
-import '../contrib/accessibility/browser/terminal.accessibility.contribution';
-import '../contrib/find/browser/terminal.find.contribution';
-import '../contrib/links/browser/terminal.links.contribution';
diff --git a/src/vs/workbench/contrib/terminal/terminal.all.ts b/src/vs/workbench/contrib/terminal/terminal.all.ts
new file mode 100644
index 00000000000..2f1ae5c4218
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/terminal.all.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Primary contribution
+import 'vs/workbench/contrib/terminal/browser/terminal.contribution';
+
+// Misc
+import 'vs/workbench/contrib/terminal/common/environmentVariable.contribution';
+import 'vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution';
+import 'vs/workbench/contrib/terminal/browser/terminalView';
+
+// Contrib
+import 'vs/workbench/contrib/terminal/contrib/accessibility/browser/terminal.accessibility.contribution';
+import 'vs/workbench/contrib/terminal/contrib/find/browser/terminal.find.contribution';
+import 'vs/workbench/contrib/terminal/contrib/links/browser/terminal.links.contribution';
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index 0dfae69dc05..4c5b07e667d 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -243,11 +243,10 @@ import 'vs/workbench/contrib/output/browser/output.contribution';
 import 'vs/workbench/contrib/output/browser/outputView';
 
 // Terminal
-import 'vs/workbench/contrib/terminal/common/environmentVariable.contribution';
-import 'vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution';
+import 'vs/workbench/contrib/terminal/terminal.all';
+
+// External terminal
 import 'vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution';
-import 'vs/workbench/contrib/terminal/browser/terminal.contribution';
-import 'vs/workbench/contrib/terminal/browser/terminalView';
 
 // Relauncher
 import 'vs/workbench/contrib/relauncher/browser/relauncher.contribution';