diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
index 6b53f46c6..1c8de2fbf 100644
--- a/src/ejabberd_http.erl
+++ b/src/ejabberd_http.erl
@@ -39,7 +39,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
index e66cf33a5..02df19e63 100644
--- a/src/ejabberd_http_ws.erl
+++ b/src/ejabberd_http_ws.erl
@@ -39,7 +39,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl
index 459423aa4..523feb9c7 100644
--- a/src/ejabberd_web.erl
+++ b/src/ejabberd_web.erl
@@ -34,7 +34,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl
index 0cdd9bac5..76568aa2d 100644
--- a/src/ejabberd_websocket.erl
+++ b/src/ejabberd_websocket.erl
@@ -47,7 +47,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl
index 73583af02..a18bc8d39 100644
--- a/src/gen_pubsub_nodetree.erl
+++ b/src/gen_pubsub_nodetree.erl
@@ -25,7 +25,6 @@
 
 -module(gen_pubsub_nodetree).
 
--include("jlib.hrl").
 
 -type(host() :: mod_pubsub:host()).
 -type(nodeId() :: mod_pubsub:nodeId()).
@@ -42,25 +41,25 @@
 -callback options() -> nodeOptions().
 
 -callback set_node(PubsubNode :: pubsubNode()) ->
-    ok | {result, NodeIdx::nodeIdx()} | {error, xmlel()}.
+    ok | {result, NodeIdx::nodeIdx()} | {error, fxml:xmlel()}.
 
 -callback get_node(Host   :: host(),
 	NodeId :: nodeId(),
-	From   :: jid()) ->
+	From   :: jid:jid()) ->
     pubsubNode() |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_node(Host :: host(),
 	NodeId :: nodeId()) ->
     pubsubNode() |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_node(NodeIdx :: nodeIdx()) ->
     pubsubNode() |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_nodes(Host :: host(),
-	From :: jid())->
+	From :: jid:jid())->
     [pubsubNode()].
 
 -callback get_nodes(Host :: host())->
@@ -68,33 +67,33 @@
 
 -callback get_parentnodes(Host :: host(),
 	NodeId :: nodeId(),
-	From :: jid()) ->
+	From :: jid:jid()) ->
     [pubsubNode()] |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_parentnodes_tree(Host :: host(),
 	NodeId :: nodeId(),
-	From :: jid()) ->
+	From :: jid:jid()) ->
     [{0, [pubsubNode(),...]}].
 
 -callback get_subnodes(Host :: host(),
 	NodeId :: nodeId(),
-	From :: jid()) ->
+	From :: jid:jid()) ->
     [pubsubNode()].
 
 -callback get_subnodes_tree(Host :: host(),
 	NodeId :: nodeId(),
-	From :: jid()) ->
+	From :: jid:jid()) ->
     [pubsubNode()].
 
 -callback create_node(Host :: host(),
 	NodeId :: nodeId(),
 	Type :: binary(),
-	Owner :: jid(),
+	Owner :: jid:jid(),
 	Options :: nodeOptions(),
 	Parents :: [nodeId()]) ->
     {ok, NodeIdx::nodeIdx()} |
-    {error, xmlel()} |
+    {error, fxml:xmlel()} |
     {error, {virtual, {host(), nodeId()}}}.
 
 -callback delete_node(Host :: host(),
diff --git a/src/mod_http_bind.erl b/src/mod_http_bind.erl
index 9a3a379f7..471b38c00 100644
--- a/src/mod_http_bind.erl
+++ b/src/mod_http_bind.erl
@@ -42,7 +42,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
diff --git a/src/node_buddy.erl b/src/node_buddy.erl
index bdaa4a89a..fb2fd1f2e 100644
--- a/src/node_buddy.erl
+++ b/src/node_buddy.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
diff --git a/src/node_club.erl b/src/node_club.erl
index 7f6ae6520..837fa6fbb 100644
--- a/src/node_club.erl
+++ b/src/node_club.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
diff --git a/src/node_hometree.erl b/src/node_hometree.erl
index def7b983d..67c5e9332 100644
--- a/src/node_hometree.erl
+++ b/src/node_hometree.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
diff --git a/src/node_hometree_sql.erl b/src/node_hometree_sql.erl
index d9af49843..661a2aab4 100644
--- a/src/node_hometree_sql.erl
+++ b/src/node_hometree_sql.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
diff --git a/src/node_mb.erl b/src/node_mb.erl
index 6c7f09780..0c3bd3722 100644
--- a/src/node_mb.erl
+++ b/src/node_mb.erl
@@ -28,7 +28,6 @@
 -author('ecestari@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 %%% @doc The module <strong>{@module}</strong> is the pep microblog PubSub plugin.
 %%% <p>To be used, mod_pubsub must be configured:<pre>
diff --git a/src/node_online.erl b/src/node_online.erl
index 1c2ab5a03..4b01d2a2c 100644
--- a/src/node_online.erl
+++ b/src/node_online.erl
@@ -28,7 +28,7 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
+-include("jid.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
diff --git a/src/node_pep.erl b/src/node_pep.erl
index 1677ed4bd..f3b5836cf 100644
--- a/src/node_pep.erl
+++ b/src/node_pep.erl
@@ -31,7 +31,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 -include("logger.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
diff --git a/src/node_pep_sql.erl b/src/node_pep_sql.erl
index ec7795475..ac42cb94f 100644
--- a/src/node_pep_sql.erl
+++ b/src/node_pep_sql.erl
@@ -31,7 +31,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 -include("logger.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
diff --git a/src/node_private.erl b/src/node_private.erl
index 0cd04b9dd..1888ce33d 100644
--- a/src/node_private.erl
+++ b/src/node_private.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
diff --git a/src/node_public.erl b/src/node_public.erl
index 0786d9995..ca200e002 100644
--- a/src/node_public.erl
+++ b/src/node_public.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
diff --git a/src/nodetree_virtual.erl b/src/nodetree_virtual.erl
index 934950dd2..31802db2b 100644
--- a/src/nodetree_virtual.erl
+++ b/src/nodetree_virtual.erl
@@ -35,7 +35,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, set_node/1,
     get_node/3, get_node/2, get_node/1, get_nodes/2,