diff --git a/demo/editor-build.html b/demo/editor-build.html
index b7d11724..6a58e532 100644
--- a/demo/editor-build.html
+++ b/demo/editor-build.html
@@ -150,7 +150,7 @@ require(
         "ace/undomanager"
     ], function(
         eventMod,
-        Editor,
+        editorMod,
         Renderer,
         theme,
         docMod,
@@ -163,6 +163,9 @@ require(
     ) {
 
 var event = eventMod.event;
+var Editor = editorMod.Editor;
+
+
 var Document = docMod.Document;
 var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
@@ -170,6 +173,7 @@ var HtmlMode = htmlMod.Html;
 var XmlMode = xmlMod.Xml;
 var TextMode = textMod.Text;
 
+
 var docs = {}
 
 docs.js = new Document(document.getElementById("jstext").innerHTML);
diff --git a/editor.html b/editor.html
index e14f9b52..b84383b7 100644
--- a/editor.html
+++ b/editor.html
@@ -149,7 +149,7 @@ require(
         "ace/undomanager"
     ], function(
         eventMod,
-        Editor,
+        editorMod,
         Renderer,
         theme,
         docMod,
@@ -162,6 +162,9 @@ require(
     ) {
 
 var event = eventMod.event;
+var Editor = editorMod.Editor;
+
+
 var Document = docMod.Document;
 var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
@@ -169,6 +172,7 @@ var HtmlMode = htmlMod.Html;
 var XmlMode = xmlMod.Xml;
 var TextMode = textMod.Text;
 
+
 var docs = {}
 
 docs.js = new Document(document.getElementById("jstext").innerHTML);
diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index a83a464b..7a40b833 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var PluginManager = require("ace/plugin_manager");
+var PluginManager = require("ace/plugin_manager").PluginManager;
 
 PluginManager.registerCommand("selectall", function(editor, selection) {
     selection.selectAll();
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index b1d66d45..22a90f12 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -41,7 +41,7 @@ var oop = require("ace/lib/oop").oop;
 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 KeyBinding = require("ace/keybinding").KeyBinding;
 var Document = require("ace/document").Document;
 var Search = require("ace/search");
 var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer;
@@ -1036,5 +1036,5 @@ var Editor =function(renderer, doc) {
 }).call(Editor.prototype);
 
 
-return Editor;
+exports.Editor = Editor;
 });
diff --git a/lib/ace/keybinding.js b/lib/ace/keybinding.js
index 6ce54bd5..2a3ba8ec 100644
--- a/lib/ace/keybinding.js
+++ b/lib/ace/keybinding.js
@@ -41,7 +41,7 @@ var core = require("ace/lib/core").core;
 var event = require("ace/lib/event").event;
 var default_mac = require("ace/conf/keybindings/default_mac").bindings;
 var default_win = require("ace/conf/keybindings/default_win").bindings;
-var PluginManager = require("ace/plugin_manager");
+var PluginManager = require("ace/plugin_manager").PluginManager;
 require("ace/commands/default_commands");
 
 var KeyBinding = function(element, editor, config) {
@@ -149,5 +149,5 @@ var KeyBinding = function(element, editor, config) {
 
 }).call(KeyBinding.prototype);
 
-return KeyBinding;
+exports.KeyBinding = KeyBinding;
 });
diff --git a/lib/ace/plugin_manager.js b/lib/ace/plugin_manager.js
index 2bd5abc6..eeffd15a 100644
--- a/lib/ace/plugin_manager.js
+++ b/lib/ace/plugin_manager.js
@@ -45,5 +45,5 @@ var PluginManager = {
     }
 };
 
-return PluginManager;
+exports.PluginManager = PluginManager;
 });
\ No newline at end of file