Description: correct includes
 Many parts of ejabberd code were moved into their own projects and are packaged
 separately by me. To make the build process work, several includes must be
 adjusted for the corresponding libraries to be found.
Author: Philipp Huebner <debalance@debian.org>
Forwarded: not-needed

Index: ejabberd/src/ejabberd_auth.erl
===================================================================
--- ejabberd.orig/src/ejabberd_auth.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_auth.erl	2026-02-11 22:40:06.143119023 +0000
@@ -50,7 +50,7 @@
 
 -export([auth_modules/1, convert_to_scram/1, drop_password_type/2, set_password_instance/3]).
 
--include_lib("xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
 -include("logger.hrl").
 
 -define(SALT_LENGTH, 16).
Index: ejabberd/src/ejabberd_auth_anonymous.erl
===================================================================
--- ejabberd.orig/src/ejabberd_auth_anonymous.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_auth_anonymous.erl	2026-02-11 22:40:06.143778568 +0000
@@ -47,7 +47,7 @@
 	 plain_password_required/1]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
 
 start(Host) ->
     ejabberd_hooks:add(sm_register_connection_hook, Host,
Index: ejabberd/src/ejabberd_auth_jwt.erl
===================================================================
--- ejabberd.orig/src/ejabberd_auth_jwt.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_auth_jwt.erl	2026-02-11 22:40:06.144185826 +0000
@@ -36,7 +36,7 @@
 %% 'ejabberd_hooks' callback:
 -export([check_decoded_jwt/5]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 
 %%%----------------------------------------------------------------------
Index: ejabberd/src/ejabberd_auth_mnesia.erl
===================================================================
--- ejabberd.orig/src/ejabberd_auth_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_auth_mnesia.erl	2026-02-11 22:40:06.144500073 +0000
@@ -40,7 +40,7 @@
 
 -include_lib("stdlib/include/ms_transform.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
 -include("ejabberd_auth.hrl").
 -include("ejabberd_db_serialize.hrl").
 
Index: ejabberd/src/ejabberd_auth_sql.erl
===================================================================
--- ejabberd.orig/src/ejabberd_auth_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_auth_sql.erl	2026-02-11 22:40:06.144823521 +0000
@@ -38,7 +38,7 @@
 -export([sql_schemas/0]).
 -export([serialize/3, deserialize_start/1, deserialize/2]).
 
--include_lib("xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("ejabberd_auth.hrl").
Index: ejabberd/src/ejabberd_bosh.erl
===================================================================
--- ejabberd.orig/src/ejabberd_bosh.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_bosh.erl	2026-02-11 22:40:06.145243998 +0000
@@ -43,7 +43,7 @@
 	 code_change/4]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_http.hrl").
 -include("bosh.hrl").
 
Index: ejabberd/src/ejabberd_c2s.erl
===================================================================
--- ejabberd.orig/src/ejabberd_c2s.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_c2s.erl	2026-02-11 22:40:06.145983092 +0000
@@ -59,7 +59,7 @@
 	 host_up/1, host_down/1, send_ws_ping/1, bounce_message_queue/2,
 	 reset_vcard_xupdate_resend_presence/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("mod_roster.hrl").
 -include("translate.hrl").
Index: ejabberd/src/ejabberd_captcha.erl
===================================================================
--- ejabberd.orig/src/ejabberd_captcha.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_captcha.erl	2026-02-11 22:40:06.146487359 +0000
@@ -43,7 +43,7 @@
 	 host_up/1, host_down/1,
 	 config_reloaded/0, process_iq/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
 -include("translate.hrl").
Index: ejabberd/src/ejabberd_http.erl
===================================================================
--- ejabberd.orig/src/ejabberd_http.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_http.erl	2026-02-11 22:40:06.146893086 +0000
@@ -39,7 +39,7 @@
 -deprecate({get_auto_url, 2}).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_http.hrl").
 
 -include_lib("kernel/include/file.hrl").
Index: ejabberd/src/ejabberd_http_ws.erl
===================================================================
--- ejabberd.orig/src/ejabberd_http_ws.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_http_ws.erl	2026-02-11 22:40:06.147256114 +0000
@@ -36,7 +36,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
Index: ejabberd/src/ejabberd_iq.erl
===================================================================
--- ejabberd.orig/src/ejabberd_iq.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_iq.erl	2026-02-11 22:40:06.147575631 +0000
@@ -34,7 +34,7 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 
 
Index: ejabberd/src/ejabberd_local.erl
===================================================================
--- ejabberd.orig/src/ejabberd_local.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_local.erl	2026-02-11 22:40:06.147873708 +0000
@@ -47,7 +47,7 @@
 
 -include("logger.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("translate.hrl").
 
Index: ejabberd/src/ejabberd_oauth.erl
===================================================================
--- ejabberd.orig/src/ejabberd_oauth.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_oauth.erl	2026-02-11 22:40:06.148243976 +0000
@@ -57,7 +57,7 @@
 -export([web_menu_main/2, web_page_main/2]).
 -export([web_menu_system/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_web_admin.hrl").
Index: ejabberd/src/ejabberd_oauth_rest.erl
===================================================================
--- ejabberd.orig/src/ejabberd_oauth_rest.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_oauth_rest.erl	2026-02-11 22:40:06.148600353 +0000
@@ -36,7 +36,7 @@
 
 -include("ejabberd_oauth.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
 
 init() ->
     rest:start(ejabberd_config:get_myname()),
Index: ejabberd/src/ejabberd_oauth_sql.erl
===================================================================
--- ejabberd.orig/src/ejabberd_oauth_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_oauth_sql.erl	2026-02-11 22:40:06.148944771 +0000
@@ -38,7 +38,7 @@
 
 -include("ejabberd_oauth.hrl").
 -include("ejabberd_sql_pt.hrl").
--include_lib("xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
 -include("logger.hrl").
 
 init() ->
Index: ejabberd/src/ejabberd_piefxis.erl
===================================================================
--- ejabberd.orig/src/ejabberd_piefxis.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_piefxis.erl	2026-02-11 22:40:06.149250129 +0000
@@ -38,9 +38,9 @@
 
 -define(CHUNK_SIZE, 1024*20). %20k
 
--include_lib("xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_privacy.hrl").
 -include("mod_roster.hrl").
 
Index: ejabberd/src/ejabberd_router.erl
===================================================================
--- ejabberd.orig/src/ejabberd_router.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_router.erl	2026-02-11 22:40:06.149586897 +0000
@@ -69,7 +69,7 @@
 
 -include("logger.hrl").
 -include("ejabberd_router.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 
 
Index: ejabberd/src/ejabberd_router_multicast.erl
===================================================================
--- ejabberd.orig/src/ejabberd_router_multicast.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_router_multicast.erl	2026-02-11 22:40:06.149929964 +0000
@@ -42,7 +42,7 @@
 	 terminate/2, code_change/3, update_to_in_wrapped/2]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -record(route_multicast, {domain = <<"">> :: binary() | '_',
 			  pid = self() :: pid()}).
Index: ejabberd/src/ejabberd_s2s.erl
===================================================================
--- ejabberd.orig/src/ejabberd_s2s.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_s2s.erl	2026-02-11 22:40:06.150231981 +0000
@@ -50,7 +50,7 @@
 -export([get_info_s2s_connections/1]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_commands.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 
Index: ejabberd/src/ejabberd_s2s_in.erl
===================================================================
--- ejabberd.orig/src/ejabberd_s2s_in.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_s2s_in.erl	2026-02-11 22:40:06.150718368 +0000
@@ -41,7 +41,7 @@
 -export([stop_async/1, close/1, close/2, send/2, update_state/2, establish/1,
 	 host_up/1, host_down/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 
 -type state() :: xmpp_stream_in:state().
Index: ejabberd/src/ejabberd_s2s_out.erl
===================================================================
--- ejabberd.orig/src/ejabberd_s2s_out.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_s2s_out.erl	2026-02-11 22:40:06.151222155 +0000
@@ -39,7 +39,7 @@
 -export([start/3, start_link/3, connect/1, close/1, close/2, stop_async/1, send/2,
 	 route/2, establish/1, update_state/2, host_up/1, host_down/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/ejabberd_service.erl
===================================================================
--- ejabberd.orig/src/ejabberd_service.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_service.erl	2026-02-11 22:40:06.151554522 +0000
@@ -35,7 +35,7 @@
 %% API
 -export([send/2, close/1, close/2, stop_async/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/ejabberd_sm.erl
===================================================================
--- ejabberd.orig/src/ejabberd_sm.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_sm.erl	2026-02-11 22:40:06.151979500 +0000
@@ -89,7 +89,7 @@
 	 handle_info/2, terminate/2, code_change/3]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_commands.hrl").
 -include("ejabberd_sm.hrl").
 
Index: ejabberd/src/ejabberd_web.erl
===================================================================
--- ejabberd.orig/src/ejabberd_web.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_web.erl	2026-02-11 22:40:06.152405156 +0000
@@ -32,7 +32,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
Index: ejabberd/src/ejabberd_web_admin.erl
===================================================================
--- ejabberd.orig/src/ejabberd_web_admin.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_web_admin.erl	2026-02-11 22:40:06.152880213 +0000
@@ -40,7 +40,7 @@
 -export([webadmin_host_last_activity/3,
          webadmin_node_db_table_page/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_commands.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_web_admin.hrl").
Index: ejabberd/src/ejabberd_websocket.erl
===================================================================
--- ejabberd.orig/src/ejabberd_websocket.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_websocket.erl	2026-02-11 22:40:06.153441378 +0000
@@ -46,7 +46,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
Index: ejabberd/src/ejabberd_xmlrpc.erl
===================================================================
--- ejabberd.orig/src/ejabberd_xmlrpc.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_xmlrpc.erl	2026-02-11 22:40:06.153703387 +0000
@@ -39,7 +39,7 @@
 -include("ejabberd_http.hrl").
 -include("mod_roster.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -record(state,
 	{auth = noauth        :: noauth | map(),
Index: ejabberd/src/gen_iq_handler.erl
===================================================================
--- ejabberd.orig/src/gen_iq_handler.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/gen_iq_handler.erl	2026-02-11 22:40:06.153932245 +0000
@@ -35,7 +35,7 @@
 -deprecated([{add_iq_handler, 6}, {handle, 5}, {iqdisc, 1}]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 
Index: ejabberd/src/gen_pubsub_node.erl
===================================================================
--- ejabberd.orig/src/gen_pubsub_node.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/gen_pubsub_node.erl	2026-02-11 22:40:06.154161733 +0000
@@ -25,7 +25,7 @@
 
 -module(gen_pubsub_node).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -type(host() :: mod_pubsub:host()).
 -type(nodeId() :: mod_pubsub:nodeId()).
Index: ejabberd/src/gen_pubsub_nodetree.erl
===================================================================
--- ejabberd.orig/src/gen_pubsub_nodetree.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/gen_pubsub_nodetree.erl	2026-02-11 22:40:06.154425542 +0000
@@ -36,7 +36,7 @@
 	ServerHost :: binary(),
 	Opts :: [any()]) -> atom().
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -callback terminate(Host :: host(), ServerHost :: binary()) -> atom().
 
Index: ejabberd/src/jd2ejd.erl
===================================================================
--- ejabberd.orig/src/jd2ejd.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/jd2ejd.erl	2026-02-11 22:40:06.154674180 +0000
@@ -31,7 +31,7 @@
 -export([import_file/1, import_dir/1]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 %%%----------------------------------------------------------------------
 %%% API
Index: ejabberd/src/misc.erl
===================================================================
--- ejabberd.orig/src/misc.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/misc.erl	2026-02-11 22:40:06.154914178 +0000
@@ -62,7 +62,7 @@
 	     {lists_uniq, 1}]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -ifdef(OTP_BELOW_27).
Index: ejabberd/src/mod_adhoc.erl
===================================================================
--- ejabberd.orig/src/mod_adhoc.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_adhoc.erl	2026-02-11 22:40:06.155185167 +0000
@@ -39,7 +39,7 @@
 	 mod_options/1, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 start(_Host, _Opts) ->
Index: ejabberd/src/mod_admin_extra.erl
===================================================================
--- ejabberd.orig/src/mod_admin_extra.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_admin_extra.erl	2026-02-11 22:40:06.155556534 +0000
@@ -98,8 +98,8 @@
 -include("mod_roster.hrl").
 -include("mod_privacy.hrl").
 -include("ejabberd_sm.hrl").
--include_lib("xmpp/include/scram.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 %%%
 %%% gen_mod
Index: ejabberd/src/mod_admin_update_sql.erl
===================================================================
--- ejabberd.orig/src/mod_admin_update_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_admin_update_sql.erl	2026-02-11 22:40:06.156622396 +0000
@@ -39,7 +39,7 @@
 
 -include("logger.hrl").
 -include("ejabberd_commands.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_announce.erl
===================================================================
--- ejabberd.orig/src/mod_announce.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_announce.erl	2026-02-11 22:40:06.156962074 +0000
@@ -65,7 +65,7 @@
 -import(ejabberd_web_admin, [make_command/4, make_command/2]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_commands.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_web_admin.hrl").
Index: ejabberd/src/mod_announce_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_announce_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_announce_mnesia.erl	2026-02-11 22:40:06.157276911 +0000
@@ -31,7 +31,7 @@
 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
 -export([need_transform/1, transform/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_announce.hrl").
 -include("logger.hrl").
 
Index: ejabberd/src/mod_announce_sql.erl
===================================================================
--- ejabberd.orig/src/mod_announce_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_announce_sql.erl	2026-02-11 22:40:06.157503579 +0000
@@ -33,7 +33,7 @@
 	 export/1]).
 -export([sql_schemas/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_announce.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("logger.hrl").
Index: ejabberd/src/mod_avatar.erl
===================================================================
--- ejabberd.orig/src/mod_avatar.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_avatar.erl	2026-02-11 22:40:06.157725068 +0000
@@ -32,7 +32,7 @@
 -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1,
 	 get_sm_features/5]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("pubsub.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_block_strangers.erl
===================================================================
--- ejabberd.orig/src/mod_block_strangers.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_block_strangers.erl	2026-02-11 22:40:06.157979116 +0000
@@ -35,7 +35,7 @@
 -export([filter_packet/1, filter_offline_msg/1, filter_subscription/2,
          get_sm_features/5]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_blocking.erl
===================================================================
--- ejabberd.orig/src/mod_blocking.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_blocking.erl	2026-02-11 22:40:06.158220004 +0000
@@ -33,7 +33,7 @@
 	 disco_features/5, mod_options/1, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_privacy.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_bosh.erl
===================================================================
--- ejabberd.orig/src/mod_bosh.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_bosh.erl	2026-02-11 22:40:06.158468213 +0000
@@ -40,7 +40,7 @@
 
 -include("logger.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_http.hrl").
 -include("bosh.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_caps.erl
===================================================================
--- ejabberd.orig/src/mod_caps.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_caps.erl	2026-02-11 22:40:06.158773881 +0000
@@ -54,7 +54,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_caps.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_carboncopy.erl
===================================================================
--- ejabberd.orig/src/mod_carboncopy.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_carboncopy.erl	2026-02-11 22:40:06.159039948 +0000
@@ -43,7 +43,7 @@
 -export([list/2]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -type direction() :: sent | received.
Index: ejabberd/src/mod_client_state.erl
===================================================================
--- ejabberd.orig/src/mod_client_state.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_client_state.erl	2026-02-11 22:40:06.159278767 +0000
@@ -42,7 +42,7 @@
 	 c2s_copy_session/2, c2s_session_resumed/1]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(CSI_QUEUE_MAX, 100).
Index: ejabberd/src/mod_configure.erl
===================================================================
--- ejabberd.orig/src/mod_configure.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_configure.erl	2026-02-11 22:40:06.159672404 +0000
@@ -40,7 +40,7 @@
 	 depends/2, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_sm.hrl").
 -include("translate.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
Index: ejabberd/src/mod_delegation.erl
===================================================================
--- ejabberd.orig/src/mod_delegation.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_delegation.erl	2026-02-11 22:40:06.160071702 +0000
@@ -42,7 +42,7 @@
 	 disco_local_identity/5, disco_sm_identity/5]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -type route_type() :: ejabberd_sm | ejabberd_local.
Index: ejabberd/src/mod_disco.erl
===================================================================
--- ejabberd.orig/src/mod_disco.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_disco.erl	2026-02-11 22:40:06.160322389 +0000
@@ -42,7 +42,7 @@
 
 -include("logger.hrl").
 -include("translate.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 -include("mod_roster.hrl").
 
Index: ejabberd/src/mod_fail2ban.erl
===================================================================
--- ejabberd.orig/src/mod_fail2ban.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_fail2ban.erl	2026-02-11 22:40:06.160637137 +0000
@@ -42,7 +42,7 @@
 -include_lib("stdlib/include/ms_transform.hrl").
 -include("ejabberd_commands.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(CLEAN_INTERVAL, timer:minutes(10)).
Index: ejabberd/src/mod_http_api.erl
===================================================================
--- ejabberd.orig/src/mod_http_api.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_http_api.erl	2026-02-11 22:40:06.160894496 +0000
@@ -33,7 +33,7 @@
          format_arg/2, handle/4,
 	 mod_opt_type/1, mod_options/1, mod_doc/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
 
Index: ejabberd/src/mod_http_upload.erl
===================================================================
--- ejabberd.orig/src/mod_http_upload.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_http_upload.erl	2026-02-11 22:40:06.161339012 +0000
@@ -63,7 +63,7 @@
 	 expand_host/2]).
 
 -include("ejabberd_http.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_http_upload_quota.erl
===================================================================
--- ejabberd.orig/src/mod_http_upload_quota.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_http_upload_quota.erl	2026-02-11 22:40:06.161943928 +0000
@@ -51,7 +51,7 @@
 %% ejabberd_hooks callback.
 -export([handle_slot_request/6]).
 
--include_lib("xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 -include_lib("kernel/include/file.hrl").
Index: ejabberd/src/mod_jidprep.erl
===================================================================
--- ejabberd.orig/src/mod_jidprep.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_jidprep.erl	2026-02-11 22:40:06.162191756 +0000
@@ -41,7 +41,7 @@
 
 -include("logger.hrl").
 -include("translate.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 %%--------------------------------------------------------------------
 %% gen_mod callbacks.
Index: ejabberd/src/mod_last.erl
===================================================================
--- ejabberd.orig/src/mod_last.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_last.erl	2026-02-11 22:40:06.162491574 +0000
@@ -38,7 +38,7 @@
 	 register_user/2, depends/2, privacy_check_packet/4]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_privacy.hrl").
 -include("mod_last.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_legacy_auth.erl
===================================================================
--- ejabberd.orig/src/mod_legacy_auth.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_legacy_auth.erl	2026-02-11 22:40:06.162722052 +0000
@@ -29,7 +29,7 @@
 %% hooks
 -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -type c2s_state() :: ejabberd_c2s:state().
Index: ejabberd/src/mod_mam.erl
===================================================================
--- ejabberd.orig/src/mod_mam.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mam.erl	2026-02-11 22:40:06.163032980 +0000
@@ -58,7 +58,7 @@
 
 -import(ejabberd_web_admin, [make_command/4, make_command/2]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("mod_muc_room.hrl").
 -include("ejabberd_commands.hrl").
Index: ejabberd/src/mod_mam_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_mam_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mam_mnesia.erl	2026-02-11 22:40:06.163495757 +0000
@@ -36,7 +36,7 @@
 -export([serialize/3, deserialize_start/1, deserialize/2]).
 
 -include_lib("stdlib/include/ms_transform.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("logger.hrl").
 -include("mod_mam.hrl").
Index: ejabberd/src/mod_mam_sql.erl
===================================================================
--- ejabberd.orig/src/mod_mam_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mam_sql.erl	2026-02-11 22:40:06.163872933 +0000
@@ -37,7 +37,7 @@
 -export([serialize/3, deserialize_start/1, deserialize/2]).
 
 -include_lib("stdlib/include/ms_transform.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_mam.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
Index: ejabberd/src/mod_metrics.erl
===================================================================
--- ejabberd.orig/src/mod_metrics.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_metrics.erl	2026-02-11 22:40:06.164165882 +0000
@@ -29,7 +29,7 @@
 -behaviour(gen_mod).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -export([start/2, stop/1, mod_opt_type/1, mod_options/1, depends/2, reload/3]).
Index: ejabberd/src/mod_mix.erl
===================================================================
--- ejabberd.orig/src/mod_mix.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mix.erl	2026-02-11 22:40:06.164423180 +0000
@@ -41,7 +41,7 @@
 	 process_mam_query/1,
 	 process_pubsub_query/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_mix_pam.erl
===================================================================
--- ejabberd.orig/src/mod_mix_pam.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mix_pam.erl	2026-02-11 22:40:06.164751648 +0000
@@ -36,7 +36,7 @@
 	 webadmin_user/4,
 	 webadmin_menu_hostuser/4, webadmin_page_hostuser/4]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("mod_roster.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_mqtt_session.erl
===================================================================
--- ejabberd.orig/src/mod_mqtt_session.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mqtt_session.erl	2026-02-11 22:40:06.165114015 +0000
@@ -28,7 +28,7 @@
 
 -include("logger.hrl").
 -include("mqtt.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
 -record(state, {vsn = ?VSN            :: integer(),
Index: ejabberd/src/mod_mqtt_ws.erl
===================================================================
--- ejabberd.orig/src/mod_mqtt_ws.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mqtt_ws.erl	2026-02-11 22:40:06.165479912 +0000
@@ -29,7 +29,7 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_http.hrl").
 -include("logger.hrl").
 
Index: ejabberd/src/mod_muc.erl
===================================================================
--- ejabberd.orig/src/mod_muc.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_muc.erl	2026-02-11 22:40:06.165776770 +0000
@@ -84,7 +84,7 @@
 	 mod_opt_type/1, mod_options/1, depends/2]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_muc.hrl").
 -include("mod_muc_room.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_muc_admin.erl
===================================================================
--- ejabberd.orig/src/mod_muc_admin.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_muc_admin.erl	2026-02-11 22:40:06.166214017 +0000
@@ -58,7 +58,7 @@
 -import(ejabberd_web_admin, [make_command/4, make_command_raw_value/3, make_table/4]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_muc.hrl").
 -include("mod_muc_room.hrl").
 -include("ejabberd_http.hrl").
Index: ejabberd/src/mod_muc_log.erl
===================================================================
--- ejabberd.orig/src/mod_muc_log.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_muc_log.erl	2026-02-11 22:40:06.166946131 +0000
@@ -42,7 +42,7 @@
 	 mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_muc_room.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_muc_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_muc_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_muc_mnesia.erl	2026-02-11 22:40:06.167278080 +0000
@@ -48,7 +48,7 @@
 -include("mod_muc.hrl").
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 
 -include("ejabberd_db_serialize.hrl").
Index: ejabberd/src/mod_muc_room.erl
===================================================================
--- ejabberd.orig/src/mod_muc_room.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_muc_room.erl	2026-02-11 22:40:06.168077004 +0000
@@ -71,7 +71,7 @@
 	 code_change/4]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 -include("mod_muc_room.hrl").
 
Index: ejabberd/src/mod_muc_sql.erl
===================================================================
--- ejabberd.orig/src/mod_muc_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_muc_sql.erl	2026-02-11 22:40:06.168862488 +0000
@@ -46,7 +46,7 @@
 -export([sql_schemas/0]).
 -export([serialize/3, deserialize_start/1, deserialize/2]).
 
--include_lib("xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
 -include("mod_muc.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
Index: ejabberd/src/mod_multicast.erl
===================================================================
--- ejabberd.orig/src/mod_multicast.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_multicast.erl	2026-02-11 22:40:06.169127496 +0000
@@ -45,7 +45,7 @@
 
 -include("logger.hrl").
 -include("translate.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -record(multicastc, {rserver :: binary(),
 		     response,
Index: ejabberd/src/mod_offline.erl
===================================================================
--- ejabberd.orig/src/mod_offline.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_offline.erl	2026-02-11 22:40:06.169428544 +0000
@@ -75,7 +75,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
Index: ejabberd/src/mod_offline_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_offline_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_offline_mnesia.erl	2026-02-11 22:40:06.169728312 +0000
@@ -33,7 +33,7 @@
 	 remove_old_messages_batch/4]).
 -export([need_transform/1, transform/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_offline.hrl").
 -include("logger.hrl").
 
Index: ejabberd/src/mod_offline_sql.erl
===================================================================
--- ejabberd.orig/src/mod_offline_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_offline_sql.erl	2026-02-11 22:40:06.169927230 +0000
@@ -33,7 +33,7 @@
 	 remove_all_messages/2, count_messages/2, import/1, export/1, remove_old_messages_batch/3]).
 -export([sql_schemas/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_offline.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
Index: ejabberd/src/mod_ping.erl
===================================================================
--- ejabberd.orig/src/mod_ping.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_ping.erl	2026-02-11 22:40:06.170122459 +0000
@@ -35,7 +35,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("translate.hrl").
 
Index: ejabberd/src/mod_pres_counter.erl
===================================================================
--- ejabberd.orig/src/mod_pres_counter.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_pres_counter.erl	2026-02-11 22:40:06.170309337 +0000
@@ -32,7 +32,7 @@
 
 -include("logger.hrl").
 -include("translate.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -record(pres_counter,
 	{dir, start, count, logged = false}).
Index: ejabberd/src/mod_privacy.erl
===================================================================
--- ejabberd.orig/src/mod_privacy.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_privacy.erl	2026-02-11 22:40:06.170533116 +0000
@@ -45,7 +45,7 @@
 -import(ejabberd_web_admin, [make_command/4, make_command/2]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_web_admin.hrl").
 -include("mod_privacy.hrl").
Index: ejabberd/src/mod_privacy_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_privacy_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_privacy_mnesia.erl	2026-02-11 22:40:06.170761264 +0000
@@ -32,7 +32,7 @@
 	 remove_list/3, use_cache/1, import/1]).
 -export([need_transform/1, transform/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_privacy.hrl").
 -include("logger.hrl").
 
Index: ejabberd/src/mod_privacy_sql.erl
===================================================================
--- ejabberd.orig/src/mod_privacy_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_privacy_sql.erl	2026-02-11 22:40:06.170950643 +0000
@@ -36,7 +36,7 @@
 
 -export([sql_schemas/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_privacy.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
Index: ejabberd/src/mod_private.erl
===================================================================
--- ejabberd.orig/src/mod_private.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_private.erl	2026-02-11 22:40:06.171180782 +0000
@@ -47,7 +47,7 @@
 -import(ejabberd_web_admin, [make_command/4, make_command/2]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_private.hrl").
 -include("ejabberd_commands.hrl").
 -include("ejabberd_http.hrl").
Index: ejabberd/src/mod_private_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_private_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_private_mnesia.erl	2026-02-11 22:40:06.171398520 +0000
@@ -32,7 +32,7 @@
 	use_cache/1, import/3]).
 -export([need_transform/1, transform/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_private.hrl").
 -include("logger.hrl").
 
Index: ejabberd/src/mod_private_sql.erl
===================================================================
--- ejabberd.orig/src/mod_private_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_private_sql.erl	2026-02-11 22:40:06.171633958 +0000
@@ -31,7 +31,7 @@
     import/3, export/1]).
 -export([sql_schemas/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_private.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("logger.hrl").
Index: ejabberd/src/mod_privilege.erl
===================================================================
--- ejabberd.orig/src/mod_privilege.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_privilege.erl	2026-02-11 22:40:06.171841196 +0000
@@ -42,7 +42,7 @@
 	 process_presence_out/1, process_presence_in/1]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -type roster_permission() :: both | get | set.
Index: ejabberd/src/mod_proxy65_service.erl
===================================================================
--- ejabberd.orig/src/mod_proxy65_service.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_proxy65_service.erl	2026-02-11 22:40:06.172125255 +0000
@@ -38,7 +38,7 @@
 	 delete_listener/1, route/1]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 
Index: ejabberd/src/mod_pubsub.erl
===================================================================
--- ejabberd.orig/src/mod_pubsub.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_pubsub.erl	2026-02-11 22:40:06.172809410 +0000
@@ -42,7 +42,7 @@
 -protocol({xep, 248, '0.2', '2.1.0', "complete", ""}).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("pubsub.hrl").
 -include("mod_roster.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_push.erl
===================================================================
--- ejabberd.orig/src/mod_push.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_push.erl	2026-02-11 22:40:06.173420535 +0000
@@ -51,7 +51,7 @@
 
 -include("ejabberd_commands.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(PUSH_CACHE, push_cache).
Index: ejabberd/src/mod_push_keepalive.erl
===================================================================
--- ejabberd.orig/src/mod_push_keepalive.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_push_keepalive.erl	2026-02-11 22:40:06.173739113 +0000
@@ -37,7 +37,7 @@
 	 c2s_stanza/3]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(PUSH_BEFORE_TIMEOUT_PERIOD, 120000). % 2 minutes.
Index: ejabberd/src/mod_push_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_push_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_push_mnesia.erl	2026-02-11 22:40:06.173929272 +0000
@@ -35,7 +35,7 @@
 
 -include_lib("stdlib/include/ms_transform.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_push.hrl").
 
 %%%-------------------------------------------------------------------
Index: ejabberd/src/mod_push_sql.erl
===================================================================
--- ejabberd.orig/src/mod_push_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_push_sql.erl	2026-02-11 22:40:06.174113090 +0000
@@ -32,7 +32,7 @@
 	 delete_session/3, delete_old_sessions/2, export/1]).
 -export([sql_schemas/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("mod_push.hrl").
Index: ejabberd/src/mod_register.erl
===================================================================
--- ejabberd.orig/src/mod_register.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_register.erl	2026-02-11 22:40:06.174323968 +0000
@@ -40,7 +40,7 @@
 -deprecated({try_register, 4}).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 start(_Host, _Opts) ->
Index: ejabberd/src/mod_register_web.erl
===================================================================
--- ejabberd.orig/src/mod_register_web.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_register_web.erl	2026-02-11 22:40:06.174588097 +0000
@@ -35,7 +35,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
Index: ejabberd/src/mod_roster.erl
===================================================================
--- ejabberd.orig/src/mod_roster.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_roster.erl	2026-02-11 22:40:06.174848495 +0000
@@ -57,7 +57,7 @@
 -import(ejabberd_web_admin, [make_command/4, make_command_raw_value/3, make_table/4]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_roster.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_web_admin.hrl").
Index: ejabberd/src/mod_roster_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_roster_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_roster_mnesia.erl	2026-02-11 22:40:06.175158643 +0000
@@ -37,7 +37,7 @@
 
 -include("mod_roster.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 %%%===================================================================
 %%% API
Index: ejabberd/src/mod_roster_sql.erl
===================================================================
--- ejabberd.orig/src/mod_roster_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_roster_sql.erl	2026-02-11 22:40:06.175384351 +0000
@@ -41,7 +41,7 @@
 -include("mod_roster.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
 -include("ejabberd_db_serialize.hrl").
 
 %%%===================================================================
Index: ejabberd/src/mod_s2s_dialback.erl
===================================================================
--- ejabberd.orig/src/mod_s2s_dialback.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_s2s_dialback.erl	2026-02-11 22:40:06.175638459 +0000
@@ -33,7 +33,7 @@
 	 s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2,
 	 s2s_out_tls_verify/2]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_service_log.erl
===================================================================
--- ejabberd.orig/src/mod_service_log.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_service_log.erl	2026-02-11 22:40:06.175829298 +0000
@@ -34,7 +34,7 @@
 
 -include("logger.hrl").
 -include("translate.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 start(_Host, _Opts) ->
     {ok, [{hook, user_send_packet, log_user_send, 50},
Index: ejabberd/src/mod_shared_roster.erl
===================================================================
--- ejabberd.orig/src/mod_shared_roster.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_shared_roster.erl	2026-02-11 22:40:06.176059047 +0000
@@ -45,7 +45,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("mod_roster.hrl").
 
Index: ejabberd/src/mod_shared_roster_ldap.erl
===================================================================
--- ejabberd.orig/src/mod_shared_roster_ldap.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_shared_roster_ldap.erl	2026-02-11 22:40:06.176411614 +0000
@@ -43,7 +43,7 @@
 	 depends/2, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_roster.hrl").
 -include("eldap.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_shared_roster_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_shared_roster_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_shared_roster_mnesia.erl	2026-02-11 22:40:06.176655372 +0000
@@ -37,7 +37,7 @@
 -include("mod_roster.hrl").
 -include("mod_shared_roster.hrl").
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 %%%===================================================================
 %%% API
Index: ejabberd/src/mod_shared_roster_sql.erl
===================================================================
--- ejabberd.orig/src/mod_shared_roster_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_shared_roster_sql.erl	2026-02-11 22:40:06.176841831 +0000
@@ -36,7 +36,7 @@
 	 export/1]).
 -export([sql_schemas/0]).
 
--include_lib("xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
 -include("mod_roster.hrl").
 -include("mod_shared_roster.hrl").
 -include("ejabberd_sql_pt.hrl").
Index: ejabberd/src/mod_sic.erl
===================================================================
--- ejabberd.orig/src/mod_sic.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_sic.erl	2026-02-11 22:40:06.177030020 +0000
@@ -35,7 +35,7 @@
 	 process_sm_iq/1, mod_options/1, depends/2, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 start(_Host, _Opts) ->
Index: ejabberd/src/mod_sip.erl
===================================================================
--- ejabberd.orig/src/mod_sip.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_sip.erl	2026-02-11 22:40:06.177215628 +0000
@@ -55,7 +55,7 @@
 	 locate/1, mod_opt_type/1, mod_options/1, depends/2,
          mod_doc/0]).
 
--include_lib("esip/include/esip.hrl").
+-include_lib("p1_sip/include/esip.hrl").
 
 %%%===================================================================
 %%% API
Index: ejabberd/src/mod_sip_proxy.erl
===================================================================
--- ejabberd.orig/src/mod_sip_proxy.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_sip_proxy.erl	2026-02-11 22:40:06.177564026 +0000
@@ -39,7 +39,7 @@
 	 code_change/4]).
 
 -include("logger.hrl").
--include_lib("esip/include/esip.hrl").
+-include_lib("p1_sip/include/esip.hrl").
 
 -define(SIGN_LIFETIME, 300). %% in seconds.
 
Index: ejabberd/src/mod_sip_registrar.erl
===================================================================
--- ejabberd.orig/src/mod_sip_registrar.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_sip_registrar.erl	2026-02-11 22:40:06.177970943 +0000
@@ -41,7 +41,7 @@
 	 terminate/2, code_change/3]).
 
 -include("logger.hrl").
--include_lib("esip/include/esip.hrl").
+-include_lib("p1_sip/include/esip.hrl").
 
 -define(CALL_TIMEOUT, timer:seconds(30)).
 -define(DEFAULT_EXPIRES, 3600).
Index: ejabberd/src/mod_stats.erl
===================================================================
--- ejabberd.orig/src/mod_stats.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_stats.erl	2026-02-11 22:40:06.178199411 +0000
@@ -35,7 +35,7 @@
 	 mod_options/1, depends/2, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 start(_Host, _Opts) ->
Index: ejabberd/src/mod_stream_mgmt.erl
===================================================================
--- ejabberd.orig/src/mod_stream_mgmt.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_stream_mgmt.erl	2026-02-11 22:40:06.178507739 +0000
@@ -42,7 +42,7 @@
 %% for sasl2 inline resume
 -export([has_resume_data/2, post_resume_tasks/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include_lib("p1_utils/include/p1_queue.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_stun_disco.erl
===================================================================
--- ejabberd.orig/src/mod_stun_disco.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_stun_disco.erl	2026-02-11 22:40:06.178798297 +0000
@@ -55,7 +55,7 @@
 
 -include("logger.hrl").
 -include("translate.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -define(STUN_MODULE, ejabberd_stun).
 
Index: ejabberd/src/mod_time.erl
===================================================================
--- ejabberd.orig/src/mod_time.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_time.erl	2026-02-11 22:40:06.179006495 +0000
@@ -36,7 +36,7 @@
 	 mod_options/1, depends/2, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 start(_Host, _Opts) ->
Index: ejabberd/src/mod_vcard.erl
===================================================================
--- ejabberd.orig/src/mod_vcard.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_vcard.erl	2026-02-11 22:40:06.179209704 +0000
@@ -48,7 +48,7 @@
 -import(ejabberd_web_admin, [make_command/4, make_command/2, make_table/2]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_vcard.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_vcard_ldap.erl
===================================================================
--- ejabberd.orig/src/mod_vcard_ldap.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_vcard_ldap.erl	2026-02-11 22:40:06.179515961 +0000
@@ -40,7 +40,7 @@
 
 -include("logger.hrl").
 -include("eldap.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(PROCNAME, ejabberd_mod_vcard_ldap).
Index: ejabberd/src/mod_vcard_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_vcard_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_vcard_mnesia.erl	2026-02-11 22:40:06.179925078 +0000
@@ -33,7 +33,7 @@
 -export([need_transform/1, transform/1]).
 -export([mod_opt_type/1, mod_options/1, mod_doc/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_vcard.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_vcard_sql.erl
===================================================================
--- ejabberd.orig/src/mod_vcard_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_vcard_sql.erl	2026-02-11 22:40:06.180168947 +0000
@@ -33,7 +33,7 @@
 -export([is_search_supported/1]).
 -export([sql_schemas/0]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("mod_vcard.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
Index: ejabberd/src/mod_vcard_xupdate.erl
===================================================================
--- ejabberd.orig/src/mod_vcard_xupdate.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_vcard_xupdate.erl	2026-02-11 22:40:06.180456515 +0000
@@ -35,7 +35,7 @@
 -export([compute_hash/1]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache).
Index: ejabberd/src/mod_version.erl
===================================================================
--- ejabberd.orig/src/mod_version.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_version.erl	2026-02-11 22:40:06.180747723 +0000
@@ -35,7 +35,7 @@
 	 mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]).
 
 -include("logger.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 start(Host, _Opts) ->
Index: ejabberd/src/node_flat.erl
===================================================================
--- ejabberd.orig/src/node_flat.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/node_flat.erl	2026-02-11 22:40:06.181000571 +0000
@@ -34,7 +34,7 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,
Index: ejabberd/src/node_flat_sql.erl
===================================================================
--- ejabberd.orig/src/node_flat_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/node_flat_sql.erl	2026-02-11 22:40:06.181324428 +0000
@@ -35,7 +35,7 @@
 
 
 -include("pubsub.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/nodetree_tree.erl
===================================================================
--- ejabberd.orig/src/nodetree_tree.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/nodetree_tree.erl	2026-02-11 22:40:06.181635547 +0000
@@ -41,7 +41,7 @@
 -include_lib("stdlib/include/ms_transform.hrl").
 
 -include("pubsub.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -export([init/3, terminate/2, options/0, set_node/1,
Index: ejabberd/src/nodetree_tree_sql.erl
===================================================================
--- ejabberd.orig/src/nodetree_tree_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/nodetree_tree_sql.erl	2026-02-11 22:40:06.181860465 +0000
@@ -39,7 +39,7 @@
 
 
 -include("pubsub.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/prosody2ejabberd.erl
===================================================================
--- ejabberd.orig/src/prosody2ejabberd.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/prosody2ejabberd.erl	2026-02-11 22:40:06.182094853 +0000
@@ -27,8 +27,8 @@
 %% API
 -export([from_dir/1]).
 
--include_lib("xmpp/include/scram.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("mod_roster.hrl").
 -include("mod_offline.hrl").
Index: ejabberd/src/pubsub_subscription.erl
===================================================================
--- ejabberd.orig/src/pubsub_subscription.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/pubsub_subscription.erl	2026-02-11 22:40:06.182339151 +0000
@@ -38,7 +38,7 @@
     read_subscription/3, write_subscription/4]).
 
 -include("pubsub.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
Index: ejabberd/src/pubsub_subscription_sql.erl
===================================================================
--- ejabberd.orig/src/pubsub_subscription_sql.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/pubsub_subscription_sql.erl	2026-02-11 22:40:06.182721358 +0000
@@ -34,7 +34,7 @@
     get_options_xform/2, parse_options_xform/1]).
 
 -include("pubsub.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("translate.hrl").
 
 -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
Index: ejabberd/test/suite.hrl
===================================================================
--- ejabberd.orig/test/suite.hrl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/test/suite.hrl	2026-02-11 22:40:06.183071385 +0000
@@ -1,8 +1,8 @@
 -include_lib("common_test/include/ct.hrl").
--include_lib("fast_xml/include/fxml.hrl").
--include_lib("xmpp/include/jid.hrl").
--include_lib("xmpp/include/ns.hrl").
--include_lib("xmpp/include/xmpp_codec.hrl").
+-include_lib("p1_xml/include/fxml.hrl").
+-include_lib("p1_xmpp/include/jid.hrl").
+-include_lib("p1_xmpp/include/ns.hrl").
+-include_lib("p1_xmpp/include/xmpp_codec.hrl").
 -include("mod_proxy65.hrl").
 
 -define(STREAM_TRAILER, <<"</stream:stream>">>).
Index: ejabberd/tools/xml_compress_gen.erl
===================================================================
--- ejabberd.orig/tools/xml_compress_gen.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/tools/xml_compress_gen.erl	2026-02-11 22:40:06.183308784 +0000
@@ -24,7 +24,7 @@
 -module(xml_compress_gen).
 -author("pawel@process-one.net").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 %% API
 -export([archive_analyze/3, process_stats/1, gen_code/3]).
Index: ejabberd/src/mod_conversejs.erl
===================================================================
--- ejabberd.orig/src/mod_conversejs.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_conversejs.erl	2026-02-11 22:40:06.183568152 +0000
@@ -33,7 +33,7 @@
          mod_opt_type/1, mod_options/1, mod_doc/0]).
 -export([http_handlers_init/2, web_menu_system/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_host_meta.erl
===================================================================
--- ejabberd.orig/src/mod_host_meta.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_host_meta.erl	2026-02-11 22:40:06.183835440 +0000
@@ -37,7 +37,7 @@
 
 -include("logger.hrl").
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 
Index: ejabberd/src/ext_mod.erl
===================================================================
--- ejabberd.orig/src/ext_mod.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ext_mod.erl	2026-02-11 22:40:06.184090089 +0000
@@ -48,7 +48,7 @@
 -include("ejabberd_web_admin.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include_lib("stdlib/include/zip.hrl").
 
 -define(REPOS, "git@github.com:processone/ejabberd-contrib.git").
Index: ejabberd/src/mod_mqtt_bridge_session.erl
===================================================================
--- ejabberd.orig/src/mod_mqtt_bridge_session.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_mqtt_bridge_session.erl	2026-02-11 22:40:06.184490305 +0000
@@ -28,7 +28,7 @@
 
 -include("logger.hrl").
 -include("mqtt.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
 -type error_reason() ::
Index: ejabberd/src/mod_muc_rtbl.erl
===================================================================
--- ejabberd.orig/src/mod_muc_rtbl.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_muc_rtbl.erl	2026-02-11 22:40:06.184888123 +0000
@@ -28,7 +28,7 @@
 -behaviour(gen_mod).
 -behaviour(gen_server).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 -include("mod_muc_room.hrl").
Index: ejabberd/src/ejabberd_acme.erl
===================================================================
--- ejabberd.orig/src/ejabberd_acme.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_acme.erl	2026-02-11 22:40:06.185360699 +0000
@@ -41,7 +41,7 @@
 -include("ejabberd_web_admin.hrl").
 -include_lib("public_key/include/public_key.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 
 -define(CALL_TIMEOUT, timer:minutes(10)).
 
Index: ejabberd/src/ejabberd_admin.erl
===================================================================
--- ejabberd.orig/src/ejabberd_admin.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/ejabberd_admin.erl	2026-02-11 22:40:06.185749337 +0000
@@ -81,7 +81,7 @@
 -export([web_menu_main/2, web_page_main/2,
          web_menu_node/3, web_page_node/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("ejabberd_commands.hrl").
 -include("ejabberd_http.hrl").
 -include("ejabberd_web_admin.hrl").
Index: ejabberd/src/mod_matrix_gw.erl
===================================================================
--- ejabberd.orig/src/mod_matrix_gw.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_matrix_gw.erl	2026-02-11 22:40:06.186138844 +0000
@@ -50,7 +50,7 @@
 	 process_disco_items/1,
          route/1]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
 -include("translate.hrl").
Index: ejabberd/src/mod_matrix_gw_room.erl
===================================================================
--- ejabberd.orig/src/mod_matrix_gw_room.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_matrix_gw_room.erl	2026-02-11 22:40:06.186653600 +0000
@@ -43,7 +43,7 @@
 -export([init/1, terminate/3, code_change/4, callback_mode/0]).
 -export([handle_event/4]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
 -include("mod_matrix_gw.hrl").
Index: ejabberd/src/mod_auth_fast.erl
===================================================================
--- ejabberd.orig/src/mod_auth_fast.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_auth_fast.erl	2026-02-11 22:40:06.187246027 +0000
@@ -32,8 +32,8 @@
 -export([c2s_inline_features/3, c2s_handle_sasl2_inline/1,
 	 get_tokens/3, get_mechanisms/1, remove_user_tokens/2]).
 
--include_lib("xmpp/include/xmpp.hrl").
--include_lib("xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_auth_fast_mnesia.erl
===================================================================
--- ejabberd.orig/src/mod_auth_fast_mnesia.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_auth_fast_mnesia.erl	2026-02-11 22:40:06.187486244 +0000
@@ -30,7 +30,7 @@
 -export([init/2]).
 -export([get_tokens/3, del_token/4, del_tokens/2, set_token/6, rotate_token/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 
 -record(mod_auth_fast, {key = {<<"">>, <<"">>, <<"">>} :: {binary(), binary(), binary() | '_'} | '$1',
Index: ejabberd/src/mod_s2s_bidi.erl
===================================================================
--- ejabberd.orig/src/mod_s2s_bidi.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_s2s_bidi.erl	2026-02-11 22:40:06.187763872 +0000
@@ -30,7 +30,7 @@
 -export([s2s_in_packet/2, s2s_out_packet/2,
 	 s2s_in_features/2, s2s_in_auth_result/3, s2s_out_unauthenticated_features/2, s2s_in_handle_info/2]).
 
--include_lib("xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("translate.hrl").
 
Index: ejabberd/src/mod_scram_upgrade.erl
===================================================================
--- ejabberd.orig/src/mod_scram_upgrade.erl	2026-02-11 22:40:06.188024611 +0000
+++ ejabberd/src/mod_scram_upgrade.erl	2026-02-11 22:40:06.188001961 +0000
@@ -30,8 +30,8 @@
 -export([c2s_inline_features/3, c2s_handle_sasl2_inline/1,
 	 c2s_handle_sasl2_task_next/4, c2s_handle_sasl2_task_data/3]).
 
--include_lib("xmpp/include/xmpp.hrl").
--include_lib("xmpp/include/scram.hrl").
+-include_lib("p1_xmpp/include/xmpp.hrl").
+-include_lib("p1_xmpp/include/scram.hrl").
 -include("logger.hrl").
 -include("translate.hrl").