diff --git a/deps/amqp_client/src/amqp_channel.erl b/deps/amqp_client/src/amqp_channel.erl
index 14467f7584..03171bb82e 100644
--- a/deps/amqp_client/src/amqp_channel.erl
+++ b/deps/amqp_client/src/amqp_channel.erl
@@ -1,7 +1,8 @@
 -module(amqp_channel).
 
--include_lib("rabbit/include/rabbit.hrl").
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
+-include_lib("mnesia/include/mnemosyne.hrl").
 -include("amqp_client.hrl").
 
 -behaviour(gen_server).
diff --git a/deps/amqp_client/src/amqp_connection.erl b/deps/amqp_client/src/amqp_connection.erl
index 7cc0151452..4d8b9a39b6 100644
--- a/deps/amqp_client/src/amqp_connection.erl
+++ b/deps/amqp_client/src/amqp_connection.erl
@@ -1,7 +1,7 @@
 -module(amqp_connection).
 
--include_lib("rabbit/include/rabbit.hrl").
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 -include("amqp_client.hrl").
 
 -behaviour(gen_server).
diff --git a/deps/amqp_client/src/amqp_direct_driver.erl b/deps/amqp_client/src/amqp_direct_driver.erl
index 10fdc744aa..e60b8b6949 100644
--- a/deps/amqp_client/src/amqp_direct_driver.erl
+++ b/deps/amqp_client/src/amqp_direct_driver.erl
@@ -1,6 +1,6 @@
 -module(amqp_direct_driver).
 
--include_lib("rabbit/include/rabbit.hrl").
+-include_lib("rabbitmq_server/include/rabbit.hrl").
 -include("amqp_client.hrl").
 
 -export([handshake/2, open_channel/3, close_connection/3]).
diff --git a/deps/amqp_client/src/amqp_method_util.erl b/deps/amqp_client/src/amqp_method_util.erl
index cad65e2c1e..8cb8ee25eb 100644
--- a/deps/amqp_client/src/amqp_method_util.erl
+++ b/deps/amqp_client/src/amqp_method_util.erl
@@ -1,7 +1,7 @@
 -module(amqp_method_util).
 
 -include("amqp_client.hrl").
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 
 -export([register_consumer/2]).
 
diff --git a/deps/amqp_client/src/amqp_network_driver.erl b/deps/amqp_client/src/amqp_network_driver.erl
index 78a242b6db..e4e119771f 100644
--- a/deps/amqp_client/src/amqp_network_driver.erl
+++ b/deps/amqp_client/src/amqp_network_driver.erl
@@ -1,6 +1,6 @@
 -module(amqp_network_driver).
 
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 -include("amqp_client.hrl").
 
 -export([handshake/2, open_channel/3, close_connection/3]).
diff --git a/deps/amqp_client/src/amqp_rpc_client.erl b/deps/amqp_client/src/amqp_rpc_client.erl
index 170a94fa61..148c86fb25 100644
--- a/deps/amqp_client/src/amqp_rpc_client.erl
+++ b/deps/amqp_client/src/amqp_rpc_client.erl
@@ -1,6 +1,6 @@
 -module(amqp_rpc_client).
 
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 -include("amqp_client.hrl").
 
 -behaviour(gen_server).
diff --git a/deps/amqp_client/src/amqp_util.erl b/deps/amqp_client/src/amqp_util.erl
index c475e30129..101bb39f03 100644
--- a/deps/amqp_client/src/amqp_util.erl
+++ b/deps/amqp_client/src/amqp_util.erl
@@ -1,7 +1,7 @@
 -module(amqp_util).
 
--include_lib("rabbit/include/rabbit.hrl").
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 
 -export([message_payload/1]).
 -export([binary/1]).
diff --git a/deps/amqp_client/src/rabbit_direct_channel.erl b/deps/amqp_client/src/rabbit_direct_channel.erl
index f9a41977b3..c40b73edb3 100644
--- a/deps/amqp_client/src/rabbit_direct_channel.erl
+++ b/deps/amqp_client/src/rabbit_direct_channel.erl
@@ -1,7 +1,7 @@
 -module(rabbit_direct_channel).
 
--include_lib("rabbit/include/rabbit.hrl").
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 
 -export([start/3]).
 
diff --git a/deps/amqp_client/test/amqp_consumer.erl b/deps/amqp_client/test/amqp_consumer.erl
index 8d7cdab2e2..4aa34e8923 100644
--- a/deps/amqp_client/test/amqp_consumer.erl
+++ b/deps/amqp_client/test/amqp_consumer.erl
@@ -2,7 +2,7 @@
 
 -behaviour(gen_event).
 
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 
 -export([init/1, handle_info/2, terminate/2]).
 
diff --git a/deps/amqp_client/test/amqp_test_util.erl b/deps/amqp_client/test/amqp_test_util.erl
index 4d91baccba..5ff94fb39b 100644
--- a/deps/amqp_client/test/amqp_test_util.erl
+++ b/deps/amqp_client/test/amqp_test_util.erl
@@ -1,7 +1,7 @@
 -module(amqp_test_util).
 
--include_lib("rabbit/include/rabbit.hrl").
--include_lib("rabbit/include/rabbit_framing.hrl").
+-include_lib("rabbitmq_server/include/rabbit.hrl").
+-include_lib("rabbitmq_server/include/rabbit_framing.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -compile([export_all]).