feature(project): point header to emqx_libs

apps/emqx/rebar.config

@@ -0,0 +1 @@
+{deps, []}.

apps/emqx/src/emqx.app.src

@@ -4,8 +4,7 @@
   {vsn, "git"},
   {modules, []},
   {registered, []},
-  {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,
-                  sasl,os_mon]},
+  {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon,emqx_libs]},
   {mod, {emqx_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx/src/emqx.erl

@@ -16,9 +16,9 @@
 
 -module(emqx).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[EMQ X]").
 

apps/emqx/src/emqx_access_control.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_access_control).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 -export([authenticate/1]).
 

apps/emqx/src/emqx_access_rule.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_access_rule).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 %% APIs
 -export([ match/3

apps/emqx/src/emqx_acl_cache.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_acl_cache).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 -export([ list_acl_cache/0
         , get_acl_cache/2

apps/emqx/src/emqx_alarm.erl

@@ -18,8 +18,8 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Alarm Handler]").
 

apps/emqx/src/emqx_alarm_handler.erl

@@ -18,8 +18,8 @@
 
 -behaviour(gen_event).
 
--include("emqx.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Alarm Handler]").
 

apps/emqx/src/emqx_banned.erl

@@ -18,9 +18,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Banned]").
 

apps/emqx/src/emqx_broker.erl

@@ -18,10 +18,10 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -logger_header("[Broker]").
 

apps/emqx/src/emqx_broker_helper.erl

@@ -18,8 +18,8 @@
 
 -behaviour(gen_server).
 
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Broker Helper]").
 

apps/emqx/src/emqx_channel.erl

@@ -17,10 +17,10 @@
 %% MQTT Channel
 -module(emqx_channel).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Channel]").
 

apps/emqx/src/emqx_cm.erl

@@ -19,9 +19,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[CM]").
 

apps/emqx/src/emqx_cm_locker.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_cm_locker).
 
--include("emqx.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([start_link/0]).
 

apps/emqx/src/emqx_cm_registry.erl

@@ -19,9 +19,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Registry]").
 

apps/emqx/src/emqx_connection.erl

@@ -17,10 +17,10 @@
 %% MQTT/TCP|TLS Connection
 -module(emqx_connection).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[MQTT]").
 

apps/emqx/src/emqx_ctl.erl

@@ -18,8 +18,8 @@
 
 -behaviour(gen_server).
 
--include("types.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Ctl]").
 

apps/emqx/src/emqx_flapping.erl

@@ -18,9 +18,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("types.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Flapping]").
 

apps/emqx/src/emqx_frame.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_frame).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -export([ initial_parse_state/0
         , initial_parse_state/1

apps/emqx/src/emqx_gc.erl

@@ -26,7 +26,7 @@
 
 -module(emqx_gc).
 
--include("types.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ init/1
         , run/2

apps/emqx/src/emqx_global_gc.erl

@@ -18,7 +18,7 @@
 
 -behaviour(gen_server).
 
--include("types.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([start_link/0, stop/0]).
 

apps/emqx/src/emqx_hooks.erl

@@ -18,8 +18,8 @@
 
 -behaviour(gen_server).
 
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Hooks]").
 

apps/emqx/src/emqx_limiter.erl

@@ -17,7 +17,7 @@
 %% Ratelimit or Quota checker
 -module(emqx_limiter).
 
--include("types.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ init/2
         , init/4 %% XXX: Compatible with before 4.2 version

apps/emqx/src/emqx_listeners.erl

@@ -17,7 +17,7 @@
 %% @doc Start/Stop MQTT listeners.
 -module(emqx_listeners).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 %% APIs
 -export([ start/0

apps/emqx/src/emqx_message.erl

@@ -18,9 +18,9 @@
 
 -compile(inline).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 %% Create
 -export([ make/2

apps/emqx/src/emqx_metrics.erl

@@ -18,9 +18,9 @@
 
 -behavior(gen_server).
 
--include("logger.hrl").
--include("types.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -logger_header("[Metrics]").
 

apps/emqx/src/emqx_misc.erl

@@ -18,8 +18,8 @@
 
 -compile(inline).
 
--include("types.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -export([ merge_opts/2
         , maybe_apply/2

apps/emqx/src/emqx_mod_acl_internal.erl

@@ -18,8 +18,8 @@
 
 -behaviour(emqx_gen_mod).
 
--include("emqx.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[ACL_INTERNAL]").
 

apps/emqx/src/emqx_mod_delayed.erl

@@ -19,8 +19,8 @@
 -behaviour(gen_server).
 -behaviour(emqx_gen_mod).
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 %% Mnesia bootstrap
 -export([mnesia/1]).

apps/emqx/src/emqx_mod_presence.erl

@@ -18,8 +18,8 @@
 
 -behaviour(emqx_gen_mod).
 
--include("emqx.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Presence]").
 

apps/emqx/src/emqx_mod_rewrite.erl

@@ -18,8 +18,8 @@
 
 -behaviour(emqx_gen_mod).
 
--include_lib("emqx.hrl").
--include_lib("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -ifdef(TEST).
 -export([ compile/1

apps/emqx/src/emqx_mod_subscription.erl

@@ -18,8 +18,8 @@
 
 -behaviour(emqx_gen_mod).
 
--include_lib("emqx.hrl").
--include_lib("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 %% emqx_gen_mod callbacks
 -export([ load/1

apps/emqx/src/emqx_mod_sup.erl

@@ -18,7 +18,7 @@
 
 -behaviour(supervisor).
 
--include("types.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ start_link/0
         , start_child/1

apps/emqx/src/emqx_mod_topic_metrics.erl

@@ -19,9 +19,9 @@
 -behaviour(gen_server).
 -behaviour(emqx_gen_mod).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -logger_header("[TOPIC_METRICS]").
 

apps/emqx/src/emqx_modules.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_modules).
 
--include("logger.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Modules]").
 

apps/emqx/src/emqx_mountpoint.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_mountpoint).
 
--include("emqx.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ mount/2
         , unmount/2

apps/emqx/src/emqx_mqtt_caps.erl

@@ -17,8 +17,8 @@
 %% @doc MQTTv5 Capabilities
 -module(emqx_mqtt_caps).
 
--include("emqx_mqtt.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ check_pub/2
         , check_sub/3

apps/emqx/src/emqx_mqtt_props.erl

@@ -17,7 +17,7 @@
 %% @doc MQTT5 Properties
 -module(emqx_mqtt_props).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -export([ id/1
         , name/1

apps/emqx/src/emqx_mqueue.erl

@@ -49,9 +49,9 @@
 
 -module(emqx_mqueue).
 
--include("emqx.hrl").
--include("types.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -export([ init/1
         , info/1

apps/emqx/src/emqx_os_mon.erl

@@ -18,7 +18,7 @@
 
 -behaviour(gen_server).
 
--include("logger.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[OS_MON]").
 
@@ -47,7 +47,7 @@
         , code_change/3
         ]).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 -define(OS_MON, ?MODULE).
 

apps/emqx/src/emqx_packet.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_packet).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 %% Header APIs
 -export([ type/1

apps/emqx/src/emqx_pd.erl

@@ -17,7 +17,7 @@
 %% @doc The utility functions for erlang process dictionary.
 -module(emqx_pd).
 
--include("types.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ get_counters/1
         , get_counter/1

apps/emqx/src/emqx_plugins.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_plugins).
 
--include("emqx.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Plugins]").
 
@@ -234,7 +234,7 @@ generate_configs(App) ->
             Conf = cuttlefish_conf:file(ConfFile),
             cuttlefish_generator:map(Schema, Conf);
         {false, false} ->
-            error(no_avaliable_configuration)
+            error({config_not_found, {ConfigFile, ConfFile, SchemaFile}})
     end.
 
 apply_configs([]) ->

apps/emqx/src/emqx_pool.erl

@@ -18,8 +18,8 @@
 
 -behaviour(gen_server).
 
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Pool]").
 

apps/emqx/src/emqx_pool_sup.erl

@@ -18,7 +18,7 @@
 
 -behaviour(supervisor).
 
--include("types.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([spec/1, spec/2]).
 

apps/emqx/src/emqx_psk.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_psk).
 
--include("logger.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[PSK]").
 

apps/emqx/src/emqx_reason_codes.erl

@@ -17,7 +17,7 @@
 %% @doc MQTT5 reason codes
 -module(emqx_reason_codes).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -export([ name/1
         , name/2

apps/emqx/src/emqx_router.erl

@@ -18,9 +18,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 -include_lib("ekka/include/ekka.hrl").
 
 -logger_header("[Router]").

apps/emqx/src/emqx_router_helper.erl

@@ -18,9 +18,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Router Helper]").
 

apps/emqx/src/emqx_session.erl

@@ -43,10 +43,10 @@
 %% MQTT Session
 -module(emqx_session).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Session]").
 

apps/emqx/src/emqx_shared_sub.erl

@@ -18,10 +18,10 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Shared Sub]").
 

apps/emqx/src/emqx_stats.erl

@@ -18,9 +18,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Stats]").
 

apps/emqx/src/emqx_sup.erl

@@ -18,7 +18,7 @@
 
 -behaviour(supervisor).
 
--include("types.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ start_link/0
         , start_child/1

apps/emqx/src/emqx_sys.erl

@@ -18,9 +18,9 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("types.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[SYS]").
 

apps/emqx/src/emqx_sys_mon.erl

@@ -18,8 +18,8 @@
 
 -behavior(gen_server).
 
--include("types.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[SYSMON]").
 

apps/emqx/src/emqx_tracer.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_tracer).
 
--include("emqx.hrl").
--include("logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[Tracer]").
 

apps/emqx/src/emqx_trie.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_trie).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 %% Mnesia bootstrap
 -export([mnesia/1]).

apps/emqx/src/emqx_types.erl

@@ -16,9 +16,9 @@
 
 -module(emqx_types).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export_type([ ver/0
              , qos/0

apps/emqx/src/emqx_vm_mon.erl

@@ -18,7 +18,7 @@
 
 -behaviour(gen_server).
 
--include("logger.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 %% APIs
 -export([start_link/1]).

apps/emqx/src/emqx_ws_connection.erl

@@ -17,10 +17,10 @@
 %% MQTT/WS|WSS Connection
 -module(emqx_ws_connection).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[MQTT/WS]").
 

apps/emqx/src/emqx_zone.erl

@@ -18,10 +18,10 @@
 
 -behaviour(gen_server).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
--include("logger.hrl").
--include("types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -logger_header("[Zone]").
 

apps/emqx/test/emqx_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx/test/emqx_access_control_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_alarm_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_banned_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_broker_SUITE.erl

@@ -24,8 +24,8 @@
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 all() -> emqx_ct:all(?MODULE).
 

apps/emqx/test/emqx_channel_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 

apps/emqx/test/emqx_client_SUITE.erl

@@ -21,7 +21,7 @@
 
 -import(lists, [nth/2]).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx/test/emqx_cm_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -define(CM, emqx_cm).

apps/emqx/test/emqx_connection_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_frame_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("emqx_ct_helpers/include/emqx_ct.hrl").

apps/emqx/test/emqx_listeners_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_message_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_metrics_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_mod_acl_internal_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_mod_delayed_SUITE.erl

@@ -25,7 +25,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
--include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 %%--------------------------------------------------------------------
 %% Setups

apps/emqx/test/emqx_mod_presence_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_mod_rewrite_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -define(RULES, [{rewrite, pub, <<"x/#">>,<<"^x/y/(.+)$">>,<<"z/y/$1">>},

apps/emqx/test/emqx_mod_subscription_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_mountpoint_SUITE.erl

@@ -25,7 +25,7 @@
         , replvar/2
         ]).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_mqtt_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx/test/emqx_mqtt_caps_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_mqtt_props_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("emqx_ct_helpers/include/emqx_ct.hrl").
 

apps/emqx/test/emqx_mqueue_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -include_lib("eunit/include/eunit.hrl").
 

apps/emqx/test/emqx_packet_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -include_lib("eunit/include/eunit.hrl").
 

apps/emqx/test/emqx_plugins_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_reason_codes_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_request_handler.erl

@@ -18,7 +18,7 @@
 
 -export([start_link/4, stop/1]).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -type qos() :: emqx_mqtt_types:qos_name() | emqx_mqtt_types:qos().
 -type topic() :: emqx_topic:topic().

apps/emqx/test/emqx_request_responser_SUITE.erl

@@ -17,7 +17,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx/test/emqx_request_sender.erl

@@ -18,7 +18,7 @@
 
 -export([start_link/3, stop/1, send/6]).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 start_link(ResponseTopic, QoS, Options0) ->
     Parent = self(),

apps/emqx/test/emqx_router_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -define(R, emqx_router).

apps/emqx/test/emqx_session_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 all() -> emqx_ct:all(?MODULE).

apps/emqx/test/emqx_shared_sub_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx/test/emqx_sys_mon_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -define(SYSMON, emqx_sys_mon).

apps/emqx/test/emqx_takeover_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx/test/emqx_trie_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -define(TRIE, emqx_trie).

apps/emqx/test/emqx_ws_connection_SUITE.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_ws_connection_SUITE).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -compile(export_all).

apps/emqx/test/mqtt_protocol_v5_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx.hrl").
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -import(lists, [nth/2]).

apps/emqx/test/props/prop_emqx_frame.erl

@@ -16,7 +16,7 @@
 
 -module(prop_emqx_frame).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("proper/include/proper.hrl").
 
 %%--------------------------------------------------------------------