LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File rabbitmq-server-3.6.12-fix-include.patch of Package rabbitmq-server (Project home:Ledest:erlang:20)

diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_access_control.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_access_control.erl
--- rabbitmq-server-3.6.11/src/rabbit_access_control.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_access_control.erl	2017-08-18 13:57:42.898310159 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_access_control).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([check_user_pass_login/2, check_user_login/2, check_user_loopback/2,
          check_vhost_access/3, check_resource_access/3]).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_amqqueue.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue.erl
--- rabbitmq-server-3.6.11/src/rabbit_amqqueue.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue.erl	2017-08-18 14:00:49.856321386 +0300
@@ -43,7 +43,7 @@
 -export([internal_declare/2, internal_delete/1, run_backing_queue/3,
          set_ram_duration_target/2, set_maximum_since_use/2]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 -include_lib("stdlib/include/qlc.hrl").
 
 -define(INTEGER_ARG_TYPES, [byte, short, signedint, long,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_amqqueue_process.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue_process.erl
--- rabbitmq-server-3.6.11/src/rabbit_amqqueue_process.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue_process.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,8 +15,8 @@
 %%
 
 -module(rabbit_amqqueue_process).
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -behaviour(gen_server2).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_amqqueue_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_amqqueue_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue_sup.erl	2017-08-18 13:57:42.902310116 +0300
@@ -22,7 +22,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_amqqueue_sup_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue_sup_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_amqqueue_sup_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_amqqueue_sup_sup.erl	2017-08-18 13:57:42.902310116 +0300
@@ -22,7 +22,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(SERVER, ?MODULE).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_auth_backend_internal.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_backend_internal.erl
--- rabbitmq-server-3.6.11/src/rabbit_auth_backend_internal.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_backend_internal.erl	2017-08-18 14:00:40.824417070 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_auth_backend_internal).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_authn_backend).
 -behaviour(rabbit_authz_backend).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_auth_mechanism_amqplain.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_mechanism_amqplain.erl
--- rabbitmq-server-3.6.11/src/rabbit_auth_mechanism_amqplain.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_mechanism_amqplain.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_auth_mechanism_amqplain).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_auth_mechanism).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_auth_mechanism_cr_demo.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_mechanism_cr_demo.erl
--- rabbitmq-server-3.6.11/src/rabbit_auth_mechanism_cr_demo.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_mechanism_cr_demo.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_auth_mechanism_cr_demo).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_auth_mechanism).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_auth_mechanism_plain.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_mechanism_plain.erl
--- rabbitmq-server-3.6.11/src/rabbit_auth_mechanism_plain.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_auth_mechanism_plain.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_auth_mechanism_plain).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_auth_mechanism).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_basic.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_basic.erl
--- rabbitmq-server-3.6.11/src/rabbit_basic.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_basic.erl	2017-08-18 14:00:35.544473019 +0300
@@ -15,8 +15,8 @@
 %%
 
 -module(rabbit_basic).
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -export([publish/4, publish/5, publish/1,
          message/3, message/4, properties/1, prepend_table_header/3,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_binding.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_binding.erl
--- rabbitmq-server-3.6.11/src/rabbit_binding.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_binding.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_binding).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([recover/2, exists/1, add/1, add/2, remove/1, remove/2, list/1]).
 -export([list_for_source/1, list_for_destination/1,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_channel.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_channel.erl
--- rabbitmq-server-3.6.11/src/rabbit_channel.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_channel.erl	2017-08-18 14:00:28.000552987 +0300
@@ -47,8 +47,8 @@
 %% When a queue is declared as exclusive on a channel, the channel
 %% will notify queue collector of that queue.
 
--include("rabbit_framing.hrl").
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(gen_server2).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_channel_interceptor.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_channel_interceptor.erl
--- rabbitmq-server-3.6.11/src/rabbit_channel_interceptor.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_channel_interceptor.erl	2017-08-18 14:00:22.680609392 +0300
@@ -16,8 +16,8 @@
 
 -module(rabbit_channel_interceptor).
 
--include("rabbit_framing.hrl").
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([init/1, intercept_in/3]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_channel_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_channel_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_channel_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_channel_sup.erl	2017-08-18 13:57:42.902310116 +0300
@@ -32,7 +32,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_client_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_client_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_client_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_client_sup.erl	2017-08-18 13:57:42.902310116 +0300
@@ -22,7 +22,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_connection_helper_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_connection_helper_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_connection_helper_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_connection_helper_sup.erl	2017-08-18 13:57:42.902310116 +0300
@@ -33,7 +33,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_connection_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_connection_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_connection_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_connection_sup.erl	2017-08-18 13:57:42.902310116 +0300
@@ -32,7 +32,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_control_main.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_control_main.erl
--- rabbitmq-server-3.6.11/src/rabbit_control_main.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_control_main.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,9 +15,9 @@
 %%
 
 -module(rabbit_control_main).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 -include("rabbit_cli.hrl").
--include("rabbit_misc.hrl").
+-include_lib("rabbit_common/include/rabbit_misc.hrl").
 
 -export([start/0, stop/0, parse_arguments/2, action/5, action/6,
          sync_queue/1, cancel_sync_queue/1, become/1,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_credential_validation.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validation.erl
--- rabbitmq-server-3.6.11/src/rabbit_credential_validation.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validation.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_credential_validation).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %% used for backwards compatibility
 -define(DEFAULT_BACKEND, rabbit_credential_validator_accept_everything).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_credential_validator_accept_everything.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator_accept_everything.erl
--- rabbitmq-server-3.6.11/src/rabbit_credential_validator_accept_everything.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator_accept_everything.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_credential_validator_accept_everything).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_credential_validator).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_credential_validator.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator.erl
--- rabbitmq-server-3.6.11/src/rabbit_credential_validator.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_credential_validator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %% Validates a password. Used by `rabbit_auth_backend_internal`.
 %%
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_credential_validator_min_password_length.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator_min_password_length.erl
--- rabbitmq-server-3.6.11/src/rabbit_credential_validator_min_password_length.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator_min_password_length.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_credential_validator_min_password_length).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_credential_validator).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_credential_validator_password_regexp.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator_password_regexp.erl
--- rabbitmq-server-3.6.11/src/rabbit_credential_validator_password_regexp.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_credential_validator_password_regexp.erl	2017-08-18 13:57:42.902310116 +0300
@@ -19,7 +19,7 @@
 %% password against a pre-configured regular expression.
 -module(rabbit_credential_validator_password_regexp).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_credential_validator).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_dead_letter.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_dead_letter.erl
--- rabbitmq-server-3.6.11/src/rabbit_dead_letter.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_dead_letter.erl	2017-08-18 13:57:42.902310116 +0300
@@ -18,8 +18,8 @@
 
 -export([publish/5]).
 
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_direct.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_direct.erl
--- rabbitmq-server-3.6.11/src/rabbit_direct.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_direct.erl	2017-08-18 13:57:42.902310116 +0300
@@ -21,7 +21,7 @@
 %% Internal
 -export([list_local/0]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit.erl rabbitmq-server-3.6.11-fix-include/src/rabbit.erl
--- rabbitmq-server-3.6.11/src/rabbit.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit.erl	2017-08-18 13:57:42.902310116 +0300
@@ -202,8 +202,8 @@
 
 %%---------------------------------------------------------------------------
 
--include("rabbit_framing.hrl").
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(APPS, [os_mon, mnesia, rabbit_common, rabbit]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_error_logger.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_error_logger.erl
--- rabbitmq-server-3.6.11/src/rabbit_error_logger.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_error_logger.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,8 +15,8 @@
 %%
 
 -module(rabbit_error_logger).
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -define(LOG_EXCH_NAME, <<"amq.rabbitmq.log">>).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_error_logger_file_h.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_error_logger_file_h.erl
--- rabbitmq-server-3.6.11/src/rabbit_error_logger_file_h.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_error_logger_file_h.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_error_logger_file_h).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(gen_event).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange_decorator.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_decorator.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange_decorator.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_decorator.erl	2017-08-18 14:00:14.496696193 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_exchange_decorator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([select/2, set/1, register/2, unregister/1]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,8 +15,8 @@
 %%
 
 -module(rabbit_exchange).
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -export([recover/0, policy_changed/2, callback/4, declare/6,
          assert_equivalence/6, assert_args_equivalence/2, check_type/1,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange_parameters.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_parameters.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange_parameters.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_parameters.erl	2017-08-18 13:57:42.902310116 +0300
@@ -18,7 +18,7 @@
 
 -behaviour(rabbit_runtime_parameter).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([register/0]).
 -export([validate/5, notify/4, notify_clear/3]).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange_type_direct.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_direct.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange_type_direct.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_direct.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_exchange_type_direct).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_exchange_type).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange_type_fanout.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_fanout.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange_type_fanout.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_fanout.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_exchange_type_fanout).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_exchange_type).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange_type_headers.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_headers.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange_type_headers.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_headers.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,8 +15,8 @@
 %%
 
 -module(rabbit_exchange_type_headers).
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -behaviour(rabbit_exchange_type).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange_type_invalid.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_invalid.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange_type_invalid.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_invalid.erl	2017-08-18 13:57:42.902310116 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_exchange_type_invalid).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_exchange_type).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_exchange_type_topic.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_topic.erl
--- rabbitmq-server-3.6.11/src/rabbit_exchange_type_topic.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_exchange_type_topic.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_exchange_type_topic).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_exchange_type).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_fhc_helpers.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_fhc_helpers.erl
--- rabbitmq-server-3.6.11/src/rabbit_fhc_helpers.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_fhc_helpers.erl	2017-08-18 13:57:42.902310116 +0300
@@ -18,7 +18,7 @@
 
 -export([clear_read_cache/0]).
 
--include("rabbit.hrl"). % For #amqqueue record definition.
+-include_lib("rabbit_common/include/rabbit.hrl"). % For #amqqueue record definition.
 
 clear_read_cache() ->
     case application:get_env(rabbit, fhc_read_buffering) of
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_limiter.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_limiter.erl
--- rabbitmq-server-3.6.11/src/rabbit_limiter.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_limiter.erl	2017-08-18 13:57:42.902310116 +0300
@@ -119,7 +119,7 @@
 
 -module(rabbit_limiter).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(gen_server2).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mirror_queue_coordinator.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_coordinator.erl
--- rabbitmq-server-3.6.11/src/rabbit_mirror_queue_coordinator.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_coordinator.erl	2017-08-18 13:57:42.902310116 +0300
@@ -26,7 +26,7 @@
 -behaviour(gen_server2).
 -behaviour(gm).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 -include("gm_specs.hrl").
 
 -record(state, { q,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mirror_queue_master.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_master.erl
--- rabbitmq-server-3.6.11/src/rabbit_mirror_queue_master.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_master.erl	2017-08-18 13:57:42.902310116 +0300
@@ -34,7 +34,7 @@
 
 -behaviour(rabbit_backing_queue).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -record(state, { name,
                  gm,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mirror_queue_misc.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_misc.erl
--- rabbitmq-server-3.6.11/src/rabbit_mirror_queue_misc.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_misc.erl	2017-08-18 13:57:42.902310116 +0300
@@ -30,7 +30,7 @@
 %% for testing only
 -export([module/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(HA_NODES_MODULE, rabbit_mirror_queue_mode_nodes).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mirror_queue_mode_all.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_mode_all.erl
--- rabbitmq-server-3.6.11/src/rabbit_mirror_queue_mode_all.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_mode_all.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_mirror_queue_mode_all).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_mirror_queue_mode).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mirror_queue_mode_exactly.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_mode_exactly.erl
--- rabbitmq-server-3.6.11/src/rabbit_mirror_queue_mode_exactly.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_mode_exactly.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_mirror_queue_mode_exactly).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_mirror_queue_mode).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mirror_queue_mode_nodes.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_mode_nodes.erl
--- rabbitmq-server-3.6.11/src/rabbit_mirror_queue_mode_nodes.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_mode_nodes.erl	2017-08-18 13:57:42.902310116 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_mirror_queue_mode_nodes).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(rabbit_mirror_queue_mode).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mirror_queue_slave.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_slave.erl
--- rabbitmq-server-3.6.11/src/rabbit_mirror_queue_slave.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mirror_queue_slave.erl	2017-08-18 13:57:42.902310116 +0300
@@ -35,7 +35,7 @@
 -behaviour(gen_server2).
 -behaviour(gm).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -include("gm_specs.hrl").
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mnesia.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mnesia.erl
--- rabbitmq-server-3.6.11/src/rabbit_mnesia.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mnesia.erl	2017-08-18 13:57:44.698290918 +0300
@@ -46,7 +46,7 @@
 %% Used internally in rpc calls
 -export([node_info/0, remove_node_if_mnesia_running/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_mnesia_rename.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_mnesia_rename.erl
--- rabbitmq-server-3.6.11/src/rabbit_mnesia_rename.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_mnesia_rename.erl	2017-08-18 13:57:44.698290918 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_mnesia_rename).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([rename/2]).
 -export([maybe_finish/1]).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_msg_file.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_file.erl
--- rabbitmq-server-3.6.11/src/rabbit_msg_file.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_file.erl	2017-08-18 13:57:44.698290918 +0300
@@ -20,7 +20,7 @@
 
 %%----------------------------------------------------------------------------
 
--include("rabbit_msg_store.hrl").
+-include_lib("rabbit_common/include/rabbit_msg_store.hrl").
 
 -define(INTEGER_SIZE_BYTES,      8).
 -define(INTEGER_SIZE_BITS,       (8 * ?INTEGER_SIZE_BYTES)).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_msg_store.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_store.erl
--- rabbitmq-server-3.6.11/src/rabbit_msg_store.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_store.erl	2017-08-18 13:57:44.698290918 +0300
@@ -34,7 +34,7 @@
 
 %%----------------------------------------------------------------------------
 
--include("rabbit_msg_store.hrl").
+-include_lib("rabbit_common/include/rabbit_msg_store.hrl").
 
 -define(SYNC_INTERVAL,  25).   %% milliseconds
 -define(CLEAN_FILENAME, "clean.dot").
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_msg_store_ets_index.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_store_ets_index.erl
--- rabbitmq-server-3.6.11/src/rabbit_msg_store_ets_index.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_store_ets_index.erl	2017-08-18 13:57:44.698290918 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_msg_store_ets_index).
 
--include("rabbit_msg_store.hrl").
+-include_lib("rabbit_common/include/rabbit_msg_store.hrl").
 
 -behaviour(rabbit_msg_store_index).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_msg_store_gc.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_store_gc.erl
--- rabbitmq-server-3.6.11/src/rabbit_msg_store_gc.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_msg_store_gc.erl	2017-08-18 13:57:44.698290918 +0300
@@ -31,7 +31,7 @@
           msg_store_state
         }).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_networking.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_networking.erl
--- rabbitmq-server-3.6.11/src/rabbit_networking.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_networking.erl	2017-08-18 14:00:08.672757985 +0300
@@ -46,7 +46,7 @@
 %% Internal
 -export([connections_local/0]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %% IANA-suggested ephemeral port range is 49152 to 65535
 -define(FIRST_TEST_BIND_PORT, 49152).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_password.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_password.erl
--- rabbitmq-server-3.6.11/src/rabbit_password.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_password.erl	2017-08-18 13:57:44.698290918 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_password).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(DEFAULT_HASHING_MODULE, rabbit_password_hashing_sha256).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_plugins_main.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_plugins_main.erl
--- rabbitmq-server-3.6.11/src/rabbit_plugins_main.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_plugins_main.erl	2017-08-18 13:57:44.698290918 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_plugins_main).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 -include("rabbit_cli.hrl").
 
 -export([start/0, stop/0, action/6]).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_policies.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_policies.erl
--- rabbitmq-server-3.6.11/src/rabbit_policies.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_policies.erl	2017-08-18 13:57:44.698290918 +0300
@@ -21,7 +21,7 @@
 
 -behaviour(rabbit_policy_validator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([register/0, validate_policy/1]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_policy.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_policy.erl
--- rabbitmq-server-3.6.11/src/rabbit_policy.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_policy.erl	2017-08-18 13:57:44.698290918 +0300
@@ -36,7 +36,7 @@
 
 -behaviour(rabbit_runtime_parameter).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -import(rabbit_misc, [pget/2]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_prelaunch.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_prelaunch.erl
--- rabbitmq-server-3.6.11/src/rabbit_prelaunch.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_prelaunch.erl	2017-08-18 13:57:44.698290918 +0300
@@ -20,7 +20,7 @@
 
 -import(rabbit_misc, [pget/2, pget/3]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(SET_DIST_PORT, 0).
 -define(ERROR_CODE, 1).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_prequeue.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_prequeue.erl
--- rabbitmq-server-3.6.11/src/rabbit_prequeue.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_prequeue.erl	2017-08-18 13:57:44.698290918 +0300
@@ -29,7 +29,7 @@
 
 -behaviour(gen_server2).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_priority_queue.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_priority_queue.erl
--- rabbitmq-server-3.6.11/src/rabbit_priority_queue.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_priority_queue.erl	2017-08-18 13:57:44.698290918 +0300
@@ -16,8 +16,8 @@
 
 -module(rabbit_priority_queue).
 
--include_lib("rabbit.hrl").
--include_lib("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 -behaviour(rabbit_backing_queue).
 
 %% enabled unconditionally. Disabling priority queueing after
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_collector.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_collector.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_collector.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_collector.erl	2017-08-18 13:59:57.896872358 +0300
@@ -28,7 +28,7 @@
 
 -record(state, {monitors, delete_from}).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_decorator.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_decorator.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_decorator.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_decorator.erl	2017-08-18 13:59:52.608928498 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_queue_decorator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([select/1, set/1, register/2, unregister/1]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_index.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_index.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_index.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_index.erl	2017-08-18 13:57:44.698290918 +0300
@@ -211,7 +211,7 @@
   unacked
 }).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_location_client_local.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_client_local.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_location_client_local.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_client_local.erl	2017-08-18 13:57:44.698290918 +0300
@@ -17,7 +17,7 @@
 -module(rabbit_queue_location_client_local).
 -behaviour(rabbit_queue_master_locator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([description/0, queue_master_location/1]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_location_min_masters.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_min_masters.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_location_min_masters.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_min_masters.erl	2017-08-18 13:57:44.698290918 +0300
@@ -17,7 +17,7 @@
 -module(rabbit_queue_location_min_masters).
 -behaviour(rabbit_queue_master_locator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([description/0, queue_master_location/1]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_location_random.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_random.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_location_random.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_random.erl	2017-08-18 13:57:44.698290918 +0300
@@ -17,7 +17,7 @@
 -module(rabbit_queue_location_random).
 -behaviour(rabbit_queue_master_locator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([description/0, queue_master_location/1]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_location_validator.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_validator.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_location_validator.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_location_validator.erl	2017-08-18 13:57:44.698290918 +0300
@@ -17,7 +17,7 @@
 -module(rabbit_queue_location_validator).
 -behaviour(rabbit_policy_validator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([validate_policy/1, validate_strategy/1]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_queue_master_location_misc.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_master_location_misc.erl
--- rabbitmq-server-3.6.11/src/rabbit_queue_master_location_misc.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_queue_master_location_misc.erl	2017-08-18 13:57:44.698290918 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_queue_master_location_misc).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([lookup_master/2,
          lookup_queue/2,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_reader.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_reader.erl
--- rabbitmq-server-3.6.11/src/rabbit_reader.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_reader.erl	2017-08-18 13:59:45.001009299 +0300
@@ -50,8 +50,8 @@
 %%
 %% Reader processes are special processes (in the OTP sense).
 
--include("rabbit_framing.hrl").
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([start_link/3, info_keys/0, info/1, info/2, force_event_refresh/2,
          shutdown/2]).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_restartable_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_restartable_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_restartable_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_restartable_sup.erl	2017-08-18 13:57:44.698290918 +0300
@@ -22,7 +22,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(DELAY, 2).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_router.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_router.erl
--- rabbitmq-server-3.6.11/src/rabbit_router.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_router.erl	2017-08-18 13:57:44.698290918 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_router).
 -include_lib("stdlib/include/qlc.hrl").
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([match_bindings/2, match_routing_key/2]).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_runtime_parameters.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_runtime_parameters.erl
--- rabbitmq-server-3.6.11/src/rabbit_runtime_parameters.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_runtime_parameters.erl	2017-08-18 13:57:44.698290918 +0300
@@ -49,7 +49,7 @@
 %%  * rabbit_registry
 %%  * rabbit_event
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([parse_set/5, set/5, set_any/5, clear/3, clear_any/3, list/0, list/1,
          list_component/1, list/2, list_formatted/1, list_formatted/3,
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_sasl_report_file_h.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_sasl_report_file_h.erl
--- rabbitmq-server-3.6.11/src/rabbit_sasl_report_file_h.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_sasl_report_file_h.erl	2017-08-18 13:57:44.698290918 +0300
@@ -15,7 +15,7 @@
 %%
 
 -module(rabbit_sasl_report_file_h).
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(gen_event).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_sup.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_sup.erl
--- rabbitmq-server-3.6.11/src/rabbit_sup.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_sup.erl	2017-08-18 13:57:44.698290918 +0300
@@ -27,7 +27,7 @@
 
 -export([init/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(SERVER, ?MODULE).
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_table.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_table.erl
--- rabbitmq-server-3.6.11/src/rabbit_table.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_table.erl	2017-08-18 13:57:44.698290918 +0300
@@ -21,7 +21,7 @@
          check_schema_integrity/1, clear_ram_only_tables/0, retry_timeout/0,
          wait_for_replicated/0]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 -type retry() :: boolean().
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_trace.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_trace.erl
--- rabbitmq-server-3.6.11/src/rabbit_trace.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_trace.erl	2017-08-18 13:57:44.698290918 +0300
@@ -18,8 +18,8 @@
 
 -export([init/1, enabled/1, tap_in/6, tap_out/5, start/1, stop/1]).
 
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -define(TRACE_VHOSTS, trace_vhosts).
 -define(XNAME, <<"amq.rabbitmq.trace">>).
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_upgrade.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_upgrade.erl
--- rabbitmq-server-3.6.11/src/rabbit_upgrade.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_upgrade.erl	2017-08-18 13:57:44.698290918 +0300
@@ -19,7 +19,7 @@
 -export([maybe_upgrade_mnesia/0, maybe_upgrade_local/0,
          nodes_running/1, secondary_upgrade/1]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(VERSION_FILENAME, "schema_version").
 -define(LOCK_FILENAME, "schema_upgrade_lock").
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_variable_queue.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_variable_queue.erl
--- rabbitmq-server-3.6.11/src/rabbit_variable_queue.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_variable_queue.erl	2017-08-18 13:57:44.698290918 +0300
@@ -340,8 +340,8 @@
 -define(TRANSIENT_MSG_STORE,  msg_store_transient).
 -define(QUEUE, lqueue).
 
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/src/rabbit_vhost.erl rabbitmq-server-3.6.11-fix-include/src/rabbit_vhost.erl
--- rabbitmq-server-3.6.11/src/rabbit_vhost.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/src/rabbit_vhost.erl	2017-08-18 13:57:44.698290918 +0300
@@ -16,7 +16,7 @@
 
 -module(rabbit_vhost).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/test/channel_operation_timeout_test_queue.erl rabbitmq-server-3.6.11-fix-include/test/channel_operation_timeout_test_queue.erl
--- rabbitmq-server-3.6.11/test/channel_operation_timeout_test_queue.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/test/channel_operation_timeout_test_queue.erl	2017-08-18 13:57:44.698290918 +0300
@@ -116,8 +116,8 @@
 -define(QUEUE, lqueue).
 -define(TIMEOUT_TEST_MSG, <<"timeout_test_msg!">>).
 
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 %%----------------------------------------------------------------------------
 
diff -Ndurp rabbitmq-server-3.6.11/test/dummy_event_receiver.erl rabbitmq-server-3.6.11-fix-include/test/dummy_event_receiver.erl
--- rabbitmq-server-3.6.11/test/dummy_event_receiver.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/test/dummy_event_receiver.erl	2017-08-18 13:57:44.702290875 +0300
@@ -21,7 +21,7 @@
 -export([init/1, handle_call/2, handle_event/2, handle_info/2,
          terminate/2, code_change/3]).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 start(Pid, Nodes, Types) ->
     Oks = [ok || _ <- Nodes],
diff -Ndurp rabbitmq-server-3.6.11/test/dummy_runtime_parameters.erl rabbitmq-server-3.6.11-fix-include/test/dummy_runtime_parameters.erl
--- rabbitmq-server-3.6.11/test/dummy_runtime_parameters.erl	2017-08-10 20:25:53.027945536 +0300
+++ rabbitmq-server-3.6.11-fix-include/test/dummy_runtime_parameters.erl	2017-08-18 13:57:44.702290875 +0300
@@ -18,7 +18,7 @@
 -behaviour(rabbit_runtime_parameter).
 -behaviour(rabbit_policy_validator).
 
--include("rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([validate/5, notify/4, notify_clear/3]).
 -export([register/0, unregister/0]).