diff --git a/src/converse-core.js b/src/converse-core.js
index 578f1c57c..b418621fe 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -24,11 +24,9 @@
         "strophe",
         "converse-templates",
         "strophe.disco",
-        "strophe.rsm",
         "strophe.vcard",
         "backbone.browserStorage",
         "backbone.overview",
-        "typeahead",
     ], factory);
 }(this, function ($, _, dummy, utils, moment, Strophe, templates) {
     /*
@@ -149,7 +147,6 @@
         Strophe.addNamespace('CHATSTATES', 'http://jabber.org/protocol/chatstates');
         Strophe.addNamespace('CSI', 'urn:xmpp:csi:0');
         Strophe.addNamespace('ROSTERX', 'http://jabber.org/protocol/rosterx');
-        Strophe.addNamespace('RSM', 'http://jabber.org/protocol/rsm');
         Strophe.addNamespace('XFORM', 'jabber:x:data');
 
         // Instance level constants
diff --git a/src/converse-mam.js b/src/converse-mam.js
index 284be9b77..1e0701317 100644
--- a/src/converse-mam.js
+++ b/src/converse-mam.js
@@ -11,7 +11,8 @@
 (function (root, factory) {
     define("converse-mam", [
             "converse-core",
-            "converse-api"
+            "converse-api",
+            "strophe.rsm"
     ], factory);
 }(this, function (converse, converse_api) {
     "use strict";
@@ -26,6 +27,7 @@
     var MAM_ATTRIBUTES = ['with', 'start', 'end'];
 
     Strophe.addNamespace('MAM', 'urn:xmpp:mam:0');
+    Strophe.addNamespace('RSM', 'http://jabber.org/protocol/rsm');
 
 
     converse_api.plugins.add('mam', {
diff --git a/src/converse-muc.js b/src/converse-muc.js
index ebc101285..721df019f 100755
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -13,6 +13,7 @@
     define("converse-muc", [
             "converse-core",
             "converse-api",
+            "typeahead",
             // TODO remove next two dependencies
             "converse-chatview",
             "converse-controlbox"