diff --git a/JSONStream/JSONStream-tests.ts b/JSONStream/JSONStream-tests.ts
index ea7eb64ff9..00884c8857 100644
--- a/JSONStream/JSONStream-tests.ts
+++ b/JSONStream/JSONStream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="JSONStream.d.ts" />
 
 import json = require('JSONStream');
 
diff --git a/OpenJsCad/openjscad.d.ts b/OpenJsCad/openjscad.d.ts
index c0bdbdc1f9..177f4a3aae 100644
--- a/OpenJsCad/openjscad.d.ts
+++ b/OpenJsCad/openjscad.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/joostn/OpenJsCad
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../threejs/three.d.ts" />
 
 declare namespace THREE {
     var CSG: {
diff --git a/absolute/absolute-tests.ts b/absolute/absolute-tests.ts
index 5c2514450a..b2eceda474 100644
--- a/absolute/absolute-tests.ts
+++ b/absolute/absolute-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./absolute.d.ts" />
 
 import absolute from 'absolute';
 
diff --git a/adm-zip/adm-zip-tests.ts b/adm-zip/adm-zip-tests.ts
index 8637751bfa..2418597087 100644
--- a/adm-zip/adm-zip-tests.ts
+++ b/adm-zip/adm-zip-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="adm-zip.d.ts" />
+
 import AdmZip = require("adm-zip");
 
 // reading archives
diff --git a/ag-grid/ag-grid-tests.ts b/ag-grid/ag-grid-tests.ts
index 67b98f9f33..7c4ebb0c8c 100644
--- a/ag-grid/ag-grid-tests.ts
+++ b/ag-grid/ag-grid-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ag-grid" />
 
 checkGridOptions(<ag.grid.GridOptions>{});
 checkColDef(<ag.grid.ColDef>{});
diff --git a/agenda/index.d.ts b/agenda/index.d.ts
index b6e2dc08d1..3e44e7ea38 100644
--- a/agenda/index.d.ts
+++ b/agenda/index.d.ts
@@ -4,9 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path='../node/node.d.ts' />
-/// <reference path='../mongodb/mongodb.d.ts' />
-
-
 
 import {EventEmitter} from "events";
 import {Db, Collection, ObjectID} from "mongodb";
diff --git a/amazon-product-api/amazon-product-api-tests.ts b/amazon-product-api/amazon-product-api-tests.ts
index b98e15710f..5a0ddda800 100644
--- a/amazon-product-api/amazon-product-api-tests.ts
+++ b/amazon-product-api/amazon-product-api-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./amazon-product-api.d.ts" />
+
 /// <reference path="../node/node.d.ts"/>
 
 import amazon = require('amazon-product-api');
diff --git a/amqp-rpc/amqp-rpc-tests.ts b/amqp-rpc/amqp-rpc-tests.ts
index 71df096a8d..eb101188ab 100644
--- a/amqp-rpc/amqp-rpc-tests.ts
+++ b/amqp-rpc/amqp-rpc-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./amqp-rpc.d.ts" />
+
 import amqp_rpc = require('amqp-rpc');
 var rpc = amqp_rpc.factory();
 
diff --git a/angular-agility/angular-agility-tests.ts b/angular-agility/angular-agility-tests.ts
index 1e8eea478b..96976aad0a 100644
--- a/angular-agility/angular-agility-tests.ts
+++ b/angular-agility/angular-agility-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="angular-agility.d.ts" />
-/// <reference path='../angularjs/angular.d.ts' />
 
 var validIconStrategy:aa.IValidIconStrategy = <aa.IValidIconStrategy>{};
 validIconStrategy.validIcon = "";
diff --git a/angular-agility/angular-agility.d.ts b/angular-agility/angular-agility.d.ts
index 33a8c3b8a4..d52c34ae6e 100644
--- a/angular-agility/angular-agility.d.ts
+++ b/angular-agility/angular-agility.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path='../angularjs/angular.d.ts' />
 
 declare namespace aa {
 
diff --git a/angular-cookie/angular-cookie-tests.ts b/angular-cookie/angular-cookie-tests.ts
index e6280fbeba..ba6b30d2ee 100644
--- a/angular-cookie/angular-cookie-tests.ts
+++ b/angular-cookie/angular-cookie-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-cookie.d.ts' />
 
 angular.module('myApp', ['ipCookie'])
diff --git a/angular-dynamic-locale/angular-dynamic-locale-tests.ts b/angular-dynamic-locale/angular-dynamic-locale-tests.ts
index a42d0c4460..03d0435d4d 100644
--- a/angular-dynamic-locale/angular-dynamic-locale-tests.ts
+++ b/angular-dynamic-locale/angular-dynamic-locale-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-dynamic-locale.d.ts' />
 
 var app = angular.module('testModule', ['tmh.dynamicLocale']);
diff --git a/angular-local-storage/angular-local-storage-tests.ts b/angular-local-storage/angular-local-storage-tests.ts
index 230a32dce1..a2540e0234 100644
--- a/angular-local-storage/angular-local-storage-tests.ts
+++ b/angular-local-storage/angular-local-storage-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-local-storage.d.ts' />
 
 interface TestScope extends ng.IScope {
diff --git a/angular-local-storage/angular-local-storage.d.ts b/angular-local-storage/angular-local-storage.d.ts
index b2bcf377d2..00694fea00 100644
--- a/angular-local-storage/angular-local-storage.d.ts
+++ b/angular-local-storage/angular-local-storage.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Ken Fukuyama <https://github.com/kenfdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path='../angularjs/angular.d.ts' />
 
 declare namespace angular.local.storage {
   interface ILocalStorageServiceProvider extends angular.IServiceProvider {
diff --git a/angular-localForage/angular-localForage-tests.ts b/angular-localForage/angular-localForage-tests.ts
index 3ea776ebf8..f010b7e010 100644
--- a/angular-localForage/angular-localForage-tests.ts
+++ b/angular-localForage/angular-localForage-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-localForage.d.ts' />
 
 var app = angular.module('angular-localForage-tests', ['LocalForageModule']);
diff --git a/angular-locker/angular-locker-tests.ts b/angular-locker/angular-locker-tests.ts
index c3c280e776..45c8708292 100644
--- a/angular-locker/angular-locker-tests.ts
+++ b/angular-locker/angular-locker-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-locker.d.ts' />
 
 angular
diff --git a/angular-permission/angular-permission-2.3.1.d.ts b/angular-permission/angular-permission-2.3.1.d.ts
index afe32ce875..40f91f79f6 100644
--- a/angular-permission/angular-permission-2.3.1.d.ts
+++ b/angular-permission/angular-permission-2.3.1.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Voislav Mishevski <https://github.com/vmishevski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+
 /// <reference path="../angular-ui-router/angular-ui-router.d.ts" />
 
 declare namespace angular.permission {
diff --git a/angular-signalr-hub/angular-signalr-hub-tests.ts b/angular-signalr-hub/angular-signalr-hub-tests.ts
index d20457bcdc..86343d36aa 100644
--- a/angular-signalr-hub/angular-signalr-hub-tests.ts
+++ b/angular-signalr-hub/angular-signalr-hub-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path='angular-signalr-hub.d.ts' />
-/// <reference path='../angularjs/angular.d.ts' />
 
 angular
     .module('app', ['SignalR'])
diff --git a/angular-storage/angular-storage-tests.ts b/angular-storage/angular-storage-tests.ts
index 1455bbd643..2854f85246 100644
--- a/angular-storage/angular-storage-tests.ts
+++ b/angular-storage/angular-storage-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-storage.d.ts' />
 
 // Samples taken from the a0-angular-storage Readme.md
diff --git a/angular-toastr/angular-toastr-tests.ts b/angular-toastr/angular-toastr-tests.ts
index e5701746f7..2dccd76120 100644
--- a/angular-toastr/angular-toastr-tests.ts
+++ b/angular-toastr/angular-toastr-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-toastr.d.ts' />
 
 
diff --git a/angular-touchspin/angular-touchspin-tests.ts b/angular-touchspin/angular-touchspin-tests.ts
index c6e229c7f5..058fe930c8 100644
--- a/angular-touchspin/angular-touchspin-tests.ts
+++ b/angular-touchspin/angular-touchspin-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
+
 /// <reference path='angular-touchspin.d.ts' />
 
 angular
diff --git a/angular-ui-tree/angular-ui-tree.d.ts b/angular-ui-tree/angular-ui-tree.d.ts
index 66909cf90f..43df4f81a8 100644
--- a/angular-ui-tree/angular-ui-tree.d.ts
+++ b/angular-ui-tree/angular-ui-tree.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Calvin Fernandez <https://github.com/CalvinFernandez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path='../angularjs/angular.d.ts' />
 
 declare namespace AngularUITree {
     interface IEventSourceInfo {
diff --git a/angular.throttle/angular.throttle-tests.ts b/angular.throttle/angular.throttle-tests.ts
index 2234adbc37..844f83a79f 100644
--- a/angular.throttle/angular.throttle-tests.ts
+++ b/angular.throttle/angular.throttle-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="angular.throttle.d.ts" />
-/// <reference path='../angularjs/angular.d.ts' />
 
 var throttledFn = angular.throttle(function (someArg:any) {
     return someArg;
diff --git a/angular.throttle/angular.throttle.d.ts b/angular.throttle/angular.throttle.d.ts
index 354d6b3f98..41e50a006c 100644
--- a/angular.throttle/angular.throttle.d.ts
+++ b/angular.throttle/angular.throttle.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path='../angularjs/angular.d.ts' />
 
 declare namespace angular {
 	interface IAngularStatic {
diff --git a/angularjs/angular-amd-tests.ts b/angularjs/angular-amd-tests.ts
index 2ce75cc22d..97f6daf462 100644
--- a/angularjs/angular-amd-tests.ts
+++ b/angularjs/angular-amd-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="angular.d.ts" />
 
 import localName = require('angular');
 var mod: localName.IModule = localName.module('mod', []);
diff --git a/angularjs/angular-animate.d.ts b/angularjs/angular-animate.d.ts
index 2f3cbc0f18..57eb619405 100644
--- a/angularjs/angular-animate.d.ts
+++ b/angularjs/angular-animate.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Adi Dahiya <https://github.com/adidahiya>, Raphael Schweizer <https://github.com/rasch>, Cody Schaaf <https://github.com/codyschaaf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-animate" {
     var _: string;
diff --git a/angularjs/angular-component-router.d.ts b/angularjs/angular-component-router.d.ts
index 2c56ef3a21..d1c2a7e373 100644
--- a/angularjs/angular-component-router.d.ts
+++ b/angularjs/angular-component-router.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: David Reher <http://github.com/davidreher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./angular.d.ts" />
 
 declare namespace angular {
     /**
diff --git a/angularjs/angular-cookies.d.ts b/angularjs/angular-cookies.d.ts
index e96ae7a671..1577ea6fef 100644
--- a/angularjs/angular-cookies.d.ts
+++ b/angularjs/angular-cookies.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-cookies" {
     var _: string;
diff --git a/angularjs/angular-mocks.d.ts b/angularjs/angular-mocks.d.ts
index 9031cc56d1..3d8a6e8926 100644
--- a/angularjs/angular-mocks.d.ts
+++ b/angularjs/angular-mocks.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Tony Curtis <http://github.com/daltin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-mocks/ngMock" {
     var _: string;
diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts
index 0fb9351342..bf9c8030cd 100644
--- a/angularjs/angular-resource.d.ts
+++ b/angularjs/angular-resource.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Michael Jess <http://github.com/miffels>
 // Definitions: https://github.com/daptiv/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module 'angular-resource' {
     var _: string;
diff --git a/angularjs/angular-route-tests.ts b/angularjs/angular-route-tests.ts
index ab5fba0b62..85bd56240b 100644
--- a/angularjs/angular-route-tests.ts
+++ b/angularjs/angular-route-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular.d.ts" />
+
 /// <reference path="angular-route.d.ts" />
 
 /**
diff --git a/angularjs/angular-route.d.ts b/angularjs/angular-route.d.ts
index 19dbf04896..569abc9df5 100644
--- a/angularjs/angular-route.d.ts
+++ b/angularjs/angular-route.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Jonathan Park <https://github.com/park9140>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-route" {
     var _: string;
diff --git a/angularjs/angular-sanitize.d.ts b/angularjs/angular-sanitize.d.ts
index d87515adca..d677af7b2f 100644
--- a/angularjs/angular-sanitize.d.ts
+++ b/angularjs/angular-sanitize.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-sanitize" {
     var _: string;
diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index 0539ae62ac..1f7bd6d492 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="angular.d.ts" />
 
 // issue: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/369
 // https://github.com/witoldsz/angular-http-auth/blob/master/src/angular-http-auth.js
diff --git a/ansi-styles/ansi-styles-tests.ts b/ansi-styles/ansi-styles-tests.ts
index dc3187ef5b..235f98dce1 100644
--- a/ansi-styles/ansi-styles-tests.ts
+++ b/ansi-styles/ansi-styles-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ansi-styles.d.ts" />
 
 import ansi = require('ansi-styles');
 
diff --git a/any-db-transaction/any-db-transaction-tests.ts b/any-db-transaction/any-db-transaction-tests.ts
index 8e38fe5a3c..9601d7f254 100644
--- a/any-db-transaction/any-db-transaction-tests.ts
+++ b/any-db-transaction/any-db-transaction-tests.ts
@@ -1,5 +1,5 @@
 
-/// <reference path="../any-db/any-db.d.ts" />
+
 /// <reference path="any-db-transaction.d.ts" />
 
 "use strict";
diff --git a/any-db-transaction/index.d.ts b/any-db-transaction/index.d.ts
index 0a94e7a634..902a481d28 100644
--- a/any-db-transaction/index.d.ts
+++ b/any-db-transaction/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../any-db/any-db.d.ts" />
-
 
 import anyDB = require("any-db");
 
diff --git a/any-db/any-db-tests.ts b/any-db/any-db-tests.ts
index 41744c452c..ca173cc4d2 100644
--- a/any-db/any-db-tests.ts
+++ b/any-db/any-db-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="any-db.d.ts" />
 
 "use strict";
 
diff --git a/anydb-sql-migrations/anydb-sql-migrations-tests.ts b/anydb-sql-migrations/anydb-sql-migrations-tests.ts
index f9c3da03a2..ed79ace368 100644
--- a/anydb-sql-migrations/anydb-sql-migrations-tests.ts
+++ b/anydb-sql-migrations/anydb-sql-migrations-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="../anydb-sql/anydb-sql.d.ts" />
-/// <reference path="anydb-sql-migrations" />
 import anydbsql = require('anydb-sql');
 import { Table, Column } from 'anydb-sql'
 import migrator = require('anydb-sql-migrations');
diff --git a/anydb-sql-migrations/index.d.ts b/anydb-sql-migrations/index.d.ts
index 222a5640c7..78ea7cd0c6 100644
--- a/anydb-sql-migrations/index.d.ts
+++ b/anydb-sql-migrations/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../anydb-sql/anydb-sql.d.ts" />
-
 
 import Promise = require('bluebird');
 import { Column, Table, Transaction, AnydbSql } from 'anydb-sql';
diff --git a/anydb-sql/anydb-sql-tests.ts b/anydb-sql/anydb-sql-tests.ts
index 9e0264f7bb..745431d857 100644
--- a/anydb-sql/anydb-sql-tests.ts
+++ b/anydb-sql/anydb-sql-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="anydb-sql.d.ts" />
+
 import anydbsql = require('anydb-sql');
 import { Table, Column } from 'anydb-sql'
 
diff --git a/api-error-handler/api-error-handler-tests.ts b/api-error-handler/api-error-handler-tests.ts
index fc92cf9a70..3bc39c4a7b 100644
--- a/api-error-handler/api-error-handler-tests.ts
+++ b/api-error-handler/api-error-handler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="api-error-handler.d.ts" />
 
 import * as errorHandler from 'api-error-handler';
 import * as express from 'express';
diff --git a/archiver/archiver-tests.ts b/archiver/archiver-tests.ts
index dcd71ca905..85c6c5fb8b 100644
--- a/archiver/archiver-tests.ts
+++ b/archiver/archiver-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="archiver.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import Archiver = require('archiver');
diff --git a/archy/archy-tests.ts b/archy/archy-tests.ts
index b2f62384ff..dba85bafea 100644
--- a/archy/archy-tests.ts
+++ b/archy/archy-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./archy.d.ts" />
 
 import archy = require("archy");
 
diff --git a/argparse/argparse-tests.ts b/argparse/argparse-tests.ts
index bf565c5f54..cec1ece95b 100644
--- a/argparse/argparse-tests.ts
+++ b/argparse/argparse-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="argparse.d.ts" />
+
 // near copy of each of the tests from https://github.com/nodeca/argparse/tree/master/examples
 
 import {ArgumentParser, RawDescriptionHelpFormatter} from 'argparse';
diff --git a/asana/asana-tests.ts b/asana/asana-tests.ts
index c1531ec9dd..0cadff6be0 100644
--- a/asana/asana-tests.ts
+++ b/asana/asana-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="asana.d.ts" />
+
 /// <reference path="../request/request.d.ts" />
 
 import * as asana from 'asana';
diff --git a/asana/index.d.ts b/asana/index.d.ts
index e1a022fb6e..5bad5c47be 100644
--- a/asana/index.d.ts
+++ b/asana/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../request/request.d.ts" />
-
 
 import * as Promise from 'bluebird';
 
diff --git a/aspnet-identity-pw/aspnet-identity-pw-tests.ts b/aspnet-identity-pw/aspnet-identity-pw-tests.ts
index 83fb6878ab..235d39dc5a 100644
--- a/aspnet-identity-pw/aspnet-identity-pw-tests.ts
+++ b/aspnet-identity-pw/aspnet-identity-pw-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="aspnet-identity-pw.d.ts" />
 
 import passwordHasher = require('aspnet-identity-pw');
 
diff --git a/assertion-error/assertion-error-tests.ts b/assertion-error/assertion-error-tests.ts
index f03e9cb52e..96eb520f1c 100644
--- a/assertion-error/assertion-error-tests.ts
+++ b/assertion-error/assertion-error-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="assertion-error.d.ts" />
 
 import AssertionError = require('assertion-error');
 
diff --git a/async-lock/async-lock-tests.ts b/async-lock/async-lock-tests.ts
index d3eedf2fda..259749d4f0 100644
--- a/async-lock/async-lock-tests.ts
+++ b/async-lock/async-lock-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="async-lock.d.ts" />
 
 import * as AsyncLock from "async-lock";
 const lock = new AsyncLock();
diff --git a/async-writer/async-writer-tests.ts b/async-writer/async-writer-tests.ts
index c26e31495c..855242c703 100644
--- a/async-writer/async-writer-tests.ts
+++ b/async-writer/async-writer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="async-writer.d.ts" />
 
 import asyncWriter = require('async-writer');
 import stream = require('stream');
diff --git a/asyncblock/asyncblock-tests.ts b/asyncblock/asyncblock-tests.ts
index 35707e81ec..edd70a7717 100644
--- a/asyncblock/asyncblock-tests.ts
+++ b/asyncblock/asyncblock-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="asyncblock.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import asyncblock = require('asyncblock');
diff --git a/atpl/atpl-tests.ts b/atpl/atpl-tests.ts
index f1751d9015..287c75ed38 100644
--- a/atpl/atpl-tests.ts
+++ b/atpl/atpl-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="atpl.d.ts" />
 
 import atpl = require('atpl');
 
diff --git a/autoprefixer-core/autoprefixer-core-tests.ts b/autoprefixer-core/autoprefixer-core-tests.ts
index 9ff4e7695f..906514e9c9 100644
--- a/autoprefixer-core/autoprefixer-core-tests.ts
+++ b/autoprefixer-core/autoprefixer-core-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="autoprefixer-core.d.ts" />
+
 import autoprefixer = require("autoprefixer-core");
 
 var css: string;
diff --git a/aws-sdk/aws-sdk-tests.ts b/aws-sdk/aws-sdk-tests.ts
index 7411beb930..7ec672ae4b 100644
--- a/aws-sdk/aws-sdk-tests.ts
+++ b/aws-sdk/aws-sdk-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="aws-sdk.d.ts" />
 
 import AWS = require('aws-sdk');
 
diff --git a/barcode/barcode-tests.ts b/barcode/barcode-tests.ts
index bb7b67187e..2748143a3b 100644
--- a/barcode/barcode-tests.ts
+++ b/barcode/barcode-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="barcode.d.ts" />
+
 import barcode = require('barcode');
 import path = require('path');
 
diff --git a/basic-auth/basic-auth-tests.ts b/basic-auth/basic-auth-tests.ts
index 54be7af1f4..1fab9c10e2 100644
--- a/basic-auth/basic-auth-tests.ts
+++ b/basic-auth/basic-auth-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="basic-auth.d.ts" />
 
 import auth = require('basic-auth');
 
diff --git a/batch-stream/batch-stream-tests.ts b/batch-stream/batch-stream-tests.ts
index 2271e67e57..df1e528543 100644
--- a/batch-stream/batch-stream-tests.ts
+++ b/batch-stream/batch-stream-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="batch-stream.d.ts" />
 
 import fs = require('fs');
 import BatchStream = require('batch-stream');
diff --git a/bcrypt-nodejs/bcrypt-nodejs-tests.ts b/bcrypt-nodejs/bcrypt-nodejs-tests.ts
index 2a151c1c7e..a1a2944d52 100644
--- a/bcrypt-nodejs/bcrypt-nodejs-tests.ts
+++ b/bcrypt-nodejs/bcrypt-nodejs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bcrypt-nodejs.d.ts" />
 
 import bCrypt = require("bcrypt-nodejs");
 
diff --git a/bcrypt/bcrypt-tests.ts b/bcrypt/bcrypt-tests.ts
index b88d4fb7aa..ec4701dab2 100644
--- a/bcrypt/bcrypt-tests.ts
+++ b/bcrypt/bcrypt-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bcrypt.d.ts" />
 
 import bcrypt = require("bcrypt");
 
diff --git a/bitwise-xor/bitwise-xor-tests.ts b/bitwise-xor/bitwise-xor-tests.ts
index e55670b85f..b19768f11f 100644
--- a/bitwise-xor/bitwise-xor-tests.ts
+++ b/bitwise-xor/bitwise-xor-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="bitwise-xor.d.ts" />
 
 "use strict";
 
diff --git a/bl/bl-tests.ts b/bl/bl-tests.ts
index b8435911de..084cf1925a 100644
--- a/bl/bl-tests.ts
+++ b/bl/bl-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./bl.d.ts" />
 
 import BufferList = require('bl');
 
diff --git a/blue-tape/blue-tape-tests.ts b/blue-tape/blue-tape-tests.ts
index a01675a1c5..6747221b9a 100644
--- a/blue-tape/blue-tape-tests.ts
+++ b/blue-tape/blue-tape-tests.ts
@@ -1,6 +1,5 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="blue-tape.d.ts" />
 
 import tape = require('blue-tape');
 import P = require('bluebird');
diff --git a/blue-tape/index.d.ts b/blue-tape/index.d.ts
index 4a973c1715..3b4e0f9ea1 100644
--- a/blue-tape/index.d.ts
+++ b/blue-tape/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../tape/tape.d.ts" />
-
 
 import tape = require('tape');
 export = tape;
diff --git a/bluebird-retry/bluebird-retry-tests.ts b/bluebird-retry/bluebird-retry-tests.ts
index 5d8c32dfcb..659b742ddc 100644
--- a/bluebird-retry/bluebird-retry-tests.ts
+++ b/bluebird-retry/bluebird-retry-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bluebird-retry.d.ts" />
+
 /// <reference path="../bluebird/bluebird.d.ts" />
 import Promise = require('bluebird');
 import retry = require('bluebird-retry');
diff --git a/blueimp-md5/blueimp-md5-tests.ts b/blueimp-md5/blueimp-md5-tests.ts
index 5e38083097..18edc69b57 100644
--- a/blueimp-md5/blueimp-md5-tests.ts
+++ b/blueimp-md5/blueimp-md5-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='./blueimp-md5.d.ts' />
 
 import blueimp = require('blueimp-md5');
 
diff --git a/bookshelf/bookshelf-tests.ts b/bookshelf/bookshelf-tests.ts
index 92758e143a..729cd617cb 100644
--- a/bookshelf/bookshelf-tests.ts
+++ b/bookshelf/bookshelf-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="bookshelf.d.ts" />
-/// <reference path="../knex/knex.d.ts" />
 
 import * as Knex from 'knex';
 import * as Bookshelf from 'bookshelf';
diff --git a/bookshelf/bookshelf.d.ts b/bookshelf/bookshelf.d.ts
index cf70220840..2785018b1e 100644
--- a/bookshelf/bookshelf.d.ts
+++ b/bookshelf/bookshelf.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path='../lodash/lodash-3.10.d.ts' />
-/// <reference path="../knex/knex.d.ts" />
 
 declare module 'bookshelf' {
 	import knex = require('knex');
diff --git a/boolify-string/boolify-string-tests.ts b/boolify-string/boolify-string-tests.ts
index 1436a1aeae..80a68375a9 100644
--- a/boolify-string/boolify-string-tests.ts
+++ b/boolify-string/boolify-string-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="boolify-string.d.ts" />
 
 import boolifyString = require('boolify-string');
 
diff --git a/bounce.js/bounce-tests.ts b/bounce.js/bounce-tests.ts
index bd90bfe4c1..0d59b0feac 100644
--- a/bounce.js/bounce-tests.ts
+++ b/bounce.js/bounce-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./bounce.d.ts" />
+
 /// <reference path="./../jquery/jquery.d.ts" />
 
 import Bounce from 'bounce.js';
diff --git a/brorand/brorand-tests.ts b/brorand/brorand-tests.ts
index 1adb7b1144..ac090e8724 100644
--- a/brorand/brorand-tests.ts
+++ b/brorand/brorand-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./brorand.d.ts" />
 
 import * as brorand from 'brorand';
 
diff --git a/browser-harness/browser-harness-tests.ts b/browser-harness/browser-harness-tests.ts
index 71001ba9b0..4215c847d0 100644
--- a/browser-harness/browser-harness-tests.ts
+++ b/browser-harness/browser-harness-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./browser-harness.d.ts" />
 
 import harness = require('browser-harness');
 
diff --git a/browser-sync/index.d.ts b/browser-sync/index.d.ts
index a6740d6d93..7f8bd54b64 100644
--- a/browser-sync/index.d.ts
+++ b/browser-sync/index.d.ts
@@ -5,8 +5,6 @@
 
 /// <reference path="../chokidar/chokidar.d.ts"/>
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../micromatch/micromatch.d.ts" />
-
 
 import chokidar = require("chokidar");
 import fs = require("fs");
diff --git a/bs58/bs58-tests.ts b/bs58/bs58-tests.ts
index 8016469269..5fe3b73675 100644
--- a/bs58/bs58-tests.ts
+++ b/bs58/bs58-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./bs58.d.ts" />
 
 import * as bs58 from 'bs58';
 
diff --git a/buffer-compare/buffer-compare-tests.ts b/buffer-compare/buffer-compare-tests.ts
index 88e6dddb94..339be8315b 100644
--- a/buffer-compare/buffer-compare-tests.ts
+++ b/buffer-compare/buffer-compare-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./buffer-compare.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import compare = require('buffer-compare');
diff --git a/buffer-equal/buffer-equal-tests.ts b/buffer-equal/buffer-equal-tests.ts
index 192051ab47..f025c2f4e6 100644
--- a/buffer-equal/buffer-equal-tests.ts
+++ b/buffer-equal/buffer-equal-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="buffer-equal.d.ts" />
 
 import bufferEqual = require('buffer-equal');
 
diff --git a/buffers/buffers-tests.ts b/buffers/buffers-tests.ts
index 0a51f97ae4..73dbd57794 100644
--- a/buffers/buffers-tests.ts
+++ b/buffers/buffers-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="buffers.d.ts" />
+
 import Buffers = require('buffers');
 
 var any: any;
diff --git a/bull/bull.d.ts b/bull/bull.d.ts
index e04a9f21e8..fc7e8ac015 100644
--- a/bull/bull.d.ts
+++ b/bull/bull.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../redis/redis.d.ts" />
 
 declare module "bull" {
 
diff --git a/bunyan-logentries/bunyan-logentries-tests.ts b/bunyan-logentries/bunyan-logentries-tests.ts
index d0e4874898..8a9a1ab27a 100644
--- a/bunyan-logentries/bunyan-logentries-tests.ts
+++ b/bunyan-logentries/bunyan-logentries-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./bunyan-logentries.d.ts" />
+
 /// <reference path="../bunyan/bunyan.d.ts" />
 
 import bunyan = require("bunyan");
diff --git a/bunyan-logentries/index.d.ts b/bunyan-logentries/index.d.ts
index 76e13b9532..f826045929 100644
--- a/bunyan-logentries/index.d.ts
+++ b/bunyan-logentries/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
-
 
 import bunyan = require("bunyan");
 
diff --git a/bunyan-prettystream/bunyan-prettystream-tests.ts b/bunyan-prettystream/bunyan-prettystream-tests.ts
index 3dd7b15a31..49a3d405dc 100644
--- a/bunyan-prettystream/bunyan-prettystream-tests.ts
+++ b/bunyan-prettystream/bunyan-prettystream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bunyan-prettystream.d.ts" />
 
 import PrettyStream = require("bunyan-prettystream");
 var stream = new PrettyStream();
diff --git a/bunyan/bunyan-tests.ts b/bunyan/bunyan-tests.ts
index 2575f043d8..86a24f6bef 100644
--- a/bunyan/bunyan-tests.ts
+++ b/bunyan/bunyan-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bunyan.d.ts" />
 
 import * as bunyan from 'bunyan';
 
diff --git a/byline/byline-tests.ts b/byline/byline-tests.ts
index 42de3d5d9c..d21b8a196c 100644
--- a/byline/byline-tests.ts
+++ b/byline/byline-tests.ts
@@ -2,7 +2,6 @@
  * Created by stefansteinhart on 31.01.15.
  */
 
-/// <reference path="byline.d.ts" />
 
 import fs = require( 'fs' );
 import byline = require( 'byline' );
diff --git a/callsite/callsite-tests.ts b/callsite/callsite-tests.ts
index fcabcd8b50..079e7522e1 100644
--- a/callsite/callsite-tests.ts
+++ b/callsite/callsite-tests.ts
@@ -1,5 +1,4 @@
 
-///<reference path="callsite.d.ts" />
 
 import callsite = require("callsite");
 
diff --git a/camel-case/camel-case-tests.ts b/camel-case/camel-case-tests.ts
index 4f40e11fb2..f26f7cdb85 100644
--- a/camel-case/camel-case-tests.ts
+++ b/camel-case/camel-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="camel-case.d.ts" />
 
 import camelCase = require('camel-case');
 
diff --git a/camelcase/camelcase-tests.ts b/camelcase/camelcase-tests.ts
index 945f79abb4..aacb29481a 100644
--- a/camelcase/camelcase-tests.ts
+++ b/camelcase/camelcase-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./camelcase.d.ts" />
 
 import camelCase = require('camelcase');
 
diff --git a/camo/camo-tests.ts b/camo/camo-tests.ts
index 68b515a61c..31354dc945 100644
--- a/camo/camo-tests.ts
+++ b/camo/camo-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./camo.d.ts" />
 
 import {
 	connect,
diff --git a/chai-datetime/chai-datetime-tests.ts b/chai-datetime/chai-datetime-tests.ts
index 5c15326f48..255d816b5a 100644
--- a/chai-datetime/chai-datetime-tests.ts
+++ b/chai-datetime/chai-datetime-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="chai-datetime.d.ts" />
 
 import chai = require('chai');
 import chaiDateTime = require('chai-datetime');
diff --git a/chai-fuzzy/chai-fuzzy-tests.ts b/chai-fuzzy/chai-fuzzy-tests.ts
index 292b25002d..42805a1869 100644
--- a/chai-fuzzy/chai-fuzzy-tests.ts
+++ b/chai-fuzzy/chai-fuzzy-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="chai-fuzzy.d.ts" />
 
 // tests taken from http://chaijs.com/plugins/chai-fuzzy
 
diff --git a/chai-string/chai-string-tests.ts b/chai-string/chai-string-tests.ts
index f5380b0768..cbb9e54081 100644
--- a/chai-string/chai-string-tests.ts
+++ b/chai-string/chai-string-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chai-string.d.ts" />
+
 /// <reference path="../mocha/mocha.d.ts" />
 /// <reference path="../node/node.d.ts" />
 
diff --git a/checksum/checksum-tests.ts b/checksum/checksum-tests.ts
index 2746bcb9e9..a5924bcb2f 100644
--- a/checksum/checksum-tests.ts
+++ b/checksum/checksum-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="checksum.d.ts" />
 
 import checksum = require("checksum");
 
diff --git a/circular-json/circular-json-tests.ts b/circular-json/circular-json-tests.ts
index d3f2e0951c..41ec8f0a36 100644
--- a/circular-json/circular-json-tests.ts
+++ b/circular-json/circular-json-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="circular-json.d.ts" />
 
 import CircularJSON = require('circular-json');
 
diff --git a/clean-css/clean-css-tests.ts b/clean-css/clean-css-tests.ts
index ffbb3d1278..1ba3953cfd 100644
--- a/clean-css/clean-css-tests.ts
+++ b/clean-css/clean-css-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="clean-css.d.ts" />
 
 import * as CleanCSS from 'clean-css';
 
diff --git a/cli/cli-tests.ts b/cli/cli-tests.ts
index 44ff7e66e7..fd84afc0f4 100644
--- a/cli/cli-tests.ts
+++ b/cli/cli-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./cli.d.ts" />
 
 import * as cli from "cli";
 
diff --git a/clone/clone-tests.ts b/clone/clone-tests.ts
index 8cb0681fd6..372eb185a9 100644
--- a/clone/clone-tests.ts
+++ b/clone/clone-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./clone.d.ts" />
 
 import clone = require("clone");
 
diff --git a/coffeeify/coffeeify-tests.ts b/coffeeify/coffeeify-tests.ts
index 753f68e79c..67e9fcfc24 100644
--- a/coffeeify/coffeeify-tests.ts
+++ b/coffeeify/coffeeify-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="coffeeify.d.ts" />
 
 import coffeeify = require('coffeeify');
 
diff --git a/coffeeify/index.d.ts b/coffeeify/index.d.ts
index 6040f06026..729dea86f9 100644
--- a/coffeeify/index.d.ts
+++ b/coffeeify/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../through/through.d.ts" />
-
 
 import through = require('through');
 
diff --git a/compare-version/compare-version-tests.ts b/compare-version/compare-version-tests.ts
index 4903cf8225..8e8826539d 100644
--- a/compare-version/compare-version-tests.ts
+++ b/compare-version/compare-version-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="compare-version.d.ts" />
 
 import compareVersion = require('compare-version');
 
diff --git a/compose-function/compose-function-tests.ts b/compose-function/compose-function-tests.ts
index dd0a80feff..52135f25a5 100644
--- a/compose-function/compose-function-tests.ts
+++ b/compose-function/compose-function-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="compose-function.d.ts" />
 
 const numberToNumber = (a: number): number => a + 2;
 const numberToString = (a: number): string => "foo";
diff --git a/compression/compression-tests.ts b/compression/compression-tests.ts
index ecfcab4320..dc284ce2df 100644
--- a/compression/compression-tests.ts
+++ b/compression/compression-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="compression.d.ts" />
 
 import express = require('express');
 import compress = require('compression');
diff --git a/confidence/confidence-tests.ts b/confidence/confidence-tests.ts
index 60825e0127..34e0c587c3 100644
--- a/confidence/confidence-tests.ts
+++ b/confidence/confidence-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="confidence.d.ts" />
 
 import Confidence = require('confidence');
 
diff --git a/config/config-tests.ts b/config/config-tests.ts
index 9525a582e1..1dab917d84 100644
--- a/config/config-tests.ts
+++ b/config/config-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="config.d.ts" />
 
 import * as config from "config";
 
diff --git a/configstore/configstore-tests.ts b/configstore/configstore-tests.ts
index e616707af9..5a615ae9fa 100644
--- a/configstore/configstore-tests.ts
+++ b/configstore/configstore-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="configstore.d.ts" />
 
 import cs = require('configstore');
 
diff --git a/connect-livereload/connect-livereload-tests.ts b/connect-livereload/connect-livereload-tests.ts
index 2609871e98..26a09a2983 100644
--- a/connect-livereload/connect-livereload-tests.ts
+++ b/connect-livereload/connect-livereload-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./connect-livereload.d.ts" />
 
 import * as connect from "connect";
 import * as livereload from "connect-livereload";
diff --git a/connect-livereload/index.d.ts b/connect-livereload/index.d.ts
index 63524bd93e..993e610b04 100644
--- a/connect-livereload/index.d.ts
+++ b/connect-livereload/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../connect/connect.d.ts" />
-
 
 import { HandleFunction } from "connect";
 
diff --git a/connect-modrewrite/connect-modrewrite-tests.ts b/connect-modrewrite/connect-modrewrite-tests.ts
index a384bb276d..9a976cbf7b 100644
--- a/connect-modrewrite/connect-modrewrite-tests.ts
+++ b/connect-modrewrite/connect-modrewrite-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='./connect-modrewrite.d.ts' />
 
 import modRewrite = require('connect-modrewrite');
 import express = require('../express');
diff --git a/connect-mongo/connect-mongo-tests.ts b/connect-mongo/connect-mongo-tests.ts
index 018aeea2fe..a512d7dc71 100644
--- a/connect-mongo/connect-mongo-tests.ts
+++ b/connect-mongo/connect-mongo-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="connect-mongo.d.ts" />
 
 import * as express from 'express';
 import * as mongoose from 'mongoose';
diff --git a/connect-mongo/index.d.ts b/connect-mongo/index.d.ts
index 3748d0b33b..a96a34d47a 100644
--- a/connect-mongo/index.d.ts
+++ b/connect-mongo/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../mongoose/mongoose.d.ts" />
+
 /// <reference path="../mongodb/mongodb.d.ts" />
 /// <reference path="../express-session/express-session.d.ts" />
 
diff --git a/connect-timeout/connect-timeout-tests.ts b/connect-timeout/connect-timeout-tests.ts
index de405f612d..c65eb35a2c 100644
--- a/connect-timeout/connect-timeout-tests.ts
+++ b/connect-timeout/connect-timeout-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="connect-timeout.d.ts" />
-/// <reference path="../body-parser/body-parser.d.ts" />
+
 /// <reference path="../cookie-parser/cookie-parser.d.ts" />
 
 
diff --git a/connect/connect-tests.ts b/connect/connect-tests.ts
index e8665f8f91..627017a7e4 100644
--- a/connect/connect-tests.ts
+++ b/connect/connect-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./connect.d.ts" />
 
 import * as http from "http";
 import * as connect from "connect";
diff --git a/console-stamp/console-stamp-tests.ts b/console-stamp/console-stamp-tests.ts
index e6ae6895b0..d4dad4d695 100644
--- a/console-stamp/console-stamp-tests.ts
+++ b/console-stamp/console-stamp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="console-stamp.d.ts" />
 
 import consoleStamp = require("console-stamp");
 
diff --git a/consolidate/consolidate-tests.ts b/consolidate/consolidate-tests.ts
index 77fddb631d..4145fd1e6c 100644
--- a/consolidate/consolidate-tests.ts
+++ b/consolidate/consolidate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="consolidate.d.ts" />
+
 import cons = require('consolidate');
 
 var path: string = 'test/path';
diff --git a/constant-case/constant-case-tests.ts b/constant-case/constant-case-tests.ts
index b7ac3fe9e0..ddb5c57e66 100644
--- a/constant-case/constant-case-tests.ts
+++ b/constant-case/constant-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="constant-case.d.ts" />
 
 import constantCase = require('constant-case');
 
diff --git a/consul/consul-tests.ts b/consul/consul-tests.ts
index 2a8619aca5..f749ef0a5d 100644
--- a/consul/consul-tests.ts
+++ b/consul/consul-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./consul.d.ts" />
 
 import * as Consul from "consul";
 
diff --git a/contentful-resolve-response/contentful-resolve-response-tests.ts b/contentful-resolve-response/contentful-resolve-response-tests.ts
index 098641e7bb..51d3f59f17 100644
--- a/contentful-resolve-response/contentful-resolve-response-tests.ts
+++ b/contentful-resolve-response/contentful-resolve-response-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="contentful-resolve-response.d.ts" />
+
 import resolveResponse = require('contentful-resolve-response');
 
 var response = {
diff --git a/contextjs/contextjs-tests.ts b/contextjs/contextjs-tests.ts
index abfc643efa..bff4d1e7c5 100644
--- a/contextjs/contextjs-tests.ts
+++ b/contextjs/contextjs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./contextjs.d.ts" />
 
 import context = require("contextjs");
 
diff --git a/convert-source-map/convert-source-map-tests.ts b/convert-source-map/convert-source-map-tests.ts
index b53e1bd2cb..1a6df7df10 100644
--- a/convert-source-map/convert-source-map-tests.ts
+++ b/convert-source-map/convert-source-map-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./convert-source-map.d.ts" />
 
 import convert = require("convert-source-map");
 
diff --git a/convict/convict-tests.ts b/convict/convict-tests.ts
index 3bd64c5929..3bb9418944 100644
--- a/convict/convict-tests.ts
+++ b/convict/convict-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='convict.d.ts' />
+
 /// <reference path='../validator/validator.d.ts' />
 
 import convict = require('convict');
diff --git a/cookie-parser/cookie-parser-tests.ts b/cookie-parser/cookie-parser-tests.ts
index 94e8a9fdb2..1f9aaa1a8b 100644
--- a/cookie-parser/cookie-parser-tests.ts
+++ b/cookie-parser/cookie-parser-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cookie-parser.d.ts" />
 
 import express = require('express');
 import cookieParser = require('cookie-parser');
diff --git a/cookies/cookies-tests.ts b/cookies/cookies-tests.ts
index 3e3274a4d4..a7de0688bd 100644
--- a/cookies/cookies-tests.ts
+++ b/cookies/cookies-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="cookies.d.ts" />
 
 import * as Cookies from 'cookies';
 import * as http from 'http';
diff --git a/copy-paste/copy-paste-tests.ts b/copy-paste/copy-paste-tests.ts
index 400c32a2a2..fa37d4bdb8 100644
--- a/copy-paste/copy-paste-tests.ts
+++ b/copy-paste/copy-paste-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="copy-paste.d.ts" />
 
 import * as CopyPaste from 'copy-paste';
 
diff --git a/core-decorators/core-decorators-tests.ts b/core-decorators/core-decorators-tests.ts
index 1731c41933..86df21fc6d 100644
--- a/core-decorators/core-decorators-tests.ts
+++ b/core-decorators/core-decorators-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="core-decorators.d.ts" />
 
 //
 // @autobind
diff --git a/cors/cors-tests.ts b/cors/cors-tests.ts
index a3f5ea10e1..186e006726 100644
--- a/cors/cors-tests.ts
+++ b/cors/cors-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cors.d.ts" />
 
 import express = require('express');
 import cors = require('cors');
diff --git a/cradle/cradle-tests.ts b/cradle/cradle-tests.ts
index 655e92a87b..cd05e6274c 100644
--- a/cradle/cradle-tests.ts
+++ b/cradle/cradle-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./cradle.d.ts" />
 
 import cradle = require("cradle");
 
diff --git a/create-error/create-error-tests.ts b/create-error/create-error-tests.ts
index 76b66adf27..5c186a2eb8 100644
--- a/create-error/create-error-tests.ts
+++ b/create-error/create-error-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="create-error.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../mocha/mocha.d.ts" />
 
diff --git a/credential/credential-tests.ts b/credential/credential-tests.ts
index 6013436b05..a2bbb152a2 100644
--- a/credential/credential-tests.ts
+++ b/credential/credential-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="credential.d.ts" />
 
 import * as credential from 'credential';
 
diff --git a/cron/cron-tests.ts b/cron/cron-tests.ts
index cea98cdab6..7eea73eeed 100644
--- a/cron/cron-tests.ts
+++ b/cron/cron-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cron.d.ts" />
 
 import cron = require('cron');
 var CronJob = cron.CronJob;
diff --git a/crossroads/crossroads.d.ts b/crossroads/crossroads.d.ts
index 6c3e17a832..74da9cc0dd 100644
--- a/crossroads/crossroads.d.ts
+++ b/crossroads/crossroads.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Diullei Gomes <https://github.com/diullei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../js-signals/js-signals.d.ts" />
 
 declare namespace CrossroadsJs {
 
diff --git a/cson/cson-tests.ts b/cson/cson-tests.ts
index 62e7f064df..e5bdc67069 100644
--- a/cson/cson-tests.ts
+++ b/cson/cson-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cson.d.ts" />
 
 import cson = require('cson');
 
diff --git a/csv-stringify/csv-stringify-tests.ts b/csv-stringify/csv-stringify-tests.ts
index 842a2f106a..5dd14d459c 100644
--- a/csv-stringify/csv-stringify-tests.ts
+++ b/csv-stringify/csv-stringify-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="csv-stringify.d.ts" />
 
 import stringify = require("csv-stringify");
 
diff --git a/cuid/cuid-tests.ts b/cuid/cuid-tests.ts
index 033f9ea833..82defb5fae 100644
--- a/cuid/cuid-tests.ts
+++ b/cuid/cuid-tests.ts
@@ -1,4 +1,3 @@
-///<reference path='cuid.d.ts' />
 
 import cuid = require('cuid')
 
diff --git a/custom-error-generator/custom-error-generator-tests.ts b/custom-error-generator/custom-error-generator-tests.ts
index 09ae86373e..52e11ad9ff 100644
--- a/custom-error-generator/custom-error-generator-tests.ts
+++ b/custom-error-generator/custom-error-generator-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./custom-error-generator.d.ts" />
 
 import createCustomError = require('custom-error-generator');
 var HTTPError = createCustomError('HTTPError', { 'code' : 500, 'status' : 'Server Error' });
diff --git a/data-driven/data-driven-tests.ts b/data-driven/data-driven-tests.ts
index b91c8361a2..247ece7327 100644
--- a/data-driven/data-driven-tests.ts
+++ b/data-driven/data-driven-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="data-driven.d.ts" />
 
 import data_driven = require('data-driven');
 
diff --git a/debounce/debounce-tests.ts b/debounce/debounce-tests.ts
index 947fbcdae5..14d7cab190 100644
--- a/debounce/debounce-tests.ts
+++ b/debounce/debounce-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="debounce.d.ts" />
 
 import debounce from "debounce";
 
diff --git a/decamelize/decamelize-tests.ts b/decamelize/decamelize-tests.ts
index a4019ad42e..af35c41943 100644
--- a/decamelize/decamelize-tests.ts
+++ b/decamelize/decamelize-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./decamelize.d.ts" />
 
 import decamelize = require('decamelize');
 
diff --git a/deep-equal/deep-equal-tests.ts b/deep-equal/deep-equal-tests.ts
index 922dcf4495..2f4f238a4f 100644
--- a/deep-equal/deep-equal-tests.ts
+++ b/deep-equal/deep-equal-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./deep-equal.d.ts" />
 
 import * as deepEqual from "deep-equal";
 
diff --git a/deep-extend/deep-extend-tests.ts b/deep-extend/deep-extend-tests.ts
index f5e35af352..a69d60cfcc 100644
--- a/deep-extend/deep-extend-tests.ts
+++ b/deep-extend/deep-extend-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="deep-extend.d.ts" />
 
 import deepExtend = require('deep-extend');
 var obj1 = {
diff --git a/denodeify/denodeify-tests.ts b/denodeify/denodeify-tests.ts
index 5179c061b7..ed76b40ff1 100644
--- a/denodeify/denodeify-tests.ts
+++ b/denodeify/denodeify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="denodeify.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import denodeify = require("denodeify");
diff --git a/detect-indent/detect-indent-tests.ts b/detect-indent/detect-indent-tests.ts
index 4ee02471b8..166b89d1ec 100644
--- a/detect-indent/detect-indent-tests.ts
+++ b/detect-indent/detect-indent-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="detect-indent.d.ts" />
 
 import di = require('detect-indent');
 
diff --git a/diff-match-patch/diff-match-patch-tests.ts b/diff-match-patch/diff-match-patch-tests.ts
index f1e5d2d42e..9226d7be4a 100644
--- a/diff-match-patch/diff-match-patch-tests.ts
+++ b/diff-match-patch/diff-match-patch-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="./diff-match-patch.d.ts" />
 
 import DiffMatchPatch = require("diff-match-patch");
 
diff --git a/documentdb/documentdb-tests.ts b/documentdb/documentdb-tests.ts
index ae0c66b892..34d6b5236b 100644
--- a/documentdb/documentdb-tests.ts
+++ b/documentdb/documentdb-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="documentdb.d.ts" />
 
 import docDB = require('documentdb');
 var docDBClient = new docDB.DocumentClient('host', { masterKey: 'masterKey' });
diff --git a/dot-case/dot-case-tests.ts b/dot-case/dot-case-tests.ts
index d5713aeba8..391724317a 100644
--- a/dot-case/dot-case-tests.ts
+++ b/dot-case/dot-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="dot-case.d.ts" />
 
 import dotCase = require('dot-case');
 
diff --git a/dot-prop/dot-prop-tests.ts b/dot-prop/dot-prop-tests.ts
index 605a72de35..b7687bb64b 100644
--- a/dot-prop/dot-prop-tests.ts
+++ b/dot-prop/dot-prop-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./dot-prop.d.ts" />
 
 import * as dotProp from 'dot-prop';
 
diff --git a/draft-js/draft-js-tests.tsx b/draft-js/draft-js-tests.tsx
index 91706cd7e0..fb5e301d28 100644
--- a/draft-js/draft-js-tests.tsx
+++ b/draft-js/draft-js-tests.tsx
@@ -1,4 +1,4 @@
-/// <reference path="draft-js.d.ts" />
+
 /// <reference path="../react/react-global.d.ts" />
 /// <reference path="../react/react-dom.d.ts"/>
 
diff --git a/easy-api-request/easy-api-request-tests.ts b/easy-api-request/easy-api-request-tests.ts
index 162266b59e..02b2bc92bf 100644
--- a/easy-api-request/easy-api-request-tests.ts
+++ b/easy-api-request/easy-api-request-tests.ts
@@ -3,7 +3,6 @@
  */
 
 
-/// <reference path="./easy-api-request.d.ts" />
 
 import express = require('express');
 import APIRequest = require('easy-api-request');
diff --git a/easy-api-request/index.d.ts b/easy-api-request/index.d.ts
index 3525c6289c..14b5971ea6 100644
--- a/easy-api-request/index.d.ts
+++ b/easy-api-request/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../q/Q.d.ts" />
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../request/request.d.ts" />
+
 /// <reference path="../bunyan/bunyan.d.ts" />
 
 
diff --git a/easy-jsend/easy-jsend-tests.ts b/easy-jsend/easy-jsend-tests.ts
index 9d7814254d..fd77a567b1 100644
--- a/easy-jsend/easy-jsend-tests.ts
+++ b/easy-jsend/easy-jsend-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="./easy-jsend.d.ts" />
-/// <reference path="../mongoose/mongoose.d.ts" />
 
 import mongoose = require('mongoose');
 import express = require('express');
diff --git a/easy-session/easy-session-tests.ts b/easy-session/easy-session-tests.ts
index 2053b634c3..ceb4093a7c 100644
--- a/easy-session/easy-session-tests.ts
+++ b/easy-session/easy-session-tests.ts
@@ -1,6 +1,5 @@
 /// <reference path="./easy-session.d.ts" />
 /// <reference path="../express-session/express-session.d.ts" />
-/// <reference path="../cookie-parser/cookie-parser.d.ts" />
 
 import express = require('express');
 import session = require('express-session');
diff --git a/easy-table/easy-table-0.2.0-tests.ts b/easy-table/easy-table-0.2.0-tests.ts
index 93a4516bf5..3887d08f66 100644
--- a/easy-table/easy-table-0.2.0-tests.ts
+++ b/easy-table/easy-table-0.2.0-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="easy-table.d.ts" />
 
 import EasyTable = require('easy-table');
 
diff --git a/easy-table/easy-table-tests.ts b/easy-table/easy-table-tests.ts
index 911031d90d..8eba36ce6e 100644
--- a/easy-table/easy-table-tests.ts
+++ b/easy-table/easy-table-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="easy-table.d.ts" />
 
 import Table = require("easy-table");
 
diff --git a/easy-xapi-supertest/easy-xapi-supertest-tests.ts b/easy-xapi-supertest/easy-xapi-supertest-tests.ts
index dc2ad44467..76dad2c8f8 100644
--- a/easy-xapi-supertest/easy-xapi-supertest-tests.ts
+++ b/easy-xapi-supertest/easy-xapi-supertest-tests.ts
@@ -3,7 +3,6 @@
  */
 
 
-/// <reference path="./easy-xapi-supertest.d.ts" />
 
 import express = require('express');
 import eSupertest = require('easy-xapi-supertest');
diff --git a/easy-xapi-utils/easy-xapi-utils-tests.ts b/easy-xapi-utils/easy-xapi-utils-tests.ts
index 0c794afdb8..48d913e65e 100644
--- a/easy-xapi-utils/easy-xapi-utils-tests.ts
+++ b/easy-xapi-utils/easy-xapi-utils-tests.ts
@@ -4,7 +4,6 @@
 
 
 /// <reference path="../easy-xapi/easy-xapi.d.ts" />
-/// <reference path="./easy-xapi-utils.d.ts" />
 
 import express = require('express');
 import eXapi = require('easy-xapi');
diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts
index 5f1232d6d3..c6e9aee0b8 100644
--- a/easy-xapi/easy-xapi.d.ts
+++ b/easy-xapi/easy-xapi.d.ts
@@ -5,7 +5,6 @@
 
 
 /// <reference path="../easy-jsend/easy-jsend.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
 
 declare namespace Express {
     export interface Request {
diff --git a/ejs-locals/ejs-locals-tests.ts b/ejs-locals/ejs-locals-tests.ts
index f4bb657ec1..b7e41ca49e 100644
--- a/ejs-locals/ejs-locals-tests.ts
+++ b/ejs-locals/ejs-locals-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="ejs-locals.d.ts" />
 
 import express = require('express');
 import ejsLocals = require('ejs-locals');
diff --git a/electron-json-storage/electron-json-storage-tests.ts b/electron-json-storage/electron-json-storage-tests.ts
index 3a0c43bce1..04461840d1 100644
--- a/electron-json-storage/electron-json-storage-tests.ts
+++ b/electron-json-storage/electron-json-storage-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../github-electron/github-electron.d.ts" />
+
 /// <reference path="electron-json-storage.d.ts" />
 
 import electron = require('electron');
diff --git a/electron-window-state/electron-window-state.d.ts b/electron-window-state/electron-window-state.d.ts
index dfcb297e4f..ca36e539b4 100644
--- a/electron-window-state/electron-window-state.d.ts
+++ b/electron-window-state/electron-window-state.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../github-electron/github-electron.d.ts" />
 
 declare namespace ElectronWindowState {
 	interface WindowState {
diff --git a/element-resize-event/element-resize-event-tests.ts b/element-resize-event/element-resize-event-tests.ts
index 55594eefa0..96c859cdae 100644
--- a/element-resize-event/element-resize-event-tests.ts
+++ b/element-resize-event/element-resize-event-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="element-resize-event.d.ts" />
 
 import ere = require("element-resize-event");
 
diff --git a/email-validator/email-validator-tests.ts b/email-validator/email-validator-tests.ts
index 61d4c6dfa6..81450bcab1 100644
--- a/email-validator/email-validator-tests.ts
+++ b/email-validator/email-validator-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="email-validator.d.ts" />
 
 import emailValidator = require('email-validator');
 import { validate } from 'email-validator';
diff --git a/encoding-japanese/encoding-japanese-tests.ts b/encoding-japanese/encoding-japanese-tests.ts
index 2947d79a48..5004213f23 100644
--- a/encoding-japanese/encoding-japanese-tests.ts
+++ b/encoding-japanese/encoding-japanese-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./encoding-japanese.d.ts" />
 
 import * as Encoding from 'encoding-japanese';
 
diff --git a/envify/envify-tests.ts b/envify/envify-tests.ts
index 52387a3e6c..b8e24c204a 100644
--- a/envify/envify-tests.ts
+++ b/envify/envify-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="envify.d.ts" />
-/// <reference path="../browserify/browserify.d.ts" />
 
 import browserify = require('browserify');
 import envify = require('envify/custom');
diff --git a/enzyme/enzyme-tests.tsx b/enzyme/enzyme-tests.tsx
index 56767b4ab3..90ffe1329b 100644
--- a/enzyme/enzyme-tests.tsx
+++ b/enzyme/enzyme-tests.tsx
@@ -1,4 +1,4 @@
-/// <reference path="enzyme.d.ts" />
+
 /// <reference path="../react/react.d.ts"/>
 
 import { shallow, mount, render, describeWithDOM, spyLifecycle } from "enzyme";
diff --git a/errorhandler/errorhandler-tests.ts b/errorhandler/errorhandler-tests.ts
index 1316888e32..f6a35dd19d 100644
--- a/errorhandler/errorhandler-tests.ts
+++ b/errorhandler/errorhandler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="errorhandler.d.ts" />
 
 import * as express from 'express';
 import * as errorhandler from 'errorhandler';
diff --git a/escape-html/escape-html-tests.ts b/escape-html/escape-html-tests.ts
index 0c8266559d..463c60457c 100644
--- a/escape-html/escape-html-tests.ts
+++ b/escape-html/escape-html-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./escape-html.d.ts" />
 
 import * as escapeHTML from "escape-html";
 
diff --git a/escape-latex/escape-latex-tests.ts b/escape-latex/escape-latex-tests.ts
index 7a5b74dfe5..0ffcd48ae0 100644
--- a/escape-latex/escape-latex-tests.ts
+++ b/escape-latex/escape-latex-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="escape-latex.d.ts" />
 
 import lescape = require('escape-latex');
 
diff --git a/event-loop-lag/event-loop-lag-tests.ts b/event-loop-lag/event-loop-lag-tests.ts
index 39de40705a..5603ed881e 100644
--- a/event-loop-lag/event-loop-lag-tests.ts
+++ b/event-loop-lag/event-loop-lag-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="event-loop-lag.d.ts" />
 
 import lag = require("event-loop-lag");
 
diff --git a/event-stream/event-stream-tests.ts b/event-stream/event-stream-tests.ts
index 7be9160fc2..02e2873ab7 100644
--- a/event-stream/event-stream-tests.ts
+++ b/event-stream/event-stream-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./event-stream.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require("gulp");
diff --git a/exit/exit-tests.ts b/exit/exit-tests.ts
index 0b5b51dc8f..2a6865cf98 100644
--- a/exit/exit-tests.ts
+++ b/exit/exit-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="exit.d.ts" />
 
 import exit = require('exit');
 
diff --git a/expect/expect-tests.ts b/expect/expect-tests.ts
index a0d2bf792b..3e66866de2 100644
--- a/expect/expect-tests.ts
+++ b/expect/expect-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./expect.d.ts" />
+
 /// <reference path="../mocha/mocha.d.ts"" />
 
 import expect,
diff --git a/express-debug/express-debug-tests.ts b/express-debug/express-debug-tests.ts
index 6f702856ed..270ba5db70 100644
--- a/express-debug/express-debug-tests.ts
+++ b/express-debug/express-debug-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="express-debug.d.ts" />
 
 import express = require('express');
 import debug = require('express-debug');
diff --git a/express-graphql/express-graphql-tests.ts b/express-graphql/express-graphql-tests.ts
index ae92736025..e64b1a2140 100644
--- a/express-graphql/express-graphql-tests.ts
+++ b/express-graphql/express-graphql-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./express-graphql.d.ts" />
-
 
 var express = require("../express");
 var graphqlHTTP = require("express-graphql");
diff --git a/express-jwt/express-jwt-tests.ts b/express-jwt/express-jwt-tests.ts
index 64bda77f25..190c85ce4b 100644
--- a/express-jwt/express-jwt-tests.ts
+++ b/express-jwt/express-jwt-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./express-jwt.d.ts" />
 
 import express = require('express');
 import jwt = require('express-jwt');
diff --git a/express-jwt/index.d.ts b/express-jwt/index.d.ts
index 7b62aa9d58..960021c647 100644
--- a/express-jwt/index.d.ts
+++ b/express-jwt/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../express-unless/express-unless.d.ts" />
-
 
 import express = require('express');
 import unless = require('express-unless');
diff --git a/express-less/express-less-tests.ts b/express-less/express-less-tests.ts
index 3fee687f24..621e89c267 100644
--- a/express-less/express-less-tests.ts
+++ b/express-less/express-less-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./express-less.d.ts" />
 
 import express = require('express');
 import expressLess = require('express-less');
diff --git a/express-myconnection/express-myconnection.d.ts b/express-myconnection/express-myconnection.d.ts
index ce46feec77..d1c7132daf 100644
--- a/express-myconnection/express-myconnection.d.ts
+++ b/express-myconnection/express-myconnection.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../mysql/mysql.d.ts" />
 
 declare namespace mysql{
   export interface IConnection {}
diff --git a/express-openapi/express-openapi-tests.ts b/express-openapi/express-openapi-tests.ts
index 7d198f4a79..a72b6f2e48 100644
--- a/express-openapi/express-openapi-tests.ts
+++ b/express-openapi/express-openapi-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="express-openapi.d.ts" />
 
 import express = require('express');
 import openapi = require('express-openapi');
diff --git a/express-partials/express-partials-tests.ts b/express-partials/express-partials-tests.ts
index 764621313d..288916c80e 100644
--- a/express-partials/express-partials-tests.ts
+++ b/express-partials/express-partials-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="express-partials.d.ts" />
 
 import express = require('express');
 import partials = require('express-partials');
diff --git a/express-route-fs/express-route-fs-tests.ts b/express-route-fs/express-route-fs-tests.ts
index 5e9f96433e..4411b855e4 100644
--- a/express-route-fs/express-route-fs-tests.ts
+++ b/express-route-fs/express-route-fs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="express-route-fs.d.ts" />
-
 
 import express = require('express');
 import routeFs = require('express-route-fs');
diff --git a/express-unless/express-unless-tests.ts b/express-unless/express-unless-tests.ts
index a6d57d486a..4a90728f1c 100644
--- a/express-unless/express-unless-tests.ts
+++ b/express-unless/express-unless-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./express-unless.d.ts" />
 
 import express = require('express');
 import unless = require('express-unless');
diff --git a/extend/extend-tests.ts b/extend/extend-tests.ts
index 059aa22baf..343bfd6aeb 100644
--- a/extend/extend-tests.ts
+++ b/extend/extend-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="extend.d.ts" />
 
 import assert = require('assert');
 import extend = require('extend');
diff --git a/eyes/eyes-tests.ts b/eyes/eyes-tests.ts
index 156054ba1c..2775aff7c4 100644
--- a/eyes/eyes-tests.ts
+++ b/eyes/eyes-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="eyes.d.ts" />
 
 import eyes = require('eyes');
 
diff --git a/falcor-express/falcor-express-tests.ts b/falcor-express/falcor-express-tests.ts
index d448f31bb8..14bc99a010 100644
--- a/falcor-express/falcor-express-tests.ts
+++ b/falcor-express/falcor-express-tests.ts
@@ -1,7 +1,6 @@
 
 /// <reference path="../falcor/falcor.d.ts" />
 /// <reference path="../falcor-router/falcor-router.d.ts" />
-/// <reference path="falcor-express.d.ts" />
 
 import express = require('express');
 import Router = require('falcor-router');
diff --git a/fast-stats/fast-stats-tests.ts b/fast-stats/fast-stats-tests.ts
index 9c3e7f9664..43dfa2c38d 100644
--- a/fast-stats/fast-stats-tests.ts
+++ b/fast-stats/fast-stats-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fast-stats.d.ts" />
 
 import faststats = require("fast-stats");
 import Stats = faststats.Stats;
diff --git a/fb/fbsdk-tests.ts b/fb/fbsdk-tests.ts
index 8ec38d8bc4..d60587b01c 100644
--- a/fb/fbsdk-tests.ts
+++ b/fb/fbsdk-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fbsdk.d.ts" />
 
 window.fbAsyncInit = function() {
     FB.init(
diff --git a/fbemitter/fbemitter-tests.ts b/fbemitter/fbemitter-tests.ts
index 614d579634..33122ea971 100644
--- a/fbemitter/fbemitter-tests.ts
+++ b/fbemitter/fbemitter-tests.ts
@@ -1,4 +1,4 @@
-///<reference path="fbemitter.d.ts" />
+
 ///<reference path="../node/node.d.ts" />
 ///<reference path="../mocha/mocha.d.ts" />
 ///<reference path="../assert/assert.d.ts" />
diff --git a/ffi/ffi.d.ts b/ffi/ffi.d.ts
index 7d63469fa7..7f83072230 100644
--- a/ffi/ffi.d.ts
+++ b/ffi/ffi.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../node/node.d.ts" />
 /// <reference path="node-ffi-buffer.d.ts" />
-/// <reference path="../ref/ref.d.ts" />
+
 /// <reference path="../ref-struct/ref-struct.d.ts" />
 
 declare module "ffi" {
diff --git a/ffi/node-ffi-tests.ts b/ffi/node-ffi-tests.ts
index ff9698bfd0..fa554e088d 100644
--- a/ffi/node-ffi-tests.ts
+++ b/ffi/node-ffi-tests.ts
@@ -1,9 +1,7 @@
-/// <reference path="node-ffi.d.ts" />
 
 /// <reference path="../ref/ref.d.ts" />
-/// <reference path="../ref-struct/ref-struct.d.ts" />
+
 /// <reference path="../ref-union/ref-union.d.ts" />
-/// <reference path="../ref-array/ref-array.d.ts" />
 
 import ffi = require('ffi');
 import ref = require('ref');
diff --git a/fibers/fibers-tests.ts b/fibers/fibers-tests.ts
index 62645defb1..5cccdc885d 100644
--- a/fibers/fibers-tests.ts
+++ b/fibers/fibers-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fibers.d.ts" />
 
 import fibers = require('fibers');
 
diff --git a/field/field-test.ts b/field/field-test.ts
index 4a3daf8dd7..91545ba0c0 100644
--- a/field/field-test.ts
+++ b/field/field-test.ts
@@ -1,6 +1,6 @@
 // From https://github.com/jprichardson/field/blob/e968fd979ba1a06e35571695ddfdad513e516eae/README.md
 
-/// <reference path="field.d.ts" />
+
 import * as field from 'field';
 
 // get
diff --git a/finalhandler/finalhandler-tests.ts b/finalhandler/finalhandler-tests.ts
index cb8dc053d1..0b419544fe 100644
--- a/finalhandler/finalhandler-tests.ts
+++ b/finalhandler/finalhandler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./finalhandler.d.ts" />
 
 import {ServerRequest, ServerResponse} from "http";
 import finalHandler from "finalhandler";
diff --git a/findup-sync/findup-sync-tests.ts b/findup-sync/findup-sync-tests.ts
index 55eab36177..e5235605f1 100644
--- a/findup-sync/findup-sync-tests.ts
+++ b/findup-sync/findup-sync-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./findup-sync.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import findup = require('findup-sync');
diff --git a/fixed-data-table/fixed-data-table-0.4.7-tests.tsx b/fixed-data-table/fixed-data-table-0.4.7-tests.tsx
index 641487ff68..a04efad245 100644
--- a/fixed-data-table/fixed-data-table-0.4.7-tests.tsx
+++ b/fixed-data-table/fixed-data-table-0.4.7-tests.tsx
@@ -1,4 +1,4 @@
-/// <reference path="./fixed-data-table-0.4.7.d.ts"" />
+
 /// <reference path="../react/react.d.ts"/>
 /// <reference path="../react/react-dom.d.ts"/>
 
diff --git a/fixed-data-table/fixed-data-table-tests.tsx b/fixed-data-table/fixed-data-table-tests.tsx
index a5f1ab9f06..6cfe9d5893 100644
--- a/fixed-data-table/fixed-data-table-tests.tsx
+++ b/fixed-data-table/fixed-data-table-tests.tsx
@@ -1,4 +1,4 @@
-/// <reference path="./fixed-data-table.d.ts"" />
+
 /// <reference path="../react/react.d.ts"/>
 
 import * as React from "react";
diff --git a/flux-standard-action/flux-standard-action-tests.ts b/flux-standard-action/flux-standard-action-tests.ts
index 9c54d810d6..5934e56fb8 100644
--- a/flux-standard-action/flux-standard-action-tests.ts
+++ b/flux-standard-action/flux-standard-action-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="flux-standard-action.d.ts" />
 
 //import action = require('flux-standard-action');
 import { isError, isFSA, Action, ErrorAction } from 'flux-standard-action';
diff --git a/forge-di/forge-di-tests.ts b/forge-di/forge-di-tests.ts
index 33bff47161..1880c62dc3 100644
--- a/forge-di/forge-di-tests.ts
+++ b/forge-di/forge-di-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./forge-di.d.ts" />
 
 import Forge = require('forge-di');
 
diff --git a/form-data/form-data-tests.ts b/form-data/form-data-tests.ts
index 641a368749..141a1ace86 100644
--- a/form-data/form-data-tests.ts
+++ b/form-data/form-data-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="form-data.d.ts" />
 
 import formData = require('form-data');
 
diff --git a/formidable/formidable-tests.ts b/formidable/formidable-tests.ts
index a0f70a713c..5b169fbd4e 100644
--- a/formidable/formidable-tests.ts
+++ b/formidable/formidable-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./formidable.d.ts" />
 
 import formidable = require('formidable');
 import http = require('http');
diff --git a/freeport/freeport-tests.ts b/freeport/freeport-tests.ts
index fc53835a98..6f8ac0fd6b 100644
--- a/freeport/freeport-tests.ts
+++ b/freeport/freeport-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="freeport.d.ts" />
 
 import freeport = require('freeport');
 
diff --git a/from/from-tests.ts b/from/from-tests.ts
index ce3a11d869..c21d937627 100644
--- a/from/from-tests.ts
+++ b/from/from-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./from.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import from = require('from');
diff --git a/fs-ext/fs-ext-tests.ts b/fs-ext/fs-ext-tests.ts
index aba507c6da..b53074bc68 100644
--- a/fs-ext/fs-ext-tests.ts
+++ b/fs-ext/fs-ext-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fs-ext.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import fs = require('fs-ext');
diff --git a/fs-extra-promise/fs-extra-promise-tests.ts b/fs-extra-promise/fs-extra-promise-tests.ts
index 893585d312..1fe8ea1bf8 100644
--- a/fs-extra-promise/fs-extra-promise-tests.ts
+++ b/fs-extra-promise/fs-extra-promise-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fs-extra-promise.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import fs = require('fs-extra-promise');
diff --git a/fs-extra/fs-extra-tests.ts b/fs-extra/fs-extra-tests.ts
index c1785f851d..61d88c2232 100644
--- a/fs-extra/fs-extra-tests.ts
+++ b/fs-extra/fs-extra-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fs-extra.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import fs = require('fs-extra');
diff --git a/fs-mock/fs-mock-tests.ts b/fs-mock/fs-mock-tests.ts
index 0637a44921..6ef5639ba5 100644
--- a/fs-mock/fs-mock-tests.ts
+++ b/fs-mock/fs-mock-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fs-mock.d.ts" />
 
 import FS = require("fs-mock");
 
diff --git a/ftp/ftp-tests.ts b/ftp/ftp-tests.ts
index a3da26aabc..989d1b182a 100644
--- a/ftp/ftp-tests.ts
+++ b/ftp/ftp-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ftp.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import Client = require("ftp");
diff --git a/ftpd/ftpd-tests.ts b/ftpd/ftpd-tests.ts
index 6840a71526..8942dedcb7 100644
--- a/ftpd/ftpd-tests.ts
+++ b/ftpd/ftpd-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ftpd.d.ts" />
 
 import ftpd = require("ftpd");
 
diff --git a/fullname/fullname-tests.ts b/fullname/fullname-tests.ts
index a037f2634e..a072a4bbc4 100644
--- a/fullname/fullname-tests.ts
+++ b/fullname/fullname-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./fullname.d.ts" />
 
 import fullname = require("fullname");
 
diff --git a/gently/gently-tests.ts b/gently/gently-tests.ts
index a1ce563520..477e6f1f17 100644
--- a/gently/gently-tests.ts
+++ b/gently/gently-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="gently.d.ts" />
 
 import Gently = require('gently');
 
diff --git a/git-config/git-config-tests.ts b/git-config/git-config-tests.ts
index a41316b938..2df4ab5308 100644
--- a/git-config/git-config-tests.ts
+++ b/git-config/git-config-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="git-config.d.ts" />
 
 import gitConfig = require('git-config');
 
diff --git a/glob-expand/glob-expand-tests.ts b/glob-expand/glob-expand-tests.ts
index fc17e5fea9..70275ea0cf 100644
--- a/glob-expand/glob-expand-tests.ts
+++ b/glob-expand/glob-expand-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./glob-expand.d.ts" />
 
 import * as expand from "glob-expand";
 
diff --git a/gm/gm-tests.ts b/gm/gm-tests.ts
index e3172dfc6a..9c3e1ec579 100644
--- a/gm/gm-tests.ts
+++ b/gm/gm-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gm.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import gm = require('gm');
diff --git a/google-closure-compiler/google-closure-compiler-tests.ts b/google-closure-compiler/google-closure-compiler-tests.ts
index b87bb4948c..f7fdda760f 100644
--- a/google-closure-compiler/google-closure-compiler-tests.ts
+++ b/google-closure-compiler/google-closure-compiler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="google-closure-compiler.d.ts" />
 
 import * as GoogleClosureCompiler from 'google-closure-compiler';
 
diff --git a/graceful-fs/graceful-fs-tests.ts b/graceful-fs/graceful-fs-tests.ts
index 5c9bb19aec..4fcd0aec49 100644
--- a/graceful-fs/graceful-fs-tests.ts
+++ b/graceful-fs/graceful-fs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="graceful-fs.d.ts" />
 
 import fs = require('graceful-fs');
 
diff --git a/graphene-pk11/graphene-pk11-tests.ts b/graphene-pk11/graphene-pk11-tests.ts
index 624e0c2f1e..738f308329 100644
--- a/graphene-pk11/graphene-pk11-tests.ts
+++ b/graphene-pk11/graphene-pk11-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./graphene-pk11.d.ts" />
 
 import * as graphene from "graphene-pk11";
 
diff --git a/gridfs-stream/gridfs-stream-tests.ts b/gridfs-stream/gridfs-stream-tests.ts
index c9ca457c2a..d4ffcf326d 100644
--- a/gridfs-stream/gridfs-stream-tests.ts
+++ b/gridfs-stream/gridfs-stream-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="gridfs-stream.d.ts" />
-/// <reference path="../mongodb/mongodb.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 // Samples from:
diff --git a/gridfs-stream/gridfs-stream.d.ts b/gridfs-stream/gridfs-stream.d.ts
index d40ac62d7e..78a7bb192e 100644
--- a/gridfs-stream/gridfs-stream.d.ts
+++ b/gridfs-stream/gridfs-stream.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../mongodb/mongodb.d.ts" />
 
 declare namespace GridFSStream {
     export interface Range {
diff --git a/gulp-babel/gulp-babel-tests.ts b/gulp-babel/gulp-babel-tests.ts
index e5daf3617a..db5e7abdcc 100644
--- a/gulp-babel/gulp-babel-tests.ts
+++ b/gulp-babel/gulp-babel-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="./gulp-babel.d.ts" />
 
 import babel = require('gulp-babel');
 
diff --git a/gulp-cached/gulp-cached-tests.ts b/gulp-cached/gulp-cached-tests.ts
index 42a6697388..52e5d0e48a 100644
--- a/gulp-cached/gulp-cached-tests.ts
+++ b/gulp-cached/gulp-cached-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="./gulp-cached.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/gulp-changed/gulp-changed-tests.ts b/gulp-changed/gulp-changed-tests.ts
index dae92e0fd8..640b01022e 100644
--- a/gulp-changed/gulp-changed-tests.ts
+++ b/gulp-changed/gulp-changed-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="./gulp-changed.d.ts" />
-/// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
 
 import * as gulp from "gulp";
 import changed = require("gulp-changed");
diff --git a/gulp-cheerio/gulp-cheerio-tests.ts b/gulp-cheerio/gulp-cheerio-tests.ts
index 954dcdf22e..eee626804e 100644
--- a/gulp-cheerio/gulp-cheerio-tests.ts
+++ b/gulp-cheerio/gulp-cheerio-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-cheerio.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 /// <reference path="../cheerio/cheerio.d.ts" />
 
diff --git a/gulp-coffeeify/gulp-coffeeify-tests.ts b/gulp-coffeeify/gulp-coffeeify-tests.ts
index 6624285637..c8b08fe6d4 100644
--- a/gulp-coffeeify/gulp-coffeeify-tests.ts
+++ b/gulp-coffeeify/gulp-coffeeify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="gulp-coffeeify.d.ts" />
 
 import gulp = require('gulp');
diff --git a/gulp-coffeelint/gulp-coffeelint-tests.ts b/gulp-coffeelint/gulp-coffeelint-tests.ts
index 0022f9888f..d07f829914 100644
--- a/gulp-coffeelint/gulp-coffeelint-tests.ts
+++ b/gulp-coffeelint/gulp-coffeelint-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-coffeelint.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import coffeelint = require('gulp-coffeelint');
diff --git a/gulp-concat/gulp-concat-tests.ts b/gulp-concat/gulp-concat-tests.ts
index f8ef7373da..5007a8d164 100644
--- a/gulp-concat/gulp-concat-tests.ts
+++ b/gulp-concat/gulp-concat-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./gulp-concat.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require("gulp");
diff --git a/gulp-csso/gulp-csso-tests.ts b/gulp-csso/gulp-csso-tests.ts
index 0ddf457c7d..6c72ad7c4d 100644
--- a/gulp-csso/gulp-csso-tests.ts
+++ b/gulp-csso/gulp-csso-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-csso.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-debug/gulp-debug-tests.ts b/gulp-debug/gulp-debug-tests.ts
index 9701074101..313c7e7aab 100644
--- a/gulp-debug/gulp-debug-tests.ts
+++ b/gulp-debug/gulp-debug-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-debug.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-dtsm/gulp-dtsm-tests.ts b/gulp-dtsm/gulp-dtsm-tests.ts
index 1eb5057380..30bb5b09bf 100644
--- a/gulp-dtsm/gulp-dtsm-tests.ts
+++ b/gulp-dtsm/gulp-dtsm-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="./gulp-dtsm.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
 
 import * as dtsm from 'gulp-dtsm';
 import * as gulp from 'gulp';
diff --git a/gulp-espower/gulp-espower-tests.ts b/gulp-espower/gulp-espower-tests.ts
index 9240ee82d9..87782e6785 100644
--- a/gulp-espower/gulp-espower-tests.ts
+++ b/gulp-espower/gulp-espower-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-espower.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 
diff --git a/gulp-filter/gulp-filter-tests.ts b/gulp-filter/gulp-filter-tests.ts
index a542ef5485..cdc8bf8027 100644
--- a/gulp-filter/gulp-filter-tests.ts
+++ b/gulp-filter/gulp-filter-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="gulp-filter.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-uglify/gulp-uglify.d.ts" />
+
 /// <reference path="../gulp-less/gulp-less.d.ts" />
 /// <reference path="../gulp-concat/gulp-concat.d.ts" />
 
diff --git a/gulp-flatten/gulp-flatten-tests.ts b/gulp-flatten/gulp-flatten-tests.ts
index 5a476195d0..644c44231c 100644
--- a/gulp-flatten/gulp-flatten-tests.ts
+++ b/gulp-flatten/gulp-flatten-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./gulp-flatten.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/gulp-gzip/gulp-gzip-tests.ts b/gulp-gzip/gulp-gzip-tests.ts
index 295e98b7fe..f75aec1276 100644
--- a/gulp-gzip/gulp-gzip-tests.ts
+++ b/gulp-gzip/gulp-gzip-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-gzip.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/gulp-help/gulp-help-tests.ts b/gulp-help/gulp-help-tests.ts
index 26abdf06ab..7808f9de9e 100644
--- a/gulp-help/gulp-help-tests.ts
+++ b/gulp-help/gulp-help-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="gulp-help.d.ts" />
 
 'use strict';
diff --git a/gulp-help/index.d.ts b/gulp-help/index.d.ts
index 7c8f48c34d..9264d7f5aa 100644
--- a/gulp-help/index.d.ts
+++ b/gulp-help/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="../orchestrator/orchestrator.d.ts" />
 
 
diff --git a/gulp-html-replace/gulp-html-replace-tests.ts b/gulp-html-replace/gulp-html-replace-tests.ts
index 8739921e8d..583e9d6f76 100644
--- a/gulp-html-replace/gulp-html-replace-tests.ts
+++ b/gulp-html-replace/gulp-html-replace-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-html-replace.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 /// <reference path="../node/node.d.ts" />
 
diff --git a/gulp-htmlmin/gulp-htmlmin-tests.ts b/gulp-htmlmin/gulp-htmlmin-tests.ts
index 78149e787e..50ecf1d35e 100644
--- a/gulp-htmlmin/gulp-htmlmin-tests.ts
+++ b/gulp-htmlmin/gulp-htmlmin-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-htmlmin.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-htmlmin/index.d.ts b/gulp-htmlmin/index.d.ts
index c445984e2a..cac35ff0ad 100644
--- a/gulp-htmlmin/index.d.ts
+++ b/gulp-htmlmin/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../html-minifier/html-minifier.d.ts" />
-
 
 import * as HTMLMinifier from 'html-minifier';
 
diff --git a/gulp-inject/gulp-inject-tests.ts b/gulp-inject/gulp-inject-tests.ts
index 4f535c8d64..fd6dd2882e 100644
--- a/gulp-inject/gulp-inject-tests.ts
+++ b/gulp-inject/gulp-inject-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./gulp-inject.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/gulp-install/gulp-install-tests.ts b/gulp-install/gulp-install-tests.ts
index 0b9b5da0c2..9aafff3d13 100644
--- a/gulp-install/gulp-install-tests.ts
+++ b/gulp-install/gulp-install-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-install.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-jade/gulp-jade-tests.ts b/gulp-jade/gulp-jade-tests.ts
index d6077eae5c..664ea8104e 100644
--- a/gulp-jade/gulp-jade-tests.ts
+++ b/gulp-jade/gulp-jade-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="./gulp-jade.d.ts"/>
 
 import * as gulp from 'gulp';
diff --git a/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts b/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
index c28b312f42..70b869d77d 100644
--- a/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
+++ b/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-jasmine-browser.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/gulp-json-editor/gulp-json-editor-tests.ts b/gulp-json-editor/gulp-json-editor-tests.ts
index a6acbb8369..4e90086607 100644
--- a/gulp-json-editor/gulp-json-editor-tests.ts
+++ b/gulp-json-editor/gulp-json-editor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-json-editor.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-jspm/gulp-jspm-tests.ts b/gulp-jspm/gulp-jspm-tests.ts
index 3b5c0f3a24..371b37dfa3 100644
--- a/gulp-jspm/gulp-jspm-tests.ts
+++ b/gulp-jspm/gulp-jspm-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-jspm.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-less/gulp-less-tests.ts b/gulp-less/gulp-less-tests.ts
index ba9758649a..8dde02d540 100644
--- a/gulp-less/gulp-less-tests.ts
+++ b/gulp-less/gulp-less-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./gulp-less.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/gulp-load-plugins/gulp-load-plugins-tests.ts b/gulp-load-plugins/gulp-load-plugins-tests.ts
index 50930358f0..21de2a0479 100644
--- a/gulp-load-plugins/gulp-load-plugins-tests.ts
+++ b/gulp-load-plugins/gulp-load-plugins-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../node/node" />
+
 /// <reference path="../gulp/gulp" />
-/// <reference path="../gulp-concat/gulp-concat" />
+
 /// <reference path="gulp-load-plugins" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-minify-css/gulp-minify-css-tests.ts b/gulp-minify-css/gulp-minify-css-tests.ts
index 9bfe9697a0..01c24555a4 100644
--- a/gulp-minify-css/gulp-minify-css-tests.ts
+++ b/gulp-minify-css/gulp-minify-css-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-minify-css.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/gulp-minify-css/index.d.ts b/gulp-minify-css/index.d.ts
index e415c24092..c8b7f98822 100644
--- a/gulp-minify-css/index.d.ts
+++ b/gulp-minify-css/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../clean-css/clean-css.d.ts" />
-
 
 import * as CleanCSS from 'clean-css';
 
diff --git a/gulp-minify-html/gulp-minify-html-tests.ts b/gulp-minify-html/gulp-minify-html-tests.ts
index 1b3c7639da..220dada22e 100644
--- a/gulp-minify-html/gulp-minify-html-tests.ts
+++ b/gulp-minify-html/gulp-minify-html-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-minify-html.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-newer/gulp-newer-tests.ts b/gulp-newer/gulp-newer-tests.ts
index 43f0c55ccb..05a355337d 100644
--- a/gulp-newer/gulp-newer-tests.ts
+++ b/gulp-newer/gulp-newer-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
-/// <reference path="./gulp-newer.d.ts" />
 
 import * as gulp from "gulp";
 import newer = require("gulp-newer");
diff --git a/gulp-ng-annotate/gulp-ng-annotate-tests.ts b/gulp-ng-annotate/gulp-ng-annotate-tests.ts
index ef6e696007..af0da1ffff 100644
--- a/gulp-ng-annotate/gulp-ng-annotate-tests.ts
+++ b/gulp-ng-annotate/gulp-ng-annotate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-ng-annotate.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import ngAnnotate = require('gulp-ng-annotate');
diff --git a/gulp-nodemon/gulp-nodemon-tests.ts b/gulp-nodemon/gulp-nodemon-tests.ts
index 6a634558ab..9e32c844da 100644
--- a/gulp-nodemon/gulp-nodemon-tests.ts
+++ b/gulp-nodemon/gulp-nodemon-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-nodemon.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/gulp-plumber/gulp-plumber-tests.ts b/gulp-plumber/gulp-plumber-tests.ts
index cf055dad52..21d742da9d 100644
--- a/gulp-plumber/gulp-plumber-tests.ts
+++ b/gulp-plumber/gulp-plumber-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../node/node" />
+
 /// <reference path="../gulp/gulp" />
-/// <reference path="gulp-plumber" />
 
 import gulp = require('gulp');
 import plumber = require('gulp-plumber');
diff --git a/gulp-protractor/gulp-protractor-tests.ts b/gulp-protractor/gulp-protractor-tests.ts
index 4224084d8b..62194a5863 100644
--- a/gulp-protractor/gulp-protractor-tests.ts
+++ b/gulp-protractor/gulp-protractor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-protractor.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/gulp-protractor/index.d.ts b/gulp-protractor/index.d.ts
index 3e72899ec9..a6d9475f2e 100644
--- a/gulp-protractor/index.d.ts
+++ b/gulp-protractor/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
 
 import gulp = require('gulp');
 
diff --git a/gulp-remember/gulp-remember-tests.ts b/gulp-remember/gulp-remember-tests.ts
index 804832c5de..487fa52bbd 100644
--- a/gulp-remember/gulp-remember-tests.ts
+++ b/gulp-remember/gulp-remember-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="./gulp-remember.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/gulp-rev-replace/gulp-rev-replace-tests.ts b/gulp-rev-replace/gulp-rev-replace-tests.ts
index 7610183d86..09b2a136c7 100644
--- a/gulp-rev-replace/gulp-rev-replace-tests.ts
+++ b/gulp-rev-replace/gulp-rev-replace-tests.ts
@@ -1,7 +1,6 @@
-/// <reference path="gulp-rev-replace.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 /// <reference path="../gulp-rev/gulp-rev.d.ts" />
-/// <reference path="../gulp-useref/gulp-useref.d.ts" />
 
 import * as gulp from 'gulp';
 import * as revReplace from 'gulp-rev-replace';
diff --git a/gulp-rev/gulp-rev-tests.ts b/gulp-rev/gulp-rev-tests.ts
index 37661424f1..55ee19c2c5 100644
--- a/gulp-rev/gulp-rev-tests.ts
+++ b/gulp-rev/gulp-rev-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-rev.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/gulp-shell/gulp-shell-tests.ts b/gulp-shell/gulp-shell-tests.ts
index eb3d1a5a47..bf16e04ddb 100644
--- a/gulp-shell/gulp-shell-tests.ts
+++ b/gulp-shell/gulp-shell-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-shell.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import shell = require('gulp-shell');
diff --git a/gulp-size/gulp-size-tests.ts b/gulp-size/gulp-size-tests.ts
index 8981960f20..d3611fa99a 100644
--- a/gulp-size/gulp-size-tests.ts
+++ b/gulp-size/gulp-size-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="gulp-size.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-debug/gulp-debug.d.ts" />
 
 import * as gulp from 'gulp';
 import * as size from 'gulp-size';
diff --git a/gulp-sort/gulp-sort-tests.ts b/gulp-sort/gulp-sort-tests.ts
index d94f5cfdcb..edf56628e9 100644
--- a/gulp-sort/gulp-sort-tests.ts
+++ b/gulp-sort/gulp-sort-tests.ts
@@ -1,7 +1,6 @@
 /** Tests taken from https://github.com/pgilad/gulp-sort#usage */
-/// <reference path="../node/node" />
+
 /// <reference path="../gulp/gulp" />
-/// <reference path="gulp-sort" />
 
 import * as gulp from 'gulp';
 import * as sort from 'gulp-sort';
diff --git a/gulp-sort/index.d.ts b/gulp-sort/index.d.ts
index 3271e32bd9..80751d6ac5 100644
--- a/gulp-sort/index.d.ts
+++ b/gulp-sort/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp-util/gulp-util.d.ts" />
 
 /** Sort files in stream by path or any custom sort comparator */
 
diff --git a/gulp-strip-debug/gulp-strip-debug-tests.ts b/gulp-strip-debug/gulp-strip-debug-tests.ts
index e6571b32f5..e5b6f9191a 100644
--- a/gulp-strip-debug/gulp-strip-debug-tests.ts
+++ b/gulp-strip-debug/gulp-strip-debug-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-strip-debug.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp-svg-sprite/gulp-svg-sprite-tests.ts b/gulp-svg-sprite/gulp-svg-sprite-tests.ts
index 6c1ba71df9..490a8936e8 100644
--- a/gulp-svg-sprite/gulp-svg-sprite-tests.ts
+++ b/gulp-svg-sprite/gulp-svg-sprite-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-svg-sprite.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 /// <reference path="../svg-sprite/svg-sprite.d.ts" />
 
diff --git a/gulp-svg-sprite/index.d.ts b/gulp-svg-sprite/index.d.ts
index fb8d5bec76..b89c06aa8f 100644
--- a/gulp-svg-sprite/index.d.ts
+++ b/gulp-svg-sprite/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../svg-sprite/svg-sprite.d.ts" />
-
 
 import spriter = require('svg-sprite');
 
diff --git a/gulp-task-listing/gulp-task-listing-tests.ts b/gulp-task-listing/gulp-task-listing-tests.ts
index 7d2c293d39..af059e1a2a 100644
--- a/gulp-task-listing/gulp-task-listing-tests.ts
+++ b/gulp-task-listing/gulp-task-listing-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="gulp-task-listing.d.ts" />
 
 import gulp = require('gulp');
diff --git a/gulp-tsd/gulp-tsd-tests.ts b/gulp-tsd/gulp-tsd-tests.ts
index 734db65e81..ff8a5ea3d6 100644
--- a/gulp-tsd/gulp-tsd-tests.ts
+++ b/gulp-tsd/gulp-tsd-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./gulp-tsd.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/gulp-tsd/index.d.ts b/gulp-tsd/index.d.ts
index 30f2fc8212..606533648d 100644
--- a/gulp-tsd/index.d.ts
+++ b/gulp-tsd/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
 
 import gulp = require('gulp');
 
diff --git a/gulp-useref/gulp-useref-tests.ts b/gulp-useref/gulp-useref-tests.ts
index 6af7aaab89..b6ba29bdfc 100644
--- a/gulp-useref/gulp-useref-tests.ts
+++ b/gulp-useref/gulp-useref-tests.ts
@@ -1,10 +1,10 @@
-/// <reference path="gulp-useref.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-if/gulp-if.d.ts" />
+
 /// <reference path="../gulp-uglify/gulp-uglify.d.ts" />
-/// <reference path="../gulp-minify-css/gulp-minify-css.d.ts" />
+
 /// <reference path="../gulp-sourcemaps/gulp-sourcemaps.d.ts" />
-/// <reference path="../lazypipe/lazypipe.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../gulp-typescript/gulp-typescript.d.ts" />
 
diff --git a/gulp-util/gulp-util-tests.ts b/gulp-util/gulp-util-tests.ts
index 6b5f756737..c238fd6aad 100644
--- a/gulp-util/gulp-util-tests.ts
+++ b/gulp-util/gulp-util-tests.ts
@@ -1,8 +1,7 @@
 /// <reference path="../mocha/mocha.d.ts" />
 /// <reference path="../should/should.d.ts" />
-/// <reference path='../gulp/gulp.d.ts' />
+
 /// <reference path='../through2/through2.d.ts' />
-/// <reference path='gulp-util.d.ts' />
 
 import gulp = require('gulp');
 import util = require('gulp-util');
diff --git a/gulp-util/index.d.ts b/gulp-util/index.d.ts
index f1cf74cc66..a73203a850 100644
--- a/gulp-util/index.d.ts
+++ b/gulp-util/index.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../chalk/chalk.d.ts" />
-/// <reference path="../through2/through2.d.ts" />
 
 import vinyl = require('../vinyl');
 import chalk = require('chalk');
diff --git a/gulp-watch/gulp-watch-tests.ts b/gulp-watch/gulp-watch-tests.ts
index d912199fdd..282b0fae49 100644
--- a/gulp-watch/gulp-watch-tests.ts
+++ b/gulp-watch/gulp-watch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp-watch.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import * as gulp from 'gulp';
diff --git a/gulp/gulp-tests.ts b/gulp/gulp-tests.ts
index d006908817..56edba692f 100644
--- a/gulp/gulp-tests.ts
+++ b/gulp/gulp-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gulp.d.ts" />
+
 /// <reference path="../browser-sync/browser-sync.d.ts"/>
 
 import gulp = require("gulp");
diff --git a/hasher/hasher.d.ts b/hasher/hasher.d.ts
index 05345543dc..d438b78c60 100644
--- a/hasher/hasher.d.ts
+++ b/hasher/hasher.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: flyfishMT <https://github.com/flyfishMT/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../js-signals/js-signals.d.ts" />
 
 declare namespace HasherJs {
 
diff --git a/helmet/helmet.d.ts b/helmet/helmet.d.ts
index f32ba0a2d9..b38599d1b0 100644
--- a/helmet/helmet.d.ts
+++ b/helmet/helmet.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../express/express.d.ts" />
 
 declare module "helmet" {
     import express = require("express");
diff --git a/html-minifier/html-minifier-tests.ts b/html-minifier/html-minifier-tests.ts
index b02ecea199..4196a870e6 100644
--- a/html-minifier/html-minifier-tests.ts
+++ b/html-minifier/html-minifier-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="html-minifier.d.ts" />
 
 import * as HTMLMinifier from 'html-minifier';
 const minify = HTMLMinifier.minify;
diff --git a/html-minifier/index.d.ts b/html-minifier/index.d.ts
index 89fb0986a0..df04fb559d 100644
--- a/html-minifier/index.d.ts
+++ b/html-minifier/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../clean-css/clean-css.d.ts" />
+
 /// <reference path="../relateurl/relateurl.d.ts" />
 
 import * as UglifyJS from '../uglify-js';
diff --git a/http-errors/http-errors-tests.ts b/http-errors/http-errors-tests.ts
index 762cb41a0f..2ad5817d44 100644
--- a/http-errors/http-errors-tests.ts
+++ b/http-errors/http-errors-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="http-errors.d.ts" />
-
 
 import * as createError from 'http-errors';
 import * as express from 'express';
diff --git a/icepick/icepick-tests.ts b/icepick/icepick-tests.ts
index 4c6f79d0e9..552204e009 100644
--- a/icepick/icepick-tests.ts
+++ b/icepick/icepick-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="icepick.d.ts" />
+
 /// <reference path="../underscore/underscore.d.ts" />
 
 
diff --git a/image-size/image-size-tests.ts b/image-size/image-size-tests.ts
index 0f9b29618a..983389091e 100644
--- a/image-size/image-size-tests.ts
+++ b/image-size/image-size-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="image-size.d.ts" />
 
 import * as url from "url";
 import * as http from "http";
diff --git a/imagemagick-native/imagemagick-native-tests.ts b/imagemagick-native/imagemagick-native-tests.ts
index efefba8eeb..d47b489ef0 100644
--- a/imagemagick-native/imagemagick-native-tests.ts
+++ b/imagemagick-native/imagemagick-native-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="imagemagick-native.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import imagemagick = require('imagemagick-native');
diff --git a/imagemagick/imagemagick-tests.ts b/imagemagick/imagemagick-tests.ts
index dbf03db04b..0244280ea5 100644
--- a/imagemagick/imagemagick-tests.ts
+++ b/imagemagick/imagemagick-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="imagemagick.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import imagemagick = require('imagemagick');
diff --git a/incremental-dom/all-tests.ts b/incremental-dom/all-tests.ts
index 099b41e3b2..aa04d08c57 100644
--- a/incremental-dom/all-tests.ts
+++ b/incremental-dom/all-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="incremental-dom.d.ts" />
 
 declare var describe:any
 ,it:any
diff --git a/inflected/inflected-tests.ts b/inflected/inflected-tests.ts
index 05a54a5d07..852398e8b3 100644
--- a/inflected/inflected-tests.ts
+++ b/inflected/inflected-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./inflected.d.ts" />
 
 import * as Inflector from "inflected";
 
diff --git a/inherits/inherits-tests.ts b/inherits/inherits-tests.ts
index 7d05a7b0b5..d09db12718 100644
--- a/inherits/inherits-tests.ts
+++ b/inherits/inherits-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./inherits.d.ts" />
 
 import inherits = require('inherits');
 
diff --git a/iniparser/iniparser-tests.ts b/iniparser/iniparser-tests.ts
index 8558766df6..c7dc0a604b 100644
--- a/iniparser/iniparser-tests.ts
+++ b/iniparser/iniparser-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="iniparser.d.ts" />
 
 import * as iniparser from 'iniparser';
 
diff --git a/inline-css/inline-css-tests.ts b/inline-css/inline-css-tests.ts
index e633e9e0ae..8fd6307dfe 100644
--- a/inline-css/inline-css-tests.ts
+++ b/inline-css/inline-css-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="inline-css.d.ts" />
 
 import inlineCss = require('inline-css');
 
diff --git a/inquirer/index.d.ts b/inquirer/index.d.ts
index 2015e4581b..e6154c44af 100644
--- a/inquirer/index.d.ts
+++ b/inquirer/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../rx/rx-lite.d.ts" />
-/// <reference path="../through/through.d.ts" />
-
 
 import through = require('through');
 
diff --git a/inquirer/inquirer-tests.ts b/inquirer/inquirer-tests.ts
index dd770e2367..af671a2ea0 100644
--- a/inquirer/inquirer-tests.ts
+++ b/inquirer/inquirer-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="inquirer.d.ts" />
 
 import inquirer = require('inquirer');
 
diff --git a/irc/irc-tests.ts b/irc/irc-tests.ts
index edda5e14fd..d2ef791106 100644
--- a/irc/irc-tests.ts
+++ b/irc/irc-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="irc.d.ts" />
+
 // https://github.com/martynsmith/node-irc/blob/master/example/bot.js
 
 import irc = require('irc');
diff --git a/is-lower-case/is-lower-case-tests.ts b/is-lower-case/is-lower-case-tests.ts
index 6b37359cc1..2ff5a8488e 100644
--- a/is-lower-case/is-lower-case-tests.ts
+++ b/is-lower-case/is-lower-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="is-lower-case.d.ts" />
 
 import isLowerCase = require('is-lower-case')
 
diff --git a/is-upper-case/is-upper-case-tests.ts b/is-upper-case/is-upper-case-tests.ts
index a02db58509..41fa04dc34 100644
--- a/is-upper-case/is-upper-case-tests.ts
+++ b/is-upper-case/is-upper-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="is-upper-case.d.ts" />
 
 import isUpperCase = require('is-upper-case')
 
diff --git a/is-url/is-url-tests.ts b/is-url/is-url-tests.ts
index c8331d991d..ec2af504e9 100644
--- a/is-url/is-url-tests.ts
+++ b/is-url/is-url-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./is-url.d.ts" />
 
 import isUrl = require('is-url');
 
diff --git a/istanbul/istanbul-tests.ts b/istanbul/istanbul-tests.ts
index b283e2dcce..0ff7adebf5 100644
--- a/istanbul/istanbul-tests.ts
+++ b/istanbul/istanbul-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="istanbul.d.ts" />
 
 import * as istanbul from 'istanbul';
 
diff --git a/jjv/jjv-tests.ts b/jjv/jjv-tests.ts
index d290fe9ab0..080dbb7740 100644
--- a/jjv/jjv-tests.ts
+++ b/jjv/jjv-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="jjv.d.ts" />
 
 import jjv = require('jjv');
 
diff --git a/jjve/index.d.ts b/jjve/index.d.ts
index 926fd04883..0cae3d4079 100644
--- a/jjve/index.d.ts
+++ b/jjve/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jjv/jjv.d.ts" />
-
 
 import jjv = require('jjv');
 
diff --git a/jjve/jjve-tests.ts b/jjve/jjve-tests.ts
index 4d5b3819e3..3e6ad22bbc 100644
--- a/jjve/jjve-tests.ts
+++ b/jjve/jjve-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../jjv/jjv.d.ts" />
+
 /// <reference path="jjve.d.ts" />
 
 import jjv = require('jjv');
diff --git a/joi/joi-tests.ts b/joi/joi-tests.ts
index a00543fe4e..ce2b41ba94 100644
--- a/joi/joi-tests.ts
+++ b/joi/joi-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="joi.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import Joi = require('joi');
diff --git a/jsdom/jsdom-tests.ts b/jsdom/jsdom-tests.ts
index 1f0d04a0b5..ec9e60b250 100644
--- a/jsdom/jsdom-tests.ts
+++ b/jsdom/jsdom-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./jsdom.d.ts" />
 
 import jsdom = require("jsdom");
 
diff --git a/jsesc/jsesc-tests.ts b/jsesc/jsesc-tests.ts
index 355b2a7988..1afe116e29 100644
--- a/jsesc/jsesc-tests.ts
+++ b/jsesc/jsesc-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="jsesc.d.ts" />
 
 import jsesc = require('jsesc');
 import Opts = jsesc.Opts;
diff --git a/jsnox/jsnox-tests.ts b/jsnox/jsnox-tests.ts
index c1203f089b..05c8a81cb4 100644
--- a/jsnox/jsnox-tests.ts
+++ b/jsnox/jsnox-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsnox.d.ts" />
+
 import React = require('react');
 import jsnox = require('jsnox');
 var $ = jsnox(React);
diff --git a/json-pointer/json-pointer-tests.ts b/json-pointer/json-pointer-tests.ts
index 79297c0f0e..7a55d1a3ec 100644
--- a/json-pointer/json-pointer-tests.ts
+++ b/json-pointer/json-pointer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="json-pointer.d.ts" />
 
 import JsonPointer = require('json-pointer');
 
diff --git a/json-socket/json-socket-tests.ts b/json-socket/json-socket-tests.ts
index 846fa362a8..f8a4a4a1a7 100644
--- a/json-socket/json-socket-tests.ts
+++ b/json-socket/json-socket-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./json-socket" />
 
 import JsonSocket = require("json-socket");
 import {Socket} from "net";
diff --git a/json5/json5-tests.ts b/json5/json5-tests.ts
index da945c3413..f1be5b1038 100644
--- a/json5/json5-tests.ts
+++ b/json5/json5-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="json5.d.ts" />
+
 import JSON5 = require('json5');
 
 var obj = JSON5.parse("{ key:'val', 'key2':[0,1,2,] } //comment ");
diff --git a/jsonpath/jsonpath-tests.ts b/jsonpath/jsonpath-tests.ts
index d7fd50868a..770258a94f 100644
--- a/jsonpath/jsonpath-tests.ts
+++ b/jsonpath/jsonpath-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="jsonpath.d.ts" />
 
 import jp = require('jsonpath');
 
diff --git a/jsonwebtoken/jsonwebtoken-tests.ts b/jsonwebtoken/jsonwebtoken-tests.ts
index d7ac4c8e2b..899078a514 100644
--- a/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/jsonwebtoken/jsonwebtoken-tests.ts
@@ -5,7 +5,6 @@
  */ 
  
 /// <reference path="../node/node.d.ts" /> 
-/// <reference path="jsonwebtoken.d.ts" />
 
 import jwt = require("jsonwebtoken");
 import fs = require("fs");
diff --git a/jug/jug-tests.ts b/jug/jug-tests.ts
index 7353428e0c..42ce38f0d6 100644
--- a/jug/jug-tests.ts
+++ b/jug/jug-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='./jug.d.ts' />
+
 import jug = require('jug');
 
 /*
diff --git a/jwt-simple/jwt-simple-tests.ts b/jwt-simple/jwt-simple-tests.ts
index 8a0cc59c52..cb87cd3b3a 100644
--- a/jwt-simple/jwt-simple-tests.ts
+++ b/jwt-simple/jwt-simple-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='jwt-simple.d.ts' />
 
 import jwt = require('jwt-simple');
 var payload = { foo: 'bar' };
diff --git a/kafka-node/kafka-node-tests.ts b/kafka-node/kafka-node-tests.ts
index 607ad5c19a..a5b9e9ca3e 100644
--- a/kafka-node/kafka-node-tests.ts
+++ b/kafka-node/kafka-node-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="kafka-node.d.ts" />
 
 import kafka = require('kafka-node');
 
diff --git a/karma-coverage/index.d.ts b/karma-coverage/index.d.ts
index ef28799697..84d8fc9f57 100644
--- a/karma-coverage/index.d.ts
+++ b/karma-coverage/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../karma/karma.d.ts" />
+
 /// <reference path="../istanbul/istanbul.d.ts" />
 
 
diff --git a/karma-coverage/karma-coverage-tests.ts b/karma-coverage/karma-coverage-tests.ts
index 8ca9edc63b..a59ca7cdea 100644
--- a/karma-coverage/karma-coverage-tests.ts
+++ b/karma-coverage/karma-coverage-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="karma-coverage.d.ts" />
 
 import * as karma from 'karma-coverage';
 
diff --git a/karma/index.d.ts b/karma/index.d.ts
index 88fa016a54..83acd17ede 100644
--- a/karma/index.d.ts
+++ b/karma/index.d.ts
@@ -5,8 +5,6 @@
 
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../log4js/log4js.d.ts" />
-
 
 // See Karma public API https://karma-runner.github.io/0.13/dev/public-api.html
 import Promise = require('bluebird');
diff --git a/karma/karma-0.12-tests.ts b/karma/karma-0.12-tests.ts
index b402c08049..d57708f41a 100644
--- a/karma/karma-0.12-tests.ts
+++ b/karma/karma-0.12-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="karma-0.12.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
 import karma = require('karma');
diff --git a/karma/karma-tests.ts b/karma/karma-tests.ts
index 7dbd533b59..37ea7eaa18 100644
--- a/karma/karma-tests.ts
+++ b/karma/karma-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="karma.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/kefir/kefir-tests.ts b/kefir/kefir-tests.ts
index 94300550b4..56055d0a22 100644
--- a/kefir/kefir-tests.ts
+++ b/kefir/kefir-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./kefir.d.ts" />
 
 import * as Kefir from 'kefir';
 import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'kefir';
diff --git a/keytar/keytar-tests.ts b/keytar/keytar-tests.ts
index 1ad9006c62..91a43ebbe9 100644
--- a/keytar/keytar-tests.ts
+++ b/keytar/keytar-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="keytar.d.ts" />
 
 import keytar = require('keytar');
 
diff --git a/knex/knex-tests.ts b/knex/knex-tests.ts
index e983ec1084..628d311ea6 100644
--- a/knex/knex-tests.ts
+++ b/knex/knex-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='knex.d.ts' />
+
 /// <reference path='../lodash/lodash-3.10.d.ts' />
 import Knex = require('knex');
 import _ = require('lodash');
diff --git a/koa-bodyparser/index.d.ts b/koa-bodyparser/index.d.ts
index 0c60dd1dbf..dc17939ead 100644
--- a/koa-bodyparser/index.d.ts
+++ b/koa-bodyparser/index.d.ts
@@ -13,9 +13,6 @@
 
  =============================================== */
 
-/// <reference path="../koa/koa.d.ts" />
-
-
 
 import * as Koa from "koa";
 
diff --git a/koa-bodyparser/koa-bodyparser-tests.ts b/koa-bodyparser/koa-bodyparser-tests.ts
index 12b5932e94..511c05ffc4 100644
--- a/koa-bodyparser/koa-bodyparser-tests.ts
+++ b/koa-bodyparser/koa-bodyparser-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../koa/koa.d.ts" />
+
 /// <reference path="koa-bodyparser.d.ts" />
 
 import * as Koa from "koa";
diff --git a/koa-compose/koa-compose-tests.ts b/koa-compose/koa-compose-tests.ts
index 122817929a..e5046b6413 100644
--- a/koa-compose/koa-compose-tests.ts
+++ b/koa-compose/koa-compose-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="koa-compose.d.ts" />
 
 import compose = require('koa-compose');
 
diff --git a/koa-favicon/index.d.ts b/koa-favicon/index.d.ts
index cd95a3a151..64ddf7be7a 100644
--- a/koa-favicon/index.d.ts
+++ b/koa-favicon/index.d.ts
@@ -13,9 +13,6 @@
 
  =============================================== */
 
-/// <reference path="../koa/koa.d.ts" />
-
-
 
 import * as Koa from "koa";
 
diff --git a/koa-favicon/koa-favicon-tests.ts b/koa-favicon/koa-favicon-tests.ts
index 5f2e0ac3f0..99f15295a1 100644
--- a/koa-favicon/koa-favicon-tests.ts
+++ b/koa-favicon/koa-favicon-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../koa/koa.d.ts" />
+
 /// <reference path="koa-favicon.d.ts" />
 
 import * as Koa from "koa";
diff --git a/koa-json/index.d.ts b/koa-json/index.d.ts
index 9ef264c405..16269804df 100644
--- a/koa-json/index.d.ts
+++ b/koa-json/index.d.ts
@@ -12,9 +12,6 @@
     app.use(json());
 
  =============================================== */
-/// <reference path="../koa/koa.d.ts" />
-
-
 
 import * as Koa from "koa";
 
diff --git a/koa-json/koa-json-tests.ts b/koa-json/koa-json-tests.ts
index d173aa83f8..2091353f7b 100644
--- a/koa-json/koa-json-tests.ts
+++ b/koa-json/koa-json-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../koa/koa.d.ts" />
+
 /// <reference path="koa-json.d.ts" />
 
 import * as Koa from "koa";
diff --git a/koa-mount/koa-mount-tests.ts b/koa-mount/koa-mount-tests.ts
index 560938b22f..7930e23ef9 100644
--- a/koa-mount/koa-mount-tests.ts
+++ b/koa-mount/koa-mount-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../koa/koa.d.ts" />
+
 /// <reference path="koa-mount.d.ts" />
 
 import * as Koa from "koa";
diff --git a/koa-mount/koa-mount.d.ts b/koa-mount/koa-mount.d.ts
index 6c9c83bb73..b1025d54df 100644
--- a/koa-mount/koa-mount.d.ts
+++ b/koa-mount/koa-mount.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: AmirSaber Sharifi <https://github.com/amirsaber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../koa/koa.d.ts" />
 
 declare module "koa-mount" {
 
diff --git a/koa-router/index.d.ts b/koa-router/index.d.ts
index 822735ef3f..4226a1197c 100644
--- a/koa-router/index.d.ts
+++ b/koa-router/index.d.ts
@@ -10,9 +10,6 @@
 
  =============================================== */
 
-/// <reference path="../koa/koa.d.ts" />
-
-
 
 import * as Koa from "koa";
 
diff --git a/koa-router/koa-router-tests.ts b/koa-router/koa-router-tests.ts
index deaa7e083d..97b90f0850 100644
--- a/koa-router/koa-router-tests.ts
+++ b/koa-router/koa-router-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../koa/koa.d.ts" />
+
 /// <reference path="koa-router.d.ts" />
 
 import * as Koa from "koa";
diff --git a/koa-static/index.d.ts b/koa-static/index.d.ts
index 3e4d4ea8a6..800f4593b2 100644
--- a/koa-static/index.d.ts
+++ b/koa-static/index.d.ts
@@ -13,9 +13,6 @@
 
  =============================================== */
 
-/// <reference path="../koa/koa.d.ts" />
-
-
 
 import * as Koa from "koa";
 
diff --git a/koa-static/koa-static-tests.ts b/koa-static/koa-static-tests.ts
index bc77286fee..a9a3f920a8 100644
--- a/koa-static/koa-static-tests.ts
+++ b/koa-static/koa-static-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../koa/koa.d.ts" />
+
 /// <reference path="koa-static.d.ts" />
 
 import * as Koa from "koa";
diff --git a/koa/koa-tests.ts b/koa/koa-tests.ts
index e984364973..115f9444c9 100644
--- a/koa/koa-tests.ts
+++ b/koa/koa-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="koa.d.ts" />
+
 import * as Koa from "koa";
 
 const app = new Koa();
diff --git a/kue/index.d.ts b/kue/index.d.ts
index 3c2a8c6e74..7c7416c603 100644
--- a/kue/index.d.ts
+++ b/kue/index.d.ts
@@ -4,9 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../redis/redis.d.ts" />
-
-
 
 import events = require('events');
 import express = require('express');
diff --git a/kue/kue-tests.ts b/kue/kue-tests.ts
index 0a990ee7b1..77508111c3 100644
--- a/kue/kue-tests.ts
+++ b/kue/kue-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="kue.d.ts" />
 
 import kue = require('kue');
 
diff --git a/lazypipe/lazypipe-tests.ts b/lazypipe/lazypipe-tests.ts
index cd3d3a7fba..5eb3558cc8 100644
--- a/lazypipe/lazypipe-tests.ts
+++ b/lazypipe/lazypipe-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
-/// <reference path="../gulp-size/gulp-size.d.ts" />
+
 /// <reference path="./lazypipe.d.ts" />
 
 import * as gulp from "gulp";
diff --git a/less-middleware/less-middleware-tests.ts b/less-middleware/less-middleware-tests.ts
index 0a84203b60..e453df6c69 100644
--- a/less-middleware/less-middleware-tests.ts
+++ b/less-middleware/less-middleware-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="less-middleware.d.ts" />
 
 import express = require('express');
 import lessMiddleware = require('less-middleware');
diff --git a/libxmljs/libxmljs-tests.ts b/libxmljs/libxmljs-tests.ts
index fbc8628185..0c3ebd3d9b 100644
--- a/libxmljs/libxmljs-tests.ts
+++ b/libxmljs/libxmljs-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="..\node\node.d.ts" />
-/// <reference path="libxmljs.d.ts" />
 
 var libxmljs = require("libxmljs");
 var xml =  '<?xml version="1.0" encoding="UTF-8"?>' +
diff --git a/linqsharp/linqsharp-tests.ts b/linqsharp/linqsharp-tests.ts
index ec6b1c725f..1fda5716b8 100644
--- a/linqsharp/linqsharp-tests.ts
+++ b/linqsharp/linqsharp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./linqsharp.d.ts" />
 
 import Linq, { LinqSharp } from "linqsharp";
 
diff --git a/lockfile/lockfile-tests.ts b/lockfile/lockfile-tests.ts
index 9ebb956dae..c9ea734852 100644
--- a/lockfile/lockfile-tests.ts
+++ b/lockfile/lockfile-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lockfile.d.ts" />
 
 import lockfile = require('lockfile');
 
diff --git a/log4js/log4js-tests.ts b/log4js/log4js-tests.ts
index 7a0981877a..444f786dc3 100644
--- a/log4js/log4js-tests.ts
+++ b/log4js/log4js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./log4js.d.ts" />
-
 
 import log4js = require('log4js');
 
diff --git a/logrotate-stream/logrotate-stream-tests.ts b/logrotate-stream/logrotate-stream-tests.ts
index da17d89c75..5e9ffe7db8 100644
--- a/logrotate-stream/logrotate-stream-tests.ts
+++ b/logrotate-stream/logrotate-stream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="logrotate-stream.d.ts" />
 
 import stream = require("stream");
 import rotateStream = require("logrotate-stream");
diff --git a/lolex/lolex-tests.ts b/lolex/lolex-tests.ts
index 10500211c8..8f2c96a1c7 100644
--- a/lolex/lolex-tests.ts
+++ b/lolex/lolex-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./lolex.d.ts" />
 
 import lolex = require("lolex");
 
diff --git a/lower-case-first/lower-case-first-tests.ts b/lower-case-first/lower-case-first-tests.ts
index dc21393c3a..0e280f27a4 100644
--- a/lower-case-first/lower-case-first-tests.ts
+++ b/lower-case-first/lower-case-first-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lower-case-first.d.ts" />
 
 import lowerCaseFirst = require('lower-case-first');
 
diff --git a/lower-case/lower-case-tests.ts b/lower-case/lower-case-tests.ts
index 70e7a427cf..a29e107d1b 100644
--- a/lower-case/lower-case-tests.ts
+++ b/lower-case/lower-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lower-case.d.ts" />
 
 import lowerCase = require('lower-case');
 
diff --git a/lru-cache/lru-cache-tests.ts b/lru-cache/lru-cache-tests.ts
index 9121ca7914..f26bdd6653 100644
--- a/lru-cache/lru-cache-tests.ts
+++ b/lru-cache/lru-cache-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lru-cache.d.ts" />
 
 import lru = require('lru-cache');
 
diff --git a/luaparse/luaparse-tests.ts b/luaparse/luaparse-tests.ts
index af10d12d64..82ebe7e5ee 100644
--- a/luaparse/luaparse-tests.ts
+++ b/luaparse/luaparse-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="luaparse.d.ts" />
 
 import luaparse = require('luaparse');
 
diff --git a/magic-number/magic-number-tests.ts b/magic-number/magic-number-tests.ts
index ac0b599820..7eadb40471 100644
--- a/magic-number/magic-number-tests.ts
+++ b/magic-number/magic-number-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="magic-number.d.ts" />
 
 import fs = require('fs');
 import magic = require('magic-number');
diff --git a/main-bower-files/main-bower-files-tests.ts b/main-bower-files/main-bower-files-tests.ts
index 1658b3800b..356b7234b8 100644
--- a/main-bower-files/main-bower-files-tests.ts
+++ b/main-bower-files/main-bower-files-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./main-bower-files.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require("gulp");
diff --git a/mandrill-api/mandrill-tests.ts b/mandrill-api/mandrill-tests.ts
index bbdaeb71fc..038a39214d 100644
--- a/mandrill-api/mandrill-tests.ts
+++ b/mandrill-api/mandrill-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mandrill-api.d.ts" />
 
 import mandrill = require('mandrill-api');
 
diff --git a/memory-cache/memory-cache-tests.ts b/memory-cache/memory-cache-tests.ts
index 14ee55c203..0553287ba7 100644
--- a/memory-cache/memory-cache-tests.ts
+++ b/memory-cache/memory-cache-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="memory-cache.d.ts" />
 
 import memoryCache = require('memory-cache');
 
diff --git a/merge-stream/merge-stream-tests.ts b/merge-stream/merge-stream-tests.ts
index 140013eb9c..67a690e824 100644
--- a/merge-stream/merge-stream-tests.ts
+++ b/merge-stream/merge-stream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./merge-stream.d.ts" />
 
 import stream = require("stream");
 import Stream = stream.Readable;
diff --git a/merge2/merge2-tests.ts b/merge2/merge2-tests.ts
index b1c4b4e546..81ccfff42a 100644
--- a/merge2/merge2-tests.ts
+++ b/merge2/merge2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="merge2.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/mess/mess-tests.ts b/mess/mess-tests.ts
index 240f435ae6..64584153f9 100644
--- a/mess/mess-tests.ts
+++ b/mess/mess-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./mess.d.ts" />
 
 import mess = require('mess');
 
diff --git a/micromatch/index.d.ts b/micromatch/index.d.ts
index 726c52d1cc..02608693a7 100644
--- a/micromatch/index.d.ts
+++ b/micromatch/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: glen-84 <https://github.com/glen-84>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../parse-glob/parse-glob.d.ts" />
-
 
 import parseGlob = require('parse-glob');
 
diff --git a/micromatch/micromatch-tests.ts b/micromatch/micromatch-tests.ts
index f90c4a4bde..a0e40d0306 100644
--- a/micromatch/micromatch-tests.ts
+++ b/micromatch/micromatch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./micromatch.d.ts" />
+
 import mm = require('micromatch');
 
 var strArrResult: string[];
diff --git a/mime/mime-tests.ts b/mime/mime-tests.ts
index abfee0bd64..abffa341f7 100644
--- a/mime/mime-tests.ts
+++ b/mime/mime-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mime.d.ts" />
 
 import * as mime from "mime";
 
diff --git a/minimist/minimist-tests.ts b/minimist/minimist-tests.ts
index efd3076aac..6e63590462 100644
--- a/minimist/minimist-tests.ts
+++ b/minimist/minimist-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="minimist.d.ts" />
 
 import minimist = require('minimist');
 import Opts = minimist.Opts;
diff --git a/mkdirp/mkdirp-tests.ts b/mkdirp/mkdirp-tests.ts
index e256e61ada..68c51f74b6 100644
--- a/mkdirp/mkdirp-tests.ts
+++ b/mkdirp/mkdirp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mkdirp.d.ts" />
 
 import mkdirp = require('mkdirp');
 
diff --git a/mkpath/mkpath-tests.ts b/mkpath/mkpath-tests.ts
index 067c9f7253..26be0728db 100644
--- a/mkpath/mkpath-tests.ts
+++ b/mkpath/mkpath-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mkpath.d.ts" />
+
 import mkpath = require('mkpath');
 
 mkpath('red/green/violet', function (err) {
diff --git a/mmmagic/mmmagic-tests.ts b/mmmagic/mmmagic-tests.ts
index afe93ff091..039f3abd27 100644
--- a/mmmagic/mmmagic-tests.ts
+++ b/mmmagic/mmmagic-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mmmagic.d.ts" />
 
 import Magic = require("mmmagic");
 
diff --git a/mock-fs/mock-fs-tests.ts b/mock-fs/mock-fs-tests.ts
index ef628ce588..83522e1a66 100644
--- a/mock-fs/mock-fs-tests.ts
+++ b/mock-fs/mock-fs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mock-fs.d.ts" />
 
 var mock = require('mock-fs');
 
diff --git a/mockery/mockery-tests.ts b/mockery/mockery-tests.ts
index d8623b3aaa..cfcd8c53bc 100644
--- a/mockery/mockery-tests.ts
+++ b/mockery/mockery-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mockery.d.ts" />
 
 import mockery = require('mockery');
 
diff --git a/mongoose-auto-increment/index.d.ts b/mongoose-auto-increment/index.d.ts
index 23ff05b395..3604b2feaa 100644
--- a/mongoose-auto-increment/index.d.ts
+++ b/mongoose-auto-increment/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../mongoose/mongoose.d.ts" />
-
 
 import { Connection, Schema, Mongoose } from 'mongoose';
 
diff --git a/mongoose-auto-increment/mongoose-auto-increment-tests.ts b/mongoose-auto-increment/mongoose-auto-increment-tests.ts
index fbd2ef68ae..c87394a8e2 100644
--- a/mongoose-auto-increment/mongoose-auto-increment-tests.ts
+++ b/mongoose-auto-increment/mongoose-auto-increment-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../mongoose/mongoose.d.ts" />
+
 /// <reference path="./mongoose-auto-increment.d.ts" />
 
 import * as autoIncrement from 'mongoose-auto-increment';
diff --git a/mongoose-deep-populate/index.d.ts b/mongoose-deep-populate/index.d.ts
index 345c15c265..db7d480e2a 100644
--- a/mongoose-deep-populate/index.d.ts
+++ b/mongoose-deep-populate/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../mongoose/mongoose.d.ts" />
-
 
 import { Mongoose, Schema } from 'mongoose';
 
diff --git a/mongoose-deep-populate/mongoose-deep-populate-tests.ts b/mongoose-deep-populate/mongoose-deep-populate-tests.ts
index d85a854a97..4733a1acf6 100644
--- a/mongoose-deep-populate/mongoose-deep-populate-tests.ts
+++ b/mongoose-deep-populate/mongoose-deep-populate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../mongoose/mongoose.d.ts" />
+
 /// <reference path="./mongoose-deep-populate.d.ts" />
 
 import mongooseDeepPopulate from 'mongoose-deep-populate';
diff --git a/mongoose-mock/index.d.ts b/mongoose-mock/index.d.ts
index e5863610aa..d5adb581d0 100644
--- a/mongoose-mock/index.d.ts
+++ b/mongoose-mock/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: jt000 <https://github.com/jt000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../mongoose/mongoose.d.ts" />
-
 
 import mongoose = require('mongoose');
 
diff --git a/mongoose-mock/mongoose-mock-tests.ts b/mongoose-mock/mongoose-mock-tests.ts
index 4f364cf97b..d14ffd79b0 100644
--- a/mongoose-mock/mongoose-mock-tests.ts
+++ b/mongoose-mock/mongoose-mock-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../mongoose/mongoose.d.ts" />
+
 /// <reference path="mongoose-mock.d.ts" />
 
 import mongooseMock = require('mongoose-mock');
diff --git a/mongoose/mongoose-tests.ts b/mongoose/mongoose-tests.ts
index 0df6b6216d..c9878dd398 100644
--- a/mongoose/mongoose-tests.ts
+++ b/mongoose/mongoose-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mongoose.d.ts" />
 
 var fs = require('fs');
 import mongoose = require('mongoose');
diff --git a/mpromise/mpromise-tests.ts b/mpromise/mpromise-tests.ts
index cb09df4756..ced235a94f 100644
--- a/mpromise/mpromise-tests.ts
+++ b/mpromise/mpromise-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mpromise.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 var assert = require('assert');
diff --git a/msnodesql/msnodesql-tests.ts b/msnodesql/msnodesql-tests.ts
index f4a99fe0a5..4ae52b41e4 100644
--- a/msnodesql/msnodesql-tests.ts
+++ b/msnodesql/msnodesql-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="msnodesql.d.ts" />
 
 import sql = require('msnodesql');
 
diff --git a/mssql/mssql-tests.ts b/mssql/mssql-tests.ts
index f1f1a20b2c..446ac97d81 100644
--- a/mssql/mssql-tests.ts
+++ b/mssql/mssql-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="mssql.d.ts" />
 
 import sql = require('mssql');
 
diff --git a/mu2/mu2-tests.ts b/mu2/mu2-tests.ts
index 24b85ec4df..df59787210 100644
--- a/mu2/mu2-tests.ts
+++ b/mu2/mu2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mu2.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import mu2 = require('mu2');
diff --git a/multiparty/multiparty-tests.ts b/multiparty/multiparty-tests.ts
index 47e6a62f71..7357dfb051 100644
--- a/multiparty/multiparty-tests.ts
+++ b/multiparty/multiparty-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='multiparty.d.ts' />
+
 /// <reference path='../node/node.d.ts' />
 import multiparty = require('multiparty');
 import http = require('http');
diff --git a/nanoajax/nanoajax-tests.ts b/nanoajax/nanoajax-tests.ts
index f02c1c854a..a6ee194ab8 100644
--- a/nanoajax/nanoajax-tests.ts
+++ b/nanoajax/nanoajax-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./nanoajax.d.ts" />
 
 import * as nanoajax from 'nanoajax';
 
diff --git a/natural-sort/natural-sort-tests.ts b/natural-sort/natural-sort-tests.ts
index d380ca51b0..e9fbd7a5fe 100644
--- a/natural-sort/natural-sort-tests.ts
+++ b/natural-sort/natural-sort-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./natural-sort.d.ts" />
 
 import naturalSort = require("naturalSort");
 
diff --git a/natural/natural-tests.ts b/natural/natural-tests.ts
index 29e38d59a2..c8650c6308 100644
--- a/natural/natural-tests.ts
+++ b/natural/natural-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="natural.d.ts" />
 
 import natural = require('natural');
 
diff --git a/nconf/nconf-tests.ts b/nconf/nconf-tests.ts
index dd33514c23..e7a18d68a8 100644
--- a/nconf/nconf-tests.ts
+++ b/nconf/nconf-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nconf.d.ts" />
 
 import nconf = require('nconf');
 
diff --git a/netmask/netmask-tests.ts b/netmask/netmask-tests.ts
index 519e1722e3..4532ecd3b5 100644
--- a/netmask/netmask-tests.ts
+++ b/netmask/netmask-tests.ts
@@ -1,5 +1,4 @@
 
-///<reference path="netmask.d.ts" />
 
 import netmask = require('netmask');
 
diff --git a/nexpect/nexpect-tests.ts b/nexpect/nexpect-tests.ts
index d584329227..14af939c52 100644
--- a/nexpect/nexpect-tests.ts
+++ b/nexpect/nexpect-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./nexpect.d.ts" />
 
 import nexpect = require('nexpect');
 
diff --git a/ng-facebook/ng-facebook.d.ts b/ng-facebook/ng-facebook.d.ts
index 5aa6280d17..9b5fc053f1 100644
--- a/ng-facebook/ng-facebook.d.ts
+++ b/ng-facebook/ng-facebook.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../angularjs/angularjs.d.ts" />
-/// <reference path="../fbsdk/fbsdk.d.ts" />
 
 declare namespace angular.ngFacebook {
     interface IFacebookProvider {
diff --git a/ng-grid/ng-grid.d.ts b/ng-grid/ng-grid.d.ts
index 12a784407a..053ca62c27 100644
--- a/ng-grid/ng-grid.d.ts
+++ b/ng-grid/ng-grid.d.ts
@@ -8,7 +8,6 @@
 // Changelog:
 // 25/4/2014: Added interfaces for all classes and services
 
-/// <reference path='../angularjs/angular.d.ts' />
 
 declare class ngGridReorderable {
     constructor();
diff --git a/ngstorage/ngstorage.d.ts b/ngstorage/ngstorage.d.ts
index 0ea372ccb8..94184296b3 100644
--- a/ngstorage/ngstorage.d.ts
+++ b/ngstorage/ngstorage.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Jakub Pistek <https://github.com/kubiq>
 // Definitions: https://github.com/kubiq/DefinitelyTyped
 
-/// <reference path='../angularjs/angular.d.ts' />
 
 declare namespace angular.storage {
 
diff --git a/nightmare/nightmare-tests.ts b/nightmare/nightmare-tests.ts
index ba3034f628..cfba9e55be 100644
--- a/nightmare/nightmare-tests.ts
+++ b/nightmare/nightmare-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./nightmare.d.ts" />
+
 /// <reference path="../jquery/jquery.d.ts" />
 
 import Nightmare = require("nightmare");
diff --git a/noble/noble-tests.ts b/noble/noble-tests.ts
index 4b1d396564..9c3f403944 100644
--- a/noble/noble-tests.ts
+++ b/noble/noble-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="noble.d.ts" />
 
 import noble = require("noble");
 
diff --git a/node-array-ext/node-array-ext-tests.ts b/node-array-ext/node-array-ext-tests.ts
index 8981165cd3..21d463a640 100644
--- a/node-array-ext/node-array-ext-tests.ts
+++ b/node-array-ext/node-array-ext-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./node-array-ext.d.ts" />
+
 import extensions = require("node-array-ext");
 
 var array: Array<string> = [ "hello", "world", "test" ];
diff --git a/node-calendar/node-calendar-tests.ts b/node-calendar/node-calendar-tests.ts
index 6b065e4c28..d702a91482 100644
--- a/node-calendar/node-calendar-tests.ts
+++ b/node-calendar/node-calendar-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-calendar" />
 
 import node_calendar = require('node-calendar');
 
diff --git a/node-config-manager/node-config-manager-tests.ts b/node-config-manager/node-config-manager-tests.ts
index e46bc84313..b333e0f72f 100644
--- a/node-config-manager/node-config-manager-tests.ts
+++ b/node-config-manager/node-config-manager-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-config-manager.d.ts" />
 
 import cfgManager = require('node-config-manager');
 var options = {
diff --git a/node-dir/node-dir-tests.ts b/node-dir/node-dir-tests.ts
index 6cc03ec538..4c8ab0b56b 100644
--- a/node-dir/node-dir-tests.ts
+++ b/node-dir/node-dir-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-dir.d.ts" />
 
 import * as dir from "node-dir";
 
diff --git a/node-gcm/node-gcm-tests.ts b/node-gcm/node-gcm-tests.ts
index b184949edf..cab0612d1b 100644
--- a/node-gcm/node-gcm-tests.ts
+++ b/node-gcm/node-gcm-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-gcm.d.ts" />
 
 import gcm = require('node-gcm');
 
diff --git a/node-getopt/node-getopt-tests.ts b/node-getopt/node-getopt-tests.ts
index 83aa050536..a9f7438626 100644
--- a/node-getopt/node-getopt-tests.ts
+++ b/node-getopt/node-getopt-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="node-getopt.d.ts" />
 
 import Getopt = require('node-getopt');
 
diff --git a/node-int64/node-int64-tests.ts b/node-int64/node-int64-tests.ts
index 095bab4a03..890ba51058 100644
--- a/node-int64/node-int64-tests.ts
+++ b/node-int64/node-int64-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="node-int64.d.ts" />
 
 // Play example copy
 
diff --git a/node-mysql-wrapper/index.d.ts b/node-mysql-wrapper/index.d.ts
index a94593886a..532f16453a 100644
--- a/node-mysql-wrapper/index.d.ts
+++ b/node-mysql-wrapper/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Makis Maropoulos <https://github.com/kataras>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path='./../mysql/mysql.d.ts' />
+
 ///<reference path='./../bluebird/bluebird.d.ts' />
 ///<reference path="./my-meteor.d.ts" />
 
diff --git a/node-mysql-wrapper/node-mysql-wrapper-tests.ts b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
index 3d26b6e8bc..15cd20517d 100644
--- a/node-mysql-wrapper/node-mysql-wrapper-tests.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./node-mysql-wrapper.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../bluebird/bluebird.d.ts" />
 
diff --git a/node-persist/node-persist-tests.ts b/node-persist/node-persist-tests.ts
index a4e2af1ed9..9e558fcbb4 100644
--- a/node-persist/node-persist-tests.ts
+++ b/node-persist/node-persist-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./node-persist.d.ts" />
+
 // node-persist tests
 // compile with --module=common
 
diff --git a/node-polyglot/node-polyglot-tests.ts b/node-polyglot/node-polyglot-tests.ts
index 249be95778..f9d4879328 100644
--- a/node-polyglot/node-polyglot-tests.ts
+++ b/node-polyglot/node-polyglot-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./node-polyglot.d.ts" />
 
 import Polyglot = require("node-polyglot");
 
diff --git a/node-sass-middleware/index.d.ts b/node-sass-middleware/index.d.ts
index bd7e4c51f9..51be3992f1 100644
--- a/node-sass-middleware/index.d.ts
+++ b/node-sass-middleware/index.d.ts
@@ -4,9 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../node-sass/node-sass.d.ts" />
-
-
 
 import * as sass from "node-sass";
 import * as express from "express";
diff --git a/node-sass-middleware/node-sass-middleware-tests.ts b/node-sass-middleware/node-sass-middleware-tests.ts
index 088aa5ce5e..bfc755a424 100644
--- a/node-sass-middleware/node-sass-middleware-tests.ts
+++ b/node-sass-middleware/node-sass-middleware-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-sass-middleware.d.ts" />
 
 import * as express from "express";
 import * as sassMiddleware from "node-sass-middleware";
diff --git a/node-sass/node-sass-tests.ts b/node-sass/node-sass-tests.ts
index a7c1477cb9..968cc6454f 100644
--- a/node-sass/node-sass-tests.ts
+++ b/node-sass/node-sass-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node-sass.d.ts" />
+
 import sass = require('node-sass');
 sass.render({
   file: '/path/to/myFile.scss',
diff --git a/node-slack/index.d.ts b/node-slack/index.d.ts
index 25f4f76962..e4d8616c16 100644
--- a/node-slack/index.d.ts
+++ b/node-slack/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../request/request.d.ts" />
-
 
 import request = require('request');
 
diff --git a/node-slack/node-slack-tests.ts b/node-slack/node-slack-tests.ts
index daf7afa272..89dc5f783e 100644
--- a/node-slack/node-slack-tests.ts
+++ b/node-slack/node-slack-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="node-slack.d.ts" />
 
 import express = require('express');
 import Slack = require('node-slack');
diff --git a/node-snap7/node-snap7-tests.ts b/node-snap7/node-snap7-tests.ts
index 005b9d9087..b592c365be 100644
--- a/node-snap7/node-snap7-tests.ts
+++ b/node-snap7/node-snap7-tests.ts
@@ -2,7 +2,6 @@
 // see: https://github.com/mathiask88/node-snap7-testsuite
 // see: http://definitelytyped.org/guides/contributing.html
 
-/// <reference path="node-snap7.d.ts" />
 
 import snap7 = require("node-snap7");
 
diff --git a/node_redis/node_redis.d.ts b/node_redis/node_redis.d.ts
index cc33d4da83..f096f3021f 100644
--- a/node_redis/node_redis.d.ts
+++ b/node_redis/node_redis.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../redis/redis.d.ts" />
 
 // PLEASE USE redis/redis.d.ts directly!
 
diff --git a/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts b/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts
index ef8c784794..ec2ba16cdc 100644
--- a/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts
+++ b/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer-direct-transport.d.ts" />
 
 import directTransport = require('nodemailer-direct-transport');
 
diff --git a/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts b/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts
index 13b0c7515c..6ae0d4f0d1 100644
--- a/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts
+++ b/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../nodemailer/nodemailer.d.ts' />
+
 /// <reference path='nodemailer-pickup-transport.d.ts' />
 
 import nodemailer = require('nodemailer')
diff --git a/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts b/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts
index 1970ebab5d..c4681fc0a8 100644
--- a/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts
+++ b/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer-smtp-pool.d.ts" />
 
 import smtpPool = require('nodemailer-smtp-pool');
 
diff --git a/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts b/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts
index 3b0c2e29ad..b789cf3045 100644
--- a/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts
+++ b/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer-smtp-transport.d.ts" />
 
 import smtpTransport = require('nodemailer-smtp-transport');
 
diff --git a/nodemailer/index.d.ts b/nodemailer/index.d.ts
index cb405c3274..21d6dc44f3 100644
--- a/nodemailer/index.d.ts
+++ b/nodemailer/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../node/node.d.ts" />
 /// <reference path="./nodemailer-types.d.ts" />
-/// <reference path="../nodemailer-direct-transport/nodemailer-direct-transport.d.ts" />
+
 /// <reference path="../nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts" />
 
 
diff --git a/nodemailer/nodemailer-tests.ts b/nodemailer/nodemailer-tests.ts
index a991096d5b..33d3d1dbfa 100644
--- a/nodemailer/nodemailer-tests.ts
+++ b/nodemailer/nodemailer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer.d.ts" />
 
 import nodemailer = require('nodemailer');
 
diff --git a/nodeunit/nodeunit-tests.ts b/nodeunit/nodeunit-tests.ts
index e7cf5e73e9..7644dd6cc4 100644
--- a/nodeunit/nodeunit-tests.ts
+++ b/nodeunit/nodeunit-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodeunit.d.ts" />
 
 import nodeunit = require('nodeunit');
 
diff --git a/nopt/nopt-tests.ts b/nopt/nopt-tests.ts
index 1e2fb60a5c..4c15df3cef 100644
--- a/nopt/nopt-tests.ts
+++ b/nopt/nopt-tests.ts
@@ -3,7 +3,6 @@
 */
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="nopt.d.ts" />
 
 import nopt = require("nopt");
 
diff --git a/nunjucks/nunjucks-tests.ts b/nunjucks/nunjucks-tests.ts
index 11438b14c8..7407cc65ba 100644
--- a/nunjucks/nunjucks-tests.ts
+++ b/nunjucks/nunjucks-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nunjucks.d.ts" />
 
 import nunjucks = require("nunjucks");
 
diff --git a/oauth2-server/oauth2-server-tests.ts b/oauth2-server/oauth2-server-tests.ts
index 874cabc018..56216edc8f 100644
--- a/oauth2-server/oauth2-server-tests.ts
+++ b/oauth2-server/oauth2-server-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="oauth2-server.d.ts" />
 
 import * as express from "express";
 import * as oauthserver from "oauth2-server";
diff --git a/object-assign/object-assign-tests.ts b/object-assign/object-assign-tests.ts
index 53dfd5e707..61e05d9677 100644
--- a/object-assign/object-assign-tests.ts
+++ b/object-assign/object-assign-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="object-assign.d.ts" />
+
 import objectAssign = require("object-assign");
 
 function assign1() {
diff --git a/on-finished/on-finished-tests.ts b/on-finished/on-finished-tests.ts
index c3956ac6b0..05bb5cd7c0 100644
--- a/on-finished/on-finished-tests.ts
+++ b/on-finished/on-finished-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="./on-finished.d.ts" />
 
 import events = require('events');
 import onFinished = require('on-finished');
diff --git a/onoff/onoff-tests.ts b/onoff/onoff-tests.ts
index d838360bd6..d00cddb778 100644
--- a/onoff/onoff-tests.ts
+++ b/onoff/onoff-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="onoff" />
+
 /// <reference path="../node/node.d.ts" />
 import * as onoff from 'onoff';
 
diff --git a/open/open-tests.ts b/open/open-tests.ts
index a529fa9cf2..fa7701553e 100644
--- a/open/open-tests.ts
+++ b/open/open-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="open.d.ts" />
 
 import open = require('open');
 
diff --git a/optimist/optimist-tests.ts b/optimist/optimist-tests.ts
index feaa3d6f7d..83aa25592d 100644
--- a/optimist/optimist-tests.ts
+++ b/optimist/optimist-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="optimist.d.ts" />
 
 import optimist = require('optimist');
 
diff --git a/ora/ora-tests.ts b/ora/ora-tests.ts
index bea4f29b51..7116db78ce 100644
--- a/ora/ora-tests.ts
+++ b/ora/ora-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ora.d.ts" />
 
 import ora = require('ora');
 const spinner = ora('Loading unicorns');
diff --git a/oracledb/oracledb-tests.ts b/oracledb/oracledb-tests.ts
index 674775bd79..1700d42d1d 100644
--- a/oracledb/oracledb-tests.ts
+++ b/oracledb/oracledb-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="oracledb.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import * as OracleDB from 'oracledb';
diff --git a/os-locale/os-locale-tests.ts b/os-locale/os-locale-tests.ts
index bcf5b01291..c54f45f6a0 100644
--- a/os-locale/os-locale-tests.ts
+++ b/os-locale/os-locale-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./os-locale.d.ts" />
 
 import osLocale, { sync } from 'os-locale';
 
diff --git a/osmtogeojson/osmtogeojson-tests.ts b/osmtogeojson/osmtogeojson-tests.ts
index f7d52c0754..aad3c9ae3f 100644
--- a/osmtogeojson/osmtogeojson-tests.ts
+++ b/osmtogeojson/osmtogeojson-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="osmtogeojson.d.ts" />
+
 /// <reference path="../xmldom/xmldom.d.ts" />
 
 import osmtogeojson from 'osmtogeojson';
diff --git a/packery/packery-tests.ts b/packery/packery-tests.ts
index f8cad75923..57d880d0f4 100644
--- a/packery/packery-tests.ts
+++ b/packery/packery-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="packery.d.ts" />
+
 /// <reference path="../jquery/jquery.d.ts" />
 
 import Packery = require('packery');
diff --git a/param-case/param-case-tests.ts b/param-case/param-case-tests.ts
index 1ac68a3d18..c7440a6bd1 100644
--- a/param-case/param-case-tests.ts
+++ b/param-case/param-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="param-case.d.ts" />
 
 import paramCase = require('param-case');
 
diff --git a/parse-glob/parse-glob-tests.ts b/parse-glob/parse-glob-tests.ts
index 267f2b4ed7..da176bf042 100644
--- a/parse-glob/parse-glob-tests.ts
+++ b/parse-glob/parse-glob-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./parse-glob.d.ts" />
+
 import parseGlob = require('parse-glob');
 
 var result: parseGlob.Result = parseGlob('a/b/c/**/*.{yml,json}');
diff --git a/parse5/parse5-tests.ts b/parse5/parse5-tests.ts
index 420fda5992..af2f5b7703 100644
--- a/parse5/parse5-tests.ts
+++ b/parse5/parse5-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Nico Jansen <https://github.com/nicojs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./parse5.d.ts" />
 
 import * as parse5 from 'parse5';
 
diff --git a/parsimmon/parsimmon-tests.ts b/parsimmon/parsimmon-tests.ts
index 569328296f..5a0ac1203e 100644
--- a/parsimmon/parsimmon-tests.ts
+++ b/parsimmon/parsimmon-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="parsimmon.d.ts" />
 
 import P = require('parsimmon');
 import Parser = P.Parser;
diff --git a/pascal-case/pascal-case-tests.ts b/pascal-case/pascal-case-tests.ts
index b13ed26657..cf0f39847b 100644
--- a/pascal-case/pascal-case-tests.ts
+++ b/pascal-case/pascal-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pascal-case.d.ts" />
 
 import pascalCase = require('pascal-case');
 
diff --git a/passport-facebook-token/passport-facebook-token-tests.ts b/passport-facebook-token/passport-facebook-token-tests.ts
index 531b7bdce2..e44100ca7d 100644
--- a/passport-facebook-token/passport-facebook-token-tests.ts
+++ b/passport-facebook-token/passport-facebook-token-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='./passport-facebook-token.d.ts' />
+
 import passport = require('passport');
 import facebook = require('passport-facebook-token');
 
diff --git a/passport-facebook/passport-facebook-tests.ts b/passport-facebook/passport-facebook-tests.ts
index 8accf57c07..d8d781ff19 100644
--- a/passport-facebook/passport-facebook-tests.ts
+++ b/passport-facebook/passport-facebook-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-facebook.d.ts" />
 
 /**
  * Created by jcabresos on 4/19/2014.
diff --git a/passport-google-oauth/passport-google-oauth-tests.ts b/passport-google-oauth/passport-google-oauth-tests.ts
index ef7a4e9ef9..d216df6e2c 100644
--- a/passport-google-oauth/passport-google-oauth-tests.ts
+++ b/passport-google-oauth/passport-google-oauth-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-google-oauth.d.ts" />
 
 /**
  * Created by jcabresos on 4/19/2014.
diff --git a/passport-jwt/index.d.ts b/passport-jwt/index.d.ts
index 7aaa1fccac..e73bc89391 100644
--- a/passport-jwt/index.d.ts
+++ b/passport-jwt/index.d.ts
@@ -2,9 +2,6 @@
 // Project: https://github.com/themikenicholson/passport-jwt
 // Definitions by: TANAKA Koichi <https://github.com/mugeso/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../passport-strategy/passport-strategy.d.ts" />
-
-
 
 import {Strategy as PassportStrategy} from 'passport-strategy';
 import {Request} from 'express';
diff --git a/passport-jwt/passport-jwt-tests.ts b/passport-jwt/passport-jwt-tests.ts
index ea173f3e07..a38cc31090 100644
--- a/passport-jwt/passport-jwt-tests.ts
+++ b/passport-jwt/passport-jwt-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="passport-jwt.d.ts" />
+
 /// <reference path="../passport/passport.d.ts" />
 'use strict';
 
diff --git a/passport-local/passport-local-tests.ts b/passport-local/passport-local-tests.ts
index 8fce004f85..c4ea2fac2c 100644
--- a/passport-local/passport-local-tests.ts
+++ b/passport-local/passport-local-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-local.d.ts" />
 
 /**
  * Created by Maxime LUCE <https://github.com/SomaticIT>.
diff --git a/passport-strategy/passport-strategy-tests.ts b/passport-strategy/passport-strategy-tests.ts
index ad5a9a38d3..e9c6fd604f 100644
--- a/passport-strategy/passport-strategy-tests.ts
+++ b/passport-strategy/passport-strategy-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-strategy.d.ts" />
 
 import express = require('express');
 import passport = require('passport-strategy');
diff --git a/passport-twitter/passport-twitter-tests.ts b/passport-twitter/passport-twitter-tests.ts
index f7d539f16b..815d490610 100644
--- a/passport-twitter/passport-twitter-tests.ts
+++ b/passport-twitter/passport-twitter-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-twitter.d.ts" />
 
 /**
  * Created by jcabresos on 4/19/2014.
diff --git a/password-hash/password-hash-tests.ts b/password-hash/password-hash-tests.ts
index a36db4e8b4..92f7a93f17 100644
--- a/password-hash/password-hash-tests.ts
+++ b/password-hash/password-hash-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="password-hash.d.ts" />
+
 'use strict';
 
 import {generate, verify, isHashed} from 'password-hash';
diff --git a/path-case/path-case-tests.ts b/path-case/path-case-tests.ts
index 8c17cbd44b..a7d30a5db8 100644
--- a/path-case/path-case-tests.ts
+++ b/path-case/path-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="path-case.d.ts" />
 
 import pathCase = require('path-case');
 
diff --git a/path-exists/path-exists-tests.ts b/path-exists/path-exists-tests.ts
index bb9bdc321e..69aeb2ecd4 100644
--- a/path-exists/path-exists-tests.ts
+++ b/path-exists/path-exists-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="path-exists.d.ts" />
 
 import pathExists = require("path-exists");
 
diff --git a/path-to-regexp/path-to-regexp-tests.ts b/path-to-regexp/path-to-regexp-tests.ts
index ef622c6027..784016f225 100644
--- a/path-to-regexp/path-to-regexp-tests.ts
+++ b/path-to-regexp/path-to-regexp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='path-to-regexp.d.ts' />
 
 import pathToRegexp = require('path-to-regexp');
 
diff --git a/pg/pg-tests.ts b/pg/pg-tests.ts
index 99d1fac9ba..c88c9c7f7f 100644
--- a/pg/pg-tests.ts
+++ b/pg/pg-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pg.d.ts" />
+
 import * as pg from "pg";
 
 var conString = "postgres://username:password@localhost/database";
diff --git a/physijs/physijs.d.ts b/physijs/physijs.d.ts
index d70eadad2b..fad8764ad5 100644
--- a/physijs/physijs.d.ts
+++ b/physijs/physijs.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../threejs/three.d.ts" />
 
 declare namespace Physijs {
     export function noConflict():Object;
diff --git a/pi-spi/pi-spi-tests.ts b/pi-spi/pi-spi-tests.ts
index 9ec08f1ba3..62c8bdf95d 100644
--- a/pi-spi/pi-spi-tests.ts
+++ b/pi-spi/pi-spi-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pi-spi" />
 
 import * as piSPI from 'pi-spi';
 
diff --git a/pify/pify-tests.ts b/pify/pify-tests.ts
index b80657df76..7aff33ddf7 100644
--- a/pify/pify-tests.ts
+++ b/pify/pify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pify.d.ts" />
+
 /// <reference path="../bluebird/bluebird.d.ts" />
 
 import * as pify from 'pify';
diff --git a/piwik-tracker/piwik-tracker-tests.ts b/piwik-tracker/piwik-tracker-tests.ts
index 7d06d6bdc4..ff11abb766 100644
--- a/piwik-tracker/piwik-tracker-tests.ts
+++ b/piwik-tracker/piwik-tracker-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="piwik-tracker.d.ts" />
 
 // Example code taken from https://www.npmjs.com/package/piwik-tracker
 
diff --git a/png-async/png-async-tests.ts b/png-async/png-async-tests.ts
index 6523089a2b..f108fe66b8 100644
--- a/png-async/png-async-tests.ts
+++ b/png-async/png-async-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="png-async.d.ts" />
 
 import fs = require('fs');
 import png = require('png-async');
diff --git a/pngjs2/pngjs2-tests.ts b/pngjs2/pngjs2-tests.ts
index ae2d73e7b3..9993622b88 100644
--- a/pngjs2/pngjs2-tests.ts
+++ b/pngjs2/pngjs2-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pngjs2.d.ts" />
 
 import * as fs from "fs";
 import { PNG } from "pngjs2";
diff --git a/precise/precise-tests.ts b/precise/precise-tests.ts
index 029a69a3ea..1e6da8608f 100644
--- a/precise/precise-tests.ts
+++ b/precise/precise-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="precise.d.ts" />
 
 import precise = require("precise");
 
diff --git a/precond/precond-tests.ts b/precond/precond-tests.ts
index dc843e99f4..f7212d4bda 100644
--- a/precond/precond-tests.ts
+++ b/precond/precond-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./precond.d.ts" />
 
 import precond = require('precond');
 
diff --git a/prelude-ls/prelude-ls-tests.ts b/prelude-ls/prelude-ls-tests.ts
index dc36e9913b..7074d6c70c 100644
--- a/prelude-ls/prelude-ls-tests.ts
+++ b/prelude-ls/prelude-ls-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./prelude-ls.d.ts" />
 
 import prelude = require("prelude-ls");
 
diff --git a/prettyjson/prettyjson-tests.ts b/prettyjson/prettyjson-tests.ts
index 5f83a1c1a1..3ad20218b2 100644
--- a/prettyjson/prettyjson-tests.ts
+++ b/prettyjson/prettyjson-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="prettyjson.d.ts" />
+
 import prettyjson = require("prettyjson");
 
 var options: prettyjson.RendererOptions,
diff --git a/project-oxford/project-oxford-tests.ts b/project-oxford/project-oxford-tests.ts
index 896d407b8d..15187d24cf 100644
--- a/project-oxford/project-oxford-tests.ts
+++ b/project-oxford/project-oxford-tests.ts
@@ -1,4 +1,4 @@
-///<reference path='project-oxford.d.ts' />
+
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../mocha/mocha.d.ts" />
diff --git a/promise-pg/index.d.ts b/promise-pg/index.d.ts
index afbafe3194..3b39e67e2c 100644
--- a/promise-pg/index.d.ts
+++ b/promise-pg/index.d.ts
@@ -5,8 +5,6 @@
 
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../q/Q.d.ts" />
-/// <reference path="../pg/pg.d.ts" />
-
 
 import * as stream from 'stream';
 import * as pg from 'pg';
diff --git a/promise-pg/promise-pg-tests.ts b/promise-pg/promise-pg-tests.ts
index 6a2e74a6fd..487a43e09f 100644
--- a/promise-pg/promise-pg-tests.ts
+++ b/promise-pg/promise-pg-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="promise-pg.d.ts" />
+
 /// <reference path="../q/Q.d.ts" />
 
 import * as pg from 'promise-pg';
diff --git a/promise-pool/promise-pool-tests.ts b/promise-pool/promise-pool-tests.ts
index a9cc160bea..4b5164525b 100644
--- a/promise-pool/promise-pool-tests.ts
+++ b/promise-pool/promise-pool-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./promise-pool.d.ts" />
 
 import Q = require('q');
 import promisePool = require('promise-pool');
diff --git a/promisify-supertest/index.d.ts b/promisify-supertest/index.d.ts
index 6ac681f55b..d0c57e3029 100644
--- a/promisify-supertest/index.d.ts
+++ b/promisify-supertest/index.d.ts
@@ -3,9 +3,6 @@
 // Definitions by: Leo Liang <https://github.com/aleung/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path='../superagent/superagent.d.ts' />
-
-
 
 // Mostly copy-pasted from supertest.d.ts
 
diff --git a/promisify-supertest/promisify-supertest-tests.ts b/promisify-supertest/promisify-supertest-tests.ts
index b18843d29f..7fa6de147d 100644
--- a/promisify-supertest/promisify-supertest-tests.ts
+++ b/promisify-supertest/promisify-supertest-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="promisify-supertest.d.ts" />
-
 
 import * as request from 'promisify-supertest';
 import * as express from 'express';
diff --git a/protractor-helpers/protractor-helpers.d.ts b/protractor-helpers/protractor-helpers.d.ts
index 20aad94c54..d71b214e27 100644
--- a/protractor-helpers/protractor-helpers.d.ts
+++ b/protractor-helpers/protractor-helpers.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: John Cant <https://github.com/johncant/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angular-protractor/angular-protractor.d.ts" />
+
 /// <reference path="../jasmine/jasmine.d.ts" />
 /// <reference path="../selenium-webdriver/selenium-webdriver.d.ts" />
 
diff --git a/pty.js/pty.js-tests.ts b/pty.js/pty.js-tests.ts
index cf73af384e..606ecf32a1 100644
--- a/pty.js/pty.js-tests.ts
+++ b/pty.js/pty.js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pty.js.d.ts" />
 
 import pty = require('pty.js');
 
diff --git a/pusher-js/pusher-js-tests.ts b/pusher-js/pusher-js-tests.ts
index c672ff58e0..b393d6cb75 100644
--- a/pusher-js/pusher-js-tests.ts
+++ b/pusher-js/pusher-js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pusher-js.d.ts" />
 
 import Pusher = require('pusher-js');
 import { PresenceChannel } from "pusher-js";
diff --git a/query-string/query-string-tests.ts b/query-string/query-string-tests.ts
index e270786004..b9a6d56075 100644
--- a/query-string/query-string-tests.ts
+++ b/query-string/query-string-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./query-string.d.ts" />
 
 import qs = require('query-string');
 
diff --git a/rabbit.js/rabbit.js-tests.ts b/rabbit.js/rabbit.js-tests.ts
index 3e5a4d6d21..c9256f9a3a 100644
--- a/rabbit.js/rabbit.js-tests.ts
+++ b/rabbit.js/rabbit.js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./rabbit.js.d.ts" />
 
 import rabbit = require('rabbit.js');
 var context = rabbit.createContext();
diff --git a/radium/radium-tests.tsx b/radium/radium-tests.tsx
index d7ec26ef83..396ce042f4 100644
--- a/radium/radium-tests.tsx
+++ b/radium/radium-tests.tsx
@@ -1,4 +1,4 @@
-/// <reference path="radium.d.ts" />
+
 /// <reference path="../react/react.d.ts" />
 
 import * as React from "react";
diff --git a/radius/radius-tests.ts b/radius/radius-tests.ts
index 2ce4d2c0d3..db9f962a0f 100644
--- a/radius/radius-tests.ts
+++ b/radius/radius-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="radius.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import radius = require('radius');
diff --git a/random-string/random-string-tests.ts b/random-string/random-string-tests.ts
index 2b278a4f5e..4a6c3c5f12 100644
--- a/random-string/random-string-tests.ts
+++ b/random-string/random-string-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="random-string.d.ts" />
 
 import randomString = require('random-string');
 
diff --git a/ratelimiter/index.d.ts b/ratelimiter/index.d.ts
index e5c3b72e7e..5bf3e33bbb 100644
--- a/ratelimiter/index.d.ts
+++ b/ratelimiter/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../redis/redis.d.ts" />
-
 
 import { RedisClient } from 'redis';
 
diff --git a/ratelimiter/ratelimiter-tests.ts b/ratelimiter/ratelimiter-tests.ts
index 7c2f03eec2..c7410b0138 100644
--- a/ratelimiter/ratelimiter-tests.ts
+++ b/ratelimiter/ratelimiter-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../redis/redis.d.ts" />
+
 /// <reference path="./ratelimiter.d.ts" />
 
 import * as redis from 'redis';
diff --git a/rcloader/rcloader-tests.ts b/rcloader/rcloader-tests.ts
index 16ade8c555..f36f61c025 100644
--- a/rcloader/rcloader-tests.ts
+++ b/rcloader/rcloader-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./rcloader.d.ts" />
 
 import RcLoader = require("rcloader");
 
diff --git a/react-intl/react-intl-tests-1.2.0.tsx b/react-intl/react-intl-tests-1.2.0.tsx
index 3560e55545..721eb6037a 100644
--- a/react-intl/react-intl-tests-1.2.0.tsx
+++ b/react-intl/react-intl-tests-1.2.0.tsx
@@ -3,7 +3,7 @@
  */
 
 ///<reference path='../react/react.d.ts' />
-///<reference path='../react-mixin/react-mixin.d.ts' />
+
 ///<reference path='../react-intl/react-intl-1.2.0.d.ts' />
 
 import * as React from 'react'
diff --git a/react-intl/react-intl-tests.tsx b/react-intl/react-intl-tests.tsx
index 701522447d..1e1ce25c54 100644
--- a/react-intl/react-intl-tests.tsx
+++ b/react-intl/react-intl-tests.tsx
@@ -3,7 +3,7 @@
  */
 
 ///<reference path="../react/react.d.ts" />
-///<reference path="../react-mixin/react-mixin.d.ts" />
+
 ///<reference path="./react-intl.d.ts" />
 
 
diff --git a/react-mixin/react-mixin-tests.tsx b/react-mixin/react-mixin-tests.tsx
index 32532b1339..dbcf5cb8ff 100644
--- a/react-mixin/react-mixin-tests.tsx
+++ b/react-mixin/react-mixin-tests.tsx
@@ -1,4 +1,4 @@
-/// <reference path="react-mixin.d.ts" />
+
 /// <reference path="../react/react.d.ts" />
 
 import reactMixin = require('react-mixin');
diff --git a/react-props-decorators/react-props-decorators-tests.ts b/react-props-decorators/react-props-decorators-tests.ts
index 33691834c3..828f945fa4 100644
--- a/react-props-decorators/react-props-decorators-tests.ts
+++ b/react-props-decorators/react-props-decorators-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="react-props-decorators.d.ts" />
+
 /// <reference path="../react/react.d.ts" />
 
 import * as React from 'react';
diff --git a/react-redux/react-redux-2.1.2-tests.tsx b/react-redux/react-redux-2.1.2-tests.tsx
index cb791a3d8e..ec8aee8c4d 100644
--- a/react-redux/react-redux-2.1.2-tests.tsx
+++ b/react-redux/react-redux-2.1.2-tests.tsx
@@ -3,7 +3,6 @@
 /// <reference path="../react/react-dom.d.ts"/>
 /// <reference path="../redux/redux.d.ts" />
 /// <reference path="../react-router/react-router-0.13.3.d.ts" />
-/// <reference path="../object-assign/object-assign.d.ts" />
 
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index d22f3aef46..42656b8eca 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -1,10 +1,9 @@
-/// <reference path="react-redux.d.ts" />
+
 /// <reference path="../react/react.d.ts"/>
 /// <reference path="../react/react-dom.d.ts"/>
 /// <reference path="../redux/redux.d.ts" />
 /// <reference path="../history/history.d.ts" />
 /// <reference path="../react-router/react-router.d.ts" />
-/// <reference path="../object-assign/object-assign.d.ts" />
 
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
diff --git a/react-scroll/react-scroll-tests.tsx b/react-scroll/react-scroll-tests.tsx
index b39b9681f5..c933038f66 100644
--- a/react-scroll/react-scroll-tests.tsx
+++ b/react-scroll/react-scroll-tests.tsx
@@ -1,5 +1,4 @@
 /// <reference path="../react/react.d.ts" />
-/// <reference path="./react-scroll.d.ts" />
 
 import * as React from 'react';
 import { Link, Element, scroller } from 'react-scroll';
diff --git a/react-spinkit/react-spinkit-tests.tsx b/react-spinkit/react-spinkit-tests.tsx
index eb84781e42..509ae48973 100644
--- a/react-spinkit/react-spinkit-tests.tsx
+++ b/react-spinkit/react-spinkit-tests.tsx
@@ -1,4 +1,4 @@
-/// <reference path="react-spinkit.d.ts" />
+
 /// <reference path="../react/react.d.ts" />
 
 import Spinner from 'react-spinkit';
diff --git a/read/read-tests.ts b/read/read-tests.ts
index 54d2708135..03b8ea83bc 100644
--- a/read/read-tests.ts
+++ b/read/read-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="read.d.ts" />
 
 import read = require('read');
 
diff --git a/readdir-stream/readdir-stream-tests.ts b/readdir-stream/readdir-stream-tests.ts
index a731e86ba8..ebdf9d6083 100644
--- a/readdir-stream/readdir-stream-tests.ts
+++ b/readdir-stream/readdir-stream-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./readdir-stream.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import readdir = require('readdir-stream');
diff --git a/rebass/rebass-tests.tsx b/rebass/rebass-tests.tsx
index e933d3c43f..2d20c900db 100644
--- a/rebass/rebass-tests.tsx
+++ b/rebass/rebass-tests.tsx
@@ -1,4 +1,3 @@
-///<reference path='rebass.d.ts' />
 
 import * as React from "react";
 import {
diff --git a/recursive-readdir/recursive-readdir-tests.ts b/recursive-readdir/recursive-readdir-tests.ts
index 2d3e1d7c92..813ec80f90 100644
--- a/recursive-readdir/recursive-readdir-tests.ts
+++ b/recursive-readdir/recursive-readdir-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="recursive-readdir.d.ts" />
 
 import recursiveReaddir = require("recursive-readdir");
 
diff --git a/redis/redis-tests.ts b/redis/redis-tests.ts
index 5acb02465e..689e64ba16 100644
--- a/redis/redis-tests.ts
+++ b/redis/redis-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="redis.d.ts" />
 
 import redis = require('redis');
 
diff --git a/redux-action-utils/redux-action-utils-tests.ts b/redux-action-utils/redux-action-utils-tests.ts
index d3994a1534..8bb94ddb33 100644
--- a/redux-action-utils/redux-action-utils-tests.ts
+++ b/redux-action-utils/redux-action-utils-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="redux-action-utils.d.ts" />
+
 /// <reference path="../redux/redux.d.ts" />
 
 import { actionCreator, optionsActionCreator } from 'redux-action-utils';
diff --git a/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx b/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
index 00845bdc0a..26f471336d 100644
--- a/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
+++ b/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
@@ -1,5 +1,4 @@
 /// <reference path="../react/react.d.ts" />
-/// <reference path="./redux-devtools-dock-monitor.d.ts" />
 
 import * as React from 'react'
 import DockMonitor from 'redux-devtools-dock-monitor'
diff --git a/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx b/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
index dbcdbcf7a2..7fb6fa5ff0 100644
--- a/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
+++ b/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
@@ -1,5 +1,4 @@
 /// <reference path="../react/react.d.ts" />
-/// <reference path="./redux-devtools-log-monitor.d.ts" />
 
 import * as React from 'react'
 import LogMonitor from 'redux-devtools-log-monitor'
diff --git a/redux-devtools/redux-devtools-tests.tsx b/redux-devtools/redux-devtools-tests.tsx
index 2cacd47c7a..7b3f9cb5ad 100644
--- a/redux-devtools/redux-devtools-tests.tsx
+++ b/redux-devtools/redux-devtools-tests.tsx
@@ -1,6 +1,6 @@
 /// <reference path="../react/react.d.ts" />
 /// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-redux/react-redux.d.ts" />
+
 /// <reference path="redux-devtools.d.ts" />
 
 import * as React from 'react'
diff --git a/redux-form/redux-form-tests.tsx b/redux-form/redux-form-tests.tsx
index ce4b93380a..1e66391d75 100644
--- a/redux-form/redux-form-tests.tsx
+++ b/redux-form/redux-form-tests.tsx
@@ -1,4 +1,3 @@
-/// <reference path="redux-form.d.ts" />
 
 import * as React from 'react';
 import {Component, PropTypes} from 'react';
diff --git a/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts b/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
index 605c49e9f9..84a8fd5489 100644
--- a/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
+++ b/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./redux-immutable-state-invariant.d.ts" />
 
 import { applyMiddleware } from "redux";
 import * as immutableStateInvariantMiddleware from "redux-immutable-state-invariant";
diff --git a/redux-immutable/redux-immutable-tests.ts b/redux-immutable/redux-immutable-tests.ts
index 2f92713ae8..8414252299 100644
--- a/redux-immutable/redux-immutable-tests.ts
+++ b/redux-immutable/redux-immutable-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="redux-immutable.d.ts" />
 
 import { combineReducers } from 'redux-immutable';
 
diff --git a/redux-logger/redux-logger-tests.ts b/redux-logger/redux-logger-tests.ts
index d93aa7e7da..f20b68b9f2 100644
--- a/redux-logger/redux-logger-tests.ts
+++ b/redux-logger/redux-logger-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./redux-logger.d.ts" />
 
 import * as createLogger from 'redux-logger';
 import { applyMiddleware, createStore } from 'redux'
diff --git a/ref-array/index.d.ts b/ref-array/index.d.ts
index 4e9383b884..c5d8744e15 100644
--- a/ref-array/index.d.ts
+++ b/ref-array/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Paul Loyd <https://github.com/loyd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
+
 /// <reference path="../ref/ref.d.ts" />
 
 
diff --git a/ref-struct/index.d.ts b/ref-struct/index.d.ts
index 2fa6f028f4..120021bf51 100644
--- a/ref-struct/index.d.ts
+++ b/ref-struct/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Paul Loyd <https://github.com/loyd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
+
 /// <reference path="../ref/ref.d.ts" />
 
 
diff --git a/ref-union/index.d.ts b/ref-union/index.d.ts
index 08fe8aa332..f48f420261 100644
--- a/ref-union/index.d.ts
+++ b/ref-union/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Paul Loyd <https://github.com/loyd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
+
 /// <reference path="../ref/ref.d.ts" />
 
 
diff --git a/ref/index.d.ts b/ref/index.d.ts
index 99ab900c05..9f7f8ed8b8 100644
--- a/ref/index.d.ts
+++ b/ref/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Paul Loyd <https://github.com/loyd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
-
 
 export interface Type {
     /** The size in bytes required to hold this datatype. */
diff --git a/relateurl/relateurl-tests.ts b/relateurl/relateurl-tests.ts
index 89a647d06e..7285dca153 100644
--- a/relateurl/relateurl-tests.ts
+++ b/relateurl/relateurl-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="relateurl.d.ts" />
 
 import * as RelateUrl from 'relateurl';
 
diff --git a/request-ip/request-ip-tests.ts b/request-ip/request-ip-tests.ts
index f925720b17..28e95af8db 100644
--- a/request-ip/request-ip-tests.ts
+++ b/request-ip/request-ip-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="request-ip.d.ts" />
 
 import express = require('express');
 import requestIp = require('request-ip');
diff --git a/request-promise/index.d.ts b/request-promise/index.d.ts
index 29dd9ff67d..18a734d7fa 100644
--- a/request-promise/index.d.ts
+++ b/request-promise/index.d.ts
@@ -5,7 +5,7 @@
 
 // Change [0]: 2015/08/20 - Aya Morisawa <https://github.com/AyaMorisawa>
 
-/// <reference path="../request/request.d.ts" />
+
 /// <reference path="../bluebird/bluebird.d.ts" />
 
 
diff --git a/request-promise/request-promise-tests.ts b/request-promise/request-promise-tests.ts
index 8c7840ad41..a00ab20728 100644
--- a/request-promise/request-promise-tests.ts
+++ b/request-promise/request-promise-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="request-promise.d.ts" />
 
 import rp = require('request-promise');
 import nodeRequest = require('request');
diff --git a/request/index.d.ts b/request/index.d.ts
index 0fab978bee..e641566354 100644
--- a/request/index.d.ts
+++ b/request/index.d.ts
@@ -6,8 +6,6 @@
 // Imported from: https://github.com/soywiz/typescript-node-definitions/d.ts
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../form-data/form-data.d.ts" />
-
 
 import stream = require('stream');
 import http = require('http');
diff --git a/request/request-tests.ts b/request/request-tests.ts
index 6efeb63c54..c2a06b61ce 100644
--- a/request/request-tests.ts
+++ b/request/request-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="request.d.ts" />
 
 import request = require('request');
 import http = require('http');
diff --git a/requirejs-domready/domready-tests.ts b/requirejs-domready/domready-tests.ts
index fb7b59acd0..fac3a18d7f 100644
--- a/requirejs-domready/domready-tests.ts
+++ b/requirejs-domready/domready-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="domready.d.ts" />
 
 import domReady = require("domReady");
 
diff --git a/response-time/response-time-tests.ts b/response-time/response-time-tests.ts
index b65b8fd19c..8c5e9595dd 100644
--- a/response-time/response-time-tests.ts
+++ b/response-time/response-time-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="response-time.d.ts" />
 
 import express = require('express');
 import responseTime = require('response-time');
diff --git a/rest-io/index.d.ts b/rest-io/index.d.ts
index 5cfca6a50e..b9abc74195 100644
--- a/rest-io/index.d.ts
+++ b/rest-io/index.d.ts
@@ -4,9 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../mongoose/mongoose.d.ts" />
-
-
 
 import {Router, Application, Response, Request} from 'express';
 
diff --git a/rest-io/rest-io-tests.ts b/rest-io/rest-io-tests.ts
index 5f558b77a2..210b46b986 100644
--- a/rest-io/rest-io-tests.ts
+++ b/rest-io/rest-io-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="rest-io.d.ts" />
 
 import express = require('express');
 import restIO = require('rest-io');
diff --git a/restful.js/restful.js-tests.ts b/restful.js/restful.js-tests.ts
index 80f3bd1874..c56103d240 100644
--- a/restful.js/restful.js-tests.ts
+++ b/restful.js/restful.js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="restful.js.d.ts" />
 
 import restful, {
     Api, MemberResponse, CollectionResponse, ResponseBody, CollectionEndpoint, MemberEndpoint,
diff --git a/restify/restify.d.ts b/restify/restify.d.ts
index f68ea0b2cc..64f97b309c 100644
--- a/restify/restify.d.ts
+++ b/restify/restify.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
 
 declare module "restify" {
   import http = require('http');
diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index a6911e3021..c2df9d5d2a 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="rethinkdb.d.ts" />
 
 import r = require("rethinkdb")
 
diff --git a/rimraf/rimraf-tests.ts b/rimraf/rimraf-tests.ts
index 74e33ce678..5827549f61 100644
--- a/rimraf/rimraf-tests.ts
+++ b/rimraf/rimraf-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="rimraf.d.ts" />
 
 import rimraf = require('rimraf');
 
diff --git a/riot-api-nodejs/index.d.ts b/riot-api-nodejs/index.d.ts
index 72c6152944..6ee823afa7 100644
--- a/riot-api-nodejs/index.d.ts
+++ b/riot-api-nodejs/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Luca Laissue <https://github.com/zafixlrp/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../request/request.d.ts" />
+
 /// <reference path="../riot-games-api/riot-games-api.d.ts" />
 
 
diff --git a/router5/router5-tests.ts b/router5/router5-tests.ts
index bc1bfba9a2..3e94724f54 100644
--- a/router5/router5-tests.ts
+++ b/router5/router5-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="router5.d.ts" />
 
 import Router5, {loggerPlugin, RouteNode, Router5 as _Router5} from 'router5';
 
diff --git a/rsmq-worker/rsmq-worker-tests.ts b/rsmq-worker/rsmq-worker-tests.ts
index d5d974bd06..2e1361d73c 100644
--- a/rsmq-worker/rsmq-worker-tests.ts
+++ b/rsmq-worker/rsmq-worker-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./rsmq-worker.d.ts" />
 
 import RSMQWorker = require('rsmq-worker');
 
diff --git a/run-sequence/index.d.ts b/run-sequence/index.d.ts
index 47008696f4..aa1bb6002e 100644
--- a/run-sequence/index.d.ts
+++ b/run-sequence/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
 
 import gulp = require('gulp');
 
diff --git a/run-sequence/run-sequence-tests.ts b/run-sequence/run-sequence-tests.ts
index edc3266e91..011c407249 100644
--- a/run-sequence/run-sequence-tests.ts
+++ b/run-sequence/run-sequence-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./run-sequence.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require("gulp");
diff --git a/s3rver/s3rver-tests.ts b/s3rver/s3rver-tests.ts
index d8f25f4fbe..6dd8159b72 100644
--- a/s3rver/s3rver-tests.ts
+++ b/s3rver/s3rver-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="s3rver.d.ts" />
 
 import S3rver = require('s3rver');
 
diff --git a/sandboxed-module/sandboxed-module-tests.ts b/sandboxed-module/sandboxed-module-tests.ts
index f702791780..ada25d0933 100644
--- a/sandboxed-module/sandboxed-module-tests.ts
+++ b/sandboxed-module/sandboxed-module-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sven Reglitzki <https://github.com/svi3c/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="sandboxed-module.d.ts" />
 
 import SandboxedModule = require("sandboxed-module");
 
diff --git a/sanitize-filename/sanitize-filename-tests.ts b/sanitize-filename/sanitize-filename-tests.ts
index 9ea38993a8..2f404c7217 100644
--- a/sanitize-filename/sanitize-filename-tests.ts
+++ b/sanitize-filename/sanitize-filename-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./sanitize-filename.d.ts" />
 
 import sanitize = require('sanitize-filename');
 
diff --git a/sanitize-html/sanitize-html-tests.ts b/sanitize-html/sanitize-html-tests.ts
index 22811faac5..ba91d207a2 100644
--- a/sanitize-html/sanitize-html-tests.ts
+++ b/sanitize-html/sanitize-html-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sanitize-html.d.ts" />
 
 import sanitizeHtml = require('sanitize-html');
 
diff --git a/sanitizer/sanitizer-tests.ts b/sanitizer/sanitizer-tests.ts
index 6a4c8982d6..e1dfd022b1 100644
--- a/sanitizer/sanitizer-tests.ts
+++ b/sanitizer/sanitizer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sanitizer.d.ts" />
 
 import sanitizer = require('sanitizer');
 
diff --git a/sax/sax-tests.ts b/sax/sax-tests.ts
index 3d347abb9b..e2afa327b5 100644
--- a/sax/sax-tests.ts
+++ b/sax/sax-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="../node/node.d.ts" />
-/// <reference path="./sax.d.ts" />
+
 import sax = require("sax");
 import fs = require("fs");
 
diff --git a/scripts/fix-reference-comments.ts b/scripts/fix-reference-comments.ts
new file mode 100644
index 0000000000..5b0a11b98a
--- /dev/null
+++ b/scripts/fix-reference-comments.ts
@@ -0,0 +1,50 @@
+/// <reference path="../node/node.d.ts" />
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+const home = path.join(__dirname, '..');
+
+function forEachTypingDir(callback: (fullPath: string, dirName: string) => void) {
+	fs.readdir(home, (err, dirs) => {
+		if (err) throw err;
+		for (const dir of dirs) {
+			const fullPath = path.join(home, dir);
+			fs.lstat(fullPath, (err, stats) => {
+				if (err) throw err;
+				if (stats.isDirectory()) {
+					callback(fullPath, dir);
+				}
+			});
+		}
+	});
+}
+
+const referenceRegex = /^\/\/\/\s?\<reference path=["'](.*)["'] \/\>(\s*)$/gm;
+
+forEachTypingDir(typingPath => {
+	fs.readdir(typingPath, (err, files) => {
+		if (err) throw err;
+		for (const file of files) {
+			if (/\.ts(x?)$/.test(file)) {
+				const fullPath = path.join(typingPath, file);
+
+				console.log('Read ' + fullPath);
+				let fileContent = fs.readFileSync(fullPath, 'utf-8');
+				let match = referenceRegex.exec(fileContent);
+				while(match !== null) {
+					const referand = match[1];
+					const referandFullPath = path.join(path.dirname(fullPath), referand);
+					if (!fs.existsSync(referandFullPath)) {
+						console.log(`${fullPath} references missing file ${referandFullPath}`);
+						fileContent = fileContent.replace(match[0], '');
+						fs.writeFileSync(fullPath, fileContent, 'utf-8');
+					}
+
+					match = referenceRegex.exec(fileContent);
+
+				}
+			}
+		}
+	});
+});
diff --git a/sencha_touch/SenchaTouch-Tests.ts b/sencha_touch/SenchaTouch-Tests.ts
index bf0b693d10..52be985f6b 100644
--- a/sencha_touch/SenchaTouch-Tests.ts
+++ b/sencha_touch/SenchaTouch-Tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="SenchaTouch.d.ts" />
 
 Ext.application({
     name: 'Sencha',
diff --git a/sentence-case/sentence-case-tests.ts b/sentence-case/sentence-case-tests.ts
index 569d35233f..67f27e26de 100644
--- a/sentence-case/sentence-case-tests.ts
+++ b/sentence-case/sentence-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sentence-case.d.ts" />
 
 import sentenceCase = require('sentence-case');
 
diff --git a/serve-favicon/serve-favicon-tests.ts b/serve-favicon/serve-favicon-tests.ts
index 0f99a56fce..9491c05109 100644
--- a/serve-favicon/serve-favicon-tests.ts
+++ b/serve-favicon/serve-favicon-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="serve-favicon.d.ts" />
 
 import express = require('express');
 import favicon = require('serve-favicon');
diff --git a/serve-index/serve-index-tests.ts b/serve-index/serve-index-tests.ts
index 78975640fe..038fc3c533 100644
--- a/serve-index/serve-index-tests.ts
+++ b/serve-index/serve-index-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="serve-index.d.ts" />
-
 
 import * as express from 'express';
 import * as serveIndex from 'serve-index';
diff --git a/serve-static/index.d.ts b/serve-static/index.d.ts
index 3ff8eb0c04..a46b99cb28 100644
--- a/serve-static/index.d.ts
+++ b/serve-static/index.d.ts
@@ -11,8 +11,6 @@
  =============================================== */
 
 /// <reference path="../express-serve-static-core/express-serve-static-core.d.ts" />
-/// <reference path="../mime/mime.d.ts" />
-
 
 import * as express from "express-serve-static-core";
 
diff --git a/shelljs/shelljs-tests.ts b/shelljs/shelljs-tests.ts
index 34292f8d8a..ac3db94277 100644
--- a/shelljs/shelljs-tests.ts
+++ b/shelljs/shelljs-tests.ts
@@ -5,7 +5,6 @@
 // Tests taken from documentation samples.
 
 ///<reference path="../node/node.d.ts" />
-///<reference path="../shelljs/shelljs.d.ts" />
 
 import shell = require("shelljs");
 
diff --git a/shortid/shortid-tests.ts b/shortid/shortid-tests.ts
index 31ee0df1d1..6d05a500b4 100644
--- a/shortid/shortid-tests.ts
+++ b/shortid/shortid-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="shortid.d.ts" />
 
 import shortid = require('shortid');
 
diff --git a/shuffle-array/shuffle-array-tests.ts b/shuffle-array/shuffle-array-tests.ts
index 9b799bb6ed..e0101fd503 100644
--- a/shuffle-array/shuffle-array-tests.ts
+++ b/shuffle-array/shuffle-array-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="../shuffle-array/shuffle-array.d.ts" />
 
 import shuffle = require('shuffle-array');
 
diff --git a/simple-cw-node/index.d.ts b/simple-cw-node/index.d.ts
index 1a9c6f3514..c73394e4b0 100644
--- a/simple-cw-node/index.d.ts
+++ b/simple-cw-node/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../superagent/superagent.d.ts" />
-
 
 import superagent = require("superagent");
 // TODO 1. update superagent with generics
diff --git a/simple-cw-node/simple-cw-node-tests.ts b/simple-cw-node/simple-cw-node-tests.ts
index d25cc0399d..3457e6f273 100644
--- a/simple-cw-node/simple-cw-node-tests.ts
+++ b/simple-cw-node/simple-cw-node-tests.ts
@@ -1,6 +1,5 @@
 /// <reference path="../node/node.d.ts" />
 
-/// <reference path="./simple-cw-node.d.ts" />
 
 import CW = require('simple-cw-node');
 var client = CW();
diff --git a/ski/ski-tests.ts b/ski/ski-tests.ts
index 73b8b43922..67ab43e4de 100644
--- a/ski/ski-tests.ts
+++ b/ski/ski-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./ski.d.ts" />
 
 import { S, K, I } from 'ski';
 
diff --git a/slate-irc/slate-irc-tests.ts b/slate-irc/slate-irc-tests.ts
index 9766a310df..3b1dd6bd3f 100644
--- a/slate-irc/slate-irc-tests.ts
+++ b/slate-irc/slate-irc-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="slate-irc.d.ts" />
 
 import * as net from "net";
 import * as SlateIRC from "slate-irc";
diff --git a/smoothie/smoothie-tests.ts b/smoothie/smoothie-tests.ts
index 9da8eebf61..5a89014192 100644
--- a/smoothie/smoothie-tests.ts
+++ b/smoothie/smoothie-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="smoothie.d.ts" />
 
 // Smoothie supports browserify
 import smoothie = require('smoothie');
diff --git a/snake-case/snake-case-tests.ts b/snake-case/snake-case-tests.ts
index e8d6db7bca..efabda950d 100644
--- a/snake-case/snake-case-tests.ts
+++ b/snake-case/snake-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="snake-case.d.ts" />
 
 import camelCase = require('snake-case');
 
diff --git a/soap/soap-tests.ts b/soap/soap-tests.ts
index 5229cfcf8e..b05095e0c2 100644
--- a/soap/soap-tests.ts
+++ b/soap/soap-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="soap.d.ts" />
 
 import * as soap from 'soap';
 import * as events from 'events';
diff --git a/socket.io-redis/socket.io-redis.d.ts b/socket.io-redis/socket.io-redis.d.ts
index b3eb44e5ec..731205a855 100644
--- a/socket.io-redis/socket.io-redis.d.ts
+++ b/socket.io-redis/socket.io-redis.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Philipp Holzer <https://github.com/nupplaphil/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../redis/redis.d.ts" />
+
 /// <reference path="../socket.io/socket.io.d.ts" />
 
 declare module 'socket.io-redis' {
diff --git a/socket.io.users/socket.io.users-tests.ts b/socket.io.users/socket.io.users-tests.ts
index 1d852767c0..26d8300947 100644
--- a/socket.io.users/socket.io.users-tests.ts
+++ b/socket.io.users/socket.io.users-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="../socket.io/socket.io.d.ts"/>
-/// <reference path="socket.io.users.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 var express = require('express');
diff --git a/sockjs-node/sockjs-node-tests.ts b/sockjs-node/sockjs-node-tests.ts
index 25e5b496af..629704e7f9 100644
--- a/sockjs-node/sockjs-node-tests.ts
+++ b/sockjs-node/sockjs-node-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sockjs-node.d.ts" />
+
 import sockjs = require("sockjs");
 import http = require("http");
 import stream = require("stream");
diff --git a/source-map-support/source-map-support-tests.ts b/source-map-support/source-map-support-tests.ts
index 09a4fff459..602547509e 100644
--- a/source-map-support/source-map-support-tests.ts
+++ b/source-map-support/source-map-support-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="source-map-support.d.ts" />
 
 import sms = require('source-map-support');
 
diff --git a/split/split-tests.ts b/split/split-tests.ts
index b9aef877f6..6b46589ab9 100644
--- a/split/split-tests.ts
+++ b/split/split-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="split.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import stream = require("stream");
diff --git a/sprintf/sprintf-tests.ts b/sprintf/sprintf-tests.ts
index 563fbebdd9..3dca1f4f02 100644
--- a/sprintf/sprintf-tests.ts
+++ b/sprintf/sprintf-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sprintf.d.ts" />
 
 import sprintf = require('sprintf');
 
diff --git a/sqlite3/sqlite3-tests.ts b/sqlite3/sqlite3-tests.ts
index 7059a439af..1a38a05d2c 100644
--- a/sqlite3/sqlite3-tests.ts
+++ b/sqlite3/sqlite3-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sqlite3.d.ts" />
 
 import sqlite3 = require('sqlite3');
 sqlite3.verbose();
diff --git a/squirejs/squirejs-tests.ts b/squirejs/squirejs-tests.ts
index fc1701fbf6..ece75c8349 100644
--- a/squirejs/squirejs-tests.ts
+++ b/squirejs/squirejs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="squirejs.d.ts" />
 
 import Squire = require('Squire');
 
diff --git a/ssh2/ssh2-tests.ts b/ssh2/ssh2-tests.ts
index d41f146dd0..0209f1ef3d 100644
--- a/ssh2/ssh2-tests.ts
+++ b/ssh2/ssh2-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ssh2.d.ts" />
 
 import * as ssh2 from 'ssh2';
 
diff --git a/stack-trace/stack-trace-tests.ts b/stack-trace/stack-trace-tests.ts
index c18f637519..19a3083d16 100644
--- a/stack-trace/stack-trace-tests.ts
+++ b/stack-trace/stack-trace-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./stack-trace.d.ts" />
 
 import stackTrace = require('stack-trace');
 
diff --git a/static-eval/static-eval-tests.ts b/static-eval/static-eval-tests.ts
index fe42c3d4d2..22b5cf6ff3 100644
--- a/static-eval/static-eval-tests.ts
+++ b/static-eval/static-eval-tests.ts
@@ -1,5 +1,4 @@
 /// <reference path="../esprima/esprima.d.ts" />
-/// <reference path="static-eval.d.ts" />
 
 import evaluate = require('static-eval');
 import esprima = require('esprima');
diff --git a/statsd-client/statsd-client-tests.ts b/statsd-client/statsd-client-tests.ts
index 2dc6f01444..d8490448a5 100644
--- a/statsd-client/statsd-client-tests.ts
+++ b/statsd-client/statsd-client-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="statsd-client.d.ts" />
 
 import SDC = require("statsd-client");
 
diff --git a/statuses/statuses-tests.ts b/statuses/statuses-tests.ts
index a55a706fff..28fd02a28b 100644
--- a/statuses/statuses-tests.ts
+++ b/statuses/statuses-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="statuses.d.ts" />
 
 import status = require('statuses');
 
diff --git a/stream-meter/stream-meter-test.ts b/stream-meter/stream-meter-test.ts
index a9d391ac8b..396f8aa6b1 100644
--- a/stream-meter/stream-meter-test.ts
+++ b/stream-meter/stream-meter-test.ts
@@ -1,4 +1,4 @@
-/// <reference path="./stream-meter.d.ts" />
+
 import * as meter from 'stream-meter';
 
 var m:meter.StreamMeter = meter();
diff --git a/stream-series/stream-series-tests.ts b/stream-series/stream-series-tests.ts
index 2ed31ffb15..b1dacf4baa 100644
--- a/stream-series/stream-series-tests.ts
+++ b/stream-series/stream-series-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./stream-series.d.ts" />
 
 import stream = require("stream");
 import Stream = stream.Duplex;
diff --git a/stream-to-array/stream-to-array-tests.ts b/stream-to-array/stream-to-array-tests.ts
index a4803d051b..ba75a5736b 100644
--- a/stream-to-array/stream-to-array-tests.ts
+++ b/stream-to-array/stream-to-array-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./stream-to-array.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import toArray = require('stream-to-array');
diff --git a/strip-json-comments/strip-json-comments-tests.ts b/strip-json-comments/strip-json-comments-tests.ts
index 057277f5b6..272cba2bad 100644
--- a/strip-json-comments/strip-json-comments-tests.ts
+++ b/strip-json-comments/strip-json-comments-tests.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sindresorhus/strip-json-comments
 // Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-///<reference path="strip-json-comments.d.ts" />
+
 import stripJsonComments = require("strip-json-comments");
 
 const json = '{/*rainbows*/"unicorn":"cake"}';
diff --git a/superagent/superagent-tests.ts b/superagent/superagent-tests.ts
index 58b6840440..1e8ae8bb3c 100644
--- a/superagent/superagent-tests.ts
+++ b/superagent/superagent-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="superagent.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 // via: http://visionmedia.github.io/superagent/
diff --git a/supertest-as-promised/index.d.ts b/supertest-as-promised/index.d.ts
index af1f80d5ee..179d199511 100644
--- a/supertest-as-promised/index.d.ts
+++ b/supertest-as-promised/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path='../superagent/superagent.d.ts' />
+
 /// <reference path="../bluebird/bluebird.d.ts" />
 
 
diff --git a/supertest-as-promised/supertest-as-promised-tests.ts b/supertest-as-promised/supertest-as-promised-tests.ts
index f449326f93..7892cf374d 100644
--- a/supertest-as-promised/supertest-as-promised-tests.ts
+++ b/supertest-as-promised/supertest-as-promised-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="supertest-as-promised.d.ts" />
 
 /// <reference path="../jasmine/jasmine.d.ts" />
 
diff --git a/supertest/index.d.ts b/supertest/index.d.ts
index a9e724ad87..7f1f9f5e79 100644
--- a/supertest/index.d.ts
+++ b/supertest/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Alex Varju <https://github.com/varju/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path='../superagent/superagent.d.ts' />
-
 
 import superagent = require('superagent');
 
diff --git a/supertest/supertest-tests.ts b/supertest/supertest-tests.ts
index 23a131ce3e..69892341d3 100644
--- a/supertest/supertest-tests.ts
+++ b/supertest/supertest-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="supertest.d.ts" />
-
 
 import * as supertest from 'supertest';
 import * as express from 'express';
diff --git a/survey-knockout/survey-knockout.d.ts b/survey-knockout/survey-knockout.d.ts
index e5e26e23b8..6051c346aa 100644
--- a/survey-knockout/survey-knockout.d.ts
+++ b/survey-knockout/survey-knockout.d.ts
@@ -93,7 +93,7 @@ declare module Survey {
     };
 }
 
-/// <reference path="base.d.ts" />
+
 /// <reference path="surveyStrings.d.ts" />
 declare module Survey {
     class AnswerRequiredError extends SurveyError {
@@ -111,7 +111,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="base.d.ts" />
+
 declare module Survey {
     class JsonObjectProperty {
         name: string;
@@ -223,8 +223,8 @@ declare module Survey {
     }
 }
 
-/// <reference path="base.d.ts" />
-/// <reference path="jsonobject.d.ts" />
+
+
 declare module Survey {
     class QuestionBase extends Base implements IQuestion {
         name: string;
@@ -249,8 +249,8 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionbase.d.ts" />
-/// <reference path="base.d.ts" />
+
+
 declare module Survey {
     class QuestionFactory {
         static Instance: QuestionFactory;
@@ -265,9 +265,9 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionbase.d.ts" />
-/// <reference path="questionfactory.d.ts" />
-/// <reference path="jsonobject.d.ts" />
+
+
+
 declare module Survey {
     class PageModel extends Base implements IPage {
         name: string;
@@ -291,9 +291,9 @@ declare module Survey {
     }
 }
 
-/// <reference path="base.d.ts" />
+
 /// <reference path="error.d.ts" />
-/// <reference path="jsonobject.d.ts" />
+
 declare module Survey {
     class ValidatorResult {
         value: any;
@@ -354,10 +354,10 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="error.d.ts" />
 /// <reference path="validator.d.ts" />
-/// <reference path="jsonobject.d.ts" />
+
 /// <reference path="questionbase.d.ts" />
 declare module Survey {
     class Question extends QuestionBase implements IValidatorOwner {
@@ -427,7 +427,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     class QuestionCheckboxModel extends QuestionCheckboxBase {
@@ -438,7 +438,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     class QuestionCommentModel extends Question {
@@ -451,7 +451,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     class QuestionDropdownModel extends QuestionSelectBase {
@@ -463,7 +463,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     class QuestionHtmlModel extends QuestionBase {
@@ -475,7 +475,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     interface IMatrixData {
@@ -509,7 +509,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     interface IMatrixDropdownData {
@@ -573,7 +573,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     interface IMultipleTextData {
@@ -610,7 +610,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     class QuestionRadiogroupModel extends QuestionCheckboxBase {
@@ -620,7 +620,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="questionfactory.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     class QuestionRatingModel extends Question {
@@ -651,7 +651,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="base.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
 declare module Survey {
     class Trigger extends Base {
@@ -691,9 +691,9 @@ declare module Survey {
 
 /// <reference path="base.d.ts" />
 /// <reference path="page.d.ts" />
-/// <reference path="trigger.d.ts" />
+
 /// <reference path="jsonobject.d.ts" />
-/// <reference path="dxSurveyService.d.ts" />
+
 declare module Survey {
     class SurveyModel extends Base implements ISurvey, ISurveyTriggerOwner {
         surveyId: string;
@@ -812,7 +812,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../surveyStrings.d.ts" />
+
 declare module Survey {
 }
 
@@ -820,7 +820,7 @@ declare module Survey {
 declare module Survey {
 }
 
-/// <reference path="../page.d.ts" />
+
 declare module Survey {
     class Page extends PageModel {
         koNo: any;
@@ -830,7 +830,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../questionbase.d.ts" />
+
 declare module Survey {
     class QuestionImplementorBase {
         question: QuestionBase;
@@ -844,7 +844,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question.d.ts" />
+
 /// <reference path="koquestionbase.d.ts" />
 declare module Survey {
     class QuestionImplementor extends QuestionImplementorBase {
@@ -866,7 +866,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="koquestion.d.ts" />
+
 declare module Survey {
     class QuestionSelectBaseImplementor extends QuestionImplementor {
         koOtherVisible: any;
@@ -882,7 +882,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_checkbox.d.ts" />
+
 /// <reference path="koquestion_baseselect.d.ts" />
 declare module Survey {
     class QuestionCheckbox extends QuestionCheckboxModel {
@@ -891,7 +891,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_comment.d.ts" />
+
 declare module Survey {
     class QuestionComment extends QuestionCommentModel {
         name: string;
@@ -899,7 +899,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_dropdown.d.ts" />
+
 declare module Survey {
     class QuestionDropdown extends QuestionDropdownModel {
         name: string;
@@ -907,7 +907,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_html.d.ts" />
+
 /// <reference path="koquestionbase.d.ts" />
 declare module Survey {
     class QuestionHtml extends QuestionHtmlModel {
@@ -916,7 +916,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_matrix.d.ts" />
+
 declare module Survey {
     class MatrixRow extends MatrixRowModel {
         name: any;
@@ -934,7 +934,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_matrixdropdown.d.ts" />
+
 declare module Survey {
     class MatrixDropdownCell extends MatrixDropdownCellModel {
         column: MatrixDropdownColumn;
@@ -957,7 +957,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_multipletext.d.ts" />
+
 declare module Survey {
     class MultipleTextItem extends MultipleTextItemModel {
         name: any;
@@ -973,7 +973,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_radiogroup.d.ts" />
+
 declare module Survey {
     class QuestionRadiogroup extends QuestionRadiogroupModel {
         name: string;
@@ -981,7 +981,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_rating.d.ts" />
+
 declare module Survey {
     class QuestionRating extends QuestionRatingModel {
         name: string;
@@ -989,7 +989,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../question_text.d.ts" />
+
 declare module Survey {
     class QuestionText extends QuestionTextModel {
         name: string;
@@ -997,7 +997,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../survey.d.ts" />
+
 declare module Survey {
     class SurveyBase extends SurveyModel {
         private renderedElement;
@@ -1021,7 +1021,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../surveyWindow.d.ts" />
+
 /// <reference path="kosurvey.d.ts" />
 declare module Survey {
     class SurveyWindowBase extends SurveyWindowModel {
@@ -1052,7 +1052,7 @@ declare module template.ko {
     var html: string;
 }
 
-/// <reference path="template.ko.html.d.ts" />
+
 /// <reference path="../kosurvey.d.ts" />
 declare module Survey {
     class Survey extends SurveyBase {
@@ -1061,7 +1061,7 @@ declare module Survey {
     }
 }
 
-/// <reference path="../koSurveyWindow.d.ts" />
+
 /// <reference path="koSurveyStandard.d.ts" />
 declare module Survey {
     class SurveyWindow extends SurveyWindowBase {
@@ -1077,7 +1077,7 @@ declare module template.window.ko {
     var html: string;
 }
 
-/// <reference path="template.ko.html.d.ts" />
+
 /// <reference path="../templateText.d.ts" />
 declare module Survey {
     class SurveyTemplateText extends SurveyTemplateTextBase {
diff --git a/svg-sprite/index.d.ts b/svg-sprite/index.d.ts
index 3754e3b659..b58d686d49 100644
--- a/svg-sprite/index.d.ts
+++ b/svg-sprite/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../winston/winston.d.ts" />
-
 
 import File = require('../vinyl');
 import winston = require('winston');
diff --git a/svg-sprite/svg-sprite-tests.ts b/svg-sprite/svg-sprite-tests.ts
index 74097962f0..39042dcf9c 100644
--- a/svg-sprite/svg-sprite-tests.ts
+++ b/svg-sprite/svg-sprite-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="svg-sprite.d.ts" />
 
 import SVGSpriter = require('svg-sprite');
 import * as fs from 'fs';
diff --git a/swaggerize-express/swaggerize-express-tests.ts b/swaggerize-express/swaggerize-express-tests.ts
index 03a0807ef6..8726472eea 100644
--- a/swaggerize-express/swaggerize-express-tests.ts
+++ b/swaggerize-express/swaggerize-express-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="swaggerize-express.d.ts" />
+
 import http = require('http');
 import express = require('express');
 import swaggerize = require('swaggerize-express');
diff --git a/swap-case/swap-case-tests.ts b/swap-case/swap-case-tests.ts
index 2a5e987efe..23a230a149 100644
--- a/swap-case/swap-case-tests.ts
+++ b/swap-case/swap-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="swap-case.d.ts" />
 
 import swapCase = require('swap-case');
 
diff --git a/swig-email-templates/swig-email-templates-tests.ts b/swig-email-templates/swig-email-templates-tests.ts
index ef845b8e17..de396909a6 100644
--- a/swig-email-templates/swig-email-templates-tests.ts
+++ b/swig-email-templates/swig-email-templates-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="swig-email-templates.d.ts" />
 
 import emailTemplates = require('swig-email-templates');
 
diff --git a/swiz/swiz-tests.ts b/swiz/swiz-tests.ts
index b156ff1403..36ff9f01a6 100644
--- a/swiz/swiz-tests.ts
+++ b/swiz/swiz-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="swiz.d.ts" />
 
 import swiz = require('swiz');
 
diff --git a/tabtab/tabtab-tests.ts b/tabtab/tabtab-tests.ts
index 69db6edbb3..254af730bc 100644
--- a/tabtab/tabtab-tests.ts
+++ b/tabtab/tabtab-tests.ts
@@ -1,6 +1,5 @@
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../tabtab/tabtab.d.ts" />
 
 import tabtab = require('tabtab');
 import child_process = require('child_process');
diff --git a/tape/tape-tests.ts b/tape/tape-tests.ts
index 919da38808..a9e903014a 100644
--- a/tape/tape-tests.ts
+++ b/tape/tape-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="tape.d.ts" />
 
 /// <reference path="../node/node.d.ts" />
 
diff --git a/tar/tar-tests.ts b/tar/tar-tests.ts
index b23ad7d06b..69f721a236 100644
--- a/tar/tar-tests.ts
+++ b/tar/tar-tests.ts
@@ -5,7 +5,6 @@
  */
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="tar.d.ts" />
 
 import tar = require("tar");
 import fs = require("fs");
diff --git a/tea-merge/tea-merge-tests.ts b/tea-merge/tea-merge-tests.ts
index 9d59bd65e1..7914b8ecc4 100644
--- a/tea-merge/tea-merge-tests.ts
+++ b/tea-merge/tea-merge-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="tea-merge.d.ts" />
 
 import merge = require('tea-merge');
 
diff --git a/tedious-connection-pool/tedious-connection-pool-tests.ts b/tedious-connection-pool/tedious-connection-pool-tests.ts
index e97f9001d6..31715e2090 100644
--- a/tedious-connection-pool/tedious-connection-pool-tests.ts
+++ b/tedious-connection-pool/tedious-connection-pool-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Cyprien Autexier <https://github.com/sandorfr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./tedious-connection-pool.d.ts" />
 
 "use strict";
 
diff --git a/temp/temp-tests.ts b/temp/temp-tests.ts
index 4fb0cc6f86..b1c6702682 100644
--- a/temp/temp-tests.ts
+++ b/temp/temp-tests.ts
@@ -1,6 +1,5 @@
 // Author: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
 
-/// <reference path="temp.d.ts" />
 
 import * as temp from "temp";
 
diff --git a/through/through-tests.ts b/through/through-tests.ts
index 83f8e8780e..55836a21b7 100644
--- a/through/through-tests.ts
+++ b/through/through-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./through.d.ts" />
 
 import through = require('through');
 
diff --git a/through2/through2-tests.ts b/through2/through2-tests.ts
index e6f97fb712..b577d3ded7 100644
--- a/through2/through2-tests.ts
+++ b/through2/through2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./through2.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import through2 = require('through2');
diff --git a/timezone-js/timezone-js-tests.ts b/timezone-js/timezone-js-tests.ts
index 9484d16406..c85e8329b9 100644
--- a/timezone-js/timezone-js-tests.ts
+++ b/timezone-js/timezone-js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="timezone-js.d.ts" />
 
 import timezone = require('timezone-js');
 var tz = timezone.timezone;
diff --git a/title-case/title-case-tests.ts b/title-case/title-case-tests.ts
index d1183db8f1..aed51f2d2a 100644
--- a/title-case/title-case-tests.ts
+++ b/title-case/title-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="title-case.d.ts" />
 
 import titleCase = require('title-case');
 
diff --git a/traverse/traverse-tests.ts b/traverse/traverse-tests.ts
index bc5bfa87c5..62d2c53f31 100644
--- a/traverse/traverse-tests.ts
+++ b/traverse/traverse-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="traverse.d.ts" />
 
 import traverse = require('traverse');
 
diff --git a/twig/twig-tests.ts b/twig/twig-tests.ts
index bf41affd1c..6b517d0c73 100644
--- a/twig/twig-tests.ts
+++ b/twig/twig-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="twig.d.ts" />
 
 import twig = require('twig');
 
diff --git a/twitter-text/twitter-text-tests.ts b/twitter-text/twitter-text-tests.ts
index 84e02232bb..708bdcfcb1 100644
--- a/twitter-text/twitter-text-tests.ts
+++ b/twitter-text/twitter-text-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./twitter-text.d.ts" />
 
 import * as twitter from "twitter-text";
 
diff --git a/type-detect/type-detect-tests.ts b/type-detect/type-detect-tests.ts
index b747de2b98..2fbbfca0d2 100644
--- a/type-detect/type-detect-tests.ts
+++ b/type-detect/type-detect-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="type-detect.d.ts" />
 
 import td = require('type-detect');
 
diff --git a/undertaker/undertaker-tests.ts b/undertaker/undertaker-tests.ts
index 13e4e766d7..9998fd0bec 100644
--- a/undertaker/undertaker-tests.ts
+++ b/undertaker/undertaker-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="undertaker.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 var fs = require('fs');
diff --git a/unique-random/unique-random-tests.ts b/unique-random/unique-random-tests.ts
index 428d1c77ee..5029dc0358 100644
--- a/unique-random/unique-random-tests.ts
+++ b/unique-random/unique-random-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./unique-random.d.ts" />
 
 import uniqueRandom = require("unique-random");
 const rand = uniqueRandom(1, 10);
diff --git a/update-notifier/update-notifier-tests.ts b/update-notifier/update-notifier-tests.ts
index 58fdbd623e..585f2c421e 100644
--- a/update-notifier/update-notifier-tests.ts
+++ b/update-notifier/update-notifier-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./update-notifier.d.ts" />
 
 import updateNotifier = require('update-notifier');
 
diff --git a/upper-case-first/upper-case-first-tests.ts b/upper-case-first/upper-case-first-tests.ts
index 2ca02dd74d..1e477b5378 100644
--- a/upper-case-first/upper-case-first-tests.ts
+++ b/upper-case-first/upper-case-first-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="upper-case-first.d.ts" />
 
 import upperCaseFirst = require('upper-case-first');
 
diff --git a/upper-case/upper-case-tests.ts b/upper-case/upper-case-tests.ts
index a7128bdf6d..124b138835 100644
--- a/upper-case/upper-case-tests.ts
+++ b/upper-case/upper-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="upper-case.d.ts" />
 
 import upperCase = require('upper-case');
 
diff --git a/uri-templates/uri-templates-tests.ts b/uri-templates/uri-templates-tests.ts
index 4809b7883a..0aeb5e0bfe 100644
--- a/uri-templates/uri-templates-tests.ts
+++ b/uri-templates/uri-templates-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="uri-templates.d.ts" />
 
 import utmpl = require('uri-templates');
 import URITemplate = utmpl.URITemplate;
diff --git a/urlrouter/urlrouter-tests.ts b/urlrouter/urlrouter-tests.ts
index ceb7e27d4d..6651a56c5a 100644
--- a/urlrouter/urlrouter-tests.ts
+++ b/urlrouter/urlrouter-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="urlrouter.d.ts" />
 
 import http = require("http");
 import urlrouter = require("urlrouter");
diff --git a/urlsafe-base64/urlsafe-base64-tests.ts b/urlsafe-base64/urlsafe-base64-tests.ts
index 2c7d4722fa..64930ac92f 100644
--- a/urlsafe-base64/urlsafe-base64-tests.ts
+++ b/urlsafe-base64/urlsafe-base64-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="urlsafe-base64.d.ts" />
 
 import URLSafeBase64 = require('urlsafe-base64');
 
diff --git a/usage/usage-tests.ts b/usage/usage-tests.ts
index af8a3b2751..af4ee9bf76 100644
--- a/usage/usage-tests.ts
+++ b/usage/usage-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="usage.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import usage = require('usage');
diff --git a/username/username-tests.ts b/username/username-tests.ts
index 46265958bb..c6e739c14f 100644
--- a/username/username-tests.ts
+++ b/username/username-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./username.d.ts" />
 
 import username = require("username");
 
diff --git a/utils-merge/utils-merge-tests.ts b/utils-merge/utils-merge-tests.ts
index b4a4a1487d..a20237c900 100644
--- a/utils-merge/utils-merge-tests.ts
+++ b/utils-merge/utils-merge-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./utils-merge.d.ts" />
 
 import merge from "utils-merge";
 
diff --git a/uuid-1345/index.d.ts b/uuid-1345/index.d.ts
index a58d2f5e14..c8f6d6bc84 100644
--- a/uuid-1345/index.d.ts
+++ b/uuid-1345/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/scravy/uuid-1345
 // Definitions by: TANAKA Koichi <https://github.com/mugeso/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-///<reference path="../node/node" />
 
 export interface UUID {
     version: string;
diff --git a/uuid-1345/uuid-1345-tests.ts b/uuid-1345/uuid-1345-tests.ts
index b73a467554..b1d33d7dc9 100644
--- a/uuid-1345/uuid-1345-tests.ts
+++ b/uuid-1345/uuid-1345-tests.ts
@@ -1,5 +1,5 @@
 ///<reference path="../node/node.d.ts" />
-///<reference path="./uuid-1345.d.ts" />
+
 'use strict';
 import * as UUID from 'uuid-1345';
 
diff --git a/uuid/UUID-tests.ts b/uuid/UUID-tests.ts
index ce40ddee15..5219c0c389 100644
--- a/uuid/UUID-tests.ts
+++ b/uuid/UUID-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="UUID.d.ts" />
-
 
 import UUID = require("UUID");
 
diff --git a/verror/verror-tests.ts b/verror/verror-tests.ts
index 9364475ce6..1be9837645 100644
--- a/verror/verror-tests.ts
+++ b/verror/verror-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sven Reglitzki <https://github.com/svi3c/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="verror.d.ts" />
 
 import VError = require("verror");
 
diff --git a/vinyl-buffer/vinyl-buffer-tests.ts b/vinyl-buffer/vinyl-buffer-tests.ts
index 6a36d0f52b..520633bc85 100644
--- a/vinyl-buffer/vinyl-buffer-tests.ts
+++ b/vinyl-buffer/vinyl-buffer-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="vinyl-buffer.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../browserify/browserify.d.ts" />
 
 import buffer = require('vinyl-buffer');
 import gulp = require('gulp')
diff --git a/vinyl-fs/vinyl-fs-tests.ts b/vinyl-fs/vinyl-fs-tests.ts
index 09758e053c..8b211b8400 100644
--- a/vinyl-fs/vinyl-fs-tests.ts
+++ b/vinyl-fs/vinyl-fs-tests.ts
@@ -1,7 +1,6 @@
 /// <reference path="../mocha/mocha.d.ts" />
 /// <reference path="../should/should.d.ts" />
 
-/// <reference path="../rimraf/rimraf.d.ts" />
 
 /// <reference path="./vinyl-fs.d.ts" />
 
diff --git a/vinyl-paths/vinyl-paths-tests.ts b/vinyl-paths/vinyl-paths-tests.ts
index e369dcb645..e70c0d79b4 100644
--- a/vinyl-paths/vinyl-paths-tests.ts
+++ b/vinyl-paths/vinyl-paths-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../gulp/gulp.d.ts" />
+
 /// <reference path="../del/del.d.ts" />
-/// <reference path="vinyl-paths.d.ts" />
 
 import gulp = require('gulp');
 import del = require('del');
diff --git a/wampy/wampy-tests.ts b/wampy/wampy-tests.ts
index f7dcf9fe52..c8431f69c8 100644
--- a/wampy/wampy-tests.ts
+++ b/wampy/wampy-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="wampy.d.ts" />
+
 /// <reference path="../node/node.d.ts" />
 
 import Wampy from 'wampy';
diff --git a/watch/watch-tests.ts b/watch/watch-tests.ts
index d6be4092dc..9510d6dfb7 100644
--- a/watch/watch-tests.ts
+++ b/watch/watch-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="watch.d.ts" />
 
 import watch = require('watch');
 import fs = require('fs');
diff --git a/webcola/webcola.d.ts b/webcola/webcola.d.ts
index 5b9efd5cbf..3e3ea9fce9 100644
--- a/webcola/webcola.d.ts
+++ b/webcola/webcola.d.ts
@@ -138,7 +138,7 @@ declare namespace cola.vpsc {
         static double_rotate(root: any, dir: any): any;
     }
 }
-/// <reference path="vpsc.d.ts" />
+
 /// <reference path="rbtree.d.ts" />
 declare namespace cola.vpsc {
     interface Point {
@@ -249,8 +249,8 @@ declare namespace cola.vpsc {
         private solve(vs, cs, starting, desired);
     }
 }
-/// <reference path="vpsc.d.ts" />
-/// <reference path="rectangle.d.ts" />
+
+
 declare namespace cola.geom {
     class Point {
         x: number;
@@ -642,7 +642,7 @@ declare class PriorityQueue<T> {
      */
     count(): number;
 }
-/// <reference path="pqueue.d.ts" />
+
 /**
  * @module shortestpaths
  */
@@ -680,12 +680,12 @@ declare namespace cola.shortestpaths {
         private dijkstraNeighbours(start, dest?);
     }
 }
-/// <reference path="handledisconnected.d.ts" />
-/// <reference path="geom.d.ts" />
+
+
 /// <reference path="descent.d.ts" />
-/// <reference path="powergraph.d.ts" />
+
 /// <reference path="linklengths.d.ts" />
-/// <reference path="shortestpaths.d.ts" />
+
 /**
  * @module cola
  */
@@ -922,7 +922,7 @@ declare namespace cola {
         static mouseOut(d: any): void;
     }
 }
-/// <reference path="layout.d.ts" />
+
 declare namespace cola {
     class LayoutAdaptor extends Layout {
         trigger(e: Event): void;
@@ -950,7 +950,7 @@ declare namespace cola {
         powerGraph: any;
     };
 }
-/// <reference path="layout.d.ts" />
+
 declare namespace cola {
     class D3StyleLayoutAdaptor extends Layout {
         event: any;
diff --git a/webfontloader/webfontloader-tests.ts b/webfontloader/webfontloader-tests.ts
index 92711d7067..00c3216b25 100644
--- a/webfontloader/webfontloader-tests.ts
+++ b/webfontloader/webfontloader-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="webfontloader" />
+
 import webfontloader = require("webfontloader");
 
 var config: webfontloader.Config = {
diff --git a/webpack/webpack-tests.ts b/webpack/webpack-tests.ts
index 9f2efe15c4..696bd7d571 100644
--- a/webpack/webpack-tests.ts
+++ b/webpack/webpack-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="webpack.d.ts" />
 
 import * as webpack from 'webpack';
 
diff --git a/websocket/websocket-tests.ts b/websocket/websocket-tests.ts
index c30ddd3e93..5ecee0080d 100644
--- a/websocket/websocket-tests.ts
+++ b/websocket/websocket-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="websocket.d.ts" />
 
 import websocket = require('websocket');
 import http = require('http');
diff --git a/which/which-tests.ts b/which/which-tests.ts
index 45a376dcb3..68cd2c03ac 100644
--- a/which/which-tests.ts
+++ b/which/which-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./which.d.ts" />
 
 import which = require("which");
 
diff --git a/windows-service/windows-service-tests.ts b/windows-service/windows-service-tests.ts
index 52ed0d91e4..662b7fef1a 100644
--- a/windows-service/windows-service-tests.ts
+++ b/windows-service/windows-service-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="windows-service.d.ts" />
 
 import stream = require("stream");
 import service = require("windows-service");
diff --git a/winston/winston-tests.ts b/winston/winston-tests.ts
index a82390d1a3..d516aa63b0 100644
--- a/winston/winston-tests.ts
+++ b/winston/winston-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="winston.d.ts" />
 
 import winston = require('winston');
 
diff --git a/wiredep/wiredep-tests.ts b/wiredep/wiredep-tests.ts
index 4fa5659b0a..9773114703 100644
--- a/wiredep/wiredep-tests.ts
+++ b/wiredep/wiredep-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./wiredep.d.ts" />
+
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
diff --git a/wreck/wreck-tests.ts b/wreck/wreck-tests.ts
index 6e7abab0e5..163f65ffa1 100644
--- a/wreck/wreck-tests.ts
+++ b/wreck/wreck-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="wreck.d.ts" />
 
 import Wreck = require('wreck');
 
diff --git a/wrench/wrench-tests.ts b/wrench/wrench-tests.ts
index 8749c8aa06..669ab4510d 100644
--- a/wrench/wrench-tests.ts
+++ b/wrench/wrench-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="wrench.d.ts" />
 
 import wrench = require('wrench');
 
diff --git a/ws/ws-tests.ts b/ws/ws-tests.ts
index ec2bc431e0..b181ebf497 100644
--- a/ws/ws-tests.ts
+++ b/ws/ws-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ws.d.ts" />
 
 import WebSocket = require('ws');
 var WebSocketServer = WebSocket.Server;
diff --git a/xlsx/xlsx-tests.ts b/xlsx/xlsx-tests.ts
index 7a40546264..1817ec8acc 100644
--- a/xlsx/xlsx-tests.ts
+++ b/xlsx/xlsx-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./xlsx.d.ts" />
+
 import xlsx = require('xlsx');
 
 var options:xlsx.IParsingOptions = {
diff --git a/xml2js/xml2js-tests.ts b/xml2js/xml2js-tests.ts
index d0ed5e5b95..3e3981156e 100644
--- a/xml2js/xml2js-tests.ts
+++ b/xml2js/xml2js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xml2js.d.ts" />
 
 import xml2js = require('xml2js');
 
diff --git a/xmlbuilder/xmlbuilder-tests.ts b/xmlbuilder/xmlbuilder-tests.ts
index bebc5f4d8f..69794640ba 100644
--- a/xmlbuilder/xmlbuilder-tests.ts
+++ b/xmlbuilder/xmlbuilder-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xmlbuilder.d.ts" />
 
 import xmlbuilder = require('xmlbuilder');
 var xml = xmlbuilder.create;
diff --git a/xmldom/xmldom-tests.ts b/xmldom/xmldom-tests.ts
index cde7ca97bd..4863686d01 100644
--- a/xmldom/xmldom-tests.ts
+++ b/xmldom/xmldom-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xmldom.d.ts" />
 
 import * as xmldom from 'xmldom';
 
diff --git a/xmltojson/xmltojson-tests.ts b/xmltojson/xmltojson-tests.ts
index f890936255..563ad656a3 100644
--- a/xmltojson/xmltojson-tests.ts
+++ b/xmltojson/xmltojson-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='xmltojson.d.ts' />
 
 import * as xmltojson from 'xmltojson';
 
diff --git a/xregexp/xregexp-tests.ts b/xregexp/xregexp-tests.ts
index 17e1d6bdfa..b7328e5d12 100644
--- a/xregexp/xregexp-tests.ts
+++ b/xregexp/xregexp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xregexp.d.ts" />
 
 import X = require('xregexp');
 import XRegExp = X.XRegExp;
diff --git a/yargs/yargs-tests.ts b/yargs/yargs-tests.ts
index a049af8cb3..9d569ecfcd 100644
--- a/yargs/yargs-tests.ts
+++ b/yargs/yargs-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Martin Poelstra <https://github.com/poelstra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="yargs.d.ts" />
 
 import yargs = require('yargs');
 
diff --git a/yosay/yosay-tests.ts b/yosay/yosay-tests.ts
index 257b546eae..37aa363490 100644
--- a/yosay/yosay-tests.ts
+++ b/yosay/yosay-tests.ts
@@ -1,3 +1,3 @@
-/// <reference path="./yosay.d.ts" />
+
 import yosay = require('yosay');
 yosay('Welcome to the generator!', {maxLength: 20});
\ No newline at end of file