diff --git a/extensions/html/server/src/test/ref.d.ts b/extensions/html/server/src/test/ref.d.ts
index 619436f24cc..4e54d6a8a24 100644
--- a/extensions/html/server/src/test/ref.d.ts
+++ b/extensions/html/server/src/test/ref.d.ts
@@ -1 +1 @@
-/// <reference path='../../node_modules/@types/mocha/index.d.ts'/>
\ No newline at end of file
+/// <reference types='@types/mocha'/>
\ No newline at end of file
diff --git a/extensions/vscode-api-tests/src/typings/ref.d.ts b/extensions/vscode-api-tests/src/typings/ref.d.ts
index 88a4b528289..3bc58fa959d 100644
--- a/extensions/vscode-api-tests/src/typings/ref.d.ts
+++ b/extensions/vscode-api-tests/src/typings/ref.d.ts
@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path="../../../../src/vs/vscode.d.ts" />
-/// <reference path='../../node_modules/@types/mocha/index.d.ts'/>
+/// <reference types='@types/mocha'/>
 /// <reference types='@types/node'/>
diff --git a/extensions/vscode-colorize-tests/src/typings/ref.d.ts b/extensions/vscode-colorize-tests/src/typings/ref.d.ts
index b5848321017..0f121ddcf43 100644
--- a/extensions/vscode-colorize-tests/src/typings/ref.d.ts
+++ b/extensions/vscode-colorize-tests/src/typings/ref.d.ts
@@ -3,5 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../node_modules/@types/mocha/index.d.ts'/>
+/// <reference types='@types/mocha'/>
 /// <reference types='@types/node'/>
diff --git a/package.json b/package.json
index ca81847b0e8..97771c90bb0 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "@types/mocha": "^2.2.39",
     "@types/semver": "^5.3.30",
     "@types/sinon": "^1.16.34",
+    "@types/winreg": "^1.2.30",
     "azure-storage": "^0.3.1",
     "clean-css": "3.4.6",
     "coveralls": "^2.11.11",
diff --git a/src/typings/winreg.d.ts b/src/typings/winreg.d.ts
deleted file mode 100644
index 10efb9d72a0..00000000000
--- a/src/typings/winreg.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module winreg {
-	export interface IRegValue {
-		host: string;
-		hive: any;
-		key: string;
-		name: string;
-		type: string;
-		value: any;
-	}
-
-	export interface IWinRegConfig {
-		hive: any;
-		key: string;
-	}
-
-	export interface IRegValuesCallback {
-		(error: Error, items: IRegValue[]): void;
-	}
-
-	export interface IWinReg {
-		/**
-		 * list the values under this key
-		 */
-		values(callback: IRegValuesCallback): void;
-
-		/**
-		 * list the subkeys of this key
-		 */
-		keys(callback: (error: Error, keys: string[]) => void): void;
-
-		/**
-		 * gets a value by it's name
-		 */
-		get(name: string, callback: (error: Error, item: IRegValue) => void): void;
-
-		/**
-		 * sets a value
-		 */
-		set(name: string, type: string, value: string, callback: (error: string) => void): void;
-
-		/**
-		 * remove the value with the given key
-		 */
-		remove(name: string, callback: (error: void) => void): void;
-
-		/**
-		 * create this key
-		 */
-		create(callback: (error: Error) => void): void;
-
-		/**
-		 * remove this key
-		 */
-		erase(callback: (error: Error) => void): void;
-
-		/**
-		 * a new Winreg instance initialized with the parent ke
-		 */
-		parent: IWinReg;
-
-		host: string;
-		hive: string;
-		key: string;
-		path: string;
-	}
-
-	export interface IWinRegFactory {
-		new (config: IWinRegConfig): IWinReg;
-
-		// hives
-		HKLM: string;
-		HKCU: string;
-		HKCR: string;
-		HKCC: string;
-		HKU: string;
-
-		// types
-		REG_SZ: string;
-		REG_MULTI_SZ: string;
-		REG_EXPAND_SZ: string;
-		REG_DWORD: string;
-		REG_QWORD: string;
-		REG_BINARY: string;
-		REG_NONE: string;
-	}
-}
-
-declare module 'winreg' {
-	var winreg: winreg.IWinRegFactory;
-	export = winreg;
-}
\ No newline at end of file