diff --git a/src/Charsets.ts b/src/Charsets.ts
index e62e3f9c0..fe0112ec7 100644
--- a/src/Charsets.ts
+++ b/src/Charsets.ts
@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { ICharset } from './Interfaces';
+import { ICharset } from './Types';
 
 /**
  * The character sets supported by the terminal. These enable several languages
diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 4fc14bd93..19f77d1e4 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -5,7 +5,7 @@
  */
 
 import { CharData, ITerminal } from '../typings/xterm-internal';
-import { IInputHandler, IInputHandlingTerminal } from './Interfaces';
+import { IInputHandler, IInputHandlingTerminal } from './Types';
 import { C0 } from './EscapeSequences';
 import { DEFAULT_CHARSET } from './Charsets';
 import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX } from './Buffer';
diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts
index 1a7c60476..1e7b41c94 100644
--- a/src/Linkifier.test.ts
+++ b/src/Linkifier.test.ts
@@ -5,7 +5,7 @@
 
 import { assert } from 'chai';
 import { ITerminal, ILinkifier, IBuffer, IBufferAccessor, IElementAccessor, LineData, IMouseZoneManager, IMouseZone } from '../typings/xterm-internal';
-import { ILinkMatcher } from './Interfaces';
+import { ILinkMatcher } from './Types';
 import { Linkifier } from './Linkifier';
 import { MockBuffer } from './utils/TestUtils.test';
 import { CircularList } from './utils/CircularList';
diff --git a/src/Linkifier.ts b/src/Linkifier.ts
index 64d7510c5..aac3048d5 100644
--- a/src/Linkifier.ts
+++ b/src/Linkifier.ts
@@ -4,7 +4,7 @@
  */
 
 import { ILinkMatcherOptions, ITerminal, IBufferAccessor, ILinkifier, IElementAccessor, LinkMatcherHandler, LinkMatcherValidationCallback, LineData, IMouseZoneManager } from '../typings/xterm-internal';
-import { ILinkHoverEvent, ILinkMatcher } from './Interfaces';
+import { ILinkHoverEvent, ILinkMatcher } from './Types';
 import { LinkHoverEventTypes } from './Types';
 import { MouseZone } from './input/MouseZoneManager';
 import { EventEmitter } from './EventEmitter';
diff --git a/src/Parser.ts b/src/Parser.ts
index 6f4b0932c..3ac03e4fb 100644
--- a/src/Parser.ts
+++ b/src/Parser.ts
@@ -5,7 +5,7 @@
  */
 
 import { C0 } from './EscapeSequences';
-import { IInputHandler } from './Interfaces';
+import { IInputHandler } from './Types';
 import { CHARSETS, DEFAULT_CHARSET } from './Charsets';
 
 const normalStateHandler: {[key: string]: (parser: Parser, handler: IInputHandler) => void} = {};
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 0c2ce7922..daf1a231e 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -40,7 +40,7 @@ import * as Browser from './shared/utils/Browser';
 import { MouseHelper } from './utils/MouseHelper';
 import { CHARSETS } from './Charsets';
 import { CustomKeyEventHandler } from './Types';
-import { ICharset, IInputHandlingTerminal, IViewport, ICompositionHelper } from './Interfaces';
+import { ICharset, IInputHandlingTerminal, IViewport, ICompositionHelper } from './Types';
 import { BELL_SOUND } from './utils/Sounds';
 import { DEFAULT_ANSI_COLORS } from './renderer/ColorManager';
 import { MouseZoneManager } from './input/MouseZoneManager';
diff --git a/src/Interfaces.ts b/src/Types.d.ts
similarity index 96%
rename from src/Interfaces.ts
rename to src/Types.d.ts
index 4ecc87f60..0e5af373a 100644
--- a/src/Interfaces.ts
+++ b/src/Types.d.ts
@@ -5,7 +5,14 @@
 
 import { IEventEmitter } from 'xterm';
 import { ITerminalOptions, ILinkMatcherOptions, IMouseZoneManager, LinkMatcherHandler, LinkMatcherValidationCallback, LineData, IColorSet, IRenderer, IBufferSet, IBuffer, ISelectionManager } from '../typings/xterm-internal';
-import { ICharset } from './Interfaces';
+
+export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;
+
+export enum LinkHoverEventTypes {
+  HOVER = 'linkhover',
+  TOOLTIP = 'linktooltip',
+  LEAVE = 'linkleave'
+}
 
 /**
  * This interface encapsulates everything needed from the Terminal by the
diff --git a/src/Types.ts b/src/Types.ts
deleted file mode 100644
index e112d6d96..000000000
--- a/src/Types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) 2017 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;
-
-export enum LinkHoverEventTypes {
-  HOVER = 'linkhover',
-  TOOLTIP = 'linktooltip',
-  LEAVE = 'linkleave'
-}
diff --git a/src/Viewport.ts b/src/Viewport.ts
index 147cc90e9..bf4d8da01 100644
--- a/src/Viewport.ts
+++ b/src/Viewport.ts
@@ -4,7 +4,7 @@
  */
 
 import { ITerminal, IColorSet } from '../typings/xterm-internal';
-import { IViewport } from './Interfaces';
+import { IViewport } from './Types';
 import { CharMeasure } from './utils/CharMeasure';
 
 /**
diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
index 3c1f52be6..0e1654244 100644
--- a/src/renderer/BaseRenderLayer.ts
+++ b/src/renderer/BaseRenderLayer.ts
@@ -4,7 +4,7 @@
  */
 
 import { IColorSet, IRenderDimensions, ITerminal, ITerminalOptions, CharData } from '../../typings/xterm-internal';
-import { IRenderLayer } from './Interfaces';
+import { IRenderLayer } from './Types';
 import { acquireCharAtlas, CHAR_ATLAS_CELL_SPACING } from './CharAtlas';
 import { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';
 
diff --git a/src/renderer/LinkRenderLayer.ts b/src/renderer/LinkRenderLayer.ts
index 24bc89b49..de14dd4dd 100644
--- a/src/renderer/LinkRenderLayer.ts
+++ b/src/renderer/LinkRenderLayer.ts
@@ -4,7 +4,7 @@
  */
 
 import { IColorSet, IRenderDimensions, ITerminal, ILinkifierAccessor, IBuffer, ICharMeasure } from '../../typings/xterm-internal';
-import { ILinkHoverEvent } from '../Interfaces';
+import { ILinkHoverEvent } from '../Types';
 import { CHAR_DATA_ATTR_INDEX } from '../Buffer';
 import { GridCache } from './GridCache';
 import { FLAGS } from './Types';
diff --git a/src/renderer/Renderer.ts b/src/renderer/Renderer.ts
index afeefe3d9..afc66db13 100644
--- a/src/renderer/Renderer.ts
+++ b/src/renderer/Renderer.ts
@@ -10,7 +10,7 @@ import { SelectionRenderLayer } from './SelectionRenderLayer';
 import { CursorRenderLayer } from './CursorRenderLayer';
 import { ColorManager } from './ColorManager';
 import { BaseRenderLayer } from './BaseRenderLayer';
-import { IRenderLayer } from './Interfaces';
+import { IRenderLayer } from './Types';
 import { LinkRenderLayer } from './LinkRenderLayer';
 import { EventEmitter } from '../EventEmitter';
 import { ScreenDprMonitor } from '../utils/ScreenDprMonitor';
diff --git a/src/renderer/Interfaces.ts b/src/renderer/Types.d.ts
similarity index 88%
rename from src/renderer/Interfaces.ts
rename to src/renderer/Types.d.ts
index d65c9d359..8f3716936 100644
--- a/src/renderer/Interfaces.ts
+++ b/src/renderer/Types.d.ts
@@ -4,9 +4,20 @@
  */
 
 import { IColorSet, IRenderDimensions, ITerminal } from '../../typings/xterm-internal';
-
 import { IEventEmitter } from 'xterm';
 
+/**
+ * Flags used to render terminal text properly.
+ */
+export enum FLAGS {
+  BOLD = 1,
+  UNDERLINE = 2,
+  BLINK = 4,
+  INVERSE = 8,
+  INVISIBLE = 16,
+  DIM = 32
+}
+
 export interface IRenderLayer {
   /**
    * Called when the terminal loses focus.
diff --git a/src/renderer/Types.ts b/src/renderer/Types.ts
deleted file mode 100644
index 834f88135..000000000
--- a/src/renderer/Types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) 2017 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
- /**
- * Flags used to render terminal text properly.
- */
-export enum FLAGS {
-  BOLD = 1,
-  UNDERLINE = 2,
-  BLINK = 4,
-  INVERSE = 8,
-  INVISIBLE = 16,
-  DIM = 32
-}
diff --git a/src/utils/TestUtils.test.ts b/src/utils/TestUtils.test.ts
index 64c326d55..54474a7f3 100644
--- a/src/utils/TestUtils.test.ts
+++ b/src/utils/TestUtils.test.ts
@@ -4,7 +4,7 @@
  */
 
 import { ITerminal, IBuffer, IBufferSet, IBrowser, ICharMeasure, ISelectionManager, ITerminalOptions, ICircularList, ITheme, ILinkifier, IMouseHelper, ILinkMatcherOptions, LineData, IColorSet, IRenderer, IRenderDimensions, IColorManager } from '../../typings/xterm-internal';
-import { IInputHandlingTerminal, IViewport, ICompositionHelper } from '../Interfaces';
+import { IInputHandlingTerminal, IViewport, ICompositionHelper } from '../Types';
 import { Buffer } from '../Buffer';
 import * as Browser from '../shared/utils/Browser';