diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index c36e176912..1eb9a05c5d 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var noOptions = {};
@@ -159,4 +166,4 @@
     });
     return true;
   });
-})();
+});
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 0566c74e43..6db3b0a2b9 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   var modes = ["clike", "css", "javascript"];
   for (var i = 0; i < modes.length; ++i)
     CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
@@ -59,4 +66,4 @@
       cm.addKeyMap(map);
     }
   });
-})();
+});
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 41d7bf8663..2c26542045 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -1,6 +1,13 @@
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   function dialogDiv(cm, template, bottom) {
     var wrap = cm.getWrapperElement();
     var dialog;
@@ -119,4 +126,4 @@
     if (duration)
       doneTimer = setTimeout(close, options.duration);
   });
-})();
+});
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index a442f6a433..e39c6e162f 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
@@ -28,4 +35,4 @@
     window.scrollTo(info.scrollLeft, info.scrollTop);
     cm.refresh();
   }
-})();
+});
diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 748afe7275..0fdc9b0d5b 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
@@ -45,4 +52,4 @@
   function isEmpty(cm) {
     return (cm.lineCount() === 1) && (cm.getLine(0) === "");
   }
-})();
+});
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 64c56f9530..84b2fc56f1 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
   var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
   var SPACE_CHAR_REGEX = /\s/;
@@ -112,4 +119,4 @@
       });
     };
   }
-})();
+});
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 7047e27738..ac6c2fc6d4 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -22,7 +22,14 @@
  * See demos/closetag.html for a usage example.
  */
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
     if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseTags");
@@ -106,4 +113,4 @@
       if (collection[i] == elt) return i;
     return -1;
   }
-})();
+});
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index a038345b4b..54c7340bbe 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var listRE = /^(\s*)([*+-]|(\d+)\.)(\s*)/,
@@ -25,4 +32,4 @@
 
     cm.replaceSelections(replacements, null, "+insert");
   };
-}());
+});
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 4d0c853a52..dcdee7516b 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
     (document.documentMode == null || document.documentMode < 8);
 
@@ -93,4 +100,4 @@
   CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
     return findMatchingBracket(this, pos, strict);
   });
-})();
+});
diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index f189c1f8ef..2b7d22ed84 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
@@ -53,4 +60,4 @@
       if (other) cm.setSelection(other.to, other.from);
     }
   };
-})();
+});
diff --git a/addon/edit/trailingspace.js b/addon/edit/trailingspace.js
index f6bb02645d..ec07221e30 100644
--- a/addon/edit/trailingspace.js
+++ b/addon/edit/trailingspace.js
@@ -1,15 +1,24 @@
-CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
-  if (prev == CodeMirror.Init) prev = false;
-  if (prev && !val)
-    cm.removeOverlay("trailingspace");
-  else if (!prev && val)
-    cm.addOverlay({
-      token: function(stream) {
-        for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
-        if (i > stream.pos) { stream.pos = i; return null; }
-        stream.pos = l;
-        return "trailingspace";
-      },
-      name: "trailingspace"
-    });
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
+    if (prev == CodeMirror.Init) prev = false;
+    if (prev && !val)
+      cm.removeOverlay("trailingspace");
+    else if (!prev && val)
+      cm.addOverlay({
+        token: function(stream) {
+          for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
+          if (i > stream.pos) { stream.pos = i; return null; }
+          stream.pos = l;
+          return "trailingspace";
+        },
+        name: "trailingspace"
+      });
+  });
 });
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 2560b2b94c..f0ee62029a 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.registerHelper("fold", "brace", function(cm, start) {
   var line = start.line, lineText = cm.getLine(line);
   var startCh, tokenType;
@@ -45,7 +55,6 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 });
-CodeMirror.braceRangeFinder = CodeMirror.fold.brace; // deprecated
 
 CodeMirror.registerHelper("fold", "import", function(cm, start) {
   function hasImport(line) {
@@ -70,7 +79,6 @@ CodeMirror.registerHelper("fold", "import", function(cm, start) {
   }
   return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
 });
-CodeMirror.importRangeFinder = CodeMirror.fold["import"]; // deprecated
 
 CodeMirror.registerHelper("fold", "include", function(cm, start) {
   function hasInclude(line) {
@@ -90,4 +98,5 @@ CodeMirror.registerHelper("fold", "include", function(cm, start) {
   return {from: CodeMirror.Pos(start, has + 1),
           to: cm.clipPos(CodeMirror.Pos(end))};
 });
-CodeMirror.includeRangeFinder = CodeMirror.fold.include; // deprecated
+
+});
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index 26e72f09f5..d72c5479a7 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
   return mode.blockCommentStart && mode.blockCommentEnd;
 }, function(cm, start) {
@@ -40,3 +50,5 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 });
+
+});
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 5c00d7093c..4627c81f9d 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   function doFold(cm, pos, options, force) {
@@ -83,4 +90,4 @@
       if (cur) return cur;
     }
   });
-})();
+});
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index a4f3bb3186..9caba59aad 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./foldcode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./foldcode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
@@ -121,4 +128,4 @@
     if (line >= state.from && line < state.to)
       updateFoldInfo(cm, line, line + 1);
   }
-})();
+});
diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 434c2bc5ca..d0130836a2 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
   if (!/\S/.test(firstLine)) return;
@@ -27,4 +37,5 @@ CodeMirror.registerHelper("fold", "indent", function(cm, start) {
     to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
   };
 });
-CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated
+
+});
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index db5aed7041..d554e2fc42 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var Pos = CodeMirror.Pos;
@@ -136,8 +143,6 @@
       }
     }
   });
-  CodeMirror.tagRangeFinder = CodeMirror.fold.xml; // deprecated
-
   CodeMirror.findMatchingTag = function(cm, pos, range) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
     if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
@@ -170,4 +175,4 @@
     var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
     return !!findMatchingClose(iter, name);
   };
-})();
+});
diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index a144768c81..1570664c4f 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var WORD = /[\w$]+/, RANGE = 500;
@@ -29,4 +36,4 @@
     }
     return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
   });
-})();
+});
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 6789c458ba..9e5b1e132d 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var pseudoClasses = {link: 1, visited: 1, active: 1, hover: 1, focus: 1,
@@ -43,4 +50,4 @@
       to: CodeMirror.Pos(cur.line, end)
     };
   });
-})();
+});
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index cf256851ef..cbe7c61ad4 100755
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -1,4 +1,13 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
   var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
   var targets = ["_blank", "_self", "_top", "_parent"];
   var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
@@ -332,6 +341,5 @@
     if (options) for (var opt in options) local[opt] = options[opt];
     return CodeMirror.hint.xml(cm, local);
   }
-  CodeMirror.htmlHint = htmlHint; // deprecated
   CodeMirror.registerHelper("hint", "html", htmlHint);
-})();
+});
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index c347c206ec..305bb85a29 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   var Pos = CodeMirror.Pos;
 
   function forEach(arr, f) {
@@ -47,7 +54,6 @@
                       function (e, cur) {return e.getTokenAt(cur);},
                       options);
   };
-  CodeMirror.javascriptHint = javascriptHint; // deprecated
   CodeMirror.registerHelper("hint", "javascript", javascriptHint);
 
   function getCoffeeScriptToken(editor, cur) {
@@ -71,7 +77,6 @@
   function coffeescriptHint(editor, options) {
     return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
   }
-  CodeMirror.coffeescriptHint = coffeescriptHint; // deprecated
   CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
 
   var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
@@ -128,4 +133,4 @@
     }
     return found;
   }
-})();
+});
diff --git a/addon/hint/pig-hint.js b/addon/hint/pig-hint.js
index 6c0c523774..02342f0246 100644
--- a/addon/hint/pig-hint.js
+++ b/addon/hint/pig-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   function forEach(arr, f) {
@@ -46,7 +53,6 @@
   function pigHint(editor) {
     return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
   }
-  CodeMirror.pigHint = pigHint; // deprecated
   CodeMirror.registerHelper("hint", "pig", pigHint);
 
   var pigKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
@@ -118,4 +124,4 @@
     }
     return found;
   }
-})();
+});
diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
index 248284e8c5..eebfcc76dc 100644
--- a/addon/hint/python-hint.js
+++ b/addon/hint/python-hint.js
@@ -1,4 +1,13 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
   function forEach(arr, f) {
     for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
   }
@@ -40,7 +49,6 @@
   function pythonHint(editor) {
     return scriptHint(editor, pythonKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
   }
-  CodeMirror.pythonHint = pythonHint; // deprecated
   CodeMirror.registerHelper("hint", "python", pythonHint);
 
   var pythonKeywords = "and del from not while as elif global or with assert else if pass yield"
@@ -88,4 +96,4 @@
     }
     return found;
   }
-})();
+});
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 831fe089da..6a4d74e360 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
@@ -332,4 +339,4 @@
   });
 
   CodeMirror.commands.autocomplete = CodeMirror.showHint;
-})();
+});
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index d00781cff9..736dbaea06 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/sql/sql"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/sql/sql"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var tables;
@@ -143,4 +150,4 @@
     };
   }
   CodeMirror.registerHelper("hint", "sql", sqlHint);
-})();
+});
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 69f2b771fe..857564909a 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var Pos = CodeMirror.Pos;
@@ -64,6 +71,5 @@
     };
   }
 
-  CodeMirror.xmlHint = getHints; // deprecated
   CodeMirror.registerHelper("hint", "xml", getHints);
-})();
+});
diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 7f55a294dd..6df17f8f84 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -2,6 +2,16 @@
 
 // declare global: coffeelint
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.registerHelper("lint", "coffeescript", function(text) {
   var found = [];
   var parseError = function(err) {
@@ -24,4 +34,5 @@ CodeMirror.registerHelper("lint", "coffeescript", function(text) {
   }
   return found;
 });
-CodeMirror.coffeeValidator = CodeMirror.lint.coffeescript; // deprecated
+
+});
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 1de71fbcbd..2a799ddc4f 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -2,6 +2,16 @@
 
 // declare global: CSSLint
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.registerHelper("lint", "css", function(text) {
   var found = [];
   var results = CSSLint.verify(text), messages = results.messages, message = null;
@@ -17,3 +27,5 @@ CodeMirror.registerHelper("lint", "css", function(text) {
   }
   return found;
 });
+
+});
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index 7123ab7e64..bbb51083b8 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   // declare global: JSHINT
 
@@ -19,7 +26,6 @@
   }
 
   CodeMirror.registerHelper("lint", "javascript", validator);
-  CodeMirror.javascriptValidator = CodeMirror.lint.javascript; // deprecated
 
   function cleanup(error) {
     // All problems are warnings by default
@@ -123,4 +129,4 @@
       }
     }
   }
-})();
+});
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index e10e11bcaf..1f5f82d0ca 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -2,6 +2,16 @@
 
 // declare global: jsonlint
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.registerHelper("lint", "json", function(text) {
   var found = [];
   jsonlint.parseError = function(str, hash) {
@@ -14,4 +24,5 @@ CodeMirror.registerHelper("lint", "json", function(text) {
   catch(e) {}
   return found;
 });
-CodeMirror.jsonValidator = CodeMirror.lint.json; // deprecated
+
+});
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 6121735d3f..db5162ee7a 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
   var SEVERITIES = /^(?:error|warning)$/;
@@ -178,7 +185,7 @@
     }
   }
 
-  function optionHandler(cm, val, old) {
+  CodeMirror.defineOption("lint", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
       cm.off("change", onChange);
@@ -196,8 +203,5 @@
 
       startLinting(cm);
     }
-  }
-
-  CodeMirror.defineOption("lintWith", false, optionHandler); // deprecated
-  CodeMirror.defineOption("lint", false, optionHandler); // deprecated
-})();
+  });
+});
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 89f852652b..99e5d075ba 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
 
@@ -476,4 +483,4 @@
   function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
   function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
   function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-})();
+});
diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index 60fafbb178..e08c281321 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
 
   var loading = {};
@@ -48,4 +55,4 @@
         instance.setOption("mode", instance.getOption("mode"));
       });
   };
-}());
+});
diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 614ab1add3..07385c35f2 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.multiplexingMode = function(outer /*, others */) {
   // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
   var others = Array.prototype.slice.call(arguments, 1);
@@ -101,3 +111,5 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
     }
   };
 };
+
+});
diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index b7928a7bbf..6f556a13a7 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -6,8 +6,17 @@
 // overlay wins, unless the combine argument was true, in which case
 // the styles are combined.
 
-// overlayParser is the old, deprecated name
-CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.overlayMode = function(base, overlay, combine) {
   return {
     startState: function() {
       return {
@@ -57,3 +66,5 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
     }
   };
 };
+
+});
diff --git a/addon/runmode/colorize.js b/addon/runmode/colorize.js
index 62286d21e4..0f9530b17b 100644
--- a/addon/runmode/colorize.js
+++ b/addon/runmode/colorize.js
@@ -1,4 +1,12 @@
-CodeMirror.colorize = (function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./runmode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./runmode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
 
   var isBlock = /^(p|li|div|h\\d|pre|blockquote|td)$/;
 
@@ -10,7 +18,7 @@ CodeMirror.colorize = (function() {
     }
   }
 
-  return function(collection, defaultMode) {
+  CodeMirror.colorize = function(collection, defaultMode) {
     if (!collection) collection = document.body.getElementsByTagName("pre");
 
     for (var i = 0; i < collection.length; ++i) {
@@ -26,4 +34,4 @@ CodeMirror.colorize = (function() {
       node.className += " cm-s-default";
     }
   };
-})();
+});
diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index ec06ba11cb..eaa2b8f2fb 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -1,5 +1,3 @@
-/* Just enough of CodeMirror to run runMode under node.js */
-
 window.CodeMirror = {};
 
 (function() {
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 2cafa811f8..351840e08e 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.runMode = function(string, modespec, callback, options) {
   var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
   var ie = /MSIE \d/.test(navigator.userAgent);
@@ -54,3 +64,5 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
     }
   }
 };
+
+});
diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index 58720ad413..467b7aa1cf 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("scrollPastEnd", false, function(cm, val, old) {
@@ -33,4 +40,4 @@
       cm.setSize();
     }
   }
-})();
+});
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index a2eda2e614..d9c818b838 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -12,7 +12,16 @@
 // actual CSS class name. showToken, when enabled, will cause the
 // current token to be highlighted when nothing is selected.
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
   var DEFAULT_DELAY = 100;
@@ -88,4 +97,4 @@
       stream.skipTo(query.charAt(0)) || stream.skipToEnd();
     }};
   }
-})();
+});
diff --git a/addon/search/search.js b/addon/search/search.js
index 38b488522f..3df006d4b7 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -6,7 +6,14 @@
 // replace by making sure the match is no longer selected when hitting
 // Ctrl-G.
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   function searchOverlay(query, caseInsensitive) {
     var startChar;
@@ -139,4 +146,4 @@
   CodeMirror.commands.clearSearch = clearSearch;
   CodeMirror.commands.replace = replace;
   CodeMirror.commands.replaceAll = function(cm) {replace(cm, true);};
-})();
+});
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 6afac80fb8..899f44c4ab 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,4 +1,12 @@
-(function(){
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
   var Pos = CodeMirror.Pos;
 
   function SearchCursor(doc, query, pos, caseFold) {
@@ -175,4 +183,4 @@
     if (ranges.length)
       this.setSelections(ranges, 0);
   });
-})();
+});
diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index c8b7001ced..a818f109b6 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -4,7 +4,14 @@
 // active line's wrapping <div> the CSS class "CodeMirror-activeline",
 // and gives its background <div> the class "CodeMirror-activeline-background".
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   var WRAP_CLASS = "CodeMirror-activeline";
   var BACK_CLASS = "CodeMirror-activeline-background";
@@ -56,4 +63,4 @@
   function selectionChange(cm, sel) {
     updateActiveLines(cm, sel.ranges);
   }
-})();
+});
diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index c40a9c99bd..ae0d393143 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -4,7 +4,14 @@
 // selected text the CSS class given as option value, or
 // "CodeMirror-selectedtext" when the value is not a string.
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) {
@@ -105,4 +112,4 @@
       }
     }
   }
-})();
+});
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index fa2a2c3528..1cc7e972e5 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -40,7 +40,14 @@
 //   load. Or, if you minified those into a single script and included
 //   them in the workerScript, simply leave this undefined.
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   // declare global: tern
 
@@ -650,4 +657,4 @@
     this.delFile = function(name) { send({type: "del", name: name}); };
     this.request = function(body, c) { send({type: "req", body: body}, c); };
   }
-})();
+});
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index f6d99212a8..f900d6e81b 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var Pos = CodeMirror.Pos;
@@ -108,4 +115,4 @@
     });
     return madeChange;
   });
-})();
+});
diff --git a/demo/btree.html b/demo/btree.html
index 7635ca1bb4..b7bd39088d 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -58,7 +58,6 @@ <h2>B-Tree visualization</h2>
         var gray = Math.min(line.text.length * 3, 230), col = gray.toString(16);
         if (col.length == 1) col = "0" + col;
         lineElt.style.background = "#" + col + col + col;
-                          console.log(line.height, line);
         lineElt.style.width = Math.max(Math.round(line.height / 3), 1) + "px";
       }
     } else {
diff --git a/doc/compress.html b/doc/compress.html
index 55e25f3e68..d4c108c516 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -128,8 +128,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/python/python.js">python.js</option>
           <option value="http://codemirror.net/mode/q/q.js">q.js</option>
           <option value="http://codemirror.net/mode/r/r.js">r.js</option>
-          <option value="http://codemirror.net/mode/rpm/changes/changes.js">rpm/changes.js</option>
-          <option value="http://codemirror.net/mode/rpm/spec/spec.js">rpm/spec.js</option>
+          <option value="http://codemirror.net/mode/rpm/rpm.js">rpm.js</option>
           <option value="http://codemirror.net/mode/rst/rst.js">rst.js</option>
           <option value="http://codemirror.net/mode/ruby/ruby.js">ruby.js</option>
           <option value="http://codemirror.net/mode/rust/rust.js">rust.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 3e81b94c3a..9a2424eb48 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -91,6 +91,9 @@ <h2>Basic Usage</h2>
 &lt;link rel="stylesheet" href="../lib/codemirror.css">
 &lt;script src="mode/javascript/javascript.js">&lt;/script></pre>
 
+    <p>(Alternatively, use a module loader. <a href="#modloader">More
+    about that later.</a>)</p>
+
     <p>Having done this, an editor instance can be created like
     this:</p>
 
@@ -135,7 +138,41 @@ <h2>Basic Usage</h2>
     of a form) is submitted. See the <a href="#fromTextArea">API
     reference</a> for a full description of this method.</p>
 
+    <h3 id=modloader>Module loaders</h3>
+
+    <p>The files in the CodeMirror distribution contain shims for
+    loading them (and their dependencies) in AMD or CommonJS
+    environments. If the variables <code>exports</code>
+    and <code>module</code> exist and have type object, CommonJS-style
+    require will be used. If not, but there is a
+    function <code>define</code> with an <code>amd</code> property
+    present, AMD-style (RequireJS) will be used.</p>
+
+    <p>It is possible to
+    use <a href="http://browserify.org/">Browserify</a> or similar
+    tools to statically build modules using CodeMirror. Alternatively,
+    use <a href="http://requirejs.org/">RequireJS</a> to dynamically
+    load dependencies at runtime. Both of these approaches have the
+    advantage that they don't use the global namespace and can, thus,
+    do things like load multiple versions of CodeMirror alongside each
+    other.</p>
+
+    <p>Here's a simple example of using RequireJS to load CodeMirror:</p>
+
+    <pre data-lang="javascript">require([
+  "cm/lib/codemirror", "cm/mode/htmlmixed/htmlmixed"
+], function(CodeMirror) {
+  CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    mode: "htmlmixed"
+  });
+});</pre>
+
+    <p>It will automatically load the modes that the mixed HTML mode
+    depends on (XML, JavaScript, and CSS).</p>
+
 </section>
+
 <section id=config>
     <h2>Configuration</h2>
 
@@ -2168,7 +2205,7 @@ <h2>Addons</h2>
         <dt><code><strong>"close"</strong> ()</code></dt>
         <dd>Fired when the completion is finished.</dd>
       </dl>
-      This addon depends styles
+      This addon depends on styles
       from <code>addon/hint/show-hint.css</code>. Check
       out <a href="../demo/complete.html">the demo</a> for an
       example.</dd>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 64a838ca26..d390228682 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -19,6 +19,7 @@
     <li><a href="#beforeSelectionChange">The beforeSelectionChange event</a>
     <li><a href="#replaceSelection">replaceSelection and collapsing</a>
     <li><a href="#changeEvent">change event data</a>
+    <li><a href="#deprecated">Deprecated interfaces dropped</a>
   </ul>
 </div>
 
@@ -77,5 +78,20 @@ <h2 id=upgrade>Upgrading to version 4</h2>
 multiple <a href="manual.html#event_change"><code>"change"</code></a>
 events. Existing code will probably continue to work unmodified.</p>
 
+</section>
+
+<section id=deprecated><h2>Deprecated interfaces dropped</h2>
+
+<p>A few properties that have been deprecated for a while are now
+gone. Most notably, the names for folding and completing functions
+(<code>CodeMirror.braceRangeFinder</code>, <code>CodeMirror.javascriptHint</code>,
+etc) are now gone
+(use <code>CodeMirror.fold.brace</code>, <code>CodeMirror.hint.javascript</code>).</p>
+
+<p>The <code>className</code> property in the return value
+of <a href="manual.html#getTokenAt"><code>getTokenAt</code></a>, which
+has been superseded by the <code>type</code> property, is also no
+longer present.</p>
+
 </section>
 </article>
diff --git a/keymap/emacs.js b/keymap/emacs.js
index c56d7eb7e7..35f199cb73 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var Pos = CodeMirror.Pos;
@@ -395,4 +402,4 @@
   }
   for (var i = 0; i < 10; ++i) regPrefix(String(i));
   regPrefix("-");
-})();
+});
diff --git a/keymap/multiselect.js b/keymap/multiselect.js
index f45f27254a..46379484a6 100644
--- a/keymap/multiselect.js
+++ b/keymap/multiselect.js
@@ -1,7 +1,14 @@
 // A number of extra keybindings for multiple-selection handling
 // Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var pc = CodeMirror.keyMap.pcDefault, mac = CodeMirror.keyMap.macDefault;
@@ -44,4 +51,4 @@
       cm.selectMatches(query);
     });
   };
-})();
+});
diff --git a/keymap/vim.js b/keymap/vim.js
index 9e5b257f4f..720ef4a2c3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -56,7 +56,14 @@
  *  8. Set up Vim to work as a keymap for CodeMirror.
  */
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   'use strict';
 
   var defaultKeymap = [
@@ -3800,5 +3807,4 @@
   };
   // Initialize Vim and make it available as an API.
   CodeMirror.Vim = Vim();
-}
-)();
+});
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c5a332264f..c4adf99f65 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1,5 +1,11 @@
-// CodeMirror is the only global var we claim
-window.CodeMirror = (function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    module.exports = mod();
+  else if (typeof define == "function" && define.amd) // AMD
+    return define([], mod);
+  else // Plain browser env
+    this.CodeMirror = mod();
+})(function() {
   "use strict";
 
   // BROWSER SNIFFING
@@ -3175,7 +3181,6 @@ window.CodeMirror = (function() {
       return {start: stream.start,
               end: stream.pos,
               string: stream.current(),
-              className: style || null, // Deprecated, use 'type' instead
               type: style || null,
               state: state};
     },
@@ -6363,4 +6368,4 @@ window.CodeMirror = (function() {
   CodeMirror.version = "4.0.0";
 
   return CodeMirror;
-})();
+});
diff --git a/mode/apl/apl.js b/mode/apl/apl.js
index 5c23af85da..2ba74c18c2 100644
--- a/mode/apl/apl.js
+++ b/mode/apl/apl.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("apl", function() {
   var builtInOps = {
     ".": "innerProduct",
@@ -158,3 +168,5 @@ CodeMirror.defineMode("apl", function() {
 });
 
 CodeMirror.defineMIME("text/apl", "apl");
+
+});
diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index 60b689d1d5..c56fc0b38a 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -14,6 +14,16 @@
  * =====================================================================================
  */
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("asterisk", function() {
   var atoms    = ["exten", "same", "include","ignorepat","switch"],
       dpcmd    = ["#include","#exec"],
@@ -181,3 +191,5 @@ CodeMirror.defineMode("asterisk", function() {
 });
 
 CodeMirror.defineMIME("text/x-asterisk", "asterisk");
+
+});
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 4e4988dd81..b869f72723 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("clike", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
@@ -379,3 +389,5 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 }());
+
+});
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index e3d87d23a6..dd2e2ce1b8 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -2,6 +2,17 @@
  * Author: Hans Engel
  * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
  */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("clojure", function (options) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
         ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
@@ -223,3 +234,5 @@ CodeMirror.defineMode("clojure", function (options) {
 });
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
+
+});
diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index d92491dde8..e66e42a191 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -2,6 +2,16 @@
  * Author: Gautam Mehta
  * Branched from CodeMirror's Scheme mode
  */
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("cobol", function () {
   var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
       ATOM = "atom", NUMBER = "number", KEYWORD = "keyword", MODTAG = "header",
@@ -238,3 +248,5 @@ CodeMirror.defineMode("cobol", function () {
 });
 
 CodeMirror.defineMIME("text/x-cobol", "cobol");
+
+});
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 0e9e6352f8..c6da8f2a29 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -2,6 +2,16 @@
  * Link to the project's GitHub page:
  * https://github.com/pickhardt/coffeescript-codemirror-mode
  */
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("coffeescript", function(conf) {
   var ERRORCLASS = "error";
 
@@ -351,3 +361,5 @@ CodeMirror.defineMode("coffeescript", function(conf) {
 });
 
 CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
+
+});
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 8fa08c8ac2..a0f0732bf6 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("commonlisp", function (config) {
   var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
   var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
@@ -103,3 +113,5 @@ CodeMirror.defineMode("commonlisp", function (config) {
 });
 
 CodeMirror.defineMIME("text/x-common-lisp", "commonlisp");
+
+});
diff --git a/mode/css/css.js b/mode/css/css.js
index 06d73455da..d63bdd0827 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,6 +1,14 @@
-CodeMirror.defineMode("css", function(config, parserConfig) {
-  "use strict";
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
 
+CodeMirror.defineMode("css", function(config, parserConfig) {
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
 
   var indentUnit = config.indentUnit,
@@ -334,7 +342,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   };
 });
 
-(function() {
   function keySet(array) {
     var keys = {};
     for (var i = 0; i < array.length; ++i) {
@@ -689,4 +696,5 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     name: "css",
     helperType: "less"
   });
-})();
+
+});
diff --git a/mode/d/d.js b/mode/d/d.js
index ab345f1a0d..3ab8b42838 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("d", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
@@ -173,7 +183,6 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
   };
 });
 
-(function() {
   function words(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -202,4 +211,5 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
       }
     }
   });
-}());
+
+});
diff --git a/mode/diff/diff.js b/mode/diff/diff.js
index 9a0d90ea55..d43f15d51a 100644
--- a/mode/diff/diff.js
+++ b/mode/diff/diff.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("diff", function() {
 
   var TOKEN_NAMES = {
@@ -30,3 +40,5 @@ CodeMirror.defineMode("diff", function() {
 });
 
 CodeMirror.defineMIME("text/x-diff", "diff");
+
+});
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 7033bf0f8b..b4a6cb3155 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -5,6 +5,16 @@
   GitHub: @peterkroon
 */
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("dtd", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
@@ -125,3 +135,5 @@ CodeMirror.defineMode("dtd", function(config) {
 });
 
 CodeMirror.defineMIME("application/xml-dtd", "dtd");
+
+});
diff --git a/mode/ecl/ecl.js b/mode/ecl/ecl.js
index 7601b189a0..2b841ff5f1 100644
--- a/mode/ecl/ecl.js
+++ b/mode/ecl/ecl.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("ecl", function(config) {
 
   function words(str) {
@@ -190,3 +200,5 @@ CodeMirror.defineMode("ecl", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-ecl", "ecl");
+
+});
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
index 15f34a9325..c6c3c84600 100644
--- a/mode/eiffel/eiffel.js
+++ b/mode/eiffel/eiffel.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("eiffel", function() {
   function wordObj(words) {
     var o = {};
@@ -145,3 +155,5 @@ CodeMirror.defineMode("eiffel", function() {
 });
 
 CodeMirror.defineMIME("text/x-eiffel", "eiffel");
+
+});
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index bc3bdce860..79693fca22 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -12,6 +12,16 @@
 //   old guard/bif/conversion clashes (e.g. "float/1")
 //   type/spec/opaque
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMIME("text/x-erlang", "erlang");
 
 CodeMirror.defineMode("erlang", function(cmCfg) {
@@ -605,3 +615,5 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     lineComment: "%"
   };
 });
+
+});
diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
index 83fd8fde85..58dac127c1 100644
--- a/mode/fortran/fortran.js
+++ b/mode/fortran/fortran.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("fortran", function() {
   function words(array) {
     var keys = {};
@@ -171,3 +181,5 @@ CodeMirror.defineMode("fortran", function() {
 });
 
 CodeMirror.defineMIME("text/x-fortran", "fortran");
+
+});
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index a6e6892908..a21d5bbe1b 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("gas", function(_config, parserConfig) {
   'use strict';
 
@@ -328,3 +338,5 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
     blockCommentEnd: "*/"
   };
 });
+
+});
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 10d5e05c06..7bd5f5ab42 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../markdown/markdown"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../markdown/markdown"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var codeDepth = 0;
   function blankLine(state) {
@@ -100,3 +110,5 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   CodeMirror.defineMIME("gfmBase", markdownConfig);
   return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay);
 }, "markdown");
+
+});
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index 685b373df7..41003641ec 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -13,6 +13,16 @@ Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
 //  keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
 //};
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("gherkin", function () {
   return {
     startState: function () {
@@ -161,3 +171,5 @@ CodeMirror.defineMode("gherkin", function () {
 });
 
 CodeMirror.defineMIME("text/x-feature", "gherkin");
+
+});
diff --git a/mode/go/go.js b/mode/go/go.js
index 862c091120..7ba780ead8 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("go", function(config) {
   var indentUnit = config.indentUnit;
 
@@ -166,3 +176,5 @@ CodeMirror.defineMode("go", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-go", "go");
+
+});
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 6800e0aaf5..399452d536 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("groovy", function(config) {
   function words(str) {
     var obj = {}, words = str.split(" ");
@@ -209,3 +219,5 @@ CodeMirror.defineMode("groovy", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-groovy", "groovy");
+
+});
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 5ea4ed12c8..6b205b43e4 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 (function() {
   "use strict";
 
@@ -147,3 +157,5 @@
 
   CodeMirror.defineMIME("text/x-haml", "haml");
 })();
+
+});
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index facfd00a65..2876172a95 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("haskell", function(_config, modeConfig) {
 
   function switchState(source, setState, f) {
@@ -250,3 +260,5 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
 });
 
 CodeMirror.defineMIME("text/x-haskell", "haskell");
+
+});
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index cb761ad1ce..3f78a8d674 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("haxe", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
 
@@ -427,3 +437,5 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
 });
 
 CodeMirror.defineMIME("text/x-haxe", "haxe");
+
+});
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index c316cd3406..3a07c3432e 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
 
   //config settings
@@ -69,3 +79,5 @@ CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingMode
 CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
 CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
 CodeMirror.defineMIME("application/x-erb", { name: "htmlembedded", scriptingModeSpec:"ruby"});
+
+});
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index e9eab3b92d..a2c3740d3d 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
   var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
   var cssMode = CodeMirror.getMode(config, "css");
@@ -100,3 +110,5 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
 }, "xml", "javascript", "css");
 
 CodeMirror.defineMIME("text/html", "htmlmixed");
+
+});
diff --git a/mode/http/http.js b/mode/http/http.js
index 5a51636027..d2ad5994b6 100644
--- a/mode/http/http.js
+++ b/mode/http/http.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("http", function() {
   function failFirstLine(stream, state) {
     stream.skipToEnd();
@@ -96,3 +106,5 @@ CodeMirror.defineMode("http", function() {
 });
 
 CodeMirror.defineMIME("message/http", "http");
+
+});
diff --git a/mode/index.html b/mode/index.html
index 7c1f740615..29d120d012 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -80,7 +80,7 @@ <h2>Language modes</h2>
       <li><a href="python/index.html">Python</a></li>
       <li><a href="q/index.html">Q</a></li>
       <li><a href="r/index.html">R</a></li>
-      <li>RPM <a href="rpm/spec/index.html">spec</a> and <a href="rpm/changes/index.html">changelog</a></li>
+      <li><a href="rpm/index.html">RPM</a></li>
       <li><a href="rst/index.html">reStructuredText</a></li>
       <li><a href="ruby/index.html">Ruby</a></li>
       <li><a href="rust/index.html">Rust</a></li>
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 61abb27ab7..020b93ec5d 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("jade", function () {
   var symbol_regex1 = /^(?:~|!|%|\^|\*|\+|=|\\|:|;|,|\/|\?|&|<|>|\|)/;
   var open_paren_regex = /^(\(|\[)/;
@@ -88,3 +98,5 @@ CodeMirror.defineMode("jade", function () {
 });
 
 CodeMirror.defineMIME('text/x-jade', 'jade');
+
+});
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fbf574b4fe..8d6035de2c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,5 +1,15 @@
 // TODO actually recognize syntax of TypeScript constructs
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
@@ -628,3 +638,5 @@ CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
 CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
 CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
 CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
+
+});
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index b28af098d0..e30ce63478 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -1,4 +1,14 @@
-CodeMirror.defineMode("jinja2", function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("jinja2", function() {
     var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
                     "extends", "filter", "endfilter", "firstof", "for",
                     "endfor", "if", "endif", "ifchanged", "endifchanged",
@@ -15,38 +25,39 @@ CodeMirror.defineMode("jinja2", function() {
     keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
 
     function tokenBase (stream, state) {
-        var ch = stream.next();
-        if (ch == "{") {
-            if (ch = stream.eat(/\{|%|#/)) {
-                stream.eat("-");
-                state.tokenize = inTag(ch);
-                return "tag";
-            }
+      var ch = stream.next();
+      if (ch == "{") {
+        if (ch = stream.eat(/\{|%|#/)) {
+          stream.eat("-");
+          state.tokenize = inTag(ch);
+          return "tag";
         }
+      }
     }
     function inTag (close) {
-        if (close == "{") {
-            close = "}";
+      if (close == "{") {
+        close = "}";
+      }
+      return function (stream, state) {
+        var ch = stream.next();
+        if ((ch == close || (ch == "-" && stream.eat(close)))
+            && stream.eat("}")) {
+          state.tokenize = tokenBase;
+          return "tag";
         }
-        return function (stream, state) {
-            var ch = stream.next();
-            if ((ch == close || (ch == "-" && stream.eat(close)))
-                && stream.eat("}")) {
-                state.tokenize = tokenBase;
-                return "tag";
-            }
-            if (stream.match(keywords)) {
-                return "keyword";
-            }
-            return close == "#" ? "comment" : "string";
-        };
+        if (stream.match(keywords)) {
+          return "keyword";
+        }
+        return close == "#" ? "comment" : "string";
+      };
     }
     return {
-        startState: function () {
-            return {tokenize: tokenBase};
-        },
-        token: function (stream, state) {
-            return state.tokenize(stream, state);
-        }
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      }
     };
+  });
 });
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 9ec2428cd4..b603713040 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var ERRORCLASS = 'error';
 
@@ -260,3 +270,5 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
 
 CodeMirror.defineMIME("text/x-julia", "julia");
+
+});
diff --git a/mode/less/less.js b/mode/less/less.js
index da681ea67b..9f0d43e938 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -5,6 +5,16 @@
   GitHub: @peterkroon
 */
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("less", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
@@ -345,3 +355,5 @@ CodeMirror.defineMode("less", function(config) {
 CodeMirror.defineMIME("text/x-less", "less");
 if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
   CodeMirror.defineMIME("text/css", "less");
+
+});
diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index c000324b8c..9322ba8073 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -2,6 +2,17 @@
  * Link to the project's GitHub page:
  * https://github.com/duralog/CodeMirror
  */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 (function() {
   CodeMirror.defineMode('livescript', function(){
     var tokenBase, external;
@@ -265,3 +276,5 @@
 })();
 
 CodeMirror.defineMIME('text/x-livescript', 'livescript');
+
+});
diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index b8deaa2575..3673557c27 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -2,6 +2,16 @@
 // CodeMirror 1 mode.
 // highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("lua", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
 
@@ -142,3 +152,5 @@ CodeMirror.defineMode("lua", function(config, parserConfig) {
 });
 
 CodeMirror.defineMIME("text/x-lua", "lua");
+
+});
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index da2ba93fea..cfa56b911d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror", require("../xml/xml")));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
@@ -744,3 +754,5 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 }, "xml");
 
 CodeMirror.defineMIME("text/x-markdown", "markdown");
+
+});
diff --git a/mode/mirc/mirc.js b/mode/mirc/mirc.js
index fc88bc56fb..6b2a23a16c 100644
--- a/mode/mirc/mirc.js
+++ b/mode/mirc/mirc.js
@@ -1,4 +1,15 @@
 //mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMIME("text/mirc", "mirc");
 CodeMirror.defineMode("mirc", function() {
   function parseWords(str) {
@@ -175,3 +186,5 @@ CodeMirror.defineMode("mirc", function() {
     }
   };
 });
+
+});
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 1d64789a19..d4d59fceb7 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -1,5 +1,14 @@
-CodeMirror.defineMode('mllike', function(_config, parserConfig) {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
 
+CodeMirror.defineMode('mllike', function(_config, parserConfig) {
   var words = {
     'let': 'keyword',
     'rec': 'keyword',
@@ -189,3 +198,5 @@ CodeMirror.defineMIME('text/x-fsharp', {
   },
   slashComments: true
 });
+
+});
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index c98c8a1dd3..4e17cdb3c4 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("nginx", function(config) {
 
   function words(str) {
@@ -161,3 +171,5 @@ CodeMirror.defineMode("nginx", function(config) {
 });
 
 CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");
+
+});
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index ed0cee34b0..cd5eb24f07 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -25,6 +25,17 @@
              -> ERROR
          }
 */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("ntriples", function() {
 
   var Location = {
@@ -168,3 +179,5 @@ CodeMirror.defineMode("ntriples", function() {
 });
 
 CodeMirror.defineMIME("text/n-triples", "ntriples");
+
+});
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index 23cd2fe222..0d8f610d1d 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("octave", function() {
   function wordRegexp(words) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
@@ -116,3 +126,5 @@ CodeMirror.defineMode("octave", function() {
 });
 
 CodeMirror.defineMIME("text/x-octave", "octave");
+
+});
diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 09d9b0617b..642dd9bf79 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("pascal", function() {
   function words(str) {
     var obj = {}, words = str.split(" ");
@@ -92,3 +102,5 @@ CodeMirror.defineMode("pascal", function() {
 });
 
 CodeMirror.defineMIME("text/x-pascal", "pascal");
+
+});
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 6b2e273791..f74f2a4f22 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../javascript/javascript"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../javascript/javascript"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("pegjs", function (config) {
   var jsMode = CodeMirror.getMode(config, "javascript");
 
@@ -97,3 +107,5 @@ CodeMirror.defineMode("pegjs", function (config) {
     }
   };
 }, "javascript");
+
+});
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 5954b1a61c..84392e4a81 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -1,5 +1,16 @@
 // CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
 // This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("perl",function(){
         // http://perldoc.perl.org
         var PERL={                                      //   null - magic touch
@@ -509,7 +520,7 @@ CodeMirror.defineMode("perl",function(){
                         return tokenSOMETHING(stream,state,'=cut');}
                 var ch=stream.next();
                 if(ch=='"'||ch=="'"){                           // NOTE: ' or " or <<'SOMETHING'\n...\nSOMETHING\n or <<"SOMETHING"\n...\nSOMETHING\n
-                        if(stream.prefix(3)=="<<"+ch){
+                        if(prefix(stream, 3)=="<<"+ch){
                                 var p=stream.pos;
                                 stream.eatWhile(/\w/);
                                 var n=stream.current().substr(1);
@@ -518,94 +529,94 @@ CodeMirror.defineMode("perl",function(){
                                 stream.pos=p;}
                         return tokenChain(stream,state,[ch],"string");}
                 if(ch=="q"){
-                        var c=stream.look(-2);
+                        var c=look(stream, -2);
                         if(!(c&&/\w/.test(c))){
-                                c=stream.look(0);
+                                c=look(stream, 0);
                                 if(c=="x"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
                                         if(c=="{"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
                                 else if(c=="q"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],"string");}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],"string");}
                                         if(c=="{"){
-stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],"string");}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],"string");}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],"string");}}
                                 else if(c=="w"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],"bracket");}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],"bracket");}
                                         if(c=="{"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],"bracket");}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],"bracket");}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],"bracket");}}
                                 else if(c=="r"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
                                         if(c=="{"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
                                 else if(/[\^'"!~\/(\[{<]/.test(c)){
                                         if(c=="("){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[")"],"string");}
                                         if(c=="["){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,["]"],"string");}
                                         if(c=="{"){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,["}"],"string");}
                                         if(c=="<"){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[">"],"string");}
                                         if(/[\^'"!~\/]/.test(c)){
                                                 return tokenChain(stream,state,[stream.eat(c)],"string");}}}}
                 if(ch=="m"){
-                        var c=stream.look(-2);
+                        var c=look(stream, -2);
                         if(!(c&&/\w/.test(c))){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
                                 if(c){
@@ -620,7 +631,7 @@ stream.eatSuffix(2);
                                         if(c=="<"){
                                                 return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}}}}
                 if(ch=="s"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
                         if(!c){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
                                 if(c){
@@ -634,7 +645,7 @@ stream.eatSuffix(2);
                                                 return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
                                         return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
                 if(ch=="y"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
                         if(!c){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
                                 if(c){
@@ -648,7 +659,7 @@ stream.eatSuffix(2);
                                                 return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
                                         return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
                 if(ch=="t"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
                         if(!c){
                                 c=stream.eat("r");if(c){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
@@ -665,7 +676,7 @@ stream.eatSuffix(2);
                 if(ch=="`"){
                         return tokenChain(stream,state,[ch],"variable-2");}
                 if(ch=="/"){
-                        if(!/~\s*$/.test(stream.prefix()))
+                        if(!/~\s*$/.test(prefix(stream)))
                                 return "operator";
                         else
                                 return tokenChain(stream,state,[ch],RXstyle,RXmodifiers);}
@@ -677,7 +688,7 @@ stream.eatSuffix(2);
                                 stream.pos=p;}
                 if(/[$@%]/.test(ch)){
                         var p=stream.pos;
-                        if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(stream.look(-2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
+                        if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(look(stream, -2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
                                 var c=stream.current();
                                 if(PERL[c])
                                         return "variable-2";}
@@ -690,7 +701,7 @@ stream.eatSuffix(2);
                                 else
                                         return "variable";}}
                 if(ch=="#"){
-                        if(stream.look(-2)!="$"){
+                        if(look(stream, -2)!="$"){
                                 stream.skipToEnd();
                                 return "comment";}}
                 if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(ch)){
@@ -702,23 +713,23 @@ stream.eatSuffix(2);
                                 stream.pos=p;}
                 if(ch=="_"){
                         if(stream.pos==1){
-                                if(stream.suffix(6)=="_END__"){
+                                if(suffix(stream, 6)=="_END__"){
                                         return tokenChain(stream,state,['\0'],"comment");}
-                                else if(stream.suffix(7)=="_DATA__"){
+                                else if(suffix(stream, 7)=="_DATA__"){
                                         return tokenChain(stream,state,['\0'],"variable-2");}
-                                else if(stream.suffix(7)=="_C__"){
+                                else if(suffix(stream, 7)=="_C__"){
                                         return tokenChain(stream,state,['\0'],"string");}}}
                 if(/\w/.test(ch)){
                         var p=stream.pos;
-                        if(stream.look(-2)=="{"&&(stream.look(0)=="}"||stream.eatWhile(/\w/)&&stream.look(0)=="}"))
+                        if(look(stream, -2)=="{"&&(look(stream, 0)=="}"||stream.eatWhile(/\w/)&&look(stream, 0)=="}"))
                                 return "string";
                         else
                                 stream.pos=p;}
                 if(/[A-Z]/.test(ch)){
-                        var l=stream.look(-2);
+                        var l=look(stream, -2);
                         var p=stream.pos;
                         stream.eatWhile(/[A-Z_]/);
-                        if(/[\da-z]/.test(stream.look(0))){
+                        if(/[\da-z]/.test(look(stream, 0))){
                                 stream.pos=p;}
                         else{
                                 var c=PERL[stream.current()];
@@ -742,7 +753,7 @@ stream.eatSuffix(2);
                                 else
                                         return "meta";}}
                 if(/[a-zA-Z_]/.test(ch)){
-                        var l=stream.look(-2);
+                        var l=look(stream, -2);
                         stream.eatWhile(/\w/);
                         var c=PERL[stream.current()];
                         if(!c)
@@ -780,37 +791,37 @@ stream.eatSuffix(2);
 CodeMirror.defineMIME("text/x-perl", "perl");
 
 // it's like "peek", but need for look-ahead or look-behind if index < 0
-CodeMirror.StringStream.prototype.look=function(c){
-        return this.string.charAt(this.pos+(c||0));};
+function look(stream, c){
+  return stream.string.charAt(stream.pos+(c||0));
+}
 
 // return a part of prefix of current stream from current position
-CodeMirror.StringStream.prototype.prefix=function(c){
-        if(c){
-                var x=this.pos-c;
-                return this.string.substr((x>=0?x:0),c);}
-        else{
-                return this.string.substr(0,this.pos-1);}};
+function prefix(stream, c){
+  if(c){
+    var x=stream.pos-c;
+    return stream.string.substr((x>=0?x:0),c);}
+  else{
+    return stream.string.substr(0,stream.pos-1);
+  }
+}
 
 // return a part of suffix of current stream from current position
-CodeMirror.StringStream.prototype.suffix=function(c){
-        var y=this.string.length;
-        var x=y-this.pos+1;
-        return this.string.substr(this.pos,(c&&c<y?c:x));};
-
-// return a part of suffix of current stream from current position and change current position
-CodeMirror.StringStream.prototype.nsuffix=function(c){
-        var p=this.pos;
-        var l=c||(this.string.length-this.pos+1);
-        this.pos+=l;
-        return this.string.substr(p,l);};
+function suffix(stream, c){
+  var y=stream.string.length;
+  var x=y-stream.pos+1;
+  return stream.string.substr(stream.pos,(c&&c<y?c:x));
+}
 
 // eating and vomiting a part of stream from current position
-CodeMirror.StringStream.prototype.eatSuffix=function(c){
-        var x=this.pos+c;
-        var y;
-        if(x<=0)
-                this.pos=0;
-        else if(x>=(y=this.string.length-1))
-                this.pos=y;
-        else
-                this.pos=x;};
+function eatSuffix(stream, c){
+  var x=stream.pos+c;
+  var y;
+  if(x<=0)
+    stream.pos=0;
+  else if(x>=(y=stream.string.length-1))
+    stream.pos=y;
+  else
+    stream.pos=x;
+}
+
+});
diff --git a/mode/php/php.js b/mode/php/php.js
index 946f770c9f..7156dbba6f 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -1,4 +1,13 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../clike/clike"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../clike/clike"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
   function keywords(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -128,4 +137,4 @@
   CodeMirror.defineMIME("application/x-httpd-php", "php");
   CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
   CodeMirror.defineMIME("text/x-php", phpConfig);
-})();
+});
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index 4b44e7ccc3..eaf525889c 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -4,6 +4,16 @@
  *      @link   https://github.com/prasanthj/pig-codemirror-2
  *  This implementation is adapted from PL/SQL mode in CodeMirror 2.
  */
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("pig", function(_config, parserConfig) {
   var keywords = parserConfig.keywords,
   builtins = parserConfig.builtins,
@@ -169,3 +179,5 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
     types: keywords(pTypes)
   });
 }());
+
+});
diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index d3a13c765d..6dfe06f128 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("properties", function() {
   return {
     token: function(stream, state) {
@@ -61,3 +71,5 @@ CodeMirror.defineMode("properties", function() {
 
 CodeMirror.defineMIME("text/x-properties", "properties");
 CodeMirror.defineMIME("text/x-ini", "properties");
+
+});
diff --git a/mode/python/python.js b/mode/python/python.js
index 8bea5d19d1..36cf951bef 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -1,3 +1,14 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+
 CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = 'error';
 
@@ -361,14 +372,13 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
 
 CodeMirror.defineMIME("text/x-python", "python");
 
-(function() {
-  "use strict";
-  var words = function(str){return str.split(' ');};
-
-  CodeMirror.defineMIME("text/x-cython", {
-    name: "python",
-    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                          "extern gil include nogil property public"+
-                          "readonly struct union DEF IF ELIF ELSE")
-  });
-})();
+var words = function(str){return str.split(' ');};
+
+CodeMirror.defineMIME("text/x-cython", {
+  name: "python",
+  extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
+                        "extern gil include nogil property public"+
+                        "readonly struct union DEF IF ELIF ELSE")
+});
+
+});
diff --git a/mode/q/q.js b/mode/q/q.js
index 56017e30ad..d6e3b66610 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("q",function(config){
   var indentUnit=config.indentUnit,
       curPunc,
@@ -122,3 +132,5 @@ CodeMirror.defineMode("q",function(config){
   };
 });
 CodeMirror.defineMIME("text/x-q","q");
+
+});
diff --git a/mode/r/r.js b/mode/r/r.js
index 690cf40502..7f4feb238b 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("r", function(config) {
   function wordObj(str) {
     var words = str.split(" "), res = {};
@@ -143,3 +153,5 @@ CodeMirror.defineMode("r", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-rsrc", "r");
+
+});
diff --git a/mode/rpm/changes/changes.js b/mode/rpm/changes/changes.js
deleted file mode 100644
index 14a08d9700..0000000000
--- a/mode/rpm/changes/changes.js
+++ /dev/null
@@ -1,19 +0,0 @@
-CodeMirror.defineMode("changes", function() {
-  var headerSeperator = /^-+$/;
-  var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
-  var simpleEmail = /^[\w+.-]+@[\w.-]+/;
-
-  return {
-    token: function(stream) {
-      if (stream.sol()) {
-        if (stream.match(headerSeperator)) { return 'tag'; }
-        if (stream.match(headerLine)) { return 'tag'; }
-      }
-      if (stream.match(simpleEmail)) { return 'string'; }
-      stream.next();
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-rpm-changes", "changes");
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
deleted file mode 100644
index 18fe7ab7bf..0000000000
--- a/mode/rpm/changes/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: RPM changes mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-    <link rel="stylesheet" href="../../../lib/codemirror.css">
-    <script src="../../../lib/codemirror.js"></script>
-    <script src="changes.js"></script>
-    <link rel="stylesheet" href="../../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../../index.html">Home</a>
-    <li><a href="../../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../../index.html">Language modes</a>
-    <li><a class=active href="#">RPM changes</a>
-  </ul>
-</div>
-
-<article>
-<h2>RPM changes mode</h2>
-
-    <div><textarea id="code" name="code">
--------------------------------------------------------------------
-Tue Oct 18 13:58:40 UTC 2011 - misterx@example.com
-
-- Update to r60.3
-- Fixes bug in the reflect package
-  * disallow Interface method on Value obtained via unexported name
-
--------------------------------------------------------------------
-Thu Oct  6 08:14:24 UTC 2011 - misterx@example.com
-
-- Update to r60.2
-- Fixes memory leak in certain map types
-
--------------------------------------------------------------------
-Wed Oct  5 14:34:10 UTC 2011 - misterx@example.com
-
-- Tweaks for gdb debugging
-- go.spec changes:
-  - move %go_arch definition to %prep section
-  - pass correct location of go specific gdb pretty printer and
-    functions to cpp as HOST_EXTRA_CFLAGS macro
-  - install go gdb functions & printer
-- gdb-printer.patch
-  - patch linker (src/cmd/ld/dwarf.c) to emit correct location of go
-    gdb functions and pretty printer
-</textarea></div>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "changes"},
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-rpm-changes</code>.</p>
-</article>
diff --git a/mode/rpm/spec/index.html b/mode/rpm/index.html
similarity index 60%
rename from mode/rpm/spec/index.html
rename to mode/rpm/index.html
index 127b72ee9d..4257bc77e3 100644
--- a/mode/rpm/spec/index.html
+++ b/mode/rpm/index.html
@@ -1,34 +1,71 @@
 <!doctype html>
 
-<title>CodeMirror: RPM spec mode</title>
+<title>CodeMirror: RPM changes mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
-    <link rel="stylesheet" href="../../../lib/codemirror.css">
-    <script src="../../../lib/codemirror.js"></script>
-    <script src="spec.js"></script>
-    <link rel="stylesheet" href="spec.css">
-    <link rel="stylesheet" href="../../../doc/docs.css">
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="rpm.js"></script>
+    <link rel="stylesheet" href="../../doc/docs.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
-    <li><a href="../../../index.html">Home</a>
-    <li><a href="../../../doc/manual.html">Manual</a>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
     <li><a href="https://github.com/marijnh/codemirror">Code</a>
   </ul>
   <ul>
-    <li><a href="../../index.html">Language modes</a>
-    <li><a class=active href="#">RPM spec</a>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">RPM</a>
   </ul>
 </div>
 
 <article>
+<h2>RPM changes mode</h2>
+
+    <div><textarea id="code" name="code">
+-------------------------------------------------------------------
+Tue Oct 18 13:58:40 UTC 2011 - misterx@example.com
+
+- Update to r60.3
+- Fixes bug in the reflect package
+  * disallow Interface method on Value obtained via unexported name
+
+-------------------------------------------------------------------
+Thu Oct  6 08:14:24 UTC 2011 - misterx@example.com
+
+- Update to r60.2
+- Fixes memory leak in certain map types
+
+-------------------------------------------------------------------
+Wed Oct  5 14:34:10 UTC 2011 - misterx@example.com
+
+- Tweaks for gdb debugging
+- go.spec changes:
+  - move %go_arch definition to %prep section
+  - pass correct location of go specific gdb pretty printer and
+    functions to cpp as HOST_EXTRA_CFLAGS macro
+  - install go gdb functions & printer
+- gdb-printer.patch
+  - patch linker (src/cmd/ld/dwarf.c) to emit correct location of go
+    gdb functions and pretty printer
+</textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "rpm-changes"},
+        lineNumbers: true,
+        indentUnit: 4,
+        tabMode: "shift"
+      });
+    </script>
+
 <h2>RPM spec mode</h2>
     
-    <div><textarea id="code" name="code">
+    <div><textarea id="code2" name="code2">
 #
 # spec file for package minidlna
 #
@@ -102,13 +139,12 @@ <h2>RPM spec mode</h2>
 
 %changelog</textarea></div>
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "spec"},
+      var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {
+        mode: {name: "rpm-spec"},
         lineNumbers: true,
         indentUnit: 4
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-rpm-spec</code>.</p>
-
+    <p><strong>MIME types defined:</strong> <code>text/x-rpm-spec</code>, <code>text/x-rpm-changes</code>.</p>
 </article>
diff --git a/mode/rpm/spec/spec.js b/mode/rpm/rpm.js
similarity index 70%
rename from mode/rpm/spec/spec.js
rename to mode/rpm/rpm.js
index 0fab6c4891..497997c4ff 100644
--- a/mode/rpm/spec/spec.js
+++ b/mode/rpm/rpm.js
@@ -1,6 +1,36 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("rpm-changes", function() {
+  var headerSeperator = /^-+$/;
+  var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
+  var simpleEmail = /^[\w+.-]+@[\w.-]+/;
+
+  return {
+    token: function(stream) {
+      if (stream.sol()) {
+        if (stream.match(headerSeperator)) { return 'tag'; }
+        if (stream.match(headerLine)) { return 'tag'; }
+      }
+      if (stream.match(simpleEmail)) { return 'string'; }
+      stream.next();
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-rpm-changes", "rpm-changes");
+
 // Quick and dirty spec file highlighting
 
-CodeMirror.defineMode("spec", function() {
+CodeMirror.defineMode("rpm-spec", function() {
   var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
 
   var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
@@ -63,4 +93,6 @@ CodeMirror.defineMode("spec", function() {
   };
 });
 
-CodeMirror.defineMIME("text/x-rpm-spec", "spec");
+CodeMirror.defineMIME("text/x-rpm-spec", "rpm-spec");
+
+});
diff --git a/mode/rpm/spec/spec.css b/mode/rpm/spec/spec.css
deleted file mode 100644
index d0a5d430ca..0000000000
--- a/mode/rpm/spec/spec.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.cm-s-default span.cm-preamble {color: #b26818; font-weight: bold;}
-.cm-s-default span.cm-macro {color: #b218b2;}
-.cm-s-default span.cm-section {color: green; font-weight: bold;}
-.cm-s-default span.cm-script {color: red;}
-.cm-s-default span.cm-issue {color: yellow;}
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 75563ba982..c53cbc36e8 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../python/python"), require("../stex/stex"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../python/python", "../stex/stex"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode('rst-base', function (config) {
 
     ///////////////////////////////////////////////////////////////////////////
@@ -558,3 +568,5 @@ CodeMirror.defineMIME('text/x-rst', 'rst');
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
+
+});
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 1cdc9a4e43..8ee9eec707 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("ruby", function(config) {
   function wordObj(words) {
     var o = {};
@@ -247,3 +257,4 @@ CodeMirror.defineMode("ruby", function(config) {
 
 CodeMirror.defineMIME("text/x-ruby", "ruby");
 
+});
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index c7530b6cc6..2e6e20b231 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("rust", function() {
   var indentUnit = 4, altIndentUnit = 2;
   var valKeywords = {
@@ -434,3 +444,5 @@ CodeMirror.defineMode("rust", function() {
 });
 
 CodeMirror.defineMIME("text/x-rustsrc", "rust");
+
+});
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 9c9a0dae07..74ae91db12 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("sass", function(config) {
   var tokenRegexp = function(words){
     return new RegExp("^" + words.join("|"));
@@ -328,3 +338,5 @@ CodeMirror.defineMode("sass", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-sass", "sass");
+
+});
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index c5990ae92c..7124f7283b 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -1,6 +1,17 @@
 /**
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
  */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("scheme", function () {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
         ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
@@ -230,3 +241,5 @@ CodeMirror.defineMode("scheme", function () {
 });
 
 CodeMirror.defineMIME("text/x-scheme", "scheme");
+
+});
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index abfd214454..7753411c98 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode('shell', function() {
 
   var words = {};
@@ -116,3 +126,5 @@ CodeMirror.defineMode('shell', function() {
 });
 
 CodeMirror.defineMIME('text/x-sh', 'shell');
+
+});
diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index 8ca2a4cb82..8256dda0a4 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -1,7 +1,12 @@
-/*
- * See LICENSE in this directory for the license under which this code
- * is released.
- */
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
 
 CodeMirror.defineMode("sieve", function(config) {
   function words(str) {
@@ -181,3 +186,5 @@ CodeMirror.defineMode("sieve", function(config) {
 });
 
 CodeMirror.defineMIME("application/sieve", "sieve");
+
+});
diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index 86f749b310..deb78a4f7a 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode('smalltalk', function(config) {
 
   var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
@@ -151,3 +161,5 @@ CodeMirror.defineMode('smalltalk', function(config) {
 });
 
 CodeMirror.defineMIME('text/x-stsrc', {name: 'smalltalk'});
+
+});
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 826c2b966c..2a78c6d394 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -1,6 +1,17 @@
 /**
  * Smarty 2 and 3 mode.
  */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("smarty", function(config) {
   "use strict";
 
@@ -203,3 +214,5 @@ CodeMirror.defineMode("smarty", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-smarty", "smarty");
+
+});
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
index 48dd1a6752..7e5e12c0ec 100644
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -5,6 +5,17 @@
 * @version 3.0
 * @date 05.07.2013
 */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../smarty/smarty"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../smarty/smarty"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("smartymixed", function(config) {
   var settings, regs, helpers, parsers,
   htmlMixedMode = CodeMirror.getMode(config, "htmlmixed"),
@@ -166,8 +177,9 @@ CodeMirror.defineMode("smartymixed", function(config) {
       };
     }
   };
-},
-"htmlmixed");
+}, "htmlmixed", "smarty");
 
 CodeMirror.defineMIME("text/x-smarty", "smartymixed");
 // vim: et ts=2 sts=2 sw=2
+
+});
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 0329057f69..f228b1dffe 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("sparql", function(config) {
   var indentUnit = config.indentUnit;
   var curPunc;
@@ -143,3 +153,5 @@ CodeMirror.defineMode("sparql", function(config) {
 });
 
 CodeMirror.defineMIME("application/x-sparql-query", "sparql");
+
+});
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 903fa6740a..c43285f338 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("sql", function(config, parserConfig) {
   "use strict";
 
@@ -334,6 +344,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   });
 }());
 
+});
+
 /*
   How Properties of Mime Types are used by SQL Mode
   =================================================
diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index ca04c24f22..59a395a0fe 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -3,6 +3,16 @@
  * Licence: MIT
  */
 
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("stex", function() {
     "use strict";
 
@@ -244,3 +254,5 @@ CodeMirror.defineMode("stex", function() {
 
 CodeMirror.defineMIME("text/x-stex", "stex");
 CodeMirror.defineMIME("text/x-latex", "stex");
+
+});
diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index ed2c697217..4c29ee7d98 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -1,4 +1,15 @@
 //tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("tcl", function() {
   function parseWords(str) {
     var obj = {}, words = str.split(" ");
@@ -129,3 +140,5 @@ CodeMirror.defineMode("tcl", function() {
     };
 });
 CodeMirror.defineMIME("text/x-tcl", "tcl");
+
+});
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 24a24786bc..ecd1d173c0 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -14,6 +14,17 @@
     CoreVersion parameter is needed for TiddlyWiki only!
 ***/
 //{{{
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("tiddlywiki", function () {
   // Tokenizer
   var textwords = {};
@@ -350,4 +361,6 @@ CodeMirror.defineMode("tiddlywiki", function () {
 });
 
 CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki");
+});
+
 //}}}
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index e789163dc7..eb9a893fde 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode('tiki', function(config) {
   function inBlock(style, terminator, returnTokenizer) {
     return function(stream, state) {
@@ -306,3 +316,5 @@ return {
 });
 
 CodeMirror.defineMIME("text/tiki", "tiki");
+
+});
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index 1d163f13bf..552dd57b08 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("toml", function () {
   return {
     startState: function () {
@@ -69,3 +79,5 @@ CodeMirror.defineMode("toml", function () {
 });
 
 CodeMirror.defineMIME('text/x-toml', 'toml');
+
+});
diff --git a/mode/turtle/turtle.js b/mode/turtle/turtle.js
index e118bfbced..de9fc2b6c7 100644
--- a/mode/turtle/turtle.js
+++ b/mode/turtle/turtle.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("turtle", function(config) {
   var indentUnit = config.indentUnit;
   var curPunc;
@@ -143,3 +153,5 @@ CodeMirror.defineMode("turtle", function(config) {
 });
 
 CodeMirror.defineMIME("text/turtle", "turtle");
+
+});
diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 27b2271951..4fd80210fb 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("vb", function(conf, parserConf) {
     var ERRORCLASS = 'error';
 
@@ -257,3 +267,5 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
 });
 
 CodeMirror.defineMIME("text/x-vb", "vb");
+
+});
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index 0a97fb6405..4be7c7f2bb 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -8,6 +8,17 @@ E.G.:
         isASP: true
       });
 */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("vbscript", function(conf, parserConf) {
     var ERRORCLASS = 'error';
 
@@ -332,3 +343,5 @@ CodeMirror.defineMode("vbscript", function(conf, parserConf) {
 });
 
 CodeMirror.defineMIME("text/vbscript", "vbscript");
+
+});
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 968d8799e9..b64636bb43 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("velocity", function() {
     function parseWords(str) {
         var obj = {}, words = str.split(" ");
@@ -184,3 +194,5 @@ CodeMirror.defineMode("velocity", function() {
 });
 
 CodeMirror.defineMIME("text/velocity", "velocity");
+
+});
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 708de23f49..bc4fd4feee 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("verilog", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       keywords = parserConfig.keywords || {},
@@ -146,7 +156,6 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   };
 });
 
-(function() {
   function words(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -179,4 +188,5 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     atoms: words("null"),
     hooks: {"`": metaHook, "$": metaHook}
   });
-}());
+
+});
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 96b51ff970..2e62b88346 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("xml", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
@@ -330,3 +340,5 @@ CodeMirror.defineMIME("text/xml", "xml");
 CodeMirror.defineMIME("application/xml", "xml");
 if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
   CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
+
+});
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index be17984635..2c7faf425a 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("xquery", function() {
 
   // The keywords object is set to the result of this self executing
@@ -430,3 +440,5 @@ CodeMirror.defineMode("xquery", function() {
 });
 
 CodeMirror.defineMIME("application/xquery", "xquery");
+
+});
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index efacd7d563..f7b3a90c03 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("yaml", function() {
 
   var cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
@@ -95,3 +105,5 @@ CodeMirror.defineMode("yaml", function() {
 });
 
 CodeMirror.defineMIME("text/x-yaml", "yaml");
+
+});
diff --git a/mode/z80/z80.js b/mode/z80/z80.js
index ff43d32b52..c778803072 100644
--- a/mode/z80/z80.js
+++ b/mode/z80/z80.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode('z80', function() {
   var keywords1 = /^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i;
   var keywords2 = /^(call|j[pr]|ret[in]?)\b/i;
@@ -83,3 +93,5 @@ CodeMirror.defineMode('z80', function() {
 });
 
 CodeMirror.defineMIME("text/x-z80", "z80");
+
+});