More include path adjustments

Author: HoloRin

deps/amqp10_client/test/mock_server.erl

@@ -16,7 +16,7 @@
          recv_amqp_header_step/1
         ]).
 
--include_lib("src/amqp10_client.hrl").
+-include_lib("amqp10_client/src/amqp10_client.hrl").
 
 start(Port) ->
     {ok, LSock} = gen_tcp:listen(Port, [binary, {packet, 0}, {active, false}]),

deps/rabbit/BUILD.bazel

@@ -660,9 +660,6 @@ suites = [
         additional_hdrs = [
             "src/rabbit_fifo.hrl",
         ],
-        erlc_opts = [
-            "-I deps/rabbit",  # allow rabbit_fifo.hrl to be included at src/rabbit_fifo.hrl
-        ],
         runtime_deps = [
             "@ra//:erlang_app",
         ],
@@ -681,9 +678,6 @@ suites = [
         additional_hdrs = [
             "src/rabbit_fifo.hrl",
         ],
-        erlc_opts = [
-            "-I deps/rabbit",  # allow rabbit_fifo.hrl to be included at src/rabbit_fifo.hrl
-        ],
         runtime_deps = [
             "@meck//:erlang_app",
             "@ra//:erlang_app",
@@ -701,9 +695,6 @@ suites = [
         additional_hdrs = [
             "src/rabbit_fifo_v0.hrl",
         ],
-        erlc_opts = [
-            "-I deps/rabbit",  # allow rabbit_fifo.hrl to be included at src/rabbit_fifo.hrl
-        ],
         runtime_deps = [
             "@meck//:erlang_app",
             "@ra//:erlang_app",

deps/rabbit/test/rabbit_fifo_SUITE.erl

@@ -17,7 +17,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
--include("src/rabbit_fifo.hrl").
+-include_lib("rabbit/src/rabbit_fifo.hrl").
 
 %%%===================================================================
 %%% Common Test callbacks

deps/rabbit/test/rabbit_fifo_prop_SUITE.erl

@@ -14,7 +14,7 @@
 -include_lib("proper/include/proper.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
--include("src/rabbit_fifo.hrl").
+-include_lib("rabbit/src/rabbit_fifo.hrl").
 
 %%%===================================================================
 %%% Common Test callbacks

deps/rabbit/test/rabbit_fifo_v0_SUITE.erl

@@ -11,7 +11,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
--include("src/rabbit_fifo_v0.hrl").
+-include_lib("rabbit/src/rabbit_fifo_v0.hrl").
 
 %%%===================================================================
 %%% Common Test callbacks