package/ejabberd/0004-correct-includes.patch

   1 From 0487178693143955ff57e3c9371fb6e7b164294c Mon Sep 17 00:00:00 2001
   2 From: Johan Oudinet <johan.oudinet@gmail.com>
   3 Date: Thu, 11 Jan 2018 12:49:38 +0100
   4 Subject: [PATCH] correct includes
   5
   6 Use include_lib() instead of include() for files from external
   7 libraries. See https://github.com/processone/ejabberd/pull/1446
   8
   9 Note: Philipp Huebner has a similar patch in Debian's port of ejabberd
  10 but it was easier to redo this patch from scratch with the following sed
  11 command on ejabberd git repository than adapting Huebner's patch format:
  12 for f in src/*.erl include/*.hrl; do
  13     sed -i -e 's,esip/include,s1_sip/include,g' \
  14     -e 's,include("ns.hrl,include_lib("p1_xmpp/include/ns.hrl,g' \
  15     -e 's,include("fxml.hrl,include_lib("p1_xml/include/fxml.hrl,g' \
  16     -e 's,include("xmpp\.hrl,include_lib("p1_xmpp/include/xmpp.hrl,g' \
  17     -e 's,include("jid\.hrl,include_lib("p1_xmpp/include/jid.hrl,g' \
  18     "$f"
  19 done
  20
  21 Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
  22 ---
  23  include/jlib.hrl                  | 4 ++--
  24  src/acl.erl                       | 2 +-
  25  src/acme_challenge.erl            | 2 +-
  26  src/ejabberd_acme.erl             | 2 +-
  27  src/ejabberd_acme_comm.erl        | 2 +-
  28  src/ejabberd_auth_anonymous.erl   | 2 +-
  29  src/ejabberd_bosh.erl             | 2 +-
  30  src/ejabberd_c2s.erl              | 2 +-
  31  src/ejabberd_captcha.erl          | 2 +-
  32  src/ejabberd_http.erl             | 2 +-
  33  src/ejabberd_http_ws.erl          | 2 +-
  34  src/ejabberd_iq.erl               | 2 +-
  35  src/ejabberd_local.erl            | 2 +-
  36  src/ejabberd_oauth.erl            | 2 +-
  37  src/ejabberd_oauth_rest.erl       | 2 +-
  38  src/ejabberd_oauth_sql.erl        | 2 +-
  39  src/ejabberd_piefxis.erl          | 2 +-
  40  src/ejabberd_router.erl           | 2 +-
  41  src/ejabberd_router_multicast.erl | 2 +-
  42  src/ejabberd_s2s.erl              | 2 +-
  43  src/ejabberd_s2s_in.erl           | 2 +-
  44  src/ejabberd_s2s_out.erl          | 2 +-
  45  src/ejabberd_service.erl          | 2 +-
  46  src/ejabberd_sm.erl               | 2 +-
  47  src/ejabberd_socket.erl           | 2 +-
  48  src/ejabberd_system_monitor.erl   | 2 +-
  49  src/ejabberd_web.erl              | 2 +-
  50  src/ejabberd_web_admin.erl        | 2 +-
  51  src/ejabberd_websocket.erl        | 2 +-
  52  src/ejabberd_xmlrpc.erl           | 2 +-
  53  src/gen_iq_handler.erl            | 2 +-
  54  src/gen_pubsub_node.erl           | 2 +-
  55  src/gen_pubsub_nodetree.erl       | 2 +-
  56  src/jd2ejd.erl                    | 2 +-
  57  src/mod_adhoc.erl                 | 2 +-
  58  src/mod_admin_extra.erl           | 2 +-
  59  src/mod_admin_update_sql.erl      | 2 +-
  60  src/mod_announce.erl              | 2 +-
  61  src/mod_announce_mnesia.erl       | 2 +-
  62  src/mod_announce_riak.erl         | 2 +-
  63  src/mod_announce_sql.erl          | 2 +-
  64  src/mod_avatar.erl                | 2 +-
  65  src/mod_block_strangers.erl       | 2 +-
  66  src/mod_blocking.erl              | 2 +-
  67  src/mod_bosh.erl                  | 2 +-
  68  src/mod_caps.erl                  | 2 +-
  69  src/mod_carboncopy.erl            | 2 +-
  70  src/mod_client_state.erl          | 2 +-
  71  src/mod_configure.erl             | 2 +-
  72  src/mod_delegation.erl            | 2 +-
  73  src/mod_disco.erl                 | 2 +-
  74  src/mod_echo.erl                  | 2 +-
  75  src/mod_fail2ban.erl              | 2 +-
  76  src/mod_http_api.erl              | 2 +-
  77  src/mod_http_upload.erl           | 2 +-
  78  src/mod_http_upload_quota.erl     | 2 +-
  79  src/mod_irc.erl                   | 2 +-
  80  src/mod_irc_connection.erl        | 2 +-
  81  src/mod_irc_mnesia.erl            | 2 +-
  82  src/mod_irc_riak.erl              | 2 +-
  83  src/mod_irc_sql.erl               | 2 +-
  84  src/mod_last.erl                  | 2 +-
  85  src/mod_legacy_auth.erl           | 2 +-
  86  src/mod_mam.erl                   | 2 +-
  87  src/mod_mam_mnesia.erl            | 2 +-
  88  src/mod_mam_sql.erl               | 2 +-
  89  src/mod_metrics.erl               | 2 +-
  90  src/mod_mix.erl                   | 2 +-
  91  src/mod_muc.erl                   | 2 +-
  92  src/mod_muc_admin.erl             | 2 +-
  93  src/mod_muc_log.erl               | 2 +-
  94  src/mod_muc_mnesia.erl            | 2 +-
  95  src/mod_muc_riak.erl              | 2 +-
  96  src/mod_muc_room.erl              | 2 +-
  97  src/mod_muc_sql.erl               | 2 +-
  98  src/mod_multicast.erl             | 2 +-
  99  src/mod_offline.erl               | 2 +-
 100  src/mod_offline_mnesia.erl        | 2 +-
 101  src/mod_offline_riak.erl          | 2 +-
 102  src/mod_offline_sql.erl           | 2 +-
 103  src/mod_ping.erl                  | 2 +-
 104  src/mod_pres_counter.erl          | 2 +-
 105  src/mod_privacy.erl               | 2 +-
 106  src/mod_privacy_mnesia.erl        | 2 +-
 107  src/mod_privacy_riak.erl          | 2 +-
 108  src/mod_privacy_sql.erl           | 2 +-
 109  src/mod_private.erl               | 2 +-
 110  src/mod_private_mnesia.erl        | 2 +-
 111  src/mod_private_riak.erl          | 2 +-
 112  src/mod_private_sql.erl           | 2 +-
 113  src/mod_privilege.erl             | 2 +-
 114  src/mod_proxy65_service.erl       | 2 +-
 115  src/mod_pubsub.erl                | 2 +-
 116  src/mod_push.erl                  | 2 +-
 117  src/mod_push_keepalive.erl        | 2 +-
 118  src/mod_push_mnesia.erl           | 2 +-
 119  src/mod_push_sql.erl              | 2 +-
 120  src/mod_register.erl              | 2 +-
 121  src/mod_register_web.erl          | 2 +-
 122  src/mod_roster.erl                | 2 +-
 123  src/mod_s2s_dialback.erl          | 2 +-
 124  src/mod_service_log.erl           | 2 +-
 125  src/mod_shared_roster.erl         | 2 +-
 126  src/mod_shared_roster_ldap.erl    | 2 +-
 127  src/mod_shared_roster_mnesia.erl  | 2 +-
 128  src/mod_shared_roster_riak.erl    | 2 +-
 129  src/mod_shared_roster_sql.erl     | 2 +-
 130  src/mod_sic.erl                   | 2 +-
 131  src/mod_sip.erl                   | 2 +-
 132  src/mod_sip_proxy.erl             | 2 +-
 133  src/mod_sip_registrar.erl         | 2 +-
 134  src/mod_stats.erl                 | 2 +-
 135  src/mod_stream_mgmt.erl           | 2 +-
 136  src/mod_time.erl                  | 2 +-
 137  src/mod_vcard.erl                 | 2 +-
 138  src/mod_vcard_ldap.erl            | 2 +-
 139  src/mod_vcard_mnesia.erl          | 2 +-
 140  src/mod_vcard_riak.erl            | 2 +-
 141  src/mod_vcard_sql.erl             | 2 +-
 142  src/mod_vcard_xupdate.erl         | 2 +-
 143  src/mod_version.erl               | 2 +-
 144  src/node_dag.erl                  | 2 +-
 145  src/node_dispatch.erl             | 2 +-
 146  src/node_flat.erl                 | 2 +-
 147  src/node_flat_sql.erl             | 2 +-
 148  src/node_online.erl               | 2 +-
 149  src/nodetree_dag.erl              | 2 +-
 150  src/nodetree_tree.erl             | 2 +-
 151  src/nodetree_tree_sql.erl         | 2 +-
 152  src/prosody2ejabberd.erl          | 2 +-
 153  src/pubsub_subscription.erl       | 2 +-
 154  src/pubsub_subscription_sql.erl   | 2 +-
 155  src/xmpp_stream_in.erl            | 2 +-
 156  src/xmpp_stream_out.erl           | 2 +-
 157  src/xmpp_stream_pkix.erl          | 2 +-
 158  135 files changed, 136 insertions(+), 136 deletions(-)
 159
 160 diff --git a/include/jlib.hrl b/include/jlib.hrl
 161 index cd5fedbf..293fcc0e 100644
 162 --- a/include/jlib.hrl
 163 +++ b/include/jlib.hrl
 164 @@ -18,8 +18,8 @@
 165  %%%
 166  %%%----------------------------------------------------------------------
 167
 168 --include("ns.hrl").
 169 --include("fxml.hrl").
 170 +-include_lib("p1_xmpp/include/ns.hrl").
 171 +-include_lib("p1_xml/include/fxml.hrl").
 172
 173  -define(STANZA_ERROR(Code, Type, Condition),
 174         #xmlel{name = <<"error">>,
 175 diff --git a/src/acl.erl b/src/acl.erl
 176 index 2d848b99..88df4625 100644
 177 --- a/src/acl.erl
 178 +++ b/src/acl.erl
 179 @@ -45,7 +45,7 @@
 180
 181  -include("ejabberd.hrl").
 182  -include("logger.hrl").
 183 --include("jid.hrl").
 184 +-include_lib("p1_xmpp/include/jid.hrl").
 185
 186  -record(acl, {aclname, aclspec}).
 187  -record(access, {name       :: aclname(),
 188 diff --git a/src/acme_challenge.erl b/src/acme_challenge.erl
 189 index f4fde4e7..45fc6d8f 100644
 190 --- a/src/acme_challenge.erl
 191 +++ b/src/acme_challenge.erl
 192 @@ -16,7 +16,7 @@
 193
 194  -include("ejabberd.hrl").
 195  -include("logger.hrl").
 196 --include("xmpp.hrl").
 197 +-include_lib("p1_xmpp/include/xmpp.hrl").
 198  -include("ejabberd_http.hrl").
 199  -include("ejabberd_acme.hrl").
 200
 201 diff --git a/src/ejabberd_acme.erl b/src/ejabberd_acme.erl
 202 index a5166b45..eee74092 100644
 203 --- a/src/ejabberd_acme.erl
 204 +++ b/src/ejabberd_acme.erl
 205 @@ -21,7 +21,7 @@
 206
 207  -include("ejabberd.hrl").
 208  -include("logger.hrl").
 209 --include("xmpp.hrl").
 210 +-include_lib("p1_xmpp/include/xmpp.hrl").
 211  -include("ejabberd_commands.hrl").
 212  -include("ejabberd_acme.hrl").
 213  -include_lib("public_key/include/public_key.hrl").
 214 diff --git a/src/ejabberd_acme_comm.erl b/src/ejabberd_acme_comm.erl
 215 index a5668d08..02acd1c4 100644
 216 --- a/src/ejabberd_acme_comm.erl
 217 +++ b/src/ejabberd_acme_comm.erl
 218 @@ -24,7 +24,7 @@
 219
 220  -include("ejabberd.hrl").
 221  -include("logger.hrl").
 222 --include("xmpp.hrl").
 223 +-include_lib("p1_xmpp/include/xmpp.hrl").
 224
 225  -include("ejabberd_acme.hrl").
 226  -include_lib("public_key/include/public_key.hrl").
 227 diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl
 228 index a4f3ac1c..697b3e08 100644
 229 --- a/src/ejabberd_auth_anonymous.erl
 230 +++ b/src/ejabberd_auth_anonymous.erl
 231 @@ -46,7 +46,7 @@
 232
 233  -include("ejabberd.hrl").
 234  -include("logger.hrl").
 235 --include("jid.hrl").
 236 +-include_lib("p1_xmpp/include/jid.hrl").
 237
 238  start(Host) ->
 239      ejabberd_hooks:add(sm_register_connection_hook, Host,
 240 diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl
 241 index 1df6681f..e8cc5f9b 100644
 242 --- a/src/ejabberd_bosh.erl
 243 +++ b/src/ejabberd_bosh.erl
 244 @@ -47,7 +47,7 @@
 245  -include("ejabberd.hrl").
 246  -include("logger.hrl").
 247
 248 --include("xmpp.hrl").
 249 +-include_lib("p1_xmpp/include/xmpp.hrl").
 250
 251  -include("ejabberd_http.hrl").
 252
 253 diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
 254 index a94d065f..a56d9041 100644
 255 --- a/src/ejabberd_c2s.erl
 256 +++ b/src/ejabberd_c2s.erl
 257 @@ -52,7 +52,7 @@
 258          host_up/1, host_down/1]).
 259
 260  -include("ejabberd.hrl").
 261 --include("xmpp.hrl").
 262 +-include_lib("p1_xmpp/include/xmpp.hrl").
 263  -include("logger.hrl").
 264  -include("mod_roster.hrl").
 265
 266 diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
 267 index 76af5278..3a950786 100644
 268 --- a/src/ejabberd_captcha.erl
 269 +++ b/src/ejabberd_captcha.erl
 270 @@ -43,7 +43,7 @@
 271          is_feature_available/0, create_captcha_x/5,
 272          opt_type/1]).
 273
 274 --include("xmpp.hrl").
 275 +-include_lib("p1_xmpp/include/xmpp.hrl").
 276  -include("ejabberd.hrl").
 277  -include("logger.hrl").
 278  -include("ejabberd_http.hrl").
 279 diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
 280 index 0bc0d8fc..d39a585d 100644
 281 --- a/src/ejabberd_http.erl
 282 +++ b/src/ejabberd_http.erl
 283 @@ -39,7 +39,7 @@
 284  -include("ejabberd.hrl").
 285  -include("logger.hrl").
 286
 287 --include("xmpp.hrl").
 288 +-include_lib("p1_xmpp/include/xmpp.hrl").
 289
 290  -include("ejabberd_http.hrl").
 291
 292 diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
 293 index f9f7b07e..5c0e6ea1 100644
 294 --- a/src/ejabberd_http_ws.erl
 295 +++ b/src/ejabberd_http_ws.erl
 296 @@ -39,7 +39,7 @@
 297  -include("ejabberd.hrl").
 298  -include("logger.hrl").
 299
 300 --include("xmpp.hrl").
 301 +-include_lib("p1_xmpp/include/xmpp.hrl").
 302
 303  -include("ejabberd_http.hrl").
 304
 305 diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl
 306 index 7d2751dc..76a6b056 100644
 307 --- a/src/ejabberd_iq.erl
 308 +++ b/src/ejabberd_iq.erl
 309 @@ -34,7 +34,7 @@
 310  -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 311          terminate/2, code_change/3]).
 312
 313 --include("xmpp.hrl").
 314 +-include_lib("p1_xmpp/include/xmpp.hrl").
 315  -include("logger.hrl").
 316
 317  -record(state, {expire = infinity :: timeout()}).
 318 diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl
 319 index cc1d6a2e..f72fd43b 100644
 320 --- a/src/ejabberd_local.erl
 321 +++ b/src/ejabberd_local.erl
 322 @@ -50,7 +50,7 @@
 323  -include("ejabberd.hrl").
 324  -include("logger.hrl").
 325  -include_lib("stdlib/include/ms_transform.hrl").
 326 --include("xmpp.hrl").
 327 +-include_lib("p1_xmpp/include/xmpp.hrl").
 328
 329  -record(state, {}).
 330
 331 diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl
 332 index df4e4bc2..34bf24f8 100644
 333 --- a/src/ejabberd_oauth.erl
 334 +++ b/src/ejabberd_oauth.erl
 335 @@ -52,7 +52,7 @@
 336
 337  -export([oauth_issue_token/3, oauth_list_tokens/0, oauth_revoke_token/1]).
 338
 339 --include("xmpp.hrl").
 340 +-include_lib("p1_xmpp/include/xmpp.hrl").
 341
 342  -include("ejabberd.hrl").
 343  -include("logger.hrl").
 344 diff --git a/src/ejabberd_oauth_rest.erl b/src/ejabberd_oauth_rest.erl
 345 index 206fab43..1a7287ee 100644
 346 --- a/src/ejabberd_oauth_rest.erl
 347 +++ b/src/ejabberd_oauth_rest.erl
 348 @@ -37,7 +37,7 @@
 349  -include("ejabberd.hrl").
 350  -include("ejabberd_oauth.hrl").
 351  -include("logger.hrl").
 352 --include("jid.hrl").
 353 +-include_lib("p1_xmpp/include/jid.hrl").
 354
 355  init() ->
 356      rest:start(?MYNAME),
 357 diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl
 358 index 14eaca6a..fcd105ba 100644
 359 --- a/src/ejabberd_oauth_sql.erl
 360 +++ b/src/ejabberd_oauth_sql.erl
 361 @@ -36,7 +36,7 @@
 362  -include("ejabberd_oauth.hrl").
 363  -include("ejabberd.hrl").
 364  -include("ejabberd_sql_pt.hrl").
 365 --include("jid.hrl").
 366 +-include_lib("p1_xmpp/include/jid.hrl").
 367  -include("logger.hrl").
 368
 369  init() ->
 370 diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
 371 index ecb4908a..7331f442 100644
 372 --- a/src/ejabberd_piefxis.erl
 373 +++ b/src/ejabberd_piefxis.erl
 374 @@ -42,7 +42,7 @@
 375
 376  -include("ejabberd.hrl").
 377  -include("logger.hrl").
 378 --include("xmpp.hrl").
 379 +-include_lib("p1_xmpp/include/xmpp.hrl").
 380  -include("mod_privacy.hrl").
 381  -include("mod_roster.hrl").
 382
 383 diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl
 384 index e2901483..315505ec 100644
 385 --- a/src/ejabberd_router.erl
 386 +++ b/src/ejabberd_router.erl
 387 @@ -71,7 +71,7 @@
 388  -include("ejabberd.hrl").
 389  -include("logger.hrl").
 390  -include("ejabberd_router.hrl").
 391 --include("xmpp.hrl").
 392 +-include_lib("p1_xmpp/include/xmpp.hrl").
 393
 394  -callback init() -> any().
 395  -callback register_route(binary(), binary(), local_hint(),
 396 diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl
 397 index 5d5acfca..3f206ef2 100644
 398 --- a/src/ejabberd_router_multicast.erl
 399 +++ b/src/ejabberd_router_multicast.erl
 400 @@ -43,7 +43,7 @@
 401
 402  -include("ejabberd.hrl").
 403  -include("logger.hrl").
 404 --include("xmpp.hrl").
 405 +-include_lib("p1_xmpp/include/xmpp.hrl").
 406
 407  -record(route_multicast, {domain = <<"">> :: binary() | '_',
 408                           pid = self() :: pid()}).
 409 diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
 410 index 0626d62f..e2fc34c9 100644
 411 --- a/src/ejabberd_s2s.erl
 412 +++ b/src/ejabberd_s2s.erl
 413 @@ -57,7 +57,7 @@
 414  -include("ejabberd.hrl").
 415  -include("logger.hrl").
 416
 417 --include("xmpp.hrl").
 418 +-include_lib("p1_xmpp/include/xmpp.hrl").
 419
 420  -include("ejabberd_commands.hrl").
 421
 422 diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
 423 index a949e83d..3d8e100e 100644
 424 --- a/src/ejabberd_s2s_in.erl
 425 +++ b/src/ejabberd_s2s_in.erl
 426 @@ -45,7 +45,7 @@
 427          host_up/1, host_down/1]).
 428
 429  -include("ejabberd.hrl").
 430 --include("xmpp.hrl").
 431 +-include_lib("p1_xmpp/include/xmpp.hrl").
 432  -include("logger.hrl").
 433
 434  -type state() :: map().
 435 diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
 436 index fea5d816..c035731f 100644
 437 --- a/src/ejabberd_s2s_out.erl
 438 +++ b/src/ejabberd_s2s_out.erl
 439 @@ -43,7 +43,7 @@
 440          route/2, establish/1, update_state/2, host_up/1, host_down/1]).
 441
 442  -include("ejabberd.hrl").
 443 --include("xmpp.hrl").
 444 +-include_lib("p1_xmpp/include/xmpp.hrl").
 445  -include("logger.hrl").
 446
 447  -type state() :: map().
 448 diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
 449 index 7b5f945d..895fed09 100644
 450 --- a/src/ejabberd_service.erl
 451 +++ b/src/ejabberd_service.erl
 452 @@ -37,7 +37,7 @@
 453  -export([send/2]).
 454
 455  -include("ejabberd.hrl").
 456 --include("xmpp.hrl").
 457 +-include_lib("p1_xmpp/include/xmpp.hrl").
 458  -include("logger.hrl").
 459
 460  -type state() :: map().
 461 diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
 462 index 3df1d88e..e8087c48 100644
 463 --- a/src/ejabberd_sm.erl
 464 +++ b/src/ejabberd_sm.erl
 465 @@ -89,7 +89,7 @@
 466  -include("ejabberd.hrl").
 467  -include("logger.hrl").
 468
 469 --include("xmpp.hrl").
 470 +-include_lib("p1_xmpp/include/xmpp.hrl").
 471
 472  -include("ejabberd_commands.hrl").
 473  -include("ejabberd_sm.hrl").
 474 diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
 475 index 9953a76a..0dd1c4ff 100644
 476 --- a/src/ejabberd_socket.erl
 477 +++ b/src/ejabberd_socket.erl
 478 @@ -52,7 +52,7 @@
 479          sockname/1, peername/1]).
 480
 481  -include("ejabberd.hrl").
 482 --include("xmpp.hrl").
 483 +-include_lib("p1_xmpp/include/xmpp.hrl").
 484  -include("logger.hrl").
 485
 486  -type sockmod() :: ejabberd_bosh |
 487 diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl
 488 index 773104f9..46e641b7 100644
 489 --- a/src/ejabberd_system_monitor.erl
 490 +++ b/src/ejabberd_system_monitor.erl
 491 @@ -41,7 +41,7 @@
 492  -include("ejabberd.hrl").
 493  -include("logger.hrl").
 494
 495 --include("xmpp.hrl").
 496 +-include_lib("p1_xmpp/include/xmpp.hrl").
 497
 498  -record(state, {}).
 499
 500 diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl
 501 index 7a40d2c7..aa1abc9b 100644
 502 --- a/src/ejabberd_web.erl
 503 +++ b/src/ejabberd_web.erl
 504 @@ -34,7 +34,7 @@
 505  -include("ejabberd.hrl").
 506  -include("logger.hrl").
 507
 508 --include("xmpp.hrl").
 509 +-include_lib("p1_xmpp/include/xmpp.hrl").
 510
 511  -include("ejabberd_http.hrl").
 512
 513 diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
 514 index b3d72c19..cdd951b6 100644
 515 --- a/src/ejabberd_web_admin.erl
 516 +++ b/src/ejabberd_web_admin.erl
 517 @@ -38,7 +38,7 @@
 518  -include("ejabberd.hrl").
 519  -include("logger.hrl").
 520
 521 --include("xmpp.hrl").
 522 +-include_lib("p1_xmpp/include/xmpp.hrl").
 523
 524  -include("ejabberd_http.hrl").
 525
 526 diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl
 527 index 9926c20c..fabf2293 100644
 528 --- a/src/ejabberd_websocket.erl
 529 +++ b/src/ejabberd_websocket.erl
 530 @@ -47,7 +47,7 @@
 531  -include("ejabberd.hrl").
 532  -include("logger.hrl").
 533
 534 --include("xmpp.hrl").
 535 +-include_lib("p1_xmpp/include/xmpp.hrl").
 536
 537  -include("ejabberd_http.hrl").
 538
 539 diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl
 540 index 213aef7a..f5b51894 100644
 541 --- a/src/ejabberd_xmlrpc.erl
 542 +++ b/src/ejabberd_xmlrpc.erl
 543 @@ -42,7 +42,7 @@
 544  -include("ejabberd_http.hrl").
 545  -include("mod_roster.hrl").
 546
 547 --include("xmpp.hrl").
 548 +-include_lib("p1_xmpp/include/xmpp.hrl").
 549
 550  -record(state,
 551         {access_commands = [] :: list(),
 552 diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl
 553 index d34db358..ab04a252 100644
 554 --- a/src/gen_iq_handler.erl
 555 +++ b/src/gen_iq_handler.erl
 556 @@ -45,7 +45,7 @@
 557
 558  -include("ejabberd.hrl").
 559  -include("logger.hrl").
 560 --include("xmpp.hrl").
 561 +-include_lib("p1_xmpp/include/xmpp.hrl").
 562
 563  -record(state, {host, module, function}).
 564
 565 diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl
 566 index 4f516bd5..83de80a8 100644
 567 --- a/src/gen_pubsub_node.erl
 568 +++ b/src/gen_pubsub_node.erl
 569 @@ -25,7 +25,7 @@
 570
 571  -module(gen_pubsub_node).
 572
 573 --include("xmpp.hrl").
 574 +-include_lib("p1_xmpp/include/xmpp.hrl").
 575
 576  -type(host() :: mod_pubsub:host()).
 577  -type(nodeId() :: mod_pubsub:nodeId()).
 578 diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl
 579 index bf7140aa..4267b9a1 100644
 580 --- a/src/gen_pubsub_nodetree.erl
 581 +++ b/src/gen_pubsub_nodetree.erl
 582 @@ -36,7 +36,7 @@
 583         ServerHost :: binary(),
 584         Opts :: [any()]) -> atom().
 585
 586 --include("xmpp.hrl").
 587 +-include_lib("p1_xmpp/include/xmpp.hrl").
 588
 589  -callback terminate(Host :: host(), ServerHost :: binary()) -> atom().
 590
 591 diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl
 592 index ae293698..bbe9bc6d 100644
 593 --- a/src/jd2ejd.erl
 594 +++ b/src/jd2ejd.erl
 595 @@ -32,7 +32,7 @@
 596
 597  -include("ejabberd.hrl").
 598  -include("logger.hrl").
 599 --include("xmpp.hrl").
 600 +-include_lib("p1_xmpp/include/xmpp.hrl").
 601
 602  %%%----------------------------------------------------------------------
 603  %%% API
 604 diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl
 605 index e6df3904..0f3ada11 100644
 606 --- a/src/mod_adhoc.erl
 607 +++ b/src/mod_adhoc.erl
 608 @@ -39,7 +39,7 @@
 609
 610  -include("ejabberd.hrl").
 611  -include("logger.hrl").
 612 --include("xmpp.hrl").
 613 +-include_lib("p1_xmpp/include/xmpp.hrl").
 614
 615  start(Host, Opts) ->
 616      IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
 617 diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
 618 index 799f0079..9fd8531b 100644
 619 --- a/src/mod_admin_extra.erl
 620 +++ b/src/mod_admin_extra.erl
 621 @@ -84,7 +84,7 @@
 622  -include("mod_roster.hrl").
 623  -include("mod_privacy.hrl").
 624  -include("ejabberd_sm.hrl").
 625 --include("xmpp.hrl").
 626 +-include_lib("p1_xmpp/include/xmpp.hrl").
 627
 628  %%%
 629  %%% gen_mod
 630 diff --git a/src/mod_admin_update_sql.erl b/src/mod_admin_update_sql.erl
 631 index 2f105d97..cace1b94 100644
 632 --- a/src/mod_admin_update_sql.erl
 633 +++ b/src/mod_admin_update_sql.erl
 634 @@ -38,7 +38,7 @@
 635  -include("logger.hrl").
 636  -include("ejabberd.hrl").
 637  -include("ejabberd_commands.hrl").
 638 --include("xmpp.hrl").
 639 +-include_lib("p1_xmpp/include/xmpp.hrl").
 640  -include("ejabberd_sql_pt.hrl").
 641
 642  %%%
 643 diff --git a/src/mod_announce.erl b/src/mod_announce.erl
 644 index b259aced..146b6a35 100644
 645 --- a/src/mod_announce.erl
 646 +++ b/src/mod_announce.erl
 647 @@ -52,7 +52,7 @@
 648
 649  -include("ejabberd.hrl").
 650  -include("logger.hrl").
 651 --include("xmpp.hrl").
 652 +-include_lib("p1_xmpp/include/xmpp.hrl").
 653  -include("mod_announce.hrl").
 654
 655  -callback init(binary(), gen_mod:opts()) -> any().
 656 diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl
 657 index f2e5c1c4..cecd68cc 100644
 658 --- a/src/mod_announce_mnesia.erl
 659 +++ b/src/mod_announce_mnesia.erl
 660 @@ -31,7 +31,7 @@
 661          get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
 662  -export([need_transform/1, transform/1]).
 663
 664 --include("xmpp.hrl").
 665 +-include_lib("p1_xmpp/include/xmpp.hrl").
 666  -include("mod_announce.hrl").
 667  -include("logger.hrl").
 668
 669 diff --git a/src/mod_announce_riak.erl b/src/mod_announce_riak.erl
 670 index 04a29a68..a3dac3e9 100644
 671 --- a/src/mod_announce_riak.erl
 672 +++ b/src/mod_announce_riak.erl
 673 @@ -30,7 +30,7 @@
 674  -export([init/2, set_motd_users/2, set_motd/2, delete_motd/1,
 675          get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
 676
 677 --include("xmpp.hrl").
 678 +-include_lib("p1_xmpp/include/xmpp.hrl").
 679  -include("mod_announce.hrl").
 680
 681  %%%===================================================================
 682 diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl
 683 index c5c9eb58..b243d05d 100644
 684 --- a/src/mod_announce_sql.erl
 685 +++ b/src/mod_announce_sql.erl
 686 @@ -33,7 +33,7 @@
 687          get_motd/1, is_motd_user/2, set_motd_user/2, import/3,
 688          export/1]).
 689
 690 --include("xmpp.hrl").
 691 +-include_lib("p1_xmpp/include/xmpp.hrl").
 692  -include("mod_announce.hrl").
 693  -include("ejabberd_sql_pt.hrl").
 694  -include("logger.hrl").
 695 diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
 696 index dde58abf..ffc31c94 100644
 697 --- a/src/mod_avatar.erl
 698 +++ b/src/mod_avatar.erl
 699 @@ -28,7 +28,7 @@
 700  %% Hooks
 701  -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1]).
 702
 703 --include("xmpp.hrl").
 704 +-include_lib("p1_xmpp/include/xmpp.hrl").
 705  -include("logger.hrl").
 706  -include("pubsub.hrl").
 707
 708 diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl
 709 index b2c56f36..429c0ab2 100644
 710 --- a/src/mod_block_strangers.erl
 711 +++ b/src/mod_block_strangers.erl
 712 @@ -34,7 +34,7 @@
 713
 714  -export([filter_packet/1, filter_offline_msg/1]).
 715
 716 --include("xmpp.hrl").
 717 +-include_lib("p1_xmpp/include/xmpp.hrl").
 718  -include("ejabberd.hrl").
 719  -include("logger.hrl").
 720
 721 diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl
 722 index 738c5e16..479b34ea 100644
 723 --- a/src/mod_blocking.erl
 724 +++ b/src/mod_blocking.erl
 725 @@ -35,7 +35,7 @@
 726  -include("ejabberd.hrl").
 727  -include("logger.hrl").
 728
 729 --include("xmpp.hrl").
 730 +-include_lib("p1_xmpp/include/xmpp.hrl").
 731
 732  -include("mod_privacy.hrl").
 733
 734 diff --git a/src/mod_bosh.erl b/src/mod_bosh.erl
 735 index 6ee58047..e49ab960 100644
 736 --- a/src/mod_bosh.erl
 737 +++ b/src/mod_bosh.erl
 738 @@ -41,7 +41,7 @@
 739  -include("ejabberd.hrl").
 740  -include("logger.hrl").
 741  -include_lib("stdlib/include/ms_transform.hrl").
 742 --include("xmpp.hrl").
 743 +-include_lib("p1_xmpp/include/xmpp.hrl").
 744  -include("ejabberd_http.hrl").
 745  -include("bosh.hrl").
 746
 747 diff --git a/src/mod_caps.erl b/src/mod_caps.erl
 748 index edc93bbf..6ead4230 100644
 749 --- a/src/mod_caps.erl
 750 +++ b/src/mod_caps.erl
 751 @@ -53,7 +53,7 @@
 752  -include("ejabberd.hrl").
 753  -include("logger.hrl").
 754
 755 --include("xmpp.hrl").
 756 +-include_lib("p1_xmpp/include/xmpp.hrl").
 757  -include("mod_caps.hrl").
 758
 759  -define(BAD_HASH_LIFETIME, 600).
 760 diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl
 761 index 307d6154..c3a998d8 100644
 762 --- a/src/mod_carboncopy.erl
 763 +++ b/src/mod_carboncopy.erl
 764 @@ -40,7 +40,7 @@
 765
 766  -include("ejabberd.hrl").
 767  -include("logger.hrl").
 768 --include("xmpp.hrl").
 769 +-include_lib("p1_xmpp/include/xmpp.hrl").
 770  -include("mod_carboncopy.hrl").
 771
 772  -type direction() :: sent | received.
 773 diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl
 774 index f7adb1c6..09507b73 100644
 775 --- a/src/mod_client_state.erl
 776 +++ b/src/mod_client_state.erl
 777 @@ -42,7 +42,7 @@
 778
 779  -include("ejabberd.hrl").
 780  -include("logger.hrl").
 781 --include("xmpp.hrl").
 782 +-include_lib("p1_xmpp/include/xmpp.hrl").
 783
 784  -define(CSI_QUEUE_MAX, 100).
 785
 786 diff --git a/src/mod_configure.erl b/src/mod_configure.erl
 787 index 31f7a9c8..6ea5bd37 100644
 788 --- a/src/mod_configure.erl
 789 +++ b/src/mod_configure.erl
 790 @@ -40,7 +40,7 @@
 791
 792  -include("ejabberd.hrl").
 793  -include("logger.hrl").
 794 --include("xmpp.hrl").
 795 +-include_lib("p1_xmpp/include/xmpp.hrl").
 796  -include("ejabberd_sm.hrl").
 797  -include_lib("stdlib/include/ms_transform.hrl").
 798
 799 diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl
 800 index 27e00768..c93912d6 100644
 801 --- a/src/mod_delegation.erl
 802 +++ b/src/mod_delegation.erl
 803 @@ -42,7 +42,7 @@
 804
 805  -include("ejabberd.hrl").
 806  -include("logger.hrl").
 807 --include("xmpp.hrl").
 808 +-include_lib("p1_xmpp/include/xmpp.hrl").
 809
 810  -type disco_acc() :: {error, stanza_error()} | {result, [binary()]} | empty.
 811  -record(state, {server_host = <<"">> :: binary(),
 812 diff --git a/src/mod_disco.erl b/src/mod_disco.erl
 813 index 76be408f..5bea1fb7 100644
 814 --- a/src/mod_disco.erl
 815 +++ b/src/mod_disco.erl
 816 @@ -42,7 +42,7 @@
 817  -include("ejabberd.hrl").
 818  -include("logger.hrl").
 819
 820 --include("xmpp.hrl").
 821 +-include_lib("p1_xmpp/include/xmpp.hrl").
 822  -include_lib("stdlib/include/ms_transform.hrl").
 823  -include("mod_roster.hrl").
 824
 825 diff --git a/src/mod_echo.erl b/src/mod_echo.erl
 826 index 79dd5996..38199d3c 100644
 827 --- a/src/mod_echo.erl
 828 +++ b/src/mod_echo.erl
 829 @@ -41,7 +41,7 @@
 830  -include("ejabberd.hrl").
 831  -include("logger.hrl").
 832
 833 --include("xmpp.hrl").
 834 +-include_lib("p1_xmpp/include/xmpp.hrl").
 835
 836  -record(state, {hosts = [] :: [binary()]}).
 837
 838 diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl
 839 index 5e931853..01bdfe2f 100644
 840 --- a/src/mod_fail2ban.erl
 841 +++ b/src/mod_fail2ban.erl
 842 @@ -39,7 +39,7 @@
 843  -include_lib("stdlib/include/ms_transform.hrl").
 844  -include("ejabberd.hrl").
 845  -include("logger.hrl").
 846 --include("xmpp.hrl").
 847 +-include_lib("p1_xmpp/include/xmpp.hrl").
 848
 849  -define(C2S_AUTH_BAN_LIFETIME, 3600). %% 1 hour
 850  -define(C2S_MAX_AUTH_FAILURES, 20).
 851 diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl
 852 index ef881d14..f7cd10bf 100644
 853 --- a/src/mod_http_api.erl
 854 +++ b/src/mod_http_api.erl
 855 @@ -77,7 +77,7 @@
 856  -export([start/2, stop/1, reload/3, process/2, mod_opt_type/1, depends/2]).
 857
 858  -include("ejabberd.hrl").
 859 --include("xmpp.hrl").
 860 +-include_lib("p1_xmpp/include/xmpp.hrl").
 861  -include("logger.hrl").
 862  -include("ejabberd_http.hrl").
 863
 864 diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
 865 index c3c295f6..d3bd4e84 100644
 866 --- a/src/mod_http_upload.erl
 867 +++ b/src/mod_http_upload.erl
 868 @@ -89,7 +89,7 @@
 869
 870  -include("ejabberd.hrl").
 871  -include("ejabberd_http.hrl").
 872 --include("xmpp.hrl").
 873 +-include_lib("p1_xmpp/include/xmpp.hrl").
 874  -include("logger.hrl").
 875
 876  -record(state,
 877 diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl
 878 index 10243ac0..cda5c563 100644
 879 --- a/src/mod_http_upload_quota.erl
 880 +++ b/src/mod_http_upload_quota.erl
 881 @@ -50,7 +50,7 @@
 882  %% ejabberd_hooks callback.
 883  -export([handle_slot_request/5]).
 884
 885 --include("jid.hrl").
 886 +-include_lib("p1_xmpp/include/jid.hrl").
 887  -include("logger.hrl").
 888  -include_lib("kernel/include/file.hrl").
 889
 890 diff --git a/src/mod_irc.erl b/src/mod_irc.erl
 891 index 92093507..9b9becc8 100644
 892 --- a/src/mod_irc.erl
 893 +++ b/src/mod_irc.erl
 894 @@ -43,7 +43,7 @@
 895
 896  -include("ejabberd.hrl").
 897  -include("logger.hrl").
 898 --include("xmpp.hrl").
 899 +-include_lib("p1_xmpp/include/xmpp.hrl").
 900  -include("mod_irc.hrl").
 901
 902  -define(DEFAULT_IRC_ENCODING, <<"iso8859-15">>).
 903 diff --git a/src/mod_irc_connection.erl b/src/mod_irc_connection.erl
 904 index 59336591..ca81358f 100644
 905 --- a/src/mod_irc_connection.erl
 906 +++ b/src/mod_irc_connection.erl
 907 @@ -41,7 +41,7 @@
 908
 909  -include("ejabberd.hrl").
 910  -include("logger.hrl").
 911 --include("xmpp.hrl").
 912 +-include_lib("p1_xmpp/include/xmpp.hrl").
 913
 914  -define(SETS, gb_sets).
 915
 916 diff --git a/src/mod_irc_mnesia.erl b/src/mod_irc_mnesia.erl
 917 index eb982e1f..510ce09d 100644
 918 --- a/src/mod_irc_mnesia.erl
 919 +++ b/src/mod_irc_mnesia.erl
 920 @@ -30,7 +30,7 @@
 921  -export([init/2, get_data/3, set_data/4, import/2]).
 922  -export([need_transform/1, transform/1]).
 923
 924 --include("jid.hrl").
 925 +-include_lib("p1_xmpp/include/jid.hrl").
 926  -include("mod_irc.hrl").
 927  -include("logger.hrl").
 928
 929 diff --git a/src/mod_irc_riak.erl b/src/mod_irc_riak.erl
 930 index 23f2a2c3..d236bfa7 100644
 931 --- a/src/mod_irc_riak.erl
 932 +++ b/src/mod_irc_riak.erl
 933 @@ -29,7 +29,7 @@
 934  %% API
 935  -export([init/2, get_data/3, set_data/4, import/2]).
 936
 937 --include("jid.hrl").
 938 +-include_lib("p1_xmpp/include/jid.hrl").
 939  -include("mod_irc.hrl").
 940
 941  %%%===================================================================
 942 diff --git a/src/mod_irc_sql.erl b/src/mod_irc_sql.erl
 943 index 1f8d7d16..5f784fdc 100644
 944 --- a/src/mod_irc_sql.erl
 945 +++ b/src/mod_irc_sql.erl
 946 @@ -31,7 +31,7 @@
 947  %% API
 948  -export([init/2, get_data/3, set_data/4, import/1, import/2, export/1]).
 949
 950 --include("jid.hrl").
 951 +-include_lib("p1_xmpp/include/jid.hrl").
 952  -include("mod_irc.hrl").
 953  -include("ejabberd_sql_pt.hrl").
 954
 955 diff --git a/src/mod_last.erl b/src/mod_last.erl
 956 index e97ef43f..34498e26 100644
 957 --- a/src/mod_last.erl
 958 +++ b/src/mod_last.erl
 959 @@ -40,7 +40,7 @@
 960  -include("ejabberd.hrl").
 961  -include("logger.hrl").
 962
 963 --include("xmpp.hrl").
 964 +-include_lib("p1_xmpp/include/xmpp.hrl").
 965
 966  -include("mod_privacy.hrl").
 967  -include("mod_last.hrl").
 968 diff --git a/src/mod_legacy_auth.erl b/src/mod_legacy_auth.erl
 969 index 722a0573..c6644386 100644
 970 --- a/src/mod_legacy_auth.erl
 971 +++ b/src/mod_legacy_auth.erl
 972 @@ -29,7 +29,7 @@
 973  %% hooks
 974  -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]).
 975
 976 --include("xmpp.hrl").
 977 +-include_lib("p1_xmpp/include/xmpp.hrl").
 978
 979  -type c2s_state() :: ejabberd_c2s:state().
 980
 981 diff --git a/src/mod_mam.erl b/src/mod_mam.erl
 982 index eb839ea1..abc461db 100644
 983 --- a/src/mod_mam.erl
 984 +++ b/src/mod_mam.erl
 985 @@ -41,7 +41,7 @@
 986          delete_old_messages/2, get_commands_spec/0, msg_to_el/4,
 987          get_room_config/4, set_room_option/3, offline_message/1, export/1]).
 988
 989 --include("xmpp.hrl").
 990 +-include_lib("p1_xmpp/include/xmpp.hrl").
 991  -include("logger.hrl").
 992  -include("mod_muc_room.hrl").
 993  -include("ejabberd_commands.hrl").
 994 diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl
 995 index 71f1f701..a3a7eb5f 100644
 996 --- a/src/mod_mam_mnesia.erl
 997 +++ b/src/mod_mam_mnesia.erl
 998 @@ -31,7 +31,7 @@
 999          extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6]).
1000
1001  -include_lib("stdlib/include/ms_transform.hrl").
1002 --include("xmpp.hrl").
1003 +-include_lib("p1_xmpp/include/xmpp.hrl").
1004  -include("logger.hrl").
1005  -include("mod_mam.hrl").
1006
1007 diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl
1008 index 40aa9836..b4fab39b 100644
1009 --- a/src/mod_mam_sql.erl
1010 +++ b/src/mod_mam_sql.erl
1011 @@ -33,7 +33,7 @@
1012          extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6, export/1]).
1013
1014  -include_lib("stdlib/include/ms_transform.hrl").
1015 --include("xmpp.hrl").
1016 +-include_lib("p1_xmpp/include/xmpp.hrl").
1017  -include("mod_mam.hrl").
1018  -include("logger.hrl").
1019  -include("ejabberd_sql_pt.hrl").
1020 diff --git a/src/mod_metrics.erl b/src/mod_metrics.erl
1021 index 73a68a8d..1b0d2e1b 100644
1022 --- a/src/mod_metrics.erl
1023 +++ b/src/mod_metrics.erl
1024 @@ -30,7 +30,7 @@
1025
1026  -include("ejabberd.hrl").
1027  -include("logger.hrl").
1028 --include("xmpp.hrl").
1029 +-include_lib("p1_xmpp/include/xmpp.hrl").
1030
1031  -export([start/2, stop/1, mod_opt_type/1, depends/2, reload/3]).
1032
1033 diff --git a/src/mod_mix.erl b/src/mod_mix.erl
1034 index 90507665..627363f3 100644
1035 --- a/src/mod_mix.erl
1036 +++ b/src/mod_mix.erl
1037 @@ -37,7 +37,7 @@
1038          terminate/2, code_change/3]).
1039
1040  -include("logger.hrl").
1041 --include("xmpp.hrl").
1042 +-include_lib("p1_xmpp/include/xmpp.hrl").
1043
1044  -define(NODES, [?NS_MIX_NODES_MESSAGES,
1045                 ?NS_MIX_NODES_PRESENCE,
1046 diff --git a/src/mod_muc.erl b/src/mod_muc.erl
1047 index f7d5303f..f01cde16 100644
1048 --- a/src/mod_muc.erl
1049 +++ b/src/mod_muc.erl
1050 @@ -73,7 +73,7 @@
1051
1052  -include("ejabberd.hrl").
1053  -include("logger.hrl").
1054 --include("xmpp.hrl").
1055 +-include_lib("p1_xmpp/include/xmpp.hrl").
1056  -include("mod_muc.hrl").
1057
1058  -record(state,
1059 diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
1060 index e41f62b5..4d18d068 100644
1061 --- a/src/mod_muc_admin.erl
1062 +++ b/src/mod_muc_admin.erl
1063 @@ -43,7 +43,7 @@
1064
1065  -include("ejabberd.hrl").
1066  -include("logger.hrl").
1067 --include("xmpp.hrl").
1068 +-include_lib("p1_xmpp/include/xmpp.hrl").
1069  -include("mod_muc.hrl").
1070  -include("mod_muc_room.hrl").
1071  -include("ejabberd_http.hrl").
1072 diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl
1073 index f2685aaa..abb55c42 100644
1074 --- a/src/mod_muc_log.erl
1075 +++ b/src/mod_muc_log.erl
1076 @@ -44,7 +44,7 @@
1077  -include("ejabberd.hrl").
1078  -include("logger.hrl").
1079
1080 --include("xmpp.hrl").
1081 +-include_lib("p1_xmpp/include/xmpp.hrl").
1082  -include("mod_muc_room.hrl").
1083
1084  -define(T(Text), translate:translate(Lang, Text)).
1085 diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl
1086 index aa59038c..7334aca4 100644
1087 --- a/src/mod_muc_mnesia.erl
1088 +++ b/src/mod_muc_mnesia.erl
1089 @@ -44,7 +44,7 @@
1090
1091  -include("mod_muc.hrl").
1092  -include("logger.hrl").
1093 --include("xmpp.hrl").
1094 +-include_lib("p1_xmpp/include/xmpp.hrl").
1095  -include_lib("stdlib/include/ms_transform.hrl").
1096
1097  -record(state, {}).
1098 diff --git a/src/mod_muc_riak.erl b/src/mod_muc_riak.erl
1099 index 57d9666b..4ebd2949 100644
1100 --- a/src/mod_muc_riak.erl
1101 +++ b/src/mod_muc_riak.erl
1102 @@ -38,7 +38,7 @@
1103  -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
1104          get_affiliations/3, search_affiliation/4]).
1105
1106 --include("jid.hrl").
1107 +-include_lib("p1_xmpp/include/jid.hrl").
1108  -include("mod_muc.hrl").
1109
1110  %%%===================================================================
1111 diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
1112 index bafa938d..d8b5e288 100644
1113 --- a/src/mod_muc_room.erl
1114 +++ b/src/mod_muc_room.erl
1115 @@ -51,7 +51,7 @@
1116  -include("ejabberd.hrl").
1117  -include("logger.hrl").
1118
1119 --include("xmpp.hrl").
1120 +-include_lib("p1_xmpp/include/xmpp.hrl").
1121
1122  -include("mod_muc_room.hrl").
1123
1124 diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
1125 index 8aa6071c..71d79b02 100644
1126 --- a/src/mod_muc_sql.erl
1127 +++ b/src/mod_muc_sql.erl
1128 @@ -41,7 +41,7 @@
1129  -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
1130          get_affiliations/3, search_affiliation/4]).
1131
1132 --include("jid.hrl").
1133 +-include_lib("p1_xmpp/include/jid.hrl").
1134  -include("mod_muc.hrl").
1135  -include("logger.hrl").
1136  -include("ejabberd_sql_pt.hrl").
1137 diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl
1138 index 7b772521..7c1cab3b 100644
1139 --- a/src/mod_multicast.erl
1140 +++ b/src/mod_multicast.erl
1141 @@ -45,7 +45,7 @@
1142  -include("ejabberd.hrl").
1143  -include("logger.hrl").
1144
1145 --include("xmpp.hrl").
1146 +-include_lib("p1_xmpp/include/xmpp.hrl").
1147
1148  -record(state,
1149         {lserver, lservice, access, service_limits}).
1150 diff --git a/src/mod_offline.erl b/src/mod_offline.erl
1151 index 5b95fe4b..8146ffdc 100644
1152 --- a/src/mod_offline.erl
1153 +++ b/src/mod_offline.erl
1154 @@ -70,7 +70,7 @@
1155  -include("ejabberd.hrl").
1156  -include("logger.hrl").
1157
1158 --include("xmpp.hrl").
1159 +-include_lib("p1_xmpp/include/xmpp.hrl").
1160
1161  -include("ejabberd_http.hrl").
1162
1163 diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl
1164 index a725ab00..126fd1bb 100644
1165 --- a/src/mod_offline_mnesia.erl
1166 +++ b/src/mod_offline_mnesia.erl
1167 @@ -32,7 +32,7 @@
1168          remove_all_messages/2, count_messages/2, import/1]).
1169  -export([need_transform/1, transform/1]).
1170
1171 --include("xmpp.hrl").
1172 +-include_lib("p1_xmpp/include/xmpp.hrl").
1173  -include("mod_offline.hrl").
1174  -include("logger.hrl").
1175
1176 diff --git a/src/mod_offline_riak.erl b/src/mod_offline_riak.erl
1177 index 5d0fd1af..607a78ba 100644
1178 --- a/src/mod_offline_riak.erl
1179 +++ b/src/mod_offline_riak.erl
1180 @@ -31,7 +31,7 @@
1181          read_message/3, remove_message/3, read_all_messages/2,
1182          remove_all_messages/2, count_messages/2, import/1]).
1183
1184 --include("xmpp.hrl").
1185 +-include_lib("p1_xmpp/include/xmpp.hrl").
1186  -include("mod_offline.hrl").
1187
1188  %%%===================================================================
1189 diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl
1190 index 53a0d345..50fa83bc 100644
1191 --- a/src/mod_offline_sql.erl
1192 +++ b/src/mod_offline_sql.erl
1193 @@ -33,7 +33,7 @@
1194          read_message/3, remove_message/3, read_all_messages/2,
1195          remove_all_messages/2, count_messages/2, import/1, export/1]).
1196
1197 --include("xmpp.hrl").
1198 +-include_lib("p1_xmpp/include/xmpp.hrl").
1199  -include("mod_offline.hrl").
1200  -include("logger.hrl").
1201  -include("ejabberd_sql_pt.hrl").
1202 diff --git a/src/mod_ping.erl b/src/mod_ping.erl
1203 index 02357181..7d51f4dc 100644
1204 --- a/src/mod_ping.erl
1205 +++ b/src/mod_ping.erl
1206 @@ -36,7 +36,7 @@
1207  -include("ejabberd.hrl").
1208  -include("logger.hrl").
1209
1210 --include("xmpp.hrl").
1211 +-include_lib("p1_xmpp/include/xmpp.hrl").
1212
1213  -define(DEFAULT_SEND_PINGS, false).
1214
1215 diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl
1216 index 875aeef3..ffa95576 100644
1217 --- a/src/mod_pres_counter.erl
1218 +++ b/src/mod_pres_counter.erl
1219 @@ -33,7 +33,7 @@
1220  -include("ejabberd.hrl").
1221  -include("logger.hrl").
1222
1223 --include("xmpp.hrl").
1224 +-include_lib("p1_xmpp/include/xmpp.hrl").
1225
1226  -record(pres_counter,
1227         {dir, start, count, logged = false}).
1228 diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
1229 index 64ae9620..034a56e4 100644
1230 --- a/src/mod_privacy.erl
1231 +++ b/src/mod_privacy.erl
1232 @@ -42,7 +42,7 @@
1233
1234  -include("ejabberd.hrl").
1235  -include("logger.hrl").
1236 --include("xmpp.hrl").
1237 +-include_lib("p1_xmpp/include/xmpp.hrl").
1238  -include("mod_privacy.hrl").
1239
1240  -define(PRIVACY_CACHE, privacy_cache).
1241 diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl
1242 index 7449262b..201b92ec 100644
1243 --- a/src/mod_privacy_mnesia.erl
1244 +++ b/src/mod_privacy_mnesia.erl
1245 @@ -32,7 +32,7 @@
1246          remove_list/3, use_cache/1, import/1]).
1247  -export([need_transform/1, transform/1]).
1248
1249 --include("xmpp.hrl").
1250 +-include_lib("p1_xmpp/include/xmpp.hrl").
1251  -include("mod_privacy.hrl").
1252  -include("logger.hrl").
1253
1254 diff --git a/src/mod_privacy_riak.erl b/src/mod_privacy_riak.erl
1255 index 0cd39c11..88f294f8 100644
1256 --- a/src/mod_privacy_riak.erl
1257 +++ b/src/mod_privacy_riak.erl
1258 @@ -33,7 +33,7 @@
1259
1260  -export([privacy_schema/0]).
1261
1262 --include("xmpp.hrl").
1263 +-include_lib("p1_xmpp/include/xmpp.hrl").
1264  -include("mod_privacy.hrl").
1265
1266  %%%===================================================================
1267 diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl
1268 index 7939cbb2..6141feda 100644
1269 --- a/src/mod_privacy_sql.erl
1270 +++ b/src/mod_privacy_sql.erl
1271 @@ -35,7 +35,7 @@
1272
1273  -export([item_to_raw/1, raw_to_item/1]).
1274
1275 --include("xmpp.hrl").
1276 +-include_lib("p1_xmpp/include/xmpp.hrl").
1277  -include("mod_privacy.hrl").
1278  -include("logger.hrl").
1279  -include("ejabberd_sql_pt.hrl").
1280 diff --git a/src/mod_private.erl b/src/mod_private.erl
1281 index cb167468..0b84d071 100644
1282 --- a/src/mod_private.erl
1283 +++ b/src/mod_private.erl
1284 @@ -37,7 +37,7 @@
1285
1286  -include("ejabberd.hrl").
1287  -include("logger.hrl").
1288 --include("xmpp.hrl").
1289 +-include_lib("p1_xmpp/include/xmpp.hrl").
1290  -include("mod_private.hrl").
1291
1292  -define(PRIVATE_CACHE, private_cache).
1293 diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl
1294 index 04c1a04a..6a9dee68 100644
1295 --- a/src/mod_private_mnesia.erl
1296 +++ b/src/mod_private_mnesia.erl
1297 @@ -31,7 +31,7 @@
1298          use_cache/1, import/3]).
1299  -export([need_transform/1, transform/1]).
1300
1301 --include("xmpp.hrl").
1302 +-include_lib("p1_xmpp/include/xmpp.hrl").
1303  -include("mod_private.hrl").
1304  -include("logger.hrl").
1305
1306 diff --git a/src/mod_private_riak.erl b/src/mod_private_riak.erl
1307 index be175f07..f97c2dd8 100644
1308 --- a/src/mod_private_riak.erl
1309 +++ b/src/mod_private_riak.erl
1310 @@ -30,7 +30,7 @@
1311  -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
1312          import/3]).
1313
1314 --include("xmpp.hrl").
1315 +-include_lib("p1_xmpp/include/xmpp.hrl").
1316  -include("mod_private.hrl").
1317
1318  %%%===================================================================
1319 diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl
1320 index 5ed584c3..da4974ce 100644
1321 --- a/src/mod_private_sql.erl
1322 +++ b/src/mod_private_sql.erl
1323 @@ -30,7 +30,7 @@
1324  -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
1325          import/3, export/1]).
1326
1327 --include("xmpp.hrl").
1328 +-include_lib("p1_xmpp/include/xmpp.hrl").
1329  -include("mod_private.hrl").
1330  -include("ejabberd_sql_pt.hrl").
1331  -include("logger.hrl").
1332 diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl
1333 index dab7a619..695c8acf 100644
1334 --- a/src/mod_privilege.erl
1335 +++ b/src/mod_privilege.erl
1336 @@ -41,7 +41,7 @@
1337
1338  -include("ejabberd.hrl").
1339  -include("logger.hrl").
1340 --include("xmpp.hrl").
1341 +-include_lib("p1_xmpp/include/xmpp.hrl").
1342
1343  -record(state, {server_host = <<"">> :: binary(),
1344                 permissions = dict:new() :: ?TDICT}).
1345 diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl
1346 index fb34ba55..f42aa461 100644
1347 --- a/src/mod_proxy65_service.erl
1348 +++ b/src/mod_proxy65_service.erl
1349 @@ -39,7 +39,7 @@
1350
1351  -include("ejabberd.hrl").
1352  -include("logger.hrl").
1353 --include("xmpp.hrl").
1354 +-include_lib("p1_xmpp/include/xmpp.hrl").
1355
1356  -define(PROCNAME, ejabberd_mod_proxy65_service).
1357
1358 diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
1359 index d2e1f6c5..b7cd6644 100644
1360 --- a/src/mod_pubsub.erl
1361 +++ b/src/mod_pubsub.erl
1362 @@ -41,7 +41,7 @@
1363
1364  -include("ejabberd.hrl").
1365  -include("logger.hrl").
1366 --include("xmpp.hrl").
1367 +-include_lib("p1_xmpp/include/xmpp.hrl").
1368  -include("pubsub.hrl").
1369  -include("mod_roster.hrl").
1370
1371 diff --git a/src/mod_push.erl b/src/mod_push.erl
1372 index 1eaec6ad..ac4ed89e 100644
1373 --- a/src/mod_push.erl
1374 +++ b/src/mod_push.erl
1375 @@ -52,7 +52,7 @@
1376  -include("ejabberd.hrl").
1377  -include("ejabberd_commands.hrl").
1378  -include("logger.hrl").
1379 --include("xmpp.hrl").
1380 +-include_lib("p1_xmpp/include/xmpp.hrl").
1381
1382  -define(PUSH_CACHE, push_cache).
1383
1384 diff --git a/src/mod_push_keepalive.erl b/src/mod_push_keepalive.erl
1385 index bcdc0c25..d979eaec 100644
1386 --- a/src/mod_push_keepalive.erl
1387 +++ b/src/mod_push_keepalive.erl
1388 @@ -36,7 +36,7 @@
1389          c2s_handle_cast/2, c2s_handle_info/2, c2s_stanza/3]).
1390
1391  -include("logger.hrl").
1392 --include("xmpp.hrl").
1393 +-include_lib("p1_xmpp/include/xmpp.hrl").
1394
1395  -define(PUSH_BEFORE_TIMEOUT_SECS, 120).
1396
1397 diff --git a/src/mod_push_mnesia.erl b/src/mod_push_mnesia.erl
1398 index ff12150f..866b5630 100644
1399 --- a/src/mod_push_mnesia.erl
1400 +++ b/src/mod_push_mnesia.erl
1401 @@ -35,7 +35,7 @@
1402
1403  -include_lib("stdlib/include/ms_transform.hrl").
1404  -include("logger.hrl").
1405 --include("xmpp.hrl").
1406 +-include_lib("p1_xmpp/include/xmpp.hrl").
1407  -include("mod_push.hrl").
1408
1409  %%%-------------------------------------------------------------------
1410 diff --git a/src/mod_push_sql.erl b/src/mod_push_sql.erl
1411 index c82d9fc0..79fedba4 100644
1412 --- a/src/mod_push_sql.erl
1413 +++ b/src/mod_push_sql.erl
1414 @@ -32,7 +32,7 @@
1415          lookup_sessions/3, lookup_sessions/2, lookup_sessions/1,
1416          delete_session/3, delete_old_sessions/2, export/1]).
1417
1418 --include("xmpp.hrl").
1419 +-include_lib("p1_xmpp/include/xmpp.hrl").
1420  -include("logger.hrl").
1421  -include("ejabberd_sql_pt.hrl").
1422  -include("mod_push.hrl").
1423 diff --git a/src/mod_register.erl b/src/mod_register.erl
1424 index 77557ee0..8ad27fcf 100644
1425 --- a/src/mod_register.erl
1426 +++ b/src/mod_register.erl
1427 @@ -41,7 +41,7 @@
1428
1429  -include("ejabberd.hrl").
1430  -include("logger.hrl").
1431 --include("xmpp.hrl").
1432 +-include_lib("p1_xmpp/include/xmpp.hrl").
1433
1434  start(Host, Opts) ->
1435      IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
1436 diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl
1437 index b7bc2edc..a7bb83f5 100644
1438 --- a/src/mod_register_web.erl
1439 +++ b/src/mod_register_web.erl
1440 @@ -60,7 +60,7 @@
1441  -include("ejabberd.hrl").
1442  -include("logger.hrl").
1443
1444 --include("xmpp.hrl").
1445 +-include_lib("p1_xmpp/include/xmpp.hrl").
1446
1447  -include("ejabberd_http.hrl").
1448
1449 diff --git a/src/mod_roster.erl b/src/mod_roster.erl
1450 index a86b50d9..57f5fdce 100644
1451 --- a/src/mod_roster.erl
1452 +++ b/src/mod_roster.erl
1453 @@ -54,7 +54,7 @@
1454  -include("ejabberd.hrl").
1455  -include("logger.hrl").
1456
1457 --include("xmpp.hrl").
1458 +-include_lib("p1_xmpp/include/xmpp.hrl").
1459
1460  -include("mod_roster.hrl").
1461
1462 diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl
1463 index b4c2ed9d..645ab37f 100644
1464 --- a/src/mod_s2s_dialback.erl
1465 +++ b/src/mod_s2s_dialback.erl
1466 @@ -33,7 +33,7 @@
1467          s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2]).
1468
1469  -include("ejabberd.hrl").
1470 --include("xmpp.hrl").
1471 +-include_lib("p1_xmpp/include/xmpp.hrl").
1472  -include("logger.hrl").
1473
1474  %%%===================================================================
1475 diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl
1476 index 1c6e5fe8..c295aa45 100644
1477 --- a/src/mod_service_log.erl
1478 +++ b/src/mod_service_log.erl
1479 @@ -35,7 +35,7 @@
1480  -include("ejabberd.hrl").
1481  -include("logger.hrl").
1482
1483 --include("xmpp.hrl").
1484 +-include_lib("p1_xmpp/include/xmpp.hrl").
1485
1486  start(Host, _Opts) ->
1487      ejabberd_hooks:add(user_send_packet, Host, ?MODULE,
1488 diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
1489 index 5f95266b..db641dbb 100644
1490 --- a/src/mod_shared_roster.erl
1491 +++ b/src/mod_shared_roster.erl
1492 @@ -44,7 +44,7 @@
1493  -include("ejabberd.hrl").
1494  -include("logger.hrl").
1495
1496 --include("xmpp.hrl").
1497 +-include_lib("p1_xmpp/include/xmpp.hrl").
1498
1499  -include("mod_roster.hrl").
1500
1501 diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl
1502 index 66cbebd9..4b431fc4 100644
1503 --- a/src/mod_shared_roster_ldap.erl
1504 +++ b/src/mod_shared_roster_ldap.erl
1505 @@ -46,7 +46,7 @@
1506
1507  -include("ejabberd.hrl").
1508  -include("logger.hrl").
1509 --include("xmpp.hrl").
1510 +-include_lib("p1_xmpp/include/xmpp.hrl").
1511  -include("mod_roster.hrl").
1512  -include("eldap.hrl").
1513
1514 diff --git a/src/mod_shared_roster_mnesia.erl b/src/mod_shared_roster_mnesia.erl
1515 index adfbac68..bdd87030 100644
1516 --- a/src/mod_shared_roster_mnesia.erl
1517 +++ b/src/mod_shared_roster_mnesia.erl
1518 @@ -37,7 +37,7 @@
1519  -include("mod_roster.hrl").
1520  -include("mod_shared_roster.hrl").
1521  -include("logger.hrl").
1522 --include("xmpp.hrl").
1523 +-include_lib("p1_xmpp/include/xmpp.hrl").
1524
1525  %%%===================================================================
1526  %%% API
1527 diff --git a/src/mod_shared_roster_riak.erl b/src/mod_shared_roster_riak.erl
1528 index 441aafd0..d5545eb1 100644
1529 --- a/src/mod_shared_roster_riak.erl
1530 +++ b/src/mod_shared_roster_riak.erl
1531 @@ -35,7 +35,7 @@
1532
1533  -include("mod_roster.hrl").
1534  -include("mod_shared_roster.hrl").
1535 --include("xmpp.hrl").
1536 +-include_lib("p1_xmpp/include/xmpp.hrl").
1537
1538  %%%===================================================================
1539  %%% API
1540 diff --git a/src/mod_shared_roster_sql.erl b/src/mod_shared_roster_sql.erl
1541 index 488e0ec7..f952347a 100644
1542 --- a/src/mod_shared_roster_sql.erl
1543 +++ b/src/mod_shared_roster_sql.erl
1544 @@ -36,7 +36,7 @@
1545          add_user_to_group/3, remove_user_from_group/3, import/3,
1546          export/1]).
1547
1548 --include("jid.hrl").
1549 +-include_lib("p1_xmpp/include/jid.hrl").
1550  -include("mod_roster.hrl").
1551  -include("mod_shared_roster.hrl").
1552  -include("ejabberd_sql_pt.hrl").
1553 diff --git a/src/mod_sic.erl b/src/mod_sic.erl
1554 index a2b3256e..da61b2c2 100644
1555 --- a/src/mod_sic.erl
1556 +++ b/src/mod_sic.erl
1557 @@ -36,7 +36,7 @@
1558
1559  -include("ejabberd.hrl").
1560  -include("logger.hrl").
1561 --include("xmpp.hrl").
1562 +-include_lib("p1_xmpp/include/xmpp.hrl").
1563
1564  start(Host, Opts) ->
1565      IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
1566 diff --git a/src/mod_sip.erl b/src/mod_sip.erl
1567 index 01327c77..70159d17 100644
1568 --- a/src/mod_sip.erl
1569 +++ b/src/mod_sip.erl
1570 @@ -52,7 +52,7 @@ mod_opt_type(_) ->
1571          locate/1, mod_opt_type/1, depends/2]).
1572
1573  -include("ejabberd.hrl").
1574 --include_lib("esip/include/esip.hrl").
1575 +-include_lib("s1_sip/include/esip.hrl").
1576
1577  %%%===================================================================
1578  %%% API
1579 diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl
1580 index d600da3d..c3dfe874 100644
1581 --- a/src/mod_sip_proxy.erl
1582 +++ b/src/mod_sip_proxy.erl
1583 @@ -40,7 +40,7 @@
1584
1585  -include("ejabberd.hrl").
1586  -include("logger.hrl").
1587 --include_lib("esip/include/esip.hrl").
1588 +-include_lib("s1_sip/include/esip.hrl").
1589
1590  -define(SIGN_LIFETIME, 300). %% in seconds.
1591
1592 diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl
1593 index a47de697..f89d3cab 100644
1594 --- a/src/mod_sip_registrar.erl
1595 +++ b/src/mod_sip_registrar.erl
1596 @@ -42,7 +42,7 @@
1597
1598  -include("ejabberd.hrl").
1599  -include("logger.hrl").
1600 --include_lib("esip/include/esip.hrl").
1601 +-include_lib("s1_sip/include/esip.hrl").
1602
1603  -define(CALL_TIMEOUT, timer:seconds(30)).
1604  -define(DEFAULT_EXPIRES, 3600).
1605 diff --git a/src/mod_stats.erl b/src/mod_stats.erl
1606 index 2bdbdbd3..2969fbd2 100644
1607 --- a/src/mod_stats.erl
1608 +++ b/src/mod_stats.erl
1609 @@ -35,7 +35,7 @@
1610
1611  -include("ejabberd.hrl").
1612  -include("logger.hrl").
1613 --include("xmpp.hrl").
1614 +-include_lib("p1_xmpp/include/xmpp.hrl").
1615
1616  start(Host, Opts) ->
1617      IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
1618 diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
1619 index 658bd504..46b00993 100644
1620 --- a/src/mod_stream_mgmt.erl
1621 +++ b/src/mod_stream_mgmt.erl
1622 @@ -37,7 +37,7 @@
1623  -export([get_resume_timeout/1, set_resume_timeout/2]).
1624
1625  -include("ejabberd.hrl").
1626 --include("xmpp.hrl").
1627 +-include_lib("p1_xmpp/include/xmpp.hrl").
1628  -include("logger.hrl").
1629  -include("p1_queue.hrl").
1630
1631 diff --git a/src/mod_time.erl b/src/mod_time.erl
1632 index c54f3d27..20321d36 100644
1633 --- a/src/mod_time.erl
1634 +++ b/src/mod_time.erl
1635 @@ -38,7 +38,7 @@
1636  -include("ejabberd.hrl").
1637  -include("logger.hrl").
1638
1639 --include("xmpp.hrl").
1640 +-include_lib("p1_xmpp/include/xmpp.hrl").
1641
1642  start(Host, Opts) ->
1643      IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
1644 diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
1645 index 378b9430..10618c96 100644
1646 --- a/src/mod_vcard.erl
1647 +++ b/src/mod_vcard.erl
1648 @@ -44,7 +44,7 @@
1649
1650  -include("ejabberd.hrl").
1651  -include("logger.hrl").
1652 --include("xmpp.hrl").
1653 +-include_lib("p1_xmpp/include/xmpp.hrl").
1654  -include("mod_vcard.hrl").
1655
1656  -define(JUD_MATCHES, 30).
1657 diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
1658 index 88621fc0..e2c741c5 100644
1659 --- a/src/mod_vcard_ldap.erl
1660 +++ b/src/mod_vcard_ldap.erl
1661 @@ -41,7 +41,7 @@
1662  -include("ejabberd.hrl").
1663  -include("logger.hrl").
1664  -include("eldap.hrl").
1665 --include("xmpp.hrl").
1666 +-include_lib("p1_xmpp/include/xmpp.hrl").
1667  -include("translate.hrl").
1668
1669  -define(PROCNAME, ejabberd_mod_vcard_ldap).
1670 diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl
1671 index 3e742ec1..6e9e0e50 100644
1672 --- a/src/mod_vcard_mnesia.erl
1673 +++ b/src/mod_vcard_mnesia.erl
1674 @@ -33,7 +33,7 @@
1675  -export([need_transform/1, transform/1]).
1676
1677  -include("ejabberd.hrl").
1678 --include("xmpp.hrl").
1679 +-include_lib("p1_xmpp/include/xmpp.hrl").
1680  -include("mod_vcard.hrl").
1681  -include("logger.hrl").
1682  -include("translate.hrl").
1683 diff --git a/src/mod_vcard_riak.erl b/src/mod_vcard_riak.erl
1684 index e5ad1b3d..5427ec7f 100644
1685 --- a/src/mod_vcard_riak.erl
1686 +++ b/src/mod_vcard_riak.erl
1687 @@ -31,7 +31,7 @@
1688          search_fields/1, search_reported/1, import/3, stop/1]).
1689  -export([is_search_supported/1]).
1690
1691 --include("xmpp.hrl").
1692 +-include_lib("p1_xmpp/include/xmpp.hrl").
1693  -include("mod_vcard.hrl").
1694
1695  %%%===================================================================
1696 diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl
1697 index 07d90b69..1dc5d40f 100644
1698 --- a/src/mod_vcard_sql.erl
1699 +++ b/src/mod_vcard_sql.erl
1700 @@ -33,7 +33,7 @@
1701          search_fields/1, search_reported/1, import/3, export/1]).
1702  -export([is_search_supported/1]).
1703
1704 --include("xmpp.hrl").
1705 +-include_lib("p1_xmpp/include/xmpp.hrl").
1706  -include("mod_vcard.hrl").
1707  -include("logger.hrl").
1708  -include("ejabberd_sql_pt.hrl").
1709 diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl
1710 index 7643fed4..19148654 100644
1711 --- a/src/mod_vcard_xupdate.erl
1712 +++ b/src/mod_vcard_xupdate.erl
1713 @@ -35,7 +35,7 @@
1714
1715  -include("ejabberd.hrl").
1716  -include("logger.hrl").
1717 --include("xmpp.hrl").
1718 +-include_lib("p1_xmpp/include/xmpp.hrl").
1719
1720  -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache).
1721
1722 diff --git a/src/mod_version.erl b/src/mod_version.erl
1723 index 5f613e02..23ac02cd 100644
1724 --- a/src/mod_version.erl
1725 +++ b/src/mod_version.erl
1726 @@ -37,7 +37,7 @@
1727  -include("ejabberd.hrl").
1728  -include("logger.hrl").
1729
1730 --include("xmpp.hrl").
1731 +-include_lib("p1_xmpp/include/xmpp.hrl").
1732
1733  start(Host, Opts) ->
1734      IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
1735 diff --git a/src/node_dag.erl b/src/node_dag.erl
1736 index 9829c27c..5f399357 100644
1737 --- a/src/node_dag.erl
1738 +++ b/src/node_dag.erl
1739 @@ -28,7 +28,7 @@
1740  -author('bjc@kublai.com').
1741
1742  -include("pubsub.hrl").
1743 --include("xmpp.hrl").
1744 +-include_lib("p1_xmpp/include/xmpp.hrl").
1745
1746  -export([init/3, terminate/2, options/0, features/0,
1747      create_node_permission/6, create_node/2, delete_node/1,
1748 diff --git a/src/node_dispatch.erl b/src/node_dispatch.erl
1749 index 92a655b8..00eb55d9 100644
1750 --- a/src/node_dispatch.erl
1751 +++ b/src/node_dispatch.erl
1752 @@ -34,7 +34,7 @@
1753  -author('christophe.romain@process-one.net').
1754
1755  -include("pubsub.hrl").
1756 --include("xmpp.hrl").
1757 +-include_lib("p1_xmpp/include/xmpp.hrl").
1758
1759  -export([init/3, terminate/2, options/0, features/0,
1760      create_node_permission/6, create_node/2, delete_node/1,
1761 diff --git a/src/node_flat.erl b/src/node_flat.erl
1762 index bc529e14..571b1b16 100644
1763 --- a/src/node_flat.erl
1764 +++ b/src/node_flat.erl
1765 @@ -34,7 +34,7 @@
1766  -author('christophe.romain@process-one.net').
1767
1768  -include("pubsub.hrl").
1769 --include("xmpp.hrl").
1770 +-include_lib("p1_xmpp/include/xmpp.hrl").
1771
1772  -export([init/3, terminate/2, options/0, features/0,
1773      create_node_permission/6, create_node/2, delete_node/1,
1774 diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl
1775 index afbc050a..ae279c4c 100644
1776 --- a/src/node_flat_sql.erl
1777 +++ b/src/node_flat_sql.erl
1778 @@ -36,7 +36,7 @@
1779  -compile([{parse_transform, ejabberd_sql_pt}]).
1780
1781  -include("pubsub.hrl").
1782 --include("xmpp.hrl").
1783 +-include_lib("p1_xmpp/include/xmpp.hrl").
1784  -include("ejabberd_sql_pt.hrl").
1785
1786  -export([init/3, terminate/2, options/0, features/0,
1787 diff --git a/src/node_online.erl b/src/node_online.erl
1788 index 39b08d99..ce71fdb0 100644
1789 --- a/src/node_online.erl
1790 +++ b/src/node_online.erl
1791 @@ -28,7 +28,7 @@
1792  -author('christophe.romain@process-one.net').
1793
1794  -include("pubsub.hrl").
1795 --include("jid.hrl").
1796 +-include_lib("p1_xmpp/include/jid.hrl").
1797
1798  -export([init/3, terminate/2, options/0, features/0,
1799      create_node_permission/6, create_node/2, delete_node/1,
1800 diff --git a/src/nodetree_dag.erl b/src/nodetree_dag.erl
1801 index a44e7155..0c5609c4 100644
1802 --- a/src/nodetree_dag.erl
1803 +++ b/src/nodetree_dag.erl
1804 @@ -30,7 +30,7 @@
1805  -include_lib("stdlib/include/qlc.hrl").
1806
1807  -include("pubsub.hrl").
1808 --include("xmpp.hrl").
1809 +-include_lib("p1_xmpp/include/xmpp.hrl").
1810
1811  -export([init/3, terminate/2, options/0, set_node/1,
1812      get_node/3, get_node/2, get_node/1, get_nodes/2,
1813 diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl
1814 index 31724036..0fe1f5e0 100644
1815 --- a/src/nodetree_tree.erl
1816 +++ b/src/nodetree_tree.erl
1817 @@ -40,7 +40,7 @@
1818  -include_lib("stdlib/include/qlc.hrl").
1819
1820  -include("pubsub.hrl").
1821 --include("xmpp.hrl").
1822 +-include_lib("p1_xmpp/include/xmpp.hrl").
1823
1824  -export([init/3, terminate/2, options/0, set_node/1,
1825      get_node/3, get_node/2, get_node/1, get_nodes/2,
1826 diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl
1827 index b310dd2d..19ff1786 100644
1828 --- a/src/nodetree_tree_sql.erl
1829 +++ b/src/nodetree_tree_sql.erl
1830 @@ -40,7 +40,7 @@
1831  -compile([{parse_transform, ejabberd_sql_pt}]).
1832
1833  -include("pubsub.hrl").
1834 --include("xmpp.hrl").
1835 +-include_lib("p1_xmpp/include/xmpp.hrl").
1836  -include("ejabberd_sql_pt.hrl").
1837
1838  -export([init/3, terminate/2, options/0, set_node/1,
1839 diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl
1840 index 2c7dabb4..b6ba864c 100644
1841 --- a/src/prosody2ejabberd.erl
1842 +++ b/src/prosody2ejabberd.erl
1843 @@ -28,7 +28,7 @@
1844  -export([from_dir/1]).
1845
1846  -include("ejabberd.hrl").
1847 --include("xmpp.hrl").
1848 +-include_lib("p1_xmpp/include/xmpp.hrl").
1849  -include("logger.hrl").
1850  -include("mod_roster.hrl").
1851  -include("mod_offline.hrl").
1852 diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl
1853 index 746e39e3..59ee734b 100644
1854 --- a/src/pubsub_subscription.erl
1855 +++ b/src/pubsub_subscription.erl
1856 @@ -39,7 +39,7 @@
1857
1858  -include("pubsub.hrl").
1859
1860 --include("xmpp.hrl").
1861 +-include_lib("p1_xmpp/include/xmpp.hrl").
1862
1863  -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
1864  -define(PUBSUB_DIGEST, <<"pubsub#digest">>).
1865 diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl
1866 index 3315748c..5700c100 100644
1867 --- a/src/pubsub_subscription_sql.erl
1868 +++ b/src/pubsub_subscription_sql.erl
1869 @@ -35,7 +35,7 @@
1870
1871  -include("pubsub.hrl").
1872
1873 --include("xmpp.hrl").
1874 +-include_lib("p1_xmpp/include/xmpp.hrl").
1875
1876  -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
1877  -define(PUBSUB_DIGEST, <<"pubsub#digest">>).
1878 diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl
1879 index 329ebad6..4ce8760c 100644
1880 --- a/src/xmpp_stream_in.erl
1881 +++ b/src/xmpp_stream_in.erl
1882 @@ -42,7 +42,7 @@
1883  -define(FSMOPTS, []).
1884  -endif.
1885
1886 --include("xmpp.hrl").
1887 +-include_lib("p1_xmpp/include/xmpp.hrl").
1888  -type state() :: map().
1889  -type stop_reason() :: {stream, reset | {in | out, stream_error()}} |
1890                        {tls, inet:posix() | atom() | binary()} |
1891 diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl
1892 index 7ddc183b..8095bd86 100644
1893 --- a/src/xmpp_stream_out.erl
1894 +++ b/src/xmpp_stream_out.erl
1895 @@ -44,7 +44,7 @@
1896
1897  -define(TCP_SEND_TIMEOUT, 15000).
1898
1899 --include("xmpp.hrl").
1900 +-include_lib("p1_xmpp/include/xmpp.hrl").
1901  -include_lib("kernel/include/inet.hrl").
1902
1903  -type state() :: map().
1904 diff --git a/src/xmpp_stream_pkix.erl b/src/xmpp_stream_pkix.erl
1905 index 8361999f..a6fe728c 100644
1906 --- a/src/xmpp_stream_pkix.erl
1907 +++ b/src/xmpp_stream_pkix.erl
1908 @@ -24,7 +24,7 @@
1909  %% API
1910  -export([authenticate/1, authenticate/2, get_cert_domains/1, format_error/1]).
1911
1912 --include("xmpp.hrl").
1913 +-include_lib("p1_xmpp/include/xmpp.hrl").
1914  -include_lib("public_key/include/public_key.hrl").
1915  -include("XmppAddr.hrl").
1916
1917 --
1918 2.14.1
1919