diff --git a/src/renderer/atlas/BaseCharAtlas.ts b/src/browser/renderer/atlas/BaseCharAtlas.ts
similarity index 93%
rename from src/renderer/atlas/BaseCharAtlas.ts
rename to src/browser/renderer/atlas/BaseCharAtlas.ts
index 470736f13..dc114601b 100644
--- a/src/renderer/atlas/BaseCharAtlas.ts
+++ b/src/browser/renderer/atlas/BaseCharAtlas.ts
@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { IGlyphIdentifier } from './Types';
-import { IDisposable } from 'xterm';
+import { IGlyphIdentifier } from 'browser/renderer/atlas/Types';
+import { IDisposable } from 'common/Types';
 
 export abstract class BaseCharAtlas implements IDisposable {
   private _didWarmUp: boolean = false;
diff --git a/src/browser/renderer/atlas/Types.d.ts b/src/browser/renderer/atlas/Types.d.ts
new file mode 100644
index 000000000..fd5b596cb
--- /dev/null
+++ b/src/browser/renderer/atlas/Types.d.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+export interface IGlyphIdentifier {
+  chars: string;
+  code: number;
+  bg: number;
+  fg: number;
+  bold: boolean;
+  dim: boolean;
+  italic: boolean;
+}
diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
index 767ef08c0..e704375c1 100644
--- a/src/renderer/BaseRenderLayer.ts
+++ b/src/renderer/BaseRenderLayer.ts
@@ -8,9 +8,9 @@ import { IRenderDimensions } from 'browser/renderer/Types';
 import { ITerminal } from '../Types';
 import { ICellData } from 'common/Types';
 import { DEFAULT_COLOR, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE } from 'common/buffer/Constants';
-import { IGlyphIdentifier } from './atlas/Types';
+import { IGlyphIdentifier } from 'browser/renderer/atlas/Types';
 import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
-import { BaseCharAtlas } from './atlas/BaseCharAtlas';
+import { BaseCharAtlas } from 'browser/renderer/atlas/BaseCharAtlas';
 import { acquireCharAtlas } from './atlas/CharAtlasCache';
 import { AttributeData } from 'common/buffer/AttributeData';
 import { IColorSet } from 'browser/Types';
diff --git a/src/renderer/atlas/CharAtlasCache.ts b/src/renderer/atlas/CharAtlasCache.ts
index 43b5eb839..f9bd68a1f 100644
--- a/src/renderer/atlas/CharAtlasCache.ts
+++ b/src/renderer/atlas/CharAtlasCache.ts
@@ -5,7 +5,7 @@
 
 import { ITerminal } from '../../Types';
 import { generateConfig, configEquals } from './CharAtlasUtils';
-import { BaseCharAtlas } from './BaseCharAtlas';
+import { BaseCharAtlas } from 'browser/renderer/atlas/BaseCharAtlas';
 import { DynamicCharAtlas } from './DynamicCharAtlas';
 import { ICharAtlasConfig } from './Types';
 import { IColorSet } from 'browser/Types';
diff --git a/src/renderer/atlas/DynamicCharAtlas.ts b/src/renderer/atlas/DynamicCharAtlas.ts
index 6e669d919..9af79e01e 100644
--- a/src/renderer/atlas/DynamicCharAtlas.ts
+++ b/src/renderer/atlas/DynamicCharAtlas.ts
@@ -3,9 +3,10 @@
  * @license MIT
  */
 
-import { IGlyphIdentifier, ICharAtlasConfig } from './Types';
+import { ICharAtlasConfig } from './Types';
 import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
-import { BaseCharAtlas } from './BaseCharAtlas';
+import { IGlyphIdentifier } from 'browser/renderer/atlas/Types';
+import { BaseCharAtlas } from '../../browser/renderer/atlas/BaseCharAtlas';
 import { DEFAULT_ANSI_COLORS } from 'browser/ColorManager';
 import { LRUMap } from 'browser/renderer/atlas/LRUMap';
 import { isFirefox, isSafari } from 'common/Platform';
diff --git a/src/renderer/atlas/Types.d.ts b/src/renderer/atlas/Types.d.ts
index 1de843e08..f717381c8 100644
--- a/src/renderer/atlas/Types.d.ts
+++ b/src/renderer/atlas/Types.d.ts
@@ -6,16 +6,6 @@
 import { FontWeight } from 'xterm';
 import { IColorSet } from 'browser/Types';
 
-export interface IGlyphIdentifier {
-  chars: string;
-  code: number;
-  bg: number;
-  fg: number;
-  bold: boolean;
-  dim: boolean;
-  italic: boolean;
-}
-
 export interface ICharAtlasConfig {
   devicePixelRatio: number;
   fontSize: number;