diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 8b785bd03..c2f3da232 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -127,7 +127,7 @@ loop(AccessMaxOfflineMsgs) ->
 %% Function copied from ejabberd_sm.erl:
 get_max_user_messages(AccessRule, LUser, Host) ->
     case acl:match_rule(
-	   Host, AccessRule, jlib:make_jid(LUser, Host, "")) of
+	   Host, AccessRule, exmpp_jid:make(LUser, Host, "")) of
 	Max when is_integer(Max) -> Max;
 	infinity -> infinity;
 	_ -> ?MAX_USER_MESSAGES
diff --git a/src/mod_offline_odbc.erl b/src/mod_offline_odbc.erl
index 2d4cd787a..254d75bc2 100644
--- a/src/mod_offline_odbc.erl
+++ b/src/mod_offline_odbc.erl
@@ -134,7 +134,7 @@ loop(Host, AccessMaxOfflineMsgs) ->
 %% Function copied from ejabberd_sm.erl:
 get_max_user_messages(AccessRule, LUser, Host) ->
     case acl:match_rule(
-	   Host, AccessRule, jlib:make_jid(LUser, Host, "")) of
+	   Host, AccessRule, exmpp_jid:make(LUser, Host, "")) of
 	Max when is_integer(Max) -> Max;
 	infinity -> infinity;
 	_ -> ?MAX_USER_MESSAGES
diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl
index 61d15943b..b2e740c48 100644
--- a/src/web/ejabberd_http_bind.erl
+++ b/src/web/ejabberd_http_bind.erl
@@ -52,6 +52,9 @@
 -include("jlib.hrl").
 -include("ejabberd_http.hrl").
 
+%% TODO: Use exmpp library instead of including this
+-define(NS_STREAM, "http://etherx.jabber.org/streams").
+
 -record(http_bind, {id, pid, to, hold, wait, version}).
 
 -define(NULL_PEER, {{0, 0, 0, 0}, 0}).