diff --git a/mod_cron/src/mod_cron.erl b/mod_cron/src/mod_cron.erl
index 03c8be4..656c83f 100644
--- a/mod_cron/src/mod_cron.erl
+++ b/mod_cron/src/mod_cron.erl
@@ -23,7 +23,7 @@
 -include("ejabberd_web_admin.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -record(task, {taskid, timerref, host, task}).
 
diff --git a/mod_default_contacts/src/mod_default_contacts.erl b/mod_default_contacts/src/mod_default_contacts.erl
index 4902d83..1238b73 100644
--- a/mod_default_contacts/src/mod_default_contacts.erl
+++ b/mod_default_contacts/src/mod_default_contacts.erl
@@ -34,7 +34,7 @@
 -export([register_user/2]).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 %%--------------------------------------------------------------------
 %% gen_mod callbacks.
diff --git a/mod_default_rooms/src/mod_default_rooms.erl b/mod_default_rooms/src/mod_default_rooms.erl
index 7930c7d..d593476 100644
--- a/mod_default_rooms/src/mod_default_rooms.erl
+++ b/mod_default_rooms/src/mod_default_rooms.erl
@@ -34,7 +34,7 @@
 -export([register_user/2]).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 %%--------------------------------------------------------------------
 %% gen_mod callbacks.
diff --git a/mod_deny_omemo/src/mod_deny_omemo.erl b/mod_deny_omemo/src/mod_deny_omemo.erl
index f5f2909..6df32f9 100644
--- a/mod_deny_omemo/src/mod_deny_omemo.erl
+++ b/mod_deny_omemo/src/mod_deny_omemo.erl
@@ -34,7 +34,7 @@
 -export([user_receive_packet/1, user_send_packet/1]).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -define(NS_AXOLOTL, "eu.siacs.conversations.axolotl").
 -define(DEVICELIST_NODE, ?NS_AXOLOTL ".devicelist").
diff --git a/mod_filter/src/mod_filter.erl b/mod_filter/src/mod_filter.erl
index 4dbddc6..fd0f85d 100644
--- a/mod_filter/src/mod_filter.erl
+++ b/mod_filter/src/mod_filter.erl
@@ -13,7 +13,7 @@
 -export([start/2, stop/1, depends/2, mod_options/1, filter_packet/1]).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 start(_Host, _Opts) ->
     ejabberd_hooks:add(filter_packet, global, ?MODULE, filter_packet, 100).
diff --git a/mod_grafite/src/mod_grafite.erl b/mod_grafite/src/mod_grafite.erl
index 0aa2c16..f7e3a3e 100644
--- a/mod_grafite/src/mod_grafite.erl
+++ b/mod_grafite/src/mod_grafite.erl
@@ -13,7 +13,7 @@
 -behaviour(gen_mod).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -define(HOOKS, [offline_message_hook,
                 sm_register_connection_hook, sm_remove_connection_hook,
diff --git a/mod_irc/src/mod_irc.erl b/mod_irc/src/mod_irc.erl
index 8aa5c92..35d9f99 100644
--- a/mod_irc/src/mod_irc.erl
+++ b/mod_irc/src/mod_irc.erl
@@ -42,7 +42,7 @@
 	 mod_opt_type/1, mod_options/1, depends/2]).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 -include("mod_irc.hrl").
 -include("translate.hrl").
 
diff --git a/mod_irc/src/mod_irc_connection.erl b/mod_irc/src/mod_irc_connection.erl
index d18ec6c..176b8e5 100644
--- a/mod_irc/src/mod_irc_connection.erl
+++ b/mod_irc/src/mod_irc_connection.erl
@@ -40,7 +40,7 @@
 	 code_change/4]).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -define(SETS, gb_sets).
 
diff --git a/mod_isolation/src/mod_isolation.erl b/mod_isolation/src/mod_isolation.erl
index dd7bfd1..b247fd2 100644
--- a/mod_isolation/src/mod_isolation.erl
+++ b/mod_isolation/src/mod_isolation.erl
@@ -23,7 +23,7 @@
 %% hooks
 -export([filter_packet/1]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/mod_log_chat/src/mod_log_chat.erl b/mod_log_chat/src/mod_log_chat.erl
index 6e59d9b..26c2ea0 100644
--- a/mod_log_chat/src/mod_log_chat.erl
+++ b/mod_log_chat/src/mod_log_chat.erl
@@ -20,7 +20,7 @@
 -endif.
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -define(PROCNAME, ?MODULE).
 -define(DEFAULT_PATH, ".").
diff --git a/mod_logsession/src/mod_logsession.erl b/mod_logsession/src/mod_logsession.erl
index 22d6dc7..84cfa1d 100644
--- a/mod_logsession/src/mod_logsession.erl
+++ b/mod_logsession/src/mod_logsession.erl
@@ -35,7 +35,7 @@
 	 failed_auth/3,
 	 forbidden/1]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 -include("ejabberd_commands.hrl").
 
 -define(PROCNAME, ejabberd_logsession).
diff --git a/mod_logxml/src/mod_logxml.erl b/mod_logxml/src/mod_logxml.erl
index f309e47..b006ccb 100644
--- a/mod_logxml/src/mod_logxml.erl
+++ b/mod_logxml/src/mod_logxml.erl
@@ -15,7 +15,7 @@
 	 send_packet/1, receive_packet/1,
 	 mod_opt_type/1, mod_options/1, depends/2]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -define(PROCNAME, ejabberd_mod_logxml).
 
diff --git a/mod_message_log/src/mod_message_log.erl b/mod_message_log/src/mod_message_log.erl
index d0c62c2..972ed94 100644
--- a/mod_message_log/src/mod_message_log.erl
+++ b/mod_message_log/src/mod_message_log.erl
@@ -50,7 +50,7 @@
 	 log_packet_offline/1,
 	 reopen_log/0]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -define(DEFAULT_FILENAME, <<"message.log">>).
 -define(FILE_MODES, [append, raw]).
diff --git a/mod_muc_log_http/src/mod_muc_log_http.erl b/mod_muc_log_http/src/mod_muc_log_http.erl
index 7f52941..6d1b079 100644
--- a/mod_muc_log_http/src/mod_muc_log_http.erl
+++ b/mod_muc_log_http/src/mod_muc_log_http.erl
@@ -14,7 +14,7 @@
 
 -export([process/2]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 -include("ejabberd_http.hrl").
 -include("mod_muc_room.hrl").
 -include("logger.hrl").
diff --git a/mod_post_log/src/mod_post_log.erl b/mod_post_log/src/mod_post_log.erl
index 66af7a8..18c7f43 100644
--- a/mod_post_log/src/mod_post_log.erl
+++ b/mod_post_log/src/mod_post_log.erl
@@ -21,7 +21,7 @@
 	 log_user_send/4,
          post_result/1]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 start(Host, _Opts) ->
     ok = case inets:start() of
diff --git a/mod_pottymouth/src/mod_pottymouth.erl b/mod_pottymouth/src/mod_pottymouth.erl
index 620cde5..94d0954 100644
--- a/mod_pottymouth/src/mod_pottymouth.erl
+++ b/mod_pottymouth/src/mod_pottymouth.erl
@@ -3,7 +3,7 @@
 -behaviour(gen_mod).
 
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -export([
   start/2,
diff --git a/mod_rest/src/mod_rest.erl b/mod_rest/src/mod_rest.erl
index 9dee8be..5780ff3 100644
--- a/mod_rest/src/mod_rest.erl
+++ b/mod_rest/src/mod_rest.erl
@@ -36,7 +36,7 @@
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_ctl.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 start(_Host, _Opts) ->
     ?DEBUG("Starting: ~p ~p", [_Host, _Opts]),
diff --git a/mod_shcommands/src/mod_shcommands.erl b/mod_shcommands/src/mod_shcommands.erl
index c58b7f2..4be2ab1 100644
--- a/mod_shcommands/src/mod_shcommands.erl
+++ b/mod_shcommands/src/mod_shcommands.erl
@@ -15,7 +15,7 @@
 -export([execute_system/1, execute_erlang/1]).
 -export([web_menu_node/3, web_page_node/5]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 -include("ejabberd_commands.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_web_admin.hrl").
diff --git a/mod_spam_filter/src/mod_spam_filter.erl b/mod_spam_filter/src/mod_spam_filter.erl
index 39e48db..6af636d 100644
--- a/mod_spam_filter/src/mod_spam_filter.erl
+++ b/mod_spam_filter/src/mod_spam_filter.erl
@@ -57,7 +57,7 @@
 
 -include("ejabberd_commands.hrl").
 -include("logger.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 
 -define(COMMAND_TIMEOUT, timer:seconds(30)).
 
diff --git a/mod_statsdx/src/mod_stats2file.erl b/mod_statsdx/src/mod_stats2file.erl
index f121ddd..2b462d0 100644
--- a/mod_statsdx/src/mod_stats2file.erl
+++ b/mod_statsdx/src/mod_stats2file.erl
@@ -15,7 +15,7 @@
 -export([start/2, stop/1, depends/2, mod_opt_type/1, mod_options/1]).
 -export([loop/5]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 -include("mod_roster.hrl").
 
 -define(PROCNAME, ejabberd_mod_stats2file).
diff --git a/mod_statsdx/src/mod_statsdx.erl b/mod_statsdx/src/mod_statsdx.erl
index 233fd09..6b518c4 100644
--- a/mod_statsdx/src/mod_statsdx.erl
+++ b/mod_statsdx/src/mod_statsdx.erl
@@ -30,7 +30,7 @@
 	 user_login/1, user_logout/4]).
 
 -include("ejabberd_commands.hrl").
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("mod_roster.hrl").
 -include("ejabberd_http.hrl").
diff --git a/mod_webpresence/src/mod_webpresence.erl b/mod_webpresence/src/mod_webpresence.erl
index ba21493..1b74a48 100644
--- a/mod_webpresence/src/mod_webpresence.erl
+++ b/mod_webpresence/src/mod_webpresence.erl
@@ -31,7 +31,7 @@
 %% API
 -export([start_link/0]).
 
--include("xmpp.hrl").
+-include_lib("xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 -include("ejabberd_web_admin.hrl").