diff --git a/connect-flash/index.d.ts b/connect-flash/index.d.ts
index 7ec2ae0ae7..1a10aae6db 100644
--- a/connect-flash/index.d.ts
+++ b/connect-flash/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Andreas Gassmann <https://github.com/AndreasGassmann/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference types="express" />
 
 declare namespace Express {
     export interface Request {
diff --git a/connect-timeout/index.d.ts b/connect-timeout/index.d.ts
index 80b3c56a6c..bfaa7c473d 100644
--- a/connect-timeout/index.d.ts
+++ b/connect-timeout/index.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="express" />
+
 declare namespace Express {
     export interface Request {
         /**
diff --git a/cookie-session/index.d.ts b/cookie-session/index.d.ts
index aa014e2049..71e63d5a3c 100644
--- a/cookie-session/index.d.ts
+++ b/cookie-session/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference types="express" />
 
 declare namespace Express {
     interface Request extends CookieSessionInterfaces.CookieSessionRequest {}
diff --git a/csurf/index.d.ts b/csurf/index.d.ts
index e8d0d22f0b..011b10a7f1 100644
--- a/csurf/index.d.ts
+++ b/csurf/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference types="express" />
 
 declare namespace Express {
   export interface Request {
diff --git a/easy-session/index.d.ts b/easy-session/index.d.ts
index 4216f5037d..0d96c61783 100644
--- a/easy-session/index.d.ts
+++ b/easy-session/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Karl Düüna <https://github.com/DeadAlready/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference types="express" />
 
 declare namespace Express {
     interface ErrorCallback {
diff --git a/easy-x-headers/index.d.ts b/easy-x-headers/index.d.ts
index c9d6c97e2b..54faf1c2a1 100644
--- a/easy-x-headers/index.d.ts
+++ b/easy-x-headers/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Karl Düüna <https://github.com/DeadAlready/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference types="express" />
 
 declare namespace Express {
     export interface Request {
diff --git a/easy-xapi/index.d.ts b/easy-xapi/index.d.ts
index 0eeb83a4d8..13a8a7bfd9 100644
--- a/easy-xapi/index.d.ts
+++ b/easy-xapi/index.d.ts
@@ -6,6 +6,8 @@
 
 /// <reference types="easy-jsend" />
 /// <reference types="bunyan" />
+/// <reference types="express" />
+/// <reference types="node" />
 
 declare namespace Express {
     export interface Request {
diff --git a/express-minify/index.d.ts b/express-minify/index.d.ts
index 60bccf44ff..f6f3d895b3 100644
--- a/express-minify/index.d.ts
+++ b/express-minify/index.d.ts
@@ -3,7 +3,8 @@
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference types="express" />
+/// <reference types="node" />
 
 declare namespace Express {
     interface Response extends ExpressMinifyInterfaces.ExpressMinifyResponse {}
diff --git a/express-session/index.d.ts b/express-session/index.d.ts
index 2f2cf68142..c5d7c63456 100644
--- a/express-session/index.d.ts
+++ b/express-session/index.d.ts
@@ -5,6 +5,7 @@
 
 
 /// <reference types="node" />
+/// <reference types="express" />
 
 declare namespace Express {
 
@@ -69,7 +70,7 @@ declare module "express-session" {
 	  regenerate (req: express.Request, fn: (err: any) => any): void;
       load (sid: string, fn: (err: any, session: Express.Session) => any): void;
       createSession (req: express.Request, sess: Express.Session): void;
-      
+
       get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
       set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
       destroy: (sid: string, callback: (err: any) => void) => void;
diff --git a/express-validator/index.d.ts b/express-validator/index.d.ts
index 05ba652555..151bf16d97 100644
--- a/express-validator/index.d.ts
+++ b/express-validator/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Nathan Ridley <https://github.com/axefrog/>, Jonathan Häberle <http://dreampulse.de>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="express" />
 
 
 // Add RequestValidation Interface on to Express's Request Interface.
@@ -179,12 +180,12 @@ declare namespace ExpressValidator {
 		/**
 		 * Decode HTML entities
 		 */
-		
+
 		/**
      		* Convert the input string to a date, or null if the input is not a date.
      		*/
     		toDate(): Sanitizer;
-    
+
 		entityDecode(): Sanitizer;
 		entityEncode(): Sanitizer;
 		/**
diff --git a/history/index.d.ts b/history/index.d.ts
index f0b3a05dd9..51ad48e18c 100644
--- a/history/index.d.ts
+++ b/history/index.d.ts
@@ -117,12 +117,12 @@ export interface Module {
     };
 }
 
-export { default as createHistory } from "history/lib/createBrowserHistory";
-export { default as createHashHistory } from "history/lib/createHashHistory";
-export { default as createMemoryHistory } from "history/lib/createMemoryHistory";
-export { default as createLocation } from "history/lib/createLocation";
-export { default as useBasename } from "history/lib/useBasename";
-export { default as useBeforeUnload } from "history/lib/useBeforeUnload";
-export { default as useQueries } from "history/lib/useQueries";
-import * as Actions from "history/lib/actions";
+export { default as createHistory } from "./lib/createBrowserHistory";
+export { default as createHashHistory } from "./lib/createHashHistory";
+export { default as createMemoryHistory } from "./lib/createMemoryHistory";
+export { default as createLocation } from "./lib/createLocation";
+export { default as useBasename } from "./lib/useBasename";
+export { default as useBeforeUnload } from "./lib/useBeforeUnload";
+export { default as useQueries } from "./lib/useQueries";
+import * as Actions from "./lib/actions";
 export { Actions };
diff --git a/history/lib/createBrowserHistory.d.ts b/history/lib/createBrowserHistory.d.ts
index a82b17e788..da07663fe8 100644
--- a/history/lib/createBrowserHistory.d.ts
+++ b/history/lib/createBrowserHistory.d.ts
@@ -1,2 +1,2 @@
-import { HistoryOptions, History } from 'history';
+import { HistoryOptions, History } from '../index';
 export default function createBrowserHistory(options?: HistoryOptions): History;
\ No newline at end of file
diff --git a/history/lib/createHashHistory.d.ts b/history/lib/createHashHistory.d.ts
index 57c0e8c1bb..76defc7727 100644
--- a/history/lib/createHashHistory.d.ts
+++ b/history/lib/createHashHistory.d.ts
@@ -1,2 +1,2 @@
-import { HistoryOptions, History } from 'history';
+import { HistoryOptions, History } from '../index';
 export default function createHashHistory(options?: HistoryOptions): History;
\ No newline at end of file
diff --git a/history/lib/createLocation.d.ts b/history/lib/createLocation.d.ts
index c78f9fed80..4d24e6e5ac 100644
--- a/history/lib/createLocation.d.ts
+++ b/history/lib/createLocation.d.ts
@@ -1,2 +1,2 @@
-import { Path, LocationState, Action, LocationKey, Location } from 'history';
+import { Path, LocationState, Action, LocationKey, Location } from '../index';
 export default function createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location;
diff --git a/history/lib/createMemoryHistory.d.ts b/history/lib/createMemoryHistory.d.ts
index 30d0180961..572140652d 100644
--- a/history/lib/createMemoryHistory.d.ts
+++ b/history/lib/createMemoryHistory.d.ts
@@ -1,2 +1,2 @@
-import { HistoryOptions, History } from 'history';
+import { HistoryOptions, History } from '../index';
 export default function createMemoryHistory(options?: HistoryOptions): History;
diff --git a/history/lib/useBasename.d.ts b/history/lib/useBasename.d.ts
index b9cfafff20..14b7169ccc 100644
--- a/history/lib/useBasename.d.ts
+++ b/history/lib/useBasename.d.ts
@@ -1,2 +1,2 @@
-import { CreateHistory } from 'history';
+import { CreateHistory } from '../index';
 export default function useBasename<T>(createHistory: CreateHistory<T>): CreateHistory<T>;
diff --git a/history/lib/useBeforeUnload.d.ts b/history/lib/useBeforeUnload.d.ts
index 87d0370a2b..0bb648b93f 100644
--- a/history/lib/useBeforeUnload.d.ts
+++ b/history/lib/useBeforeUnload.d.ts
@@ -1,2 +1,2 @@
-import { CreateHistory, HistoryBeforeUnload } from 'history';
+import { CreateHistory, HistoryBeforeUnload } from '../index';
 export default function useBeforeUnload<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryBeforeUnload>;
diff --git a/history/lib/useQueries.d.ts b/history/lib/useQueries.d.ts
index 2bb2a6697a..8aeebe0cb5 100644
--- a/history/lib/useQueries.d.ts
+++ b/history/lib/useQueries.d.ts
@@ -1,2 +1,2 @@
-import { CreateHistory, HistoryQueries } from 'history';
+import { CreateHistory, HistoryQueries } from '../index';
 export default function useQueries<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryQueries>;
\ No newline at end of file
diff --git a/history/tsconfig.json b/history/tsconfig.json
index 3e41931775..91e7f3f3d6 100644
--- a/history/tsconfig.json
+++ b/history/tsconfig.json
@@ -14,6 +14,15 @@
     },
     "files": [
         "index.d.ts",
-        "history-tests.ts"
+        "history-tests.ts",
+        "lib/actions.d.ts",
+        "lib/createBrowserHistory.d.ts",
+        "lib/createHashHistory.d.ts",
+        "lib/createLocation.d.ts",
+        "lib/createMemoryHistory.d.ts",
+        "lib/DOMUtils.d.ts",
+        "lib/useBasename.d.ts",
+        "lib/useBeforeUnload.d.ts",
+        "lib/useQueries.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/i18next-browser-languagedetector/index.d.ts b/i18next-browser-languagedetector/index.d.ts
index 2edcb5e04b..906910fa49 100644
--- a/i18next-browser-languagedetector/index.d.ts
+++ b/i18next-browser-languagedetector/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="i18next"/>
+/// <reference types="express" />
 
 declare namespace I18next {
     interface I18nextStatic extends i18nextBrowserLanguageDetector.I18nextStatic { }
diff --git a/i18next-express-middleware/index.d.ts b/i18next-express-middleware/index.d.ts
index 05328ffadc..4570061021 100644
--- a/i18next-express-middleware/index.d.ts
+++ b/i18next-express-middleware/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="i18next" />
+/// <reference types="express" />
 
 declare namespace I18next {
     interface I18nextOptions extends i18nextExpressMiddleware.I18nextOptions { }
diff --git a/passport/index.d.ts b/passport/index.d.ts
index 0d66436bfe..ec986974a9 100644
--- a/passport/index.d.ts
+++ b/passport/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Horiuchi_H <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference types="express" />
 
 declare namespace Express {
     export interface Request {