diff --git a/src/addons/attach/attach.ts b/src/addons/attach/attach.ts
index 731739f43..d0e8bd4b2 100644
--- a/src/addons/attach/attach.ts
+++ b/src/addons/attach/attach.ts
@@ -5,8 +5,6 @@
  * Implements the attach method, that attaches the terminal to a WebSocket stream.
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { Terminal } from 'xterm';
 import { IAttachAddonTerminal } from './Interfaces';
 
diff --git a/src/addons/attach/tsconfig.json b/src/addons/attach/tsconfig.json
index a4e8e78b3..199542497 100644
--- a/src/addons/attach/tsconfig.json
+++ b/src/addons/attach/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/fit/fit.ts b/src/addons/fit/fit.ts
index f6f593dcf..68e4cfd58 100644
--- a/src/addons/fit/fit.ts
+++ b/src/addons/fit/fit.ts
@@ -13,8 +13,6 @@
  *          row and truncate its width with the current number of columns).
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { Terminal } from 'xterm';
 
 export interface IGeometry {
diff --git a/src/addons/fit/tsconfig.json b/src/addons/fit/tsconfig.json
index 78b3c4109..e1dce37f8 100644
--- a/src/addons/fit/tsconfig.json
+++ b/src/addons/fit/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/fullscreen/fullscreen.ts b/src/addons/fullscreen/fullscreen.ts
index 474406677..297a7f5bf 100644
--- a/src/addons/fullscreen/fullscreen.ts
+++ b/src/addons/fullscreen/fullscreen.ts
@@ -3,8 +3,6 @@
  * @license MIT
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { Terminal } from 'xterm';
 
 /**
diff --git a/src/addons/fullscreen/tsconfig.json b/src/addons/fullscreen/tsconfig.json
index 35ecb7cef..5a06c4907 100644
--- a/src/addons/fullscreen/tsconfig.json
+++ b/src/addons/fullscreen/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/search/search.ts b/src/addons/search/search.ts
index 5c0b2b96d..a1dd766ff 100644
--- a/src/addons/search/search.ts
+++ b/src/addons/search/search.ts
@@ -3,8 +3,6 @@
  * @license MIT
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { SearchHelper } from './SearchHelper';
 import { Terminal } from 'xterm';
 import { ISearchAddonTerminal } from './Interfaces';
diff --git a/src/addons/search/tsconfig.json b/src/addons/search/tsconfig.json
index d1c3d7e02..d833bb28c 100644
--- a/src/addons/search/tsconfig.json
+++ b/src/addons/search/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/terminado/terminado.ts b/src/addons/terminado/terminado.ts
index 4acf9dd84..136eea8e8 100644
--- a/src/addons/terminado/terminado.ts
+++ b/src/addons/terminado/terminado.ts
@@ -6,8 +6,6 @@
  * WebSocket stream.
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { Terminal } from 'xterm';
 import { ITerminadoAddonTerminal } from './Interfaces';
 
diff --git a/src/addons/terminado/tsconfig.json b/src/addons/terminado/tsconfig.json
index 84e3ac32d..2c795b994 100644
--- a/src/addons/terminado/tsconfig.json
+++ b/src/addons/terminado/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/webLinks/tsconfig.json b/src/addons/webLinks/tsconfig.json
index 7549370b3..b34f544d1 100644
--- a/src/addons/webLinks/tsconfig.json
+++ b/src/addons/webLinks/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/webLinks/webLinks.ts b/src/addons/webLinks/webLinks.ts
index 7ff87c606..a007bbd61 100644
--- a/src/addons/webLinks/webLinks.ts
+++ b/src/addons/webLinks/webLinks.ts
@@ -3,8 +3,6 @@
  * @license MIT
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { Terminal, ILinkMatcherOptions } from 'xterm';
 
 const protocolClause = '(https?:\\/\\/)';
diff --git a/src/addons/winptyCompat/tsconfig.json b/src/addons/winptyCompat/tsconfig.json
index a51f73322..fdca3e3d4 100644
--- a/src/addons/winptyCompat/tsconfig.json
+++ b/src/addons/winptyCompat/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/winptyCompat/winptyCompat.ts b/src/addons/winptyCompat/winptyCompat.ts
index 61524e125..9cde62e0c 100644
--- a/src/addons/winptyCompat/winptyCompat.ts
+++ b/src/addons/winptyCompat/winptyCompat.ts
@@ -3,8 +3,6 @@
  * @license MIT
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { Terminal } from 'xterm';
 import { IWinptyCompatAddonTerminal } from './Interfaces';
 
diff --git a/src/addons/zmodem/tsconfig.json b/src/addons/zmodem/tsconfig.json
index abae12381..f5693801f 100644
--- a/src/addons/zmodem/tsconfig.json
+++ b/src/addons/zmodem/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "removeComments": true,
     "declaration": true
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
+  ]
 }
diff --git a/src/addons/zmodem/zmodem.ts b/src/addons/zmodem/zmodem.ts
index 4f2f4a91c..4683538f2 100644
--- a/src/addons/zmodem/zmodem.ts
+++ b/src/addons/zmodem/zmodem.ts
@@ -3,8 +3,6 @@
  * @license MIT
  */
 
-/// <reference path="../../../typings/xterm.d.ts"/>
-
 import { Terminal } from 'xterm';
 
 /**