diff --git a/demo/editor-build.html b/demo/editor-build.html
index 32deec81..b7d11724 100644
--- a/demo/editor-build.html
+++ b/demo/editor-build.html
@@ -153,7 +153,7 @@ require(
         Editor,
         Renderer,
         theme,
-        Document,
+        docMod,
         jsMod,
         cssMod,
         htmlMod,
@@ -163,6 +163,7 @@ require(
     ) {
 
 var event = eventMod.event;
+var Document = docMod.Document;
 var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
 var HtmlMode = htmlMod.Html;
diff --git a/editor.html b/editor.html
index a4ddddff..e14f9b52 100644
--- a/editor.html
+++ b/editor.html
@@ -152,7 +152,7 @@ require(
         Editor,
         Renderer,
         theme,
-        Document,
+        docMod,
         jsMod,
         cssMod,
         htmlMod,
@@ -162,6 +162,7 @@ require(
     ) {
 
 var event = eventMod.event;
+var Document = docMod.Document;
 var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
 var HtmlMode = htmlMod.Html;
diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js
index 4b557352..21539d69 100644
--- a/lib/ace/background_tokenizer.js
+++ b/lib/ace/background_tokenizer.js
@@ -164,5 +164,5 @@ var BackgroundTokenizer = function(tokenizer, editor) {
 
 }).call(BackgroundTokenizer.prototype);
 
-return BackgroundTokenizer;
+exports.BackgroundTokenizer = BackgroundTokenizer;
 });
diff --git a/lib/ace/document.js b/lib/ace/document.js
index 3a799655..3023e720 100644
--- a/lib/ace/document.js
+++ b/lib/ace/document.js
@@ -746,5 +746,5 @@ var Document = function(text, mode) {
 
 }).call(Document.prototype);
 
-return Document;
+exports.Document = Document;
 });
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 87db8917..b1d66d45 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -42,9 +42,9 @@ var event = require("ace/lib/event").event;
 var lang = require("ace/lib/lang").lang;
 var TextInput = require("ace/textinput");
 var KeyBinding = require("ace/keybinding");
-var Document = require("ace/document");
+var Document = require("ace/document").Document;
 var Search = require("ace/search");
-var BackgroundTokenizer = require("ace/background_tokenizer");
+var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer;
 var Range = require("ace/range");
 var MEventEmitter = require("ace/event_emitter").MEventEmitter;