From c091e89796fe075000e0a2b1807b1cf5193835ef Mon Sep 17 00:00:00 2001
From: Feng Lee <feng@emqx.io>
Date: Tue, 23 Jul 2019 10:56:14 +0800
Subject: [PATCH] Remove the unnecessary include/emqx_client.hrl

---
 include/emqx_client.hrl | 21 ---------------------
 src/emqx_client.erl     | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 include/emqx_client.hrl

diff --git a/include/emqx_client.hrl b/include/emqx_client.hrl
deleted file mode 100644
index bf2f49283..000000000
--- a/include/emqx_client.hrl
+++ /dev/null
@@ -1,21 +0,0 @@
-%% Copyright (c) 2013-2019 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-
-
--ifndef(EMQX_CLIENT_HRL).
--define(EMQX_CLIENT_HRL, true).
--include("emqx_mqtt.hrl").
--record(mqtt_msg, {qos = ?QOS_0, retain = false, dup = false,
-                   packet_id, topic, props, payload}).
--endif.
diff --git a/src/emqx_client.erl b/src/emqx_client.erl
index 41ff2f72e..2125006a9 100644
--- a/src/emqx_client.erl
+++ b/src/emqx_client.erl
@@ -20,7 +20,7 @@
 
 -include("logger.hrl").
 -include("types.hrl").
--include("emqx_client.hrl").
+-include("emqx_mqtt.hrl").
 
 -logger_header("[Client]").
 
@@ -144,7 +144,17 @@
                 | {force_ping, boolean()}
                 | {properties, properties()}).
 
--type(mqtt_msg() :: #mqtt_msg{}).
+-record(mqtt_msg, {
+          qos = ?QOS_0,
+          retain = false,
+          dup = false,
+          packet_id,
+          topic,
+          props,
+          payload
+         }).
+
+-opaque(mqtt_msg() :: #mqtt_msg{}).
 
 -record(state, {name            :: atom(),
                 owner           :: pid(),