diff --git a/BUILD b/BUILD
index cb791ed906..efaaa052a8 100644
--- a/BUILD
+++ b/BUILD
@@ -196,30 +196,6 @@ cc_library(
 	visibility = ["//visibility:public"],
 )
 
-cc_library(
-	name = 'kafka_message',
-	hdrs = [
-		'src/factory/KafkaTaskImpl.inl',
-		'src/protocol/KafkaDataTypes.h',
-		'src/protocol/KafkaMessage.h',
-		'src/protocol/KafkaResult.h',
-		'src/protocol/kafka_parser.h',
-	],
-	includes = [
-		'src/factory',
-		'src/protocol',
-	],
-	srcs = [
-		'src/factory/KafkaTaskImpl.cc',
-		'src/protocol/KafkaMessage.cc',
-		'src/protocol/KafkaResult.cc',
-	],
-	copts = ['-fno-rtti'],
-	deps = [
-		':common',
-	],
-)
-
 cc_library(
 	name = 'kafka',
 	hdrs = [
@@ -239,10 +215,12 @@ cc_library(
 		'src/client/WFKafkaClient.cc',
 		'src/protocol/KafkaDataTypes.cc',
 		'src/protocol/kafka_parser.c',
+		'src/factory/KafkaTaskImpl.cc',
+		'src/protocol/KafkaMessage.cc',
+		'src/protocol/KafkaResult.cc',
 	],
 	deps = [
 		':common',
-		':kafka_message',
 	],
 	visibility = ["//visibility:public"],
 	linkopts = [
@@ -276,37 +254,37 @@ cc_library(
 )
 
 cc_binary(
-	 name = 'helloworld',
-	 srcs = ['tutorial/tutorial-00-helloworld.cc'],
-	 deps = [':http'],
+	name = 'helloworld',
+	srcs = ['tutorial/tutorial-00-helloworld.cc'],
+	deps = [':http'],
 )
 cc_binary(
-	 name = 'wget',
-	 srcs = ['tutorial/tutorial-01-wget.cc'],
-	 deps = [':http'],
+	name = 'wget',
+	srcs = ['tutorial/tutorial-01-wget.cc'],
+	deps = [':http'],
 )
 cc_binary(
-	 name = 'redis_cli',
-	 srcs = ['tutorial/tutorial-02-redis_cli.cc'],
-	 deps = [':redis'],
+	name = 'redis_cli',
+	srcs = ['tutorial/tutorial-02-redis_cli.cc'],
+	deps = [':redis'],
 )
 
 cc_binary(
-	 name = 'wget_to_redis',
-	 srcs = ['tutorial/tutorial-03-wget_to_redis.cc'],
-	 deps = [':http', 'redis'],
+	name = 'wget_to_redis',
+	srcs = ['tutorial/tutorial-03-wget_to_redis.cc'],
+	deps = [':http', 'redis'],
 )
 
 cc_binary(
-	 name = 'http_echo_server',
-	 srcs = ['tutorial/tutorial-04-http_echo_server.cc'],
-	 deps = [':http'],
+	name = 'http_echo_server',
+	srcs = ['tutorial/tutorial-04-http_echo_server.cc'],
+	deps = [':http'],
 )
 
 cc_binary(
-	 name = 'http_proxy',
-	 srcs = ['tutorial/tutorial-05-http_proxy.cc'],
-	 deps = [':http'],
+	name = 'http_proxy',
+	srcs = ['tutorial/tutorial-05-http_proxy.cc'],
+	deps = [':http'],
 )
 
 cc_binary(
@@ -316,21 +294,21 @@ cc_binary(
 )
 
 cc_binary(
-	 name = 'sort_task',
-	 srcs = ['tutorial/tutorial-07-sort_task.cc'],
-	 deps = [':common'],
+	name = 'sort_task',
+	srcs = ['tutorial/tutorial-07-sort_task.cc'],
+	deps = [':common'],
 )
 
 cc_binary(
-	 name = 'matrix_multiply',
-	 srcs = ['tutorial/tutorial-08-matrix_multiply.cc'],
-	 deps = [':common'],
+	name = 'matrix_multiply',
+	srcs = ['tutorial/tutorial-08-matrix_multiply.cc'],
+	deps = [':common'],
 )
 
 cc_binary(
-	 name = 'http_file_server',
-	 srcs = ['tutorial/tutorial-09-http_file_server.cc'],
-	 deps = [':http'],
+	name = 'http_file_server',
+	srcs = ['tutorial/tutorial-09-http_file_server.cc'],
+	deps = [':http'],
 )
 
 cc_library(
@@ -340,45 +318,45 @@ cc_library(
 )
 
 cc_binary(
-	 name = 'server',
-	 srcs = [
-	 	  'tutorial/tutorial-10-user_defined_protocol/server.cc',
-		  'tutorial/tutorial-10-user_defined_protocol/message.cc',
-	 ],
-	 deps = [':common', ':user_hdrs'],
+	name = 'server',
+	srcs = [
+		'tutorial/tutorial-10-user_defined_protocol/server.cc',
+		'tutorial/tutorial-10-user_defined_protocol/message.cc',
+	],
+	deps = [':common', ':user_hdrs'],
 )
 
 cc_binary(
-	 name = 'client',
-	 srcs = [
-	 	  'tutorial/tutorial-10-user_defined_protocol/client.cc',
-		  'tutorial/tutorial-10-user_defined_protocol/message.cc',
-	 ],
-	 deps = [':common', ':user_hdrs'],
+	name = 'client',
+	srcs = [
+		'tutorial/tutorial-10-user_defined_protocol/client.cc',
+		'tutorial/tutorial-10-user_defined_protocol/message.cc',
+	],
+	deps = [':common', ':user_hdrs'],
 )
 
 cc_binary(
-	 name = 'graph_task',
-	 srcs = ['tutorial/tutorial-11-graph_task.cc'],
-	 deps = [':http'],
+	name = 'graph_task',
+	srcs = ['tutorial/tutorial-11-graph_task.cc'],
+	deps = [':http'],
 )
 
 cc_binary(
-	 name = 'mysql_cli',
-	 srcs = ['tutorial/tutorial-12-mysql_cli.cc'],
-	 deps = [':mysql'],
+	name = 'mysql_cli',
+	srcs = ['tutorial/tutorial-12-mysql_cli.cc'],
+	deps = [':mysql'],
 )
 
 cc_binary(
-	 name = 'kafka_cli',
-	 srcs = ['tutorial/tutorial-13-kafka_cli.cc'],
-	 deps = [':kafka', ':workflow_hdrs'],
+	name = 'kafka_cli',
+	srcs = ['tutorial/tutorial-13-kafka_cli.cc'],
+	deps = [':kafka', ':workflow_hdrs'],
 )
 
 cc_binary(
-	 name = 'consul_cli',
-	 srcs = ['tutorial/tutorial-14-consul_cli.cc'],
-	 deps = [':consul'],
+	name = 'consul_cli',
+	srcs = ['tutorial/tutorial-14-consul_cli.cc'],
+	deps = [':consul'],
 )
 
 cc_binary(
@@ -409,9 +387,9 @@ cc_binary(
 )
 
 cc_binary(
-	 name = 'redis_subscriber',
-	 srcs = ['tutorial/tutorial-18-redis_subscriber.cc'],
-	 deps = [':redis'],
+	name = 'redis_subscriber',
+	srcs = ['tutorial/tutorial-18-redis_subscriber.cc'],
+	deps = [':redis'],
 )
 
 cc_binary(
diff --git a/src/factory/CMakeLists.txt b/src/factory/CMakeLists.txt
index c8efcaf7e8..6a247ba84b 100644
--- a/src/factory/CMakeLists.txt
+++ b/src/factory/CMakeLists.txt
@@ -33,5 +33,4 @@ if (KAFKA STREQUAL "y")
 		KafkaTaskImpl.cc
 	)
 	add_library("factory_kafka" OBJECT ${SRC})
-	set_property(SOURCE KafkaTaskImpl.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
 endif ()
diff --git a/src/factory/xmake.lua b/src/factory/xmake.lua
index e1e76b2c3e..9e7aa55989 100644
--- a/src/factory/xmake.lua
+++ b/src/factory/xmake.lua
@@ -13,7 +13,6 @@ target("kafka_factory")
     if has_config("kafka") then
         add_files("KafkaTaskImpl.cc")
         set_kind("object")
-        add_cxxflags("-fno-rtti")
         add_deps("factory")
         add_packages("zlib", "snappy", "zstd", "lz4")
     else
diff --git a/src/include/workflow/dns_types.h b/src/include/workflow/dns_types.h
new file mode 120000
index 0000000000..666230eff4
--- /dev/null
+++ b/src/include/workflow/dns_types.h
@@ -0,0 +1 @@
+../../protocol/dns_types.h
\ No newline at end of file
diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt
index 9c77764890..86e71a1e4b 100644
--- a/src/protocol/CMakeLists.txt
+++ b/src/protocol/CMakeLists.txt
@@ -43,6 +43,4 @@ if (KAFKA STREQUAL "y")
 		KafkaResult.cc
 	)
 	add_library("protocol_kafka" OBJECT ${SRC})
-	set_property(SOURCE KafkaMessage.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
-	set_property(SOURCE KafkaResult.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
 endif ()
diff --git a/src/protocol/KafkaDataTypes.cc b/src/protocol/KafkaDataTypes.cc
index 870366bb36..9a0be8aec1 100644
--- a/src/protocol/KafkaDataTypes.cc
+++ b/src/protocol/KafkaDataTypes.cc
@@ -664,4 +664,12 @@ const KafkaMeta *get_meta(const char *topic, KafkaMetaList *meta_list)
 	return NULL;
 }
 
+KafkaSnappySink::~KafkaSnappySink()
+{
+}
+
+KafkaSnappySource::~KafkaSnappySource()
+{
+}
+
 } /* namespace protocol */
diff --git a/src/protocol/KafkaDataTypes.h b/src/protocol/KafkaDataTypes.h
index 325b332b26..ca6013a0e1 100644
--- a/src/protocol/KafkaDataTypes.h
+++ b/src/protocol/KafkaDataTypes.h
@@ -1609,6 +1609,9 @@ class KafkaSnappySink : public snappy::Sink
 
 private:
 	KafkaBuffer *buffer;
+
+public:
+	virtual ~KafkaSnappySink();
 };
 
 class KafkaSnappySource : public snappy::Source
@@ -1643,6 +1646,9 @@ class KafkaSnappySource : public snappy::Source
 	KafkaBuffer *buffer;
 	size_t buf_size;
 	size_t pos;
+
+public:
+	virtual ~KafkaSnappySource();
 };
 
 }
diff --git a/src/protocol/KafkaResult.cc b/src/protocol/KafkaResult.cc
index f573ab5b39..6292ded4aa 100644
--- a/src/protocol/KafkaResult.cc
+++ b/src/protocol/KafkaResult.cc
@@ -27,12 +27,6 @@ enum
 	KAFKA_STATUS_END,
 };
 
-KafkaResult::KafkaResult()
-{
-	this->resp_vec = NULL;
-	this->resp_num = 0;
-}
-
 KafkaResult::~KafkaResult()
 {
 	delete []this->resp_vec;
diff --git a/src/protocol/KafkaResult.h b/src/protocol/KafkaResult.h
index d2d1631875..3ce575d7dc 100644
--- a/src/protocol/KafkaResult.h
+++ b/src/protocol/KafkaResult.h
@@ -43,7 +43,11 @@ class KafkaResult
 	void set_resp(KafkaResponse&& resp, size_t i);
 
 public:
-	KafkaResult();
+	KafkaResult()
+	{
+		this->resp_vec = NULL;
+		this->resp_num = 0;
+	}
 
 	virtual ~KafkaResult();
 
diff --git a/src/protocol/xmake.lua b/src/protocol/xmake.lua
index e2809936b7..cadd3ff899 100644
--- a/src/protocol/xmake.lua
+++ b/src/protocol/xmake.lua
@@ -36,23 +36,14 @@ target("protocol")
     set_kind("object")
     add_deps("basic_protocol", "mysql_protocol", "redis_protocol")
 
-target("kafka_message")
-    if has_config("kafka") then
-        add_files("KafkaMessage.cc",
-                  "KafkaResult.cc")
-        set_kind("object")
-        add_cxxflags("-fno-rtti")
-        add_packages("lz4", "zstd", "zlib", "snappy")
-    else
-        set_kind("phony")
-    end
-
 target("kafka_protocol")
     if has_config("kafka") then
         set_kind("object")
         add_files("kafka_parser.c",
-                  "KafkaDataTypes.cc")
-        add_deps("kafka_message", "protocol")
+                  "KafkaDataTypes.cc",
+                  "KafkaMessage.cc",
+                  "KafkaResult.cc")
+        add_deps("basic_protocol")
         add_packages("zlib", "snappy", "zstd", "lz4")
     else
         set_kind("phony")