diff --git a/examples/bdev/fio_plugin/fio_plugin.c b/examples/bdev/fio_plugin/fio_plugin.c
index 4ceec651e..1b559c5b4 100644
--- a/examples/bdev/fio_plugin/fio_plugin.c
+++ b/examples/bdev/fio_plugin/fio_plugin.c
@@ -42,7 +42,6 @@
 #include "spdk/queue.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/thread.h"
 #include "spdk_internal/event.h"
 
 #include "config-host.h"
diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc
index b1147927a..a1e574e6a 100644
--- a/lib/rocksdb/env_spdk.cc
+++ b/lib/rocksdb/env_spdk.cc
@@ -45,8 +45,6 @@ extern "C" {
 #include "spdk/log.h"
 #include "spdk/thread.h"
 #include "spdk/bdev.h"
-
-#include "spdk_internal/thread.h"
 }
 
 namespace rocksdb
diff --git a/test/common/lib/ut_multithread.c b/test/common/lib/ut_multithread.c
index 30b78f74d..49f4f3615 100644
--- a/test/common/lib/ut_multithread.c
+++ b/test/common/lib/ut_multithread.c
@@ -34,7 +34,6 @@
 #include "spdk_cunit.h"
 #include "spdk/thread.h"
 #include "spdk_internal/mock.h"
-#include "spdk_internal/thread.h"
 
 #include "common/lib/test_env.c"
 
diff --git a/test/unit/lib/bdev/part.c/part_ut.c b/test/unit/lib/bdev/part.c/part_ut.c
index bcedc1dad..2258c717d 100644
--- a/test/unit/lib/bdev/part.c/part_ut.c
+++ b/test/unit/lib/bdev/part.c/part_ut.c
@@ -40,8 +40,6 @@
 /* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */
 #undef SPDK_CONFIG_VTUNE
 
-#include "spdk_internal/thread.h"
-
 #include "bdev/bdev.c"
 #include "bdev/part.c"
 
diff --git a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c
index 46115474d..9c6053ce0 100644
--- a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c
+++ b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c
@@ -36,8 +36,6 @@
 #include "common/lib/ut_multithread.c"
 #include "unit/lib/json_mock.c"
 
-#include "spdk_internal/thread.h"
-
 #include "bdev/pmem/bdev_pmem.c"
 
 static struct spdk_bdev_module *g_bdev_pmem_module;
diff --git a/test/unit/lib/blob/blob.c/blob_ut.c b/test/unit/lib/blob/blob.c/blob_ut.c
index 95c1a5453..929e853fe 100644
--- a/test/unit/lib/blob/blob.c/blob_ut.c
+++ b/test/unit/lib/blob/blob.c/blob_ut.c
@@ -36,7 +36,6 @@
 #include "spdk_cunit.h"
 #include "spdk/blob.h"
 #include "spdk/string.h"
-#include "spdk_internal/thread.h"
 
 #include "common/lib/ut_multithread.c"
 #include "../bs_dev_common.c"
diff --git a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
index edbde682f..804bc3a60 100644
--- a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
+++ b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
@@ -42,8 +42,6 @@
 #include "blobfs/tree.c"
 #include "blob/blobstore.h"
 
-#include "spdk_internal/thread.h"
-
 #include "unit/lib/blob/bs_dev_common.c"
 
 struct spdk_filesystem *g_fs;
diff --git a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
index bab5deb68..ae483dec9 100644
--- a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
+++ b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
@@ -38,7 +38,6 @@
 #include "spdk/log.h"
 #include "spdk/thread.h"
 #include "spdk/barrier.h"
-#include "spdk_internal/thread.h"
 
 #include "spdk_cunit.h"
 #include "unit/lib/blob/bs_dev_common.c"
diff --git a/test/unit/lib/ftl/common/utils.c b/test/unit/lib/ftl/common/utils.c
index dda828df8..cd834069d 100644
--- a/test/unit/lib/ftl/common/utils.c
+++ b/test/unit/lib/ftl/common/utils.c
@@ -31,8 +31,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/thread.h"
-
 #include "spdk/ftl.h"
 #include "ftl/ftl_core.h"
 
diff --git a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
index 1382c9c2a..5543f94a3 100644
--- a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
+++ b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
@@ -42,8 +42,6 @@
 #include "iscsi/portal_grp.c"
 #include "unit/lib/json_mock.c"
 
-#include "spdk_internal/thread.h"
-
 DEFINE_STUB(iscsi_conn_construct, int,
 	    (struct spdk_iscsi_portal *portal, struct spdk_sock *sock),
 	    0);
diff --git a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
index 09e130aa6..c09932f3f 100644
--- a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
+++ b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
@@ -35,7 +35,6 @@
 
 #include "spdk_cunit.h"
 #include "spdk_internal/mock.h"
-#include "spdk_internal/thread.h"
 
 #include "common/lib/ut_multithread.c"
 #include "nvmf/ctrlr.c"
diff --git a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
index 7b6be9770..df5529b2e 100644
--- a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
+++ b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
@@ -36,7 +36,6 @@
 #include "common/lib/ut_multithread.c"
 #include "spdk_cunit.h"
 #include "spdk_internal/mock.h"
-#include "spdk_internal/thread.h"
 
 #include "nvmf/subsystem.c"
 
diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c
index 5b250c9ae..e19dbceaf 100644
--- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c
+++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c
@@ -36,7 +36,6 @@
 #include "spdk_cunit.h"
 
 #include "spdk_internal/mock.h"
-#include "spdk_internal/thread.h"
 
 #include "common/lib/test_env.c"
 #include "common/lib/test_sock.c"