diff --git a/lib/trace/Makefile b/lib/trace/Makefile
index 507ffee954..8bd9ec1783 100644
--- a/lib/trace/Makefile
+++ b/lib/trace/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = trace.c trace_flags.c
 LIBNAME = trace
 
diff --git a/lib/trace/trace.c b/lib/trace/trace.c
index 6e64553f2c..fdc0de8043 100644
--- a/lib/trace/trace.c
+++ b/lib/trace/trace.c
@@ -37,9 +37,6 @@
 #include "spdk/string.h"
 #include "spdk/trace.h"
 
-#include <rte_config.h>
-#include <rte_lcore.h>
-
 static char g_shm_name[64];
 
 static struct spdk_trace_histories *g_trace_histories;
@@ -63,7 +60,7 @@ spdk_trace_record(uint16_t tpoint_id, uint16_t poller_id, uint32_t size,
 		return;
 	}
 
-	lcore = rte_lcore_id();
+	lcore = spdk_env_get_current_core();
 	if (lcore >= SPDK_TRACE_MAX_LCORE) {
 		return;
 	}
diff --git a/lib/trace/trace_flags.c b/lib/trace/trace_flags.c
index 03f58a805a..dede1e2d9b 100644
--- a/lib/trace/trace_flags.c
+++ b/lib/trace/trace_flags.c
@@ -37,9 +37,6 @@
 #include "spdk/trace.h"
 #include "spdk/log.h"
 
-#include <rte_config.h>
-#include <rte_lcore.h>
-
 struct spdk_trace_flags *g_trace_flags = NULL;
 static struct spdk_trace_register_fn *g_reg_fn_head = NULL;