diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index ed00f5003a9..156d501ce43 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -3,16 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchConstructionOptions, create } from 'vs/workbench/workbench.web.api';
-import { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
-import { Event, Emitter } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { IWorkbenchConstructionOptions, create, URI, Event, Emitter, UriComponents, ICredentialsProvider, IURLCallbackProvider } from 'vs/workbench/workbench.web.api';
 import { generateUuid } from 'vs/base/common/uuid';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { streamToBuffer } from 'vs/base/common/buffer';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { request } from 'vs/base/parts/request/browser/request';
-import { ICredentialsProvider } from 'vs/workbench/services/credentials/browser/credentialsService';
 
 interface ICredential {
 	service: string;
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
index 14657c79f7f..4a1ccfaade2 100644
--- a/src/vs/workbench/workbench.web.api.ts
+++ b/src/vs/workbench/workbench.web.api.ts
@@ -6,15 +6,17 @@
 import 'vs/workbench/workbench.web.main';
 import { main } from 'vs/workbench/browser/web.main';
 import { UriComponents, URI } from 'vs/base/common/uri';
-import { IFileSystemProvider } from 'vs/platform/files/common/files';
-import { IWebSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
+import { IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, FileChangeType } from 'vs/platform/files/common/files';
+import { IWebSocketFactory, IWebSocket } from 'vs/platform/remote/browser/browserSocketFactory';
 import { ICredentialsProvider } from 'vs/workbench/services/credentials/browser/credentialsService';
 import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
 import { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
 import { LogLevel } from 'vs/platform/log/common/log';
-import { IUpdateProvider } from 'vs/workbench/services/update/browser/updateService';
+import { IUpdateProvider, IUpdate } from 'vs/workbench/services/update/browser/updateService';
+import { Event, Emitter } from 'vs/base/common/event';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 
-export interface IWorkbenchConstructionOptions {
+interface IWorkbenchConstructionOptions {
 
 	/**
 	 * Experimental: the remote authority is the IP:PORT from where the workbench is served
@@ -101,5 +103,42 @@ function create(domElement: HTMLElement, options: IWorkbenchConstructionOptions)
 }
 
 export {
-	create
+
+	// Factory
+	create,
+	IWorkbenchConstructionOptions,
+
+	// Basic Types
+	UriComponents,
+	URI,
+	Event,
+	Emitter,
+	IDisposable,
+	Disposable,
+
+	// FileSystem
+	IFileSystemProvider,
+	FileSystemProviderCapabilities,
+	IFileChange,
+	FileChangeType,
+
+	// WebSockets
+	IWebSocketFactory,
+	IWebSocket,
+
+	// Credentials
+	ICredentialsProvider,
+
+	// Static Extensions
+	IExtensionManifest,
+
+	// Callbacks
+	IURLCallbackProvider,
+
+	// LogLevel
+	LogLevel,
+
+	// Updates
+	IUpdateProvider,
+	IUpdate
 };