diff --git a/include/spdk/barrier.h b/include/spdk/barrier.h
index 0295967cd..6a183481e 100644
--- a/include/spdk/barrier.h
+++ b/include/spdk/barrier.h
@@ -34,7 +34,7 @@
 #ifndef SPDK_BARRIER_H
 #define SPDK_BARRIER_H
 
-#define wmb()	__asm volatile("sfence" ::: "memory")
-#define mb()	__asm volatile("mfence" ::: "memory")
+#define spdk_wmb()	__asm volatile("sfence" ::: "memory")
+#define spdk_mb()	__asm volatile("mfence" ::: "memory")
 
 #endif
diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c
index feaf3e792..2dabe8af1 100644
--- a/lib/nvme/nvme_qpair.c
+++ b/lib/nvme/nvme_qpair.c
@@ -308,7 +308,7 @@ nvme_qpair_submit_tracker(struct nvme_qpair *qpair, struct nvme_tracker *tr)
 		qpair->sq_tail = 0;
 	}
 
-	wmb();
+	spdk_wmb();
 	spdk_mmio_write_4(qpair->sq_tdbl, qpair->sq_tail);
 }