diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index 6e2127dfc..3fc675160 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -46,7 +46,7 @@ C_SRCS := iscsi_tgt.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_vmd event
 SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf
-SPDK_LIB_LIST += thread util log log_rpc trace_rpc app_rpc net sock notify
+SPDK_LIB_LIST += thread util log log_rpc app_rpc net sock notify
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index a044b10ef..76f2874db 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -42,7 +42,7 @@ C_SRCS := nvmf_main.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += event_bdev event_copy event_nvmf event_net event_vmd
 SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json net sock
-SPDK_LIB_LIST += app_rpc log_rpc trace_rpc bdev_rpc notify
+SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc notify
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
index 4167c5660..6e0766aa5 100644
--- a/app/spdk_tgt/Makefile
+++ b/app/spdk_tgt/Makefile
@@ -52,7 +52,7 @@ endif
 
 SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event_vmd event
 SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json
-SPDK_LIB_LIST += app_rpc log_rpc trace_rpc bdev_rpc net sock notify
+SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net sock notify
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
diff --git a/app/vhost/Makefile b/app/vhost/Makefile
index 2bef6ecd9..0e15723c4 100644
--- a/app/vhost/Makefile
+++ b/app/vhost/Makefile
@@ -48,7 +48,7 @@ endif
 
 SPDK_LIB_LIST += event_bdev event_copy event_net event_scsi event_vmd event
 SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf
-SPDK_LIB_LIST += thread util log log_rpc trace_rpc app_rpc
+SPDK_LIB_LIST += thread util log log_rpc app_rpc
 SPDK_LIB_LIST += event_nbd nbd net sock notify
 
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
diff --git a/lib/trace/Makefile b/lib/trace/Makefile
index 262a5cdf9..3b8c0006b 100644
--- a/lib/trace/Makefile
+++ b/lib/trace/Makefile
@@ -34,9 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-C_SRCS = trace.c trace_flags.c
+C_SRCS = trace.c trace_flags.c trace_rpc.c
 LIBNAME = trace
 
-DIRS-y = rpc
-
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/trace/rpc/Makefile b/lib/trace/rpc/Makefile
deleted file mode 100644
index 2899f098f..000000000
--- a/lib/trace/rpc/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  BSD LICENSE
-#
-#  Copyright (c) Intel Corporation.
-#  All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#    * Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright
-#      notice, this list of conditions and the following disclaimer in
-#      the documentation and/or other materials provided with the
-#      distribution.
-#    * Neither the name of Intel Corporation nor the names of its
-#      contributors may be used to endorse or promote products derived
-#      from this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
-include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
-
-C_SRCS = trace_rpc.c
-LIBNAME = trace_rpc
-
-include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/trace/rpc/trace_rpc.c b/lib/trace/trace_rpc.c
similarity index 100%
rename from lib/trace/rpc/trace_rpc.c
rename to lib/trace/trace_rpc.c
diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile
index de35d58b4..2c6290ad1 100644
--- a/test/app/bdev_svc/Makefile
+++ b/test/app/bdev_svc/Makefile
@@ -42,7 +42,7 @@ C_SRCS := bdev_svc.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += event_bdev event_copy event_vmd
 SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json sock
-SPDK_LIB_LIST += app_rpc log_rpc trace_rpc bdev_rpc notify
+SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc notify
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile
index 345b0d125..3f9ad380b 100644
--- a/test/bdev/bdevperf/Makefile
+++ b/test/bdev/bdevperf/Makefile
@@ -42,7 +42,7 @@ C_SRCS := bdevperf.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += event_bdev event_copy event_vmd
 SPDK_LIB_LIST += bdev copy event trace log conf thread util sock notify
-SPDK_LIB_LIST += rpc jsonrpc json app_rpc log_rpc trace_rpc bdev_rpc
+SPDK_LIB_LIST += rpc jsonrpc json app_rpc log_rpc bdev_rpc
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd