diff --git a/src/services/codefixes/fixes.ts b/src/services/codefixes/fixes.ts
new file mode 100644
index 00000000000..d64a99ca1b9
--- /dev/null
+++ b/src/services/codefixes/fixes.ts
@@ -0,0 +1 @@
+///<reference path='superFixes.ts' />
diff --git a/src/services/codefixes/references.ts b/src/services/codefixes/references.ts
deleted file mode 100644
index a9ab7a98b33..00000000000
--- a/src/services/codefixes/references.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-///<reference path='..\services.ts' />
-///<reference path='codeFixProvider.ts' />
-///<reference path='superFixes.ts' />
diff --git a/src/services/services.ts b/src/services/services.ts
index bed1869b7fb..050096b45d4 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -24,7 +24,8 @@
 /// <reference path='transpile.ts' />
 /// <reference path='formatting\formatting.ts' />
 /// <reference path='formatting\smartIndenter.ts' />
-/// <reference path='codefixes\references.ts' />
+/// <reference path='codefixes\codeFixProvider.ts' />
+/// <reference path='codefixes\fixes.ts' />
 
 namespace ts {
     /** The version of the language service API */
@@ -1641,15 +1642,18 @@ namespace ts {
         function getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: string[]): CodeAction[] {
             synchronizeHostData();
             const sourceFile = getValidSourceFile(fileName);
+            const span = { start, length: end - start };
+            const newLineChar = getNewLineOrDefaultFromHost(host);
+
             let allFixes: CodeAction[] = [];
 
             forEach(errorCodes, error => {
                 const context = {
                     errorCode: error,
                     sourceFile: sourceFile,
-                    span: { start, length: end - start },
+                    span: span,
                     program: program,
-                    newLineCharacter: getNewLineOrDefaultFromHost(host)
+                    newLineCharacter: newLineChar
                 };
 
                 const fixes = codefix.getFixes(context);
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 0f3059a449d..0066ef94343 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -80,7 +80,6 @@
         "formatting/smartIndenter.ts",
         "formatting/tokenRange.ts",
         "codeFixes/codeFixProvider.ts",
-        "codeFixes/references.ts",
-        "codeFixes/superFixes.ts"
+        "codeFixes/fixes.ts"
     ]
 }