diff --git a/types/spdy/index.d.ts b/types/spdy/index.d.ts
index 3016c16a11..35b5987f3c 100644
--- a/types/spdy/index.d.ts
+++ b/types/spdy/index.d.ts
@@ -9,115 +9,117 @@
 import * as http from 'http';
 import * as https from 'https';
 
-declare module "spdy" {
-    // lib/spdy/agent.js
-    namespace agent {
-        class Agent extends https.Agent {}
-        class PlainAgent extends http.Agent {}
-        function create(base: any, options: AgentOptions): Agent | PlainAgent;
+// lib/spdy/agent.js
+export namespace agent {
+    class Agent extends https.Agent {}
+    class PlainAgent extends http.Agent {}
+    function create(base: any, options: AgentOptions): Agent | PlainAgent;
 
-        interface AgentOptions extends https.AgentOptions {
-            port?: number;
-            spdy?: {
-                plain?: boolean,
-                ssl?: boolean,
-                'x-forwarded-for'?: string,
-                protocol?: string,
-                protocols?: string[]
-            };
-        }
+    interface AgentOptions extends https.AgentOptions {
+        port?: number;
+        spdy?: {
+            plain?: boolean,
+            ssl?: boolean,
+            'x-forwarded-for'?: string,
+            protocol?: string,
+            protocols?: string[]
+        };
     }
-
-    // lib/spdy/handle.js
-    interface Handle {
-        create(options: object, stream: any, socket: Socket): Handle;
-        getStream(callback?: (stream: any) => void): any;
-        assignSocket(socket: Socket, options: object): void;
-        assignClientRequest(req: any): void;
-        assignRequest(req: any): void;
-        assignResponse(res: any): void;
-        emitRequest(): void;
-        emitResponse(status: any, headers: any): void;
-    }
-
-    // lib/spdy/request.js
-    namespace request {
-        function onNewListener(type: string): void;
-    }
-
-    // lib/spdy/response.js
-    namespace response {
-        function writeHead(statusCode: number, reason: string, obj: object): void;
-        function writeHead(statusCode: number, obj: object): void;
-        function end(data: any, encoding: string, callback: () => void): void;
-    }
-
-    // lib/spdy/server.js
-    namespace server {
-        type Server = https.Server;
-        type PlainServer = http.Server;
-        type IncomingMessage = http.IncomingMessage;
-        interface ServerResponse extends http.ServerResponse {
-            push(filename: string, options: PushOptions): any;
-        }
-        function create(base: any,
-                               options: https.ServerOptions,
-                               handler: (request: IncomingMessage, response: ServerResponse | http.ServerResponse) => void): Server;
-        function create(options: https.ServerOptions,
-                               handler: (request: IncomingMessage, response: http.ServerResponse) => void): Server;
-        function create(handler: (request: IncomingMessage, response: ServerResponse | http.ServerResponse) => void): Server;
-
-        type Protocol =
-            'h2'
-                | 'spdy/3.1'
-                | 'spdy/3'
-                | 'spdy/2'
-                | 'http/1.1'
-                | 'http/1.0';
-
-        interface PushOptions {
-            status?: number;
-            method?: string;
-            request?: any;
-            response?: any;
-        }
-
-        interface ServerOptions extends https.ServerOptions {
-            spdy?: {
-                protocols?: Protocol[],
-                plain?: boolean,
-                'x-forwarded-for'?: boolean,
-                connection?: {
-                    windowSize?: number,
-                    autoSpdy31?: boolean,
-                },
-            };
-        }
-    }
-
-    // lib/spdy/socket.js
-    namespace socket {
-        // tslint:disable-next-line no-empty-interface
-        interface Socket {} // net.Socket
-    }
-
-    // lib/spdy.js
-    type Agent = agent.Agent;
-    type PlainAgent = agent.PlainAgent;
-    type AgentOptions = agent.AgentOptions;
-    type Socket = socket.Socket;
-    type Server = server.Server;
-    type IncomingMessage = server.IncomingMessage;
-    type ServerRequest = server.IncomingMessage;
-    type ServerResponse = server.ServerResponse;
-    type PlainServer = server.PlainServer;
-    type ServerOptions = server.ServerOptions;
-    function createAgent(base: any, options: AgentOptions): Agent | PlainAgent;
-    function createAgent(options: AgentOptions): Agent | PlainAgent;
-    function createServer(base: any,
-                                 options: ServerOptions,
-                                 handler: (request: IncomingMessage, response: http.ServerResponse) => void): Server;
-    function createServer(options: ServerOptions,
-                                 handler: (request: IncomingMessage, response: http.ServerResponse) => void): Server;
-    function createServer(handler: (request: IncomingMessage, response: http.ServerResponse) => void): Server;
 }
+
+// lib/spdy/handle.js
+export interface Handle {
+    create(options: object, stream: any, socket: Socket): Handle;
+    getStream(callback?: (stream: any) => void): any;
+    assignSocket(socket: Socket, options: object): void;
+    assignClientRequest(req: any): void;
+    assignRequest(req: any): void;
+    assignResponse(res: any): void;
+    emitRequest(): void;
+    emitResponse(status: any, headers: any): void;
+}
+
+// lib/spdy/request.js
+export namespace request {
+    function onNewListener(type: string): void;
+}
+
+// lib/spdy/response.js
+export namespace response {
+    function writeHead(statusCode: number, reason: string, obj: object): void;
+    function writeHead(statusCode: number, obj: object): void;
+    function end(data: any, encoding: string, callback: () => void): void;
+}
+
+// lib/spdy/server.js
+export namespace server {
+    type Server = https.Server;
+    type PlainServer = http.Server;
+    type IncomingMessage = http.IncomingMessage;
+    interface ServerResponse extends http.ServerResponse {
+        push(filename: string, options: PushOptions): any;
+    }
+    function create(base: any,
+                            options: https.ServerOptions,
+                            handler: (request: IncomingMessage, response: ServerResponse | http.ServerResponse) => void): Server;
+    function create(options: https.ServerOptions,
+                            handler: (request: IncomingMessage, response: http.ServerResponse) => void): Server;
+    function create(handler: (request: IncomingMessage, response: ServerResponse | http.ServerResponse) => void): Server;
+
+    type Protocol =
+        'h2'
+            | 'spdy/3.1'
+            | 'spdy/3'
+            | 'spdy/2'
+            | 'http/1.1'
+            | 'http/1.0';
+
+    interface PushOptions {
+        status?: number;
+        method?: string;
+        request?: any;
+        response?: any;
+    }
+
+    interface ServerOptions extends https.ServerOptions {
+        spdy?: {
+            protocols?: Protocol[],
+            plain?: boolean,
+            'x-forwarded-for'?: boolean,
+            connection?: {
+                windowSize?: number,
+                autoSpdy31?: boolean,
+            },
+        };
+    }
+}
+
+// lib/spdy/socket.js
+export namespace socket {
+    // tslint:disable-next-line no-empty-interface
+    interface Socket {} // net.Socket
+}
+
+// lib/spdy.js
+export type Agent = agent.Agent;
+export type PlainAgent = agent.PlainAgent;
+export type AgentOptions = agent.AgentOptions;
+export type Socket = socket.Socket;
+export type Server = server.Server;
+export type IncomingMessage = server.IncomingMessage;
+export type ServerRequest = server.IncomingMessage;
+export type ServerResponse = server.ServerResponse;
+export type PlainServer = server.PlainServer;
+export type ServerOptions = server.ServerOptions;
+export function createAgent(base: any, options: AgentOptions): Agent | PlainAgent;
+export function createAgent(options: AgentOptions): Agent | PlainAgent;
+export function createServer(
+    base: any,
+    options: ServerOptions,
+    handler: (request: IncomingMessage, response: http.ServerResponse) => void,
+): Server;
+export function createServer(
+    options: ServerOptions,
+    handler: (request: IncomingMessage, response: http.ServerResponse) => void,
+): Server;
+export function createServer(handler: (request: IncomingMessage, response: http.ServerResponse) => void): Server;