diff --git a/app/spdk_dd/spdk_dd.c b/app/spdk_dd/spdk_dd.c
index 99dc7f271..8b9518bea 100644
--- a/app/spdk_dd/spdk_dd.c
+++ b/app/spdk_dd/spdk_dd.c
@@ -37,6 +37,7 @@
 #include "spdk/event.h"
 #include "spdk/fd.h"
 #include "spdk/string.h"
+#include "spdk/util.h"
 #include "spdk/vmd.h"
 
 #include <libaio.h>
diff --git a/include/spdk/queue_extras.h b/include/spdk/queue_extras.h
index 904625e4d..f52529e7e 100644
--- a/include/spdk/queue_extras.h
+++ b/include/spdk/queue_extras.h
@@ -105,8 +105,6 @@
  *
  */
 
-#include "spdk/util.h"
-
 /*
  * Singly-linked Tail queue declarations.
  */
diff --git a/lib/rdma/rdma_mlx5_dv.c b/lib/rdma/rdma_mlx5_dv.c
index a7d2ad2c2..f4061b627 100644
--- a/lib/rdma/rdma_mlx5_dv.c
+++ b/lib/rdma/rdma_mlx5_dv.c
@@ -40,6 +40,7 @@
 
 #include "spdk_internal/rdma.h"
 #include "spdk/log.h"
+#include "spdk/util.h"
 
 struct spdk_rdma_mlx5_dv_qp {
 	struct spdk_rdma_qp common;
diff --git a/lib/vfio_user/vfio_user_pci.c b/lib/vfio_user/vfio_user_pci.c
index 0878399b1..b7838c48f 100644
--- a/lib/vfio_user/vfio_user_pci.c
+++ b/lib/vfio_user/vfio_user_pci.c
@@ -39,6 +39,7 @@
 #include "spdk/log.h"
 #include "spdk/env.h"
 #include "spdk/queue.h"
+#include "spdk/util.h"
 #include "spdk/vfio_user_pci.h"
 
 #include "vfio_user_internal.h"
diff --git a/lib/virtio/virtio_user.c b/lib/virtio/virtio_user.c
index 10e3cb811..3fab1ef0f 100644
--- a/lib/virtio/virtio_user.c
+++ b/lib/virtio/virtio_user.c
@@ -38,6 +38,7 @@
 #include "vhost_user.h"
 #include "spdk/string.h"
 #include "spdk/config.h"
+#include "spdk/util.h"
 
 #include "spdk_internal/virtio.h"
 
diff --git a/test/event/scheduler/scheduler.c b/test/event/scheduler/scheduler.c
index a9aa7ba58..b50523192 100644
--- a/test/event/scheduler/scheduler.c
+++ b/test/event/scheduler/scheduler.c
@@ -41,6 +41,7 @@
 #include "spdk/rpc.h"
 #include "spdk/string.h"
 #include "spdk/thread.h"
+#include "spdk/util.h"
 
 static bool g_is_running = true;
 pthread_mutex_t g_sched_list_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/test/external_code/nvme/nvme.c b/test/external_code/nvme/nvme.c
index e83e327ba..2eb8beea2 100644
--- a/test/external_code/nvme/nvme.c
+++ b/test/external_code/nvme/nvme.c
@@ -36,6 +36,7 @@
 #include "spdk/likely.h"
 #include "spdk/log.h"
 #include "spdk/stdinc.h"
+#include "spdk/util.h"
 #include "nvme.h"
 
 typedef void (*nvme_cmd_cb)(void *ctx, const struct spdk_nvme_cpl *cpl);