diff --git a/include/spdk/scsi.h b/include/spdk/scsi.h
index 5fe07de45..3f04ad784 100644
--- a/include/spdk/scsi.h
+++ b/include/spdk/scsi.h
@@ -46,6 +46,13 @@
 #include "spdk/queue.h"
 #include "spdk/event.h"
 
+/* Defines for SPDK tracing framework */
+#define OWNER_SCSI_DEV				0x10
+#define OBJECT_SCSI_TASK			0x10
+#define TRACE_GROUP_SCSI			0x2
+#define TRACE_SCSI_TASK_DONE	SPDK_TPOINT_ID(TRACE_GROUP_SCSI, 0x0)
+#define TRACE_SCSI_TASK_START	SPDK_TPOINT_ID(TRACE_GROUP_SCSI, 0x1)
+
 #define SPDK_SCSI_MAX_DEVS			1024
 #define SPDK_SCSI_DEV_MAX_LUN			64
 #define SPDK_SCSI_DEV_MAX_PORTS			4
diff --git a/lib/scsi/scsi_internal.h b/lib/scsi/scsi_internal.h
index 4d680a408..6f5115100 100644
--- a/lib/scsi/scsi_internal.h
+++ b/lib/scsi/scsi_internal.h
@@ -61,14 +61,6 @@ enum {
 	SPDK_SCSI_TASK_PENDING,
 };
 
-#define OWNER_SCSI_DEV		0x10
-
-#define OBJECT_SCSI_TASK	0x10
-
-#define TRACE_GROUP_SCSI	0x2
-#define TRACE_SCSI_TASK_DONE	SPDK_TPOINT_ID(TRACE_GROUP_SCSI, 0x0)
-#define TRACE_SCSI_TASK_START	SPDK_TPOINT_ID(TRACE_GROUP_SCSI, 0x1)
-
 struct spdk_lun_db_entry {
 	struct spdk_scsi_lun *lun;
 	int claimed;