From 7bea9920b5bafa2ecbdfab1ca6e42100556afcf7 Mon Sep 17 00:00:00 2001
From: terry-xiaoyu <506895667@qq.com>
Date: Sat, 31 Oct 2020 11:00:12 +0800
Subject: [PATCH] feature(project): point header to emqx_libs

---
 apps/emqx/rebar.config                          |  1 +
 apps/emqx/src/emqx.app.src                      |  3 +--
 apps/emqx/src/emqx.erl                          |  6 +++---
 apps/emqx/src/emqx_access_control.erl           |  2 +-
 apps/emqx/src/emqx_access_rule.erl              |  2 +-
 apps/emqx/src/emqx_acl_cache.erl                |  2 +-
 apps/emqx/src/emqx_alarm.erl                    |  4 ++--
 apps/emqx/src/emqx_alarm_handler.erl            |  4 ++--
 apps/emqx/src/emqx_banned.erl                   |  6 +++---
 apps/emqx/src/emqx_broker.erl                   |  8 ++++----
 apps/emqx/src/emqx_broker_helper.erl            |  4 ++--
 apps/emqx/src/emqx_channel.erl                  |  8 ++++----
 apps/emqx/src/emqx_cm.erl                       |  6 +++---
 apps/emqx/src/emqx_cm_locker.erl                |  4 ++--
 apps/emqx/src/emqx_cm_registry.erl              |  6 +++---
 apps/emqx/src/emqx_connection.erl               |  8 ++++----
 apps/emqx/src/emqx_ctl.erl                      |  4 ++--
 apps/emqx/src/emqx_flapping.erl                 |  6 +++---
 apps/emqx/src/emqx_frame.erl                    |  4 ++--
 apps/emqx/src/emqx_gc.erl                       |  2 +-
 apps/emqx/src/emqx_global_gc.erl                |  2 +-
 apps/emqx/src/emqx_hooks.erl                    |  4 ++--
 apps/emqx/src/emqx_limiter.erl                  |  2 +-
 apps/emqx/src/emqx_listeners.erl                |  2 +-
 apps/emqx/src/emqx_message.erl                  |  6 +++---
 apps/emqx/src/emqx_metrics.erl                  |  6 +++---
 apps/emqx/src/emqx_misc.erl                     |  4 ++--
 apps/emqx/src/emqx_mod_acl_internal.erl         |  4 ++--
 apps/emqx/src/emqx_mod_delayed.erl              |  4 ++--
 apps/emqx/src/emqx_mod_presence.erl             |  4 ++--
 apps/emqx/src/emqx_mod_rewrite.erl              |  4 ++--
 apps/emqx/src/emqx_mod_subscription.erl         |  4 ++--
 apps/emqx/src/emqx_mod_sup.erl                  |  2 +-
 apps/emqx/src/emqx_mod_topic_metrics.erl        |  6 +++---
 apps/emqx/src/emqx_modules.erl                  |  2 +-
 apps/emqx/src/emqx_mountpoint.erl               |  4 ++--
 apps/emqx/src/emqx_mqtt_caps.erl                |  4 ++--
 apps/emqx/src/emqx_mqtt_props.erl               |  2 +-
 apps/emqx/src/emqx_mqueue.erl                   |  6 +++---
 apps/emqx/src/emqx_os_mon.erl                   |  4 ++--
 apps/emqx/src/emqx_packet.erl                   |  4 ++--
 apps/emqx/src/emqx_pd.erl                       |  2 +-
 apps/emqx/src/emqx_plugins.erl                  |  6 +++---
 apps/emqx/src/emqx_pool.erl                     |  4 ++--
 apps/emqx/src/emqx_pool_sup.erl                 |  2 +-
 apps/emqx/src/emqx_psk.erl                      |  2 +-
 apps/emqx/src/emqx_reason_codes.erl             |  2 +-
 apps/emqx/src/emqx_router.erl                   |  6 +++---
 apps/emqx/src/emqx_router_helper.erl            |  6 +++---
 apps/emqx/src/emqx_session.erl                  |  8 ++++----
 apps/emqx/src/emqx_shared_sub.erl               |  8 ++++----
 apps/emqx/src/emqx_stats.erl                    |  6 +++---
 apps/emqx/src/emqx_sup.erl                      |  2 +-
 apps/emqx/src/emqx_sys.erl                      |  6 +++---
 apps/emqx/src/emqx_sys_mon.erl                  |  4 ++--
 apps/emqx/src/emqx_tracer.erl                   |  4 ++--
 apps/emqx/src/emqx_trie.erl                     |  2 +-
 apps/emqx/src/emqx_types.erl                    |  6 +++---
 apps/emqx/src/emqx_vm_mon.erl                   |  2 +-
 apps/emqx/src/emqx_ws_connection.erl            |  8 ++++----
 apps/emqx/src/emqx_zone.erl                     |  8 ++++----
 apps/emqx/test/emqx_SUITE.erl                   |  2 +-
 apps/emqx/test/emqx_access_control_SUITE.erl    |  2 +-
 apps/emqx/test/emqx_alarm_SUITE.erl             |  4 ++--
 apps/emqx/test/emqx_banned_SUITE.erl            |  2 +-
 apps/emqx/test/emqx_broker_SUITE.erl            |  4 ++--
 apps/emqx/test/emqx_channel_SUITE.erl           |  4 ++--
 apps/emqx/test/emqx_client_SUITE.erl            |  2 +-
 apps/emqx/test/emqx_cm_SUITE.erl                |  2 +-
 apps/emqx/test/emqx_connection_SUITE.erl        |  2 +-
 apps/emqx/test/emqx_frame_SUITE.erl             |  2 +-
 apps/emqx/test/emqx_listeners_SUITE.erl         |  4 ++--
 apps/emqx/test/emqx_message_SUITE.erl           |  4 ++--
 apps/emqx/test/emqx_metrics_SUITE.erl           |  2 +-
 apps/emqx/test/emqx_mod_acl_internal_SUITE.erl  |  2 +-
 apps/emqx/test/emqx_mod_delayed_SUITE.erl       |  2 +-
 apps/emqx/test/emqx_mod_presence_SUITE.erl      |  2 +-
 apps/emqx/test/emqx_mod_rewrite_SUITE.erl       |  2 +-
 apps/emqx/test/emqx_mod_subscription_SUITE.erl  |  2 +-
 apps/emqx/test/emqx_mountpoint_SUITE.erl        |  2 +-
 apps/emqx/test/emqx_mqtt_SUITE.erl              |  2 +-
 apps/emqx/test/emqx_mqtt_caps_SUITE.erl         |  2 +-
 apps/emqx/test/emqx_mqtt_props_SUITE.erl        |  2 +-
 apps/emqx/test/emqx_mqueue_SUITE.erl            |  4 ++--
 apps/emqx/test/emqx_packet_SUITE.erl            |  4 ++--
 apps/emqx/test/emqx_plugins_SUITE.erl           |  2 +-
 apps/emqx/test/emqx_reason_codes_SUITE.erl      |  2 +-
 apps/emqx/test/emqx_request_handler.erl         |  2 +-
 apps/emqx/test/emqx_request_responser_SUITE.erl |  2 +-
 apps/emqx/test/emqx_request_sender.erl          |  2 +-
 apps/emqx/test/emqx_router_SUITE.erl            |  2 +-
 apps/emqx/test/emqx_session_SUITE.erl           |  2 +-
 apps/emqx/test/emqx_shared_sub_SUITE.erl        |  2 +-
 apps/emqx/test/emqx_sys_mon_SUITE.erl           |  2 +-
 apps/emqx/test/emqx_takeover_SUITE.erl          |  2 +-
 apps/emqx/test/emqx_trie_SUITE.erl              |  2 +-
 apps/emqx/test/emqx_ws_connection_SUITE.erl     |  4 ++--
 apps/emqx/test/mqtt_protocol_v5_SUITE.erl       |  4 ++--
 apps/emqx/test/props/prop_emqx_frame.erl        |  2 +-
 apps/emqx/test/props/prop_emqx_reason_codes.erl |  2 +-
 scripts/run_emqx.escript                        | 17 -----------------
 101 files changed, 180 insertions(+), 197 deletions(-)
 create mode 100644 apps/emqx/rebar.config
 delete mode 100644 scripts/run_emqx.escript

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
new file mode 100644
index 000000000..7b1f06cca
--- /dev/null
+++ b/apps/emqx/rebar.config
@@ -0,0 +1 @@
+{deps, []}.
\ No newline at end of file
diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index ac5c50d7c..698e45b92 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/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"]},
diff --git a/apps/emqx/src/emqx.erl b/apps/emqx/src/emqx.erl
index 2c6d444e7..4f4f4964f 100644
--- a/apps/emqx/src/emqx.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_access_control.erl b/apps/emqx/src/emqx_access_control.erl
index 32383b3f0..2495d3579 100644
--- a/apps/emqx/src/emqx_access_control.erl
+++ b/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]).
 
diff --git a/apps/emqx/src/emqx_access_rule.erl b/apps/emqx/src/emqx_access_rule.erl
index 89943cdbd..a5bc2aad9 100644
--- a/apps/emqx/src/emqx_access_rule.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_acl_cache.erl b/apps/emqx/src/emqx_acl_cache.erl
index ef549d8d3..0f8693d72 100644
--- a/apps/emqx/src/emqx_acl_cache.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_alarm.erl b/apps/emqx/src/emqx_alarm.erl
index 37d6fe1e8..f3f696adb 100644
--- a/apps/emqx/src/emqx_alarm.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_alarm_handler.erl b/apps/emqx/src/emqx_alarm_handler.erl
index 7f66f6eb1..8c73b5605 100644
--- a/apps/emqx/src/emqx_alarm_handler.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_banned.erl b/apps/emqx/src/emqx_banned.erl
index 80f93be70..f4c5d728f 100644
--- a/apps/emqx/src/emqx_banned.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_broker.erl b/apps/emqx/src/emqx_broker.erl
index 85c6ad070..5a1c1d9d3 100644
--- a/apps/emqx/src/emqx_broker.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_broker_helper.erl b/apps/emqx/src/emqx_broker_helper.erl
index 18ebbccf2..535d81a35 100644
--- a/apps/emqx/src/emqx_broker_helper.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl
index 71b89f153..312fe60c9 100644
--- a/apps/emqx/src/emqx_channel.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl
index 200a5f08e..1654f4b4e 100644
--- a/apps/emqx/src/emqx_cm.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_cm_locker.erl b/apps/emqx/src/emqx_cm_locker.erl
index b5979c706..84e24a568 100644
--- a/apps/emqx/src/emqx_cm_locker.erl
+++ b/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]).
 
diff --git a/apps/emqx/src/emqx_cm_registry.erl b/apps/emqx/src/emqx_cm_registry.erl
index 6609d70f4..fb53d571d 100644
--- a/apps/emqx/src/emqx_cm_registry.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_connection.erl b/apps/emqx/src/emqx_connection.erl
index 2ab7f6c1e..632357f83 100644
--- a/apps/emqx/src/emqx_connection.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_ctl.erl b/apps/emqx/src/emqx_ctl.erl
index 45cf34543..ffe3537b5 100644
--- a/apps/emqx/src/emqx_ctl.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_flapping.erl b/apps/emqx/src/emqx_flapping.erl
index 0c1b60ddd..7a0602647 100644
--- a/apps/emqx/src/emqx_flapping.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_frame.erl b/apps/emqx/src/emqx_frame.erl
index 1c27548f7..5fb893e57 100644
--- a/apps/emqx/src/emqx_frame.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_gc.erl b/apps/emqx/src/emqx_gc.erl
index 3bf826f73..908ab50b6 100644
--- a/apps/emqx/src/emqx_gc.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_global_gc.erl b/apps/emqx/src/emqx_global_gc.erl
index da953e347..7c7fdc461 100644
--- a/apps/emqx/src/emqx_global_gc.erl
+++ b/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]).
 
diff --git a/apps/emqx/src/emqx_hooks.erl b/apps/emqx/src/emqx_hooks.erl
index 273071d75..3325ca87c 100644
--- a/apps/emqx/src/emqx_hooks.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_limiter.erl b/apps/emqx/src/emqx_limiter.erl
index e3ff7512f..ddcff03f4 100644
--- a/apps/emqx/src/emqx_limiter.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl
index ce256d147..456c06f6e 100644
--- a/apps/emqx/src/emqx_listeners.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_message.erl b/apps/emqx/src/emqx_message.erl
index decbb0c18..db85c5f79 100644
--- a/apps/emqx/src/emqx_message.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_metrics.erl b/apps/emqx/src/emqx_metrics.erl
index 2a5a82749..f68846cfb 100644
--- a/apps/emqx/src/emqx_metrics.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_misc.erl b/apps/emqx/src/emqx_misc.erl
index 88e3c91a6..dc2aac0a5 100644
--- a/apps/emqx/src/emqx_misc.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_mod_acl_internal.erl b/apps/emqx/src/emqx_mod_acl_internal.erl
index 7d5dd82c6..e7b498463 100644
--- a/apps/emqx/src/emqx_mod_acl_internal.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_mod_delayed.erl b/apps/emqx/src/emqx_mod_delayed.erl
index 208da68ca..524d9015a 100644
--- a/apps/emqx/src/emqx_mod_delayed.erl
+++ b/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]).
diff --git a/apps/emqx/src/emqx_mod_presence.erl b/apps/emqx/src/emqx_mod_presence.erl
index f5aa2279e..08e1be9d1 100644
--- a/apps/emqx/src/emqx_mod_presence.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_mod_rewrite.erl b/apps/emqx/src/emqx_mod_rewrite.erl
index f5e343eed..007f8fde4 100644
--- a/apps/emqx/src/emqx_mod_rewrite.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_mod_subscription.erl b/apps/emqx/src/emqx_mod_subscription.erl
index b6d04528b..7fcac81cc 100644
--- a/apps/emqx/src/emqx_mod_subscription.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_mod_sup.erl b/apps/emqx/src/emqx_mod_sup.erl
index b5512013c..dfae8125d 100644
--- a/apps/emqx/src/emqx_mod_sup.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_mod_topic_metrics.erl b/apps/emqx/src/emqx_mod_topic_metrics.erl
index f0e638f4d..cfcf1ae79 100644
--- a/apps/emqx/src/emqx_mod_topic_metrics.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_modules.erl b/apps/emqx/src/emqx_modules.erl
index 55fb44001..58621f28a 100644
--- a/apps/emqx/src/emqx_modules.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_mountpoint.erl b/apps/emqx/src/emqx_mountpoint.erl
index 8dfc23b30..83367655f 100644
--- a/apps/emqx/src/emqx_mountpoint.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_mqtt_caps.erl b/apps/emqx/src/emqx_mqtt_caps.erl
index f29d59915..7f4896ebd 100644
--- a/apps/emqx/src/emqx_mqtt_caps.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_mqtt_props.erl b/apps/emqx/src/emqx_mqtt_props.erl
index 7acea6761..643b8cc76 100644
--- a/apps/emqx/src/emqx_mqtt_props.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_mqueue.erl b/apps/emqx/src/emqx_mqueue.erl
index f77a1d98f..5286dfe10 100644
--- a/apps/emqx/src/emqx_mqueue.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_os_mon.erl b/apps/emqx/src/emqx_os_mon.erl
index 49517d8a6..0e2dbbd15 100644
--- a/apps/emqx/src/emqx_os_mon.erl
+++ b/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).
 
diff --git a/apps/emqx/src/emqx_packet.erl b/apps/emqx/src/emqx_packet.erl
index 015f95e0d..25b9d9996 100644
--- a/apps/emqx/src/emqx_packet.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_pd.erl b/apps/emqx/src/emqx_pd.erl
index 8754ac090..c62f761b3 100644
--- a/apps/emqx/src/emqx_pd.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_plugins.erl b/apps/emqx/src/emqx_plugins.erl
index faa6abae3..5eb9267c7 100644
--- a/apps/emqx/src/emqx_plugins.erl
+++ b/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([]) ->
diff --git a/apps/emqx/src/emqx_pool.erl b/apps/emqx/src/emqx_pool.erl
index 49a7c2cac..00fdb4c8b 100644
--- a/apps/emqx/src/emqx_pool.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_pool_sup.erl b/apps/emqx/src/emqx_pool_sup.erl
index 080cd842b..7c2d6639d 100644
--- a/apps/emqx/src/emqx_pool_sup.erl
+++ b/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]).
 
diff --git a/apps/emqx/src/emqx_psk.erl b/apps/emqx/src/emqx_psk.erl
index f1170d2d9..057dc3e84 100644
--- a/apps/emqx/src/emqx_psk.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_reason_codes.erl b/apps/emqx/src/emqx_reason_codes.erl
index 8e96df165..c9ada26a4 100644
--- a/apps/emqx/src/emqx_reason_codes.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_router.erl b/apps/emqx/src/emqx_router.erl
index cc358758f..00fb934f6 100644
--- a/apps/emqx/src/emqx_router.erl
+++ b/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]").
diff --git a/apps/emqx/src/emqx_router_helper.erl b/apps/emqx/src/emqx_router_helper.erl
index ba5cc5543..33761c027 100644
--- a/apps/emqx/src/emqx_router_helper.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_session.erl b/apps/emqx/src/emqx_session.erl
index e89943f2a..9961e5a75 100644
--- a/apps/emqx/src/emqx_session.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_shared_sub.erl b/apps/emqx/src/emqx_shared_sub.erl
index 71372cd90..863b57868 100644
--- a/apps/emqx/src/emqx_shared_sub.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_stats.erl b/apps/emqx/src/emqx_stats.erl
index a6d53cfeb..6a120b55d 100644
--- a/apps/emqx/src/emqx_stats.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_sup.erl b/apps/emqx/src/emqx_sup.erl
index c0aa3a2a8..f841f57d1 100644
--- a/apps/emqx/src/emqx_sup.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_sys.erl b/apps/emqx/src/emqx_sys.erl
index 38387b3ce..64da255f9 100644
--- a/apps/emqx/src/emqx_sys.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_sys_mon.erl b/apps/emqx/src/emqx_sys_mon.erl
index 5ee22c563..514b5f7d2 100644
--- a/apps/emqx/src/emqx_sys_mon.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_tracer.erl b/apps/emqx/src/emqx_tracer.erl
index a01dcb27f..32b74ec54 100644
--- a/apps/emqx/src/emqx_tracer.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_trie.erl b/apps/emqx/src/emqx_trie.erl
index 4189c0270..051cc1d84 100644
--- a/apps/emqx/src/emqx_trie.erl
+++ b/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]).
diff --git a/apps/emqx/src/emqx_types.erl b/apps/emqx/src/emqx_types.erl
index 291e35538..2794b8834 100644
--- a/apps/emqx/src/emqx_types.erl
+++ b/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
diff --git a/apps/emqx/src/emqx_vm_mon.erl b/apps/emqx/src/emqx_vm_mon.erl
index 791e700d1..98d4fccb3 100644
--- a/apps/emqx/src/emqx_vm_mon.erl
+++ b/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]).
diff --git a/apps/emqx/src/emqx_ws_connection.erl b/apps/emqx/src/emqx_ws_connection.erl
index 33b882768..a6610796c 100644
--- a/apps/emqx/src/emqx_ws_connection.erl
+++ b/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]").
 
diff --git a/apps/emqx/src/emqx_zone.erl b/apps/emqx/src/emqx_zone.erl
index 6cec6c1ee..19a64ba21 100644
--- a/apps/emqx/src/emqx_zone.erl
+++ b/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]").
 
diff --git a/apps/emqx/test/emqx_SUITE.erl b/apps/emqx/test/emqx_SUITE.erl
index 48c2177e1..37e2d21c3 100644
--- a/apps/emqx/test/emqx_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_access_control_SUITE.erl b/apps/emqx/test/emqx_access_control_SUITE.erl
index a327eea6d..7da7a28cb 100644
--- a/apps/emqx/test/emqx_access_control_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_alarm_SUITE.erl b/apps/emqx/test/emqx_alarm_SUITE.erl
index 863806ff6..c575ec375 100644
--- a/apps/emqx/test/emqx_alarm_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_banned_SUITE.erl b/apps/emqx/test/emqx_banned_SUITE.erl
index d99530e12..885bff9e4 100644
--- a/apps/emqx/test/emqx_banned_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_broker_SUITE.erl b/apps/emqx/test/emqx_broker_SUITE.erl
index d52132497..7bc4f5e84 100644
--- a/apps/emqx/test/emqx_broker_SUITE.erl
+++ b/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).
 
diff --git a/apps/emqx/test/emqx_channel_SUITE.erl b/apps/emqx/test/emqx_channel_SUITE.erl
index 613da40ac..71bfe6e8b 100644
--- a/apps/emqx/test/emqx_channel_SUITE.erl
+++ b/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").
 
 
diff --git a/apps/emqx/test/emqx_client_SUITE.erl b/apps/emqx/test/emqx_client_SUITE.erl
index e231e40ab..eb552ae90 100644
--- a/apps/emqx/test/emqx_client_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_cm_SUITE.erl b/apps/emqx/test/emqx_cm_SUITE.erl
index 6a4b84d01..7ba4f56c3 100644
--- a/apps/emqx/test/emqx_cm_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_connection_SUITE.erl b/apps/emqx/test/emqx_connection_SUITE.erl
index b908fe4ab..0c3706787 100644
--- a/apps/emqx/test/emqx_connection_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_frame_SUITE.erl b/apps/emqx/test/emqx_frame_SUITE.erl
index 5d4e146db..8471cd1f2 100644
--- a/apps/emqx/test/emqx_frame_SUITE.erl
+++ b/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").
diff --git a/apps/emqx/test/emqx_listeners_SUITE.erl b/apps/emqx/test/emqx_listeners_SUITE.erl
index 1472cc072..d7960bd57 100644
--- a/apps/emqx/test/emqx_listeners_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_message_SUITE.erl b/apps/emqx/test/emqx_message_SUITE.erl
index 2eebdc1dc..fc52feb24 100644
--- a/apps/emqx/test/emqx_message_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_metrics_SUITE.erl b/apps/emqx/test/emqx_metrics_SUITE.erl
index 33f297e7d..9f107bffd 100644
--- a/apps/emqx/test/emqx_metrics_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_mod_acl_internal_SUITE.erl b/apps/emqx/test/emqx_mod_acl_internal_SUITE.erl
index bd9a0bf5a..8734e5f55 100644
--- a/apps/emqx/test/emqx_mod_acl_internal_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_mod_delayed_SUITE.erl b/apps/emqx/test/emqx_mod_delayed_SUITE.erl
index 3759e8c4d..2badb9867 100644
--- a/apps/emqx/test/emqx_mod_delayed_SUITE.erl
+++ b/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
diff --git a/apps/emqx/test/emqx_mod_presence_SUITE.erl b/apps/emqx/test/emqx_mod_presence_SUITE.erl
index 49d5d206b..955526558 100644
--- a/apps/emqx/test/emqx_mod_presence_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_mod_rewrite_SUITE.erl b/apps/emqx/test/emqx_mod_rewrite_SUITE.erl
index e3c19200e..1dcfb87b2 100644
--- a/apps/emqx/test/emqx_mod_rewrite_SUITE.erl
+++ b/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">>},
diff --git a/apps/emqx/test/emqx_mod_subscription_SUITE.erl b/apps/emqx/test/emqx_mod_subscription_SUITE.erl
index 06cd17cea..57fbf3b66 100644
--- a/apps/emqx/test/emqx_mod_subscription_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_mountpoint_SUITE.erl b/apps/emqx/test/emqx_mountpoint_SUITE.erl
index 26d717cd8..56b000f40 100644
--- a/apps/emqx/test/emqx_mountpoint_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_mqtt_SUITE.erl b/apps/emqx/test/emqx_mqtt_SUITE.erl
index 27bd46a7f..371f07ee8 100644
--- a/apps/emqx/test/emqx_mqtt_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_mqtt_caps_SUITE.erl b/apps/emqx/test/emqx_mqtt_caps_SUITE.erl
index 695d69642..c65647608 100644
--- a/apps/emqx/test/emqx_mqtt_caps_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_mqtt_props_SUITE.erl b/apps/emqx/test/emqx_mqtt_props_SUITE.erl
index f440b386d..f35d7f433 100644
--- a/apps/emqx/test/emqx_mqtt_props_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_mqueue_SUITE.erl b/apps/emqx/test/emqx_mqueue_SUITE.erl
index 3be1344a2..d950decb6 100644
--- a/apps/emqx/test/emqx_mqueue_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_packet_SUITE.erl b/apps/emqx/test/emqx_packet_SUITE.erl
index 00ab6e0c5..0b95dbd24 100644
--- a/apps/emqx/test/emqx_packet_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_plugins_SUITE.erl b/apps/emqx/test/emqx_plugins_SUITE.erl
index ad99209e6..9b7e22289 100644
--- a/apps/emqx/test/emqx_plugins_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_reason_codes_SUITE.erl b/apps/emqx/test/emqx_reason_codes_SUITE.erl
index 027d6d85f..5ed810f24 100644
--- a/apps/emqx/test/emqx_reason_codes_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_request_handler.erl b/apps/emqx/test/emqx_request_handler.erl
index 690d45d34..c76e093c8 100644
--- a/apps/emqx/test/emqx_request_handler.erl
+++ b/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().
diff --git a/apps/emqx/test/emqx_request_responser_SUITE.erl b/apps/emqx/test/emqx_request_responser_SUITE.erl
index 7d66c7760..67187ed3f 100644
--- a/apps/emqx/test/emqx_request_responser_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_request_sender.erl b/apps/emqx/test/emqx_request_sender.erl
index aed845a42..b07622bb9 100644
--- a/apps/emqx/test/emqx_request_sender.erl
+++ b/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(),
diff --git a/apps/emqx/test/emqx_router_SUITE.erl b/apps/emqx/test/emqx_router_SUITE.erl
index fb2d34ea7..06d310072 100644
--- a/apps/emqx/test/emqx_router_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_session_SUITE.erl b/apps/emqx/test/emqx_session_SUITE.erl
index dd9611b71..452e1d622 100644
--- a/apps/emqx/test/emqx_session_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_shared_sub_SUITE.erl b/apps/emqx/test/emqx_shared_sub_SUITE.erl
index 218e8a073..c827a8fc2 100644
--- a/apps/emqx/test/emqx_shared_sub_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_sys_mon_SUITE.erl b/apps/emqx/test/emqx_sys_mon_SUITE.erl
index ef0e31957..520c45e54 100644
--- a/apps/emqx/test/emqx_sys_mon_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_takeover_SUITE.erl b/apps/emqx/test/emqx_takeover_SUITE.erl
index ca5ebb084..98f258440 100644
--- a/apps/emqx/test/emqx_takeover_SUITE.erl
+++ b/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").
 
diff --git a/apps/emqx/test/emqx_trie_SUITE.erl b/apps/emqx/test/emqx_trie_SUITE.erl
index f1db3813c..b3d7549f7 100644
--- a/apps/emqx/test/emqx_trie_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/emqx_ws_connection_SUITE.erl b/apps/emqx/test/emqx_ws_connection_SUITE.erl
index 125b14a74..83fbcb195 100644
--- a/apps/emqx/test/emqx_ws_connection_SUITE.erl
+++ b/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).
diff --git a/apps/emqx/test/mqtt_protocol_v5_SUITE.erl b/apps/emqx/test/mqtt_protocol_v5_SUITE.erl
index 50fc9c04d..f171d0f67 100644
--- a/apps/emqx/test/mqtt_protocol_v5_SUITE.erl
+++ b/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]).
diff --git a/apps/emqx/test/props/prop_emqx_frame.erl b/apps/emqx/test/props/prop_emqx_frame.erl
index 731e4ba1e..da763f8f5 100644
--- a/apps/emqx/test/props/prop_emqx_frame.erl
+++ b/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").
 
 %%--------------------------------------------------------------------
diff --git a/apps/emqx/test/props/prop_emqx_reason_codes.erl b/apps/emqx/test/props/prop_emqx_reason_codes.erl
index f6f5e81b0..2b90d2e43 100644
--- a/apps/emqx/test/props/prop_emqx_reason_codes.erl
+++ b/apps/emqx/test/props/prop_emqx_reason_codes.erl
@@ -16,7 +16,7 @@
 
 -module(prop_emqx_reason_codes).
 
--include("emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 -include_lib("proper/include/proper.hrl").
 
 %%--------------------------------------------------------------------
diff --git a/scripts/run_emqx.escript b/scripts/run_emqx.escript
deleted file mode 100644
index 10767820b..000000000
--- a/scripts/run_emqx.escript
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env escript
-
-main(_) ->
-    start().
-
-start() ->
-    ok = application:load(mnesia),
-    MnesiaName = lists:concat(["Mnesia.", atom_to_list(node())]),
-    MnesiaDir = filename:join(["_build", "data", MnesiaName]),
-    ok = application:set_env(mnesia, dir, MnesiaDir),
-    SpecEmqxConfig = fun(_) -> ok end,
-    start(SpecEmqxConfig).
-
-start(SpecEmqxConfig) ->
-    SchemaPath = filename:join(["priv", "emqx.schema"]),
-    ConfPath = filename:join(["etc", "emqx.conf"]),
-    emqx_ct_helpers:start_app(emqx, SchemaPath, ConfPath, SpecEmqxConfig).