diff --git a/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts b/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts
index 21e9b2ce98..a2373785ce 100644
--- a/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts
+++ b/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts
@@ -1,5 +1,3 @@
-///<reference path='angular-bootstrap-lightbox.d.ts'/>
-
 var imageList:angular.bootstrap.lightbox.ILightboxImageInfo[] = [];
 imageList.push({
 	url: 'url1',
diff --git a/angular-google-analytics/angular-google-analytics-tests.ts b/angular-google-analytics/angular-google-analytics-tests.ts
index 80cdb7cb2b..42c7e1506c 100644
--- a/angular-google-analytics/angular-google-analytics-tests.ts
+++ b/angular-google-analytics/angular-google-analytics-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 function ConfigurationMethodChaining(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
     AnalyticsProvider
         .logAllCalls(true)
diff --git a/angular-google-analytics/index.d.ts b/angular-google-analytics/index.d.ts
index 818e73482d..403391f2e4 100644
--- a/angular-google-analytics/index.d.ts
+++ b/angular-google-analytics/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="angularjs" />
+/// <reference path="angular-google-analytics-service.d.ts" />
 
 declare namespace angular.google.analytics {
     /**
diff --git a/angular-localForage/angular-localForage-tests.ts b/angular-localForage/angular-localForage-tests.ts
index f010b7e010..8f917f5ca6 100644
--- a/angular-localForage/angular-localForage-tests.ts
+++ b/angular-localForage/angular-localForage-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference path='angular-localForage.d.ts' />
-
 var app = angular.module('angular-localForage-tests', ['LocalForageModule']);
 app.config(function (localStorageServiceProvider:angular.localForage.ILocalForageProvider) {
 
diff --git a/angularLocalStorage/angularLocalStorage-tests.ts b/angularLocalStorage/angularLocalStorage-tests.ts
index e5942f7d68..409dcde292 100644
--- a/angularLocalStorage/angularLocalStorage-tests.ts
+++ b/angularLocalStorage/angularLocalStorage-tests.ts
@@ -1,5 +1,4 @@
-///<reference types="angularjs" />
-///<reference path="./angularLocalStorage.d.ts" />
+/// <reference types="angularjs" />
 
 interface TestScope extends ng.IScope {
   viewType: string;
diff --git a/animation-frame/animation-frame-tests.ts b/animation-frame/animation-frame-tests.ts
index f7b1648303..2e0486f6ab 100644
--- a/animation-frame/animation-frame-tests.ts
+++ b/animation-frame/animation-frame-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="animation-frame.d.ts"/>
 namespace AnimationFrameTests {
   var animation = new AnimationFrame();
   function frame() {
diff --git a/applicationinsights/applicationinsights-tests.ts b/applicationinsights/applicationinsights-tests.ts
index eb9d5e7019..00c303eff4 100644
--- a/applicationinsights/applicationinsights-tests.ts
+++ b/applicationinsights/applicationinsights-tests.ts
@@ -1,4 +1,3 @@
-///<reference path='applicationinsights.d.ts' />
 import * as appInsights from "applicationinsights";
 
 // basic use
diff --git a/autobahn/autobahn-tests.ts b/autobahn/autobahn-tests.ts
index 5cdc4f95c6..141a43547e 100644
--- a/autobahn/autobahn-tests.ts
+++ b/autobahn/autobahn-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="autobahn.d.ts"/>
-
 import autobahn = require("autobahn");
 
 class MyClass {
diff --git a/autolinker/autolinker-tests.ts b/autolinker/autolinker-tests.ts
index c25bedbbc4..afd7e1d629 100644
--- a/autolinker/autolinker-tests.ts
+++ b/autolinker/autolinker-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="./autolinker.d.ts"/>
-
 import AutolinkerCJS = require('autolinker');
 
 () => {
diff --git a/backbone.localstorage/index.d.ts b/backbone.localstorage/index.d.ts
index dcbb92174c..9519fa56e4 100644
--- a/backbone.localstorage/index.d.ts
+++ b/backbone.localstorage/index.d.ts
@@ -6,7 +6,8 @@
 import * as Backbone from 'backbone';
 
 declare global {
-    import Store = Backbone.LocalStorage;
+    const Store = Backbone.LocalStorage;
+    type Store = Backbone.LocalStorage;
 }
 
 declare module 'backbone' {
diff --git a/bardjs/bardjs-tests.ts b/bardjs/bardjs-tests.ts
index 6cf0d787d6..4dad9b9ad9 100644
--- a/bardjs/bardjs-tests.ts
+++ b/bardjs/bardjs-tests.ts
@@ -1,8 +1,6 @@
-
 /// <reference types="mocha" />
 /// <reference types="chai" />
 /// <reference types="angularjs" />
-/// <reference types="angular-mocks" />
 
 namespace bardTests {
     var expect = chai.expect,
diff --git a/business-rules-engine/business-rules-engine-tests.ts b/business-rules-engine/business-rules-engine-tests.ts
index 6ad84074e7..1aecba7f9f 100644
--- a/business-rules-engine/business-rules-engine-tests.ts
+++ b/business-rules-engine/business-rules-engine-tests.ts
@@ -1,6 +1,5 @@
-
-
 /// <reference types="Q" />
+import * as Validators from './node-validators';
 
 export interface IPerson{
     Checked:boolean;
diff --git a/chartist/chartist-tests.ts b/chartist/chartist-tests.ts
index 22b10e8b03..94c43874f7 100644
--- a/chartist/chartist-tests.ts
+++ b/chartist/chartist-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="chartist.d.ts" />
-
 Chartist.escapingMap = {
   '&': '&amp;',
   '<': '&lt;',
diff --git a/chui/chui-tests.ts b/chui/chui-tests.ts
index b7c853071e..5e1e549dc7 100644
--- a/chui/chui-tests.ts
+++ b/chui/chui-tests.ts
@@ -1,5 +1,4 @@
 /// <reference types="jquery"/>
-/// <reference path="chui.d.ts"/>
 
 $(function() {
 
diff --git a/classnames/classnames-tests.ts b/classnames/classnames-tests.ts
index 3c3086c51e..e296001ed8 100644
--- a/classnames/classnames-tests.ts
+++ b/classnames/classnames-tests.ts
@@ -1,5 +1,3 @@
-///<reference path='classnames.d.ts' />
-
 import classNames = require('classnames')
 
 classNames('foo', 'bar'); // => 'foo bar'
diff --git a/cordova-ionic/index.d.ts b/cordova-ionic/index.d.ts
index a3f763f046..dc008b8a54 100644
--- a/cordova-ionic/index.d.ts
+++ b/cordova-ionic/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Hendrik Maus <https://github.com/hendrikmaus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="keyboard.d.ts" />
 
 interface CordovaPlugins {
-  Keyboard:Ionic.Keyboard;
+  Keyboard: Ionic.Keyboard;
 }
diff --git a/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts b/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts
index 8bdb7f1427..6022aa7bc4 100644
--- a/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts
+++ b/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="./cordova-plugin-ms-adal.d.ts"/>
-
 function test_cordova_plugin_ms_adal() {
-
     var testConfiguration = {
         authority: 'https://login.microsoftonline.com/testtenant.onmicrosoft.com',
         resourceUrl: 'https://graph.windows.net/',
diff --git a/drop/drop-tests.ts b/drop/drop-tests.ts
index 2693f11345..8aa98c69f4 100644
--- a/drop/drop-tests.ts
+++ b/drop/drop-tests.ts
@@ -1,5 +1,4 @@
 ///<reference types="tether" />
-///<reference path="drop.d.ts" />
 
 var yellowBox = document.querySelector(".yellow");
 var greenBox = document.querySelector(".green");
diff --git a/dropzone/dropzone-tests.ts b/dropzone/dropzone-tests.ts
index 249d90a707..43b950068f 100644
--- a/dropzone/dropzone-tests.ts
+++ b/dropzone/dropzone-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./dropzone.d.ts"/>
-
 const dropzoneFromString = new Dropzone(".test");
 const dropzoneFromElement = new Dropzone(document.getElementById("test"));
 const dropzoneRenameFunction = function (name:string):string {
diff --git a/dynatable/dynatable-tests.ts b/dynatable/dynatable-tests.ts
index ed7c24ea54..acba41092a 100644
--- a/dynatable/dynatable-tests.ts
+++ b/dynatable/dynatable-tests.ts
@@ -1,6 +1,4 @@
 /// <reference types="jquery"/>
-/// <reference path="dynatable.d.ts"/>
-
 
 // Using the global setup option
 // =============================
diff --git a/fingerprintjs/fingerprint-tests.ts b/fingerprintjs/fingerprint-tests.ts
index 8b07898709..a71983cdee 100644
--- a/fingerprintjs/fingerprint-tests.ts
+++ b/fingerprintjs/fingerprint-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="fingerprint.d.ts"/>
-
 function test_no_option() {
   var fingerprint = new Fingerprint().get();
 }
diff --git a/flexSlider/flexSlider-tests.ts b/flexSlider/flexSlider-tests.ts
index 8651102422..2369ce9b31 100644
--- a/flexSlider/flexSlider-tests.ts
+++ b/flexSlider/flexSlider-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="flexSlider.d.ts"/>
-
 // Can also be used with $(document).ready()
 $(window).load(function() {
 	$('.flexslider').flexslider({
diff --git a/i18next-express-middleware/i18next-express-middleware-tests.ts b/i18next-express-middleware/i18next-express-middleware-tests.ts
index b7167cfa51..d56f7a9207 100644
--- a/i18next-express-middleware/i18next-express-middleware-tests.ts
+++ b/i18next-express-middleware/i18next-express-middleware-tests.ts
@@ -1,6 +1,3 @@
-///<reference types="i18next-2.0.17"/>
-///<reference path="i18next-express-middleware.d.ts"/>
-
 import * as express from "express";
 import * as i18next from "i18next";
 import middleware = require("i18next-express-middleware");
diff --git a/i18next-express-middleware/index.d.ts b/i18next-express-middleware/index.d.ts
index 609a79aa99..c657243acd 100644
--- a/i18next-express-middleware/index.d.ts
+++ b/i18next-express-middleware/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="i18next-2.0.17"/>
+/// <reference types="i18next" />
 
 declare namespace I18next {
     interface I18nextOptions extends i18nextExpressMiddleware.I18nextOptions { }
diff --git a/i18next-node-fs-backend/index.d.ts b/i18next-node-fs-backend/index.d.ts
index 6ef812a390..48053b8ab5 100644
--- a/i18next-node-fs-backend/index.d.ts
+++ b/i18next-node-fs-backend/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="i18next-2.0.17"/>
+///<reference types="i18next" />
 
 declare namespace I18next {
     interface I18nextOptions extends i18nextNodeFsBackEnd.I18nextOptions { }
diff --git a/mobservable-react/index.d.ts b/mobservable-react/index.d.ts
index c026957f0e..a5f77cf5d4 100644
--- a/mobservable-react/index.d.ts
+++ b/mobservable-react/index.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: Michel Weststrate <https://github.com/mweststrate/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="react-global" />
-
+import * as React from 'react';
 
 /**
  * Turns a React component or stateless render function into a reactive component.
  */
-export declare function reactiveComponent<P>(clazz: React.ClassicComponentClass<P>): React.ClassicComponentClass<P>;
-export declare function reactiveComponent<TFunction extends React.ComponentClass<any>>(target: TFunction): void; // decorator signature
-export declare function reactiveComponent<P>(clazz: React.ComponentClass<P>): React.ComponentClass<P>;
-export declare function reactiveComponent<P>(renderFunction: (props: P) => React.ReactElement<any>): React.ClassicComponentClass<P>;
+export function reactiveComponent<P>(clazz: React.ClassicComponentClass<P>): React.ClassicComponentClass<P>;
+export function reactiveComponent<TFunction extends React.ComponentClass<any>>(target: TFunction): void; // decorator signature
+export function reactiveComponent<P>(clazz: React.ComponentClass<P>): React.ComponentClass<P>;
+export function reactiveComponent<P>(renderFunction: (props: P) => React.ReactElement<any>): React.ClassicComponentClass<P>;
diff --git a/mobservable-react/mobservable-react-tests.ts b/mobservable-react/mobservable-react-tests.ts
index 59085afa47..af2bf5a138 100644
--- a/mobservable-react/mobservable-react-tests.ts
+++ b/mobservable-react/mobservable-react-tests.ts
@@ -1,6 +1,6 @@
-/// <reference types="react-global" />
-
 import {reactiveComponent} from 'mobservable-react';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 
 {
     let c1 = reactiveComponent(React.createClass({
diff --git a/node/index.d.ts b/node/index.d.ts
index 6f115759ff..31f1cecc0c 100644
--- a/node/index.d.ts
+++ b/node/index.d.ts
@@ -434,7 +434,7 @@ interface NodeBuffer extends Uint8Array {
     writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
     writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
     writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
-    fill(value: any, offset?: number, end?: number): Buffer;
+    fill(value: any, offset?: number, end?: number): this;
     // TODO: encoding param
     indexOf(value: string | number | Buffer, byteOffset?: number): number;
     // TODO: entries
diff --git a/peerjs/peerjs-tests.ts b/peerjs/peerjs-tests.ts
index a2e7cb77f7..373df3ba2f 100644
--- a/peerjs/peerjs-tests.ts
+++ b/peerjs/peerjs-tests.ts
@@ -1,5 +1,4 @@
-
-/// <reference types="RTCPeerConnection" />
+/// <reference types="webrtc" />
 
 var peerByOption: PeerJs.Peer = new Peer({
     key: 'peerKey',
diff --git a/physijs/tests/body.ts b/physijs/tests/body.ts
index d1fea9f725..83924a9a4d 100644
--- a/physijs/tests/body.ts
+++ b/physijs/tests/body.ts
@@ -1,7 +1,5 @@
 /// <reference types="stats" />
 
-/// <reference types="three-projector" />
-
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';
 
diff --git a/physijs/tests/constraints_car.ts b/physijs/tests/constraints_car.ts
index 261d640c5a..4e343c06d1 100644
--- a/physijs/tests/constraints_car.ts
+++ b/physijs/tests/constraints_car.ts
@@ -1,7 +1,5 @@
 /// <reference types="stats" />
 
-/// <reference types="three-projector" />
-
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';
 
diff --git a/physijs/tests/jenga.ts b/physijs/tests/jenga.ts
index 0bd246bd5e..43a4d924de 100644
--- a/physijs/tests/jenga.ts
+++ b/physijs/tests/jenga.ts
@@ -1,7 +1,5 @@
 /// <reference types="stats" />
 
-/// <reference types="three-projector" />
-
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';
 
diff --git a/physijs/tests/vehicle.ts b/physijs/tests/vehicle.ts
index 644f490be8..b133299a5b 100644
--- a/physijs/tests/vehicle.ts
+++ b/physijs/tests/vehicle.ts
@@ -1,7 +1,5 @@
 /// <reference types="stats" />
 
-/// <reference types="three-projector" />
-
 var TWEEN: any;
 var SimplexNoise: any;
 
diff --git a/react-intl/react-intl-tests.tsx b/react-intl/react-intl-tests.tsx
index a57dbd5618..f140dd95d1 100644
--- a/react-intl/react-intl-tests.tsx
+++ b/react-intl/react-intl-tests.tsx
@@ -4,12 +4,9 @@
 
 ///<reference types="react" />
 
-///<reference path="./react-intl.d.ts" />
-
-
 import * as React from "react"
-
 import * as reactMixin from "react-mixin"
+
 import {
 IntlProvider,
 InjectedIntlProps,
@@ -26,6 +23,7 @@ FormattedPlural,
 FormattedDate,
 FormattedTime
 } from "react-intl"
+
 import reactIntlEn = require("react-intl/locale-data/en");
 
 addLocaleData(reactIntlEn);
diff --git a/react-redux/react-redux-2.1.2-tests.tsx b/react-redux/react-redux-2.1.2-tests.tsx
index 205e4aa734..e7942c154f 100644
--- a/react-redux/react-redux-2.1.2-tests.tsx
+++ b/react-redux/react-redux-2.1.2-tests.tsx
@@ -1,8 +1,4 @@
-
-/// <reference types="react"/>
-/// <reference types="react-dom"/>
 /// <reference types="redux" />
-/// <reference types="react-router-0.13.3" />
 
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
diff --git a/react-router-bootstrap/react-router-bootstrap-tests.tsx b/react-router-bootstrap/react-router-bootstrap-tests.tsx
index c23ca73360..d4f8733c03 100644
--- a/react-router-bootstrap/react-router-bootstrap-tests.tsx
+++ b/react-router-bootstrap/react-router-bootstrap-tests.tsx
@@ -2,7 +2,6 @@
 // ================================================================================
 ///<reference types="react"/>
 ///<reference types="react-bootstrap"/>
-///<reference path="react-router-bootstrap.d.ts"/>
 
 // Imports
 // --------------------------------------------------------------------------------
diff --git a/react/react-tests.ts b/react/react-tests.ts
index c4615d0f4d..9fc0db1676 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -543,8 +543,7 @@ TestUtils.Simulate.click(node);
 TestUtils.Simulate.change(node);
 TestUtils.Simulate.keyDown(node, { key: "Enter", cancelable: false });
 
-var renderer: React.ShallowRenderer =
-    TestUtils.createRenderer();
+var renderer: TestUtils.ShallowRenderer = TestUtils.createRenderer();
 renderer.render(React.createElement(Timer));
 var output: React.ReactElement<React.Props<Timer>> =
     renderer.getRenderOutput();
diff --git a/three/index.d.ts b/three/index.d.ts
index 788dc26799..8a955d903a 100644
--- a/three/index.d.ts
+++ b/three/index.d.ts
@@ -3,6 +3,24 @@
 // Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="detector.d.ts" />
+/// <reference path="three-canvasrenderer.d.ts" />
+/// <reference path="three-copyshader.d.ts" />
+/// <reference path="three-css3drenderer.d.ts" />
+/// <reference path="three-editorcontrols.d.ts" />
+/// <reference path="three-effectcomposer.d.ts" />
+/// <reference path="three-FirstPersonControls.d.ts" />
+/// <reference path="three-maskpass.d.ts" />
+/// <reference path="three-orbitcontrols.d.ts" />
+/// <reference path="three-orthographictrackballcontrols.d.ts" />
+/// <reference path="three-projector.d.ts" />
+/// <reference path="three-renderpass.d.ts" />
+/// <reference path="three-shaderpass.d.ts" />
+/// <reference path="three-trackballcontrols.d.ts" />
+/// <reference path="three-transformcontrols.d.ts" />
+/// <reference path="three-vrcontrols.d.ts" />
+/// <reference path="three-vreffect.d.ts" />
+
 declare namespace THREE {
     export const REVISION: string;
 
diff --git a/three/tests/examples/controls/vrcontrols.ts b/three/tests/examples/controls/vrcontrols.ts
index bff0226a06..1d6e932a0e 100644
--- a/three/tests/examples/controls/vrcontrols.ts
+++ b/three/tests/examples/controls/vrcontrols.ts
@@ -1,5 +1,4 @@
 /// <reference types="three" />
-/// <reference types="three-vrcontrols" />
 
 var _vrControls = new THREE.VRControls(new THREE.Camera());
 
diff --git a/three/tests/examples/effects/vreffect.ts b/three/tests/examples/effects/vreffect.ts
index 72a97e3a0b..67917a94ae 100644
--- a/three/tests/examples/effects/vreffect.ts
+++ b/three/tests/examples/effects/vreffect.ts
@@ -1,5 +1,4 @@
 /// <reference types="three" />
-/// <reference types="three-vreffect" />
 
 var _vrEffect: THREE.VREffect;
 
diff --git a/three/three-canvasrenderer.d.ts b/three/three-canvasrenderer.d.ts
index 9f588f5782..074f1ae964 100644
--- a/three/three-canvasrenderer.d.ts
+++ b/three/three-canvasrenderer.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
 declare namespace THREE {
     export interface SpriteCanvasMaterialParameters extends MaterialParameters{
         color?: number;
diff --git a/winjs/index.d.ts b/winjs/index.d.ts
index 0695a1fb3c..4903936fac 100644
--- a/winjs/index.d.ts
+++ b/winjs/index.d.ts
@@ -9967,7 +9967,7 @@ declare namespace WinJS.Utilities {
          * Sorts an array.
          * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
         **/
-        sort(compareFn?: (a: T, b: T) => number): T[];
+        sort(compareFn?: (a: T, b: T) => number): this;
 
         /**
          * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.