diff --git a/examples/bdev/fio_plugin/fio_plugin.c b/examples/bdev/fio_plugin/fio_plugin.c
index 9da1f171e..52a85d7bc 100644
--- a/examples/bdev/fio_plugin/fio_plugin.c
+++ b/examples/bdev/fio_plugin/fio_plugin.c
@@ -37,7 +37,7 @@
 #include "spdk/copy_engine.h"
 #include "spdk/conf.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/string.h"
 #include "spdk/queue.h"
diff --git a/examples/bdev/hello_world/hello_bdev.c b/examples/bdev/hello_world/hello_bdev.c
index 6bc20325d..d9f1be1d6 100644
--- a/examples/bdev/hello_world/hello_bdev.c
+++ b/examples/bdev/hello_world/hello_bdev.c
@@ -32,7 +32,7 @@
  */
 
 #include "spdk/stdinc.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/bdev.h"
 #include "spdk/env.h"
 #include "spdk/event.h"
diff --git a/include/spdk/bdev_module.h b/include/spdk/bdev_module.h
index 06214d913..31e02cc57 100644
--- a/include/spdk/bdev_module.h
+++ b/include/spdk/bdev_module.h
@@ -46,7 +46,7 @@
 #include "spdk/bdev.h"
 #include "spdk/queue.h"
 #include "spdk/scsi_spec.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/uuid.h"
 
 /** Block device module */
diff --git a/include/spdk_internal/virtio.h b/include/spdk_internal/virtio.h
index c6d15d82d..3517fb95a 100644
--- a/include/spdk_internal/virtio.h
+++ b/include/spdk_internal/virtio.h
@@ -44,7 +44,7 @@
 #include "spdk/likely.h"
 #include "spdk/queue.h"
 #include "spdk/json.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/pci_ids.h"
 #include "spdk/env.h"
 
diff --git a/lib/bdev/aio/bdev_aio.c b/lib/bdev/aio/bdev_aio.c
index 9cf5c382a..d339ff831 100644
--- a/lib/bdev/aio/bdev_aio.c
+++ b/lib/bdev/aio/bdev_aio.c
@@ -39,7 +39,7 @@
 #include "spdk/conf.h"
 #include "spdk/env.h"
 #include "spdk/fd.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index 4d073198a..055d08413 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -39,7 +39,7 @@
 
 #include "spdk/env.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/queue.h"
 #include "spdk/nvme_spec.h"
diff --git a/lib/bdev/gpt/vbdev_gpt.c b/lib/bdev/gpt/vbdev_gpt.c
index d9a96369c..6efd09a5a 100644
--- a/lib/bdev/gpt/vbdev_gpt.c
+++ b/lib/bdev/gpt/vbdev_gpt.c
@@ -41,7 +41,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/rpc.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
diff --git a/lib/bdev/iscsi/bdev_iscsi.c b/lib/bdev/iscsi/bdev_iscsi.c
index ba7ae37c1..54b915e7f 100644
--- a/lib/bdev/iscsi/bdev_iscsi.c
+++ b/lib/bdev/iscsi/bdev_iscsi.c
@@ -37,7 +37,7 @@
 #include "spdk/conf.h"
 #include "spdk/env.h"
 #include "spdk/fd.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 #include "spdk/util.h"
 #include "spdk/rpc.h"
diff --git a/lib/bdev/malloc/bdev_malloc.c b/lib/bdev/malloc/bdev_malloc.c
index 63735f086..0575cfcad 100644
--- a/lib/bdev/malloc/bdev_malloc.c
+++ b/lib/bdev/malloc/bdev_malloc.c
@@ -41,7 +41,7 @@
 #include "spdk/env.h"
 #include "spdk/copy_engine.h"
 #include "spdk/json.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/queue.h"
 #include "spdk/string.h"
 
diff --git a/lib/bdev/null/bdev_null.c b/lib/bdev/null/bdev_null.c
index 3fb6dd2ce..33a07111d 100644
--- a/lib/bdev/null/bdev_null.c
+++ b/lib/bdev/null/bdev_null.c
@@ -36,7 +36,7 @@
 #include "spdk/bdev.h"
 #include "spdk/conf.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 
 #include "spdk/bdev_module.h"
diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c
index 07e340878..83c140cf0 100644
--- a/lib/bdev/nvme/bdev_nvme.c
+++ b/lib/bdev/nvme/bdev_nvme.c
@@ -41,7 +41,7 @@
 #include "spdk/bdev.h"
 #include "spdk/json.h"
 #include "spdk/nvme.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/string.h"
 #include "spdk/likely.h"
 #include "spdk/util.h"
diff --git a/lib/bdev/passthru/vbdev_passthru.c b/lib/bdev/passthru/vbdev_passthru.c
index 9dd582e82..a451c1ac5 100644
--- a/lib/bdev/passthru/vbdev_passthru.c
+++ b/lib/bdev/passthru/vbdev_passthru.c
@@ -44,7 +44,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"
diff --git a/lib/bdev/rbd/bdev_rbd.c b/lib/bdev/rbd/bdev_rbd.c
index b680be94b..528b33d6a 100644
--- a/lib/bdev/rbd/bdev_rbd.c
+++ b/lib/bdev/rbd/bdev_rbd.c
@@ -42,7 +42,7 @@
 #include "spdk/conf.h"
 #include "spdk/env.h"
 #include "spdk/bdev.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
diff --git a/lib/bdev/split/vbdev_split.c b/lib/bdev/split/vbdev_split.c
index 7785cc18a..8cae00b7a 100644
--- a/lib/bdev/split/vbdev_split.c
+++ b/lib/bdev/split/vbdev_split.c
@@ -42,7 +42,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"
diff --git a/lib/bdev/virtio/bdev_virtio_blk.c b/lib/bdev/virtio/bdev_virtio_blk.c
index 23127f474..30e1570b8 100644
--- a/lib/bdev/virtio/bdev_virtio_blk.c
+++ b/lib/bdev/virtio/bdev_virtio_blk.c
@@ -37,7 +37,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
 #include "spdk/json.h"
diff --git a/lib/bdev/virtio/bdev_virtio_scsi.c b/lib/bdev/virtio/bdev_virtio_scsi.c
index efed8d74b..cbb1853db 100644
--- a/lib/bdev/virtio/bdev_virtio_scsi.c
+++ b/lib/bdev/virtio/bdev_virtio_scsi.c
@@ -37,7 +37,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/scsi_spec.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
diff --git a/lib/blob/bdev/blob_bdev.c b/lib/blob/bdev/blob_bdev.c
index bd4021403..c42ed70df 100644
--- a/lib/blob/bdev/blob_bdev.c
+++ b/lib/blob/bdev/blob_bdev.c
@@ -35,7 +35,7 @@
 
 #include "spdk/blob_bdev.h"
 #include "spdk/blob.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/endian.h"
 #include "spdk/bdev_module.h"
diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c
index f5e3883bf..3b76e224f 100644
--- a/lib/blob/blobstore.c
+++ b/lib/blob/blobstore.c
@@ -37,7 +37,7 @@
 #include "spdk/crc32.h"
 #include "spdk/env.h"
 #include "spdk/queue.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/bit_array.h"
 #include "spdk/likely.h"
 
diff --git a/lib/blob/request.c b/lib/blob/request.c
index d900e8a57..98821dde5 100644
--- a/lib/blob/request.c
+++ b/lib/blob/request.c
@@ -36,7 +36,7 @@
 #include "blobstore.h"
 #include "request.h"
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/queue.h"
 
 #include "spdk_internal/log.h"
diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c
index edeeacfd9..72fc6ebad 100644
--- a/lib/blobfs/blobfs.c
+++ b/lib/blobfs/blobfs.c
@@ -38,7 +38,7 @@
 #include "blobfs_internal.h"
 
 #include "spdk/queue.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/assert.h"
 #include "spdk/env.h"
 #include "spdk/util.h"
diff --git a/lib/copy/copy_engine.c b/lib/copy/copy_engine.c
index f8b6fb8f0..971f0b753 100644
--- a/lib/copy/copy_engine.c
+++ b/lib/copy/copy_engine.c
@@ -38,7 +38,7 @@
 #include "spdk/env.h"
 #include "spdk/event.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 static size_t g_max_copy_module_size = 0;
 
diff --git a/lib/copy/ioat/copy_engine_ioat.c b/lib/copy/ioat/copy_engine_ioat.c
index c5dc7380e..9c0ea464f 100644
--- a/lib/copy/ioat/copy_engine_ioat.c
+++ b/lib/copy/ioat/copy_engine_ioat.c
@@ -39,7 +39,7 @@
 #include "spdk/env.h"
 #include "spdk/conf.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/ioat.h"
 
 #define IOAT_MAX_CHANNELS		64
diff --git a/lib/event/reactor.c b/lib/event/reactor.c
index 7bd694292..28f48b14f 100644
--- a/lib/event/reactor.c
+++ b/lib/event/reactor.c
@@ -38,7 +38,7 @@
 #include "spdk_internal/log.h"
 
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/env.h"
 #include "spdk/util.h"
 
diff --git a/lib/event/rpc.c b/lib/event/rpc.c
index e5a95150c..f84143496 100644
--- a/lib/event/rpc.c
+++ b/lib/event/rpc.c
@@ -35,7 +35,7 @@
 
 #include "spdk/conf.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/rpc.h"
 
diff --git a/lib/event/subsystems/bdev/bdev.c b/lib/event/subsystems/bdev/bdev.c
index e98ba351c..5999d612a 100644
--- a/lib/event/subsystems/bdev/bdev.c
+++ b/lib/event/subsystems/bdev/bdev.c
@@ -35,7 +35,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "spdk_internal/event.h"
 #include "spdk/env.h"
diff --git a/lib/event/subsystems/nvmf/nvmf_tgt.c b/lib/event/subsystems/nvmf/nvmf_tgt.c
index cb94076a2..6e4786f1d 100644
--- a/lib/event/subsystems/nvmf/nvmf_tgt.c
+++ b/lib/event/subsystems/nvmf/nvmf_tgt.c
@@ -35,7 +35,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/nvme.h"
 #include "spdk/util.h"
diff --git a/lib/iscsi/acceptor.c b/lib/iscsi/acceptor.c
index 2b7e64fae..9b13de309 100644
--- a/lib/iscsi/acceptor.c
+++ b/lib/iscsi/acceptor.c
@@ -35,7 +35,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/sock.h"
 #include "spdk/string.h"
diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c
index a4c879727..21f383af0 100644
--- a/lib/iscsi/conn.c
+++ b/lib/iscsi/conn.c
@@ -37,7 +37,7 @@
 #include "spdk/endian.h"
 #include "spdk/env.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/queue.h"
 #include "spdk/trace.h"
 #include "spdk/net.h"
diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index 50be79804..beec9e5a3 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -40,7 +40,7 @@
 #include "spdk/bdev.h"
 #include "spdk/iscsi_spec.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "iscsi/param.h"
 #include "iscsi/tgt_node.h"
diff --git a/lib/lvol/lvol.c b/lib/lvol/lvol.c
index dca14a491..ea83991e2 100644
--- a/lib/lvol/lvol.c
+++ b/lib/lvol/lvol.c
@@ -34,7 +34,7 @@
 #include "spdk_internal/lvolstore.h"
 #include "spdk_internal/log.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/blob_bdev.h"
 #include "spdk/util.h"
 
diff --git a/lib/nbd/nbd.c b/lib/nbd/nbd.c
index 7f8eba235..ad635ff4d 100644
--- a/lib/nbd/nbd.c
+++ b/lib/nbd/nbd.c
@@ -43,7 +43,7 @@
 #include "spdk/env.h"
 #include "spdk/log.h"
 #include "spdk/util.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/event.h"
 
 #include "spdk_internal/log.h"
diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c
index 80934a3a8..d8f596f93 100644
--- a/lib/nvmf/ctrlr.c
+++ b/lib/nvmf/ctrlr.c
@@ -38,7 +38,7 @@
 
 #include "spdk/bit_array.h"
 #include "spdk/endian.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/trace.h"
 #include "spdk/nvme_spec.h"
 #include "spdk/string.h"
diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c
index 3db87487e..73723315b 100644
--- a/lib/nvmf/ctrlr_bdev.c
+++ b/lib/nvmf/ctrlr_bdev.c
@@ -37,7 +37,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/endian.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/nvme.h"
 #include "spdk/nvmf_spec.h"
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 95dc3bfb7..d30671985 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -35,7 +35,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/conf.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/nvmf.h"
 #include "spdk/trace.h"
 
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index 7025dd09c..caccdaab7 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -41,7 +41,7 @@
 #include "transport.h"
 
 #include "spdk/assert.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/nvmf.h"
 #include "spdk/nvmf_spec.h"
 #include "spdk/string.h"
diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c
index 3e0b2fd7a..7c294e5e4 100644
--- a/lib/nvmf/request.c
+++ b/lib/nvmf/request.c
@@ -36,7 +36,7 @@
 #include "nvmf_internal.h"
 #include "transport.h"
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/nvme.h"
 #include "spdk/nvmf_spec.h"
diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc
index 06a46edca..0fe3a3639 100644
--- a/lib/rocksdb/env_spdk.cc
+++ b/lib/rocksdb/env_spdk.cc
@@ -43,7 +43,7 @@ extern "C" {
 #include "spdk/blobfs.h"
 #include "spdk/blob_bdev.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/bdev.h"
 }
 
diff --git a/lib/scsi/lun.c b/lib/scsi/lun.c
index b39e285b5..b3957ac74 100644
--- a/lib/scsi/lun.c
+++ b/lib/scsi/lun.c
@@ -35,7 +35,7 @@
 #include "scsi_internal.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/event.h"
 #include "spdk/util.h"
 
diff --git a/lib/thread/thread.c b/lib/thread/thread.c
index 97681c560..713737c0c 100644
--- a/lib/thread/thread.c
+++ b/lib/thread/thread.c
@@ -33,7 +33,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 
 #ifdef __linux__
diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c
index 9e986d499..a105b503f 100644
--- a/lib/vhost/vhost_blk.c
+++ b/lib/vhost/vhost_blk.c
@@ -36,7 +36,7 @@
 #include "spdk/env.h"
 #include "spdk/bdev.h"
 #include "spdk/conf.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
diff --git a/lib/vhost/vhost_nvme.c b/lib/vhost/vhost_nvme.c
index da705867b..94bb80c3b 100644
--- a/lib/vhost/vhost_nvme.c
+++ b/lib/vhost/vhost_nvme.c
@@ -38,7 +38,7 @@
 #include "spdk/conf.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/barrier.h"
 #include "spdk/vhost.h"
 #include "spdk/bdev.h"
diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c
index 4ed9d448e..f31632537 100644
--- a/lib/vhost/vhost_scsi.c
+++ b/lib/vhost/vhost_scsi.c
@@ -36,7 +36,7 @@
 #include <linux/virtio_scsi.h>
 
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/scsi.h"
 #include "spdk/scsi_spec.h"
 #include "spdk/conf.h"
diff --git a/test/bdev/bdevio/bdevio.c b/test/bdev/bdevio/bdevio.c
index 99ed265be..4d28b57bb 100644
--- a/test/bdev/bdevio/bdevio.c
+++ b/test/bdev/bdevio/bdevio.c
@@ -38,7 +38,7 @@
 #include "spdk/copy_engine.h"
 #include "spdk/env.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "CUnit/Basic.h"
 
diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c
index c16230a8c..a8e823590 100644
--- a/test/bdev/bdevperf/bdevperf.c
+++ b/test/bdev/bdevperf/bdevperf.c
@@ -41,7 +41,7 @@
 #include "spdk/event.h"
 #include "spdk/log.h"
 #include "spdk/util.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/string.h"
 
 struct bdevperf_task {
diff --git a/test/blobfs/fuse/fuse.c b/test/blobfs/fuse/fuse.c
index 9cba34c44..2cdaa5a22 100644
--- a/test/blobfs/fuse/fuse.c
+++ b/test/blobfs/fuse/fuse.c
@@ -40,7 +40,7 @@
 #include "spdk/blobfs.h"
 #include "spdk/bdev.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/blob_bdev.h"
 #include "spdk/log.h"
 
diff --git a/test/common/lib/ut_multithread.c b/test/common/lib/ut_multithread.c
index 724186fdb..835be3cba 100644
--- a/test/common/lib/ut_multithread.c
+++ b/test/common/lib/ut_multithread.c
@@ -32,7 +32,7 @@
  */
 
 #include "spdk_cunit.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk_internal/mock.h"
 
 static uint32_t g_ut_num_threads;
diff --git a/test/event/reactor/reactor.c b/test/event/reactor/reactor.c
index bd94303c9..d79f94baa 100644
--- a/test/event/reactor/reactor.c
+++ b/test/event/reactor/reactor.c
@@ -34,7 +34,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 static int g_time_in_sec;
 static struct spdk_poller *test_end_poller;
diff --git a/test/event/reactor_perf/reactor_perf.c b/test/event/reactor_perf/reactor_perf.c
index df9680988..357f9038a 100644
--- a/test/event/reactor_perf/reactor_perf.c
+++ b/test/event/reactor_perf/reactor_perf.c
@@ -35,7 +35,7 @@
 
 #include "spdk/env.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 static int g_time_in_sec;
 static int g_queue_depth;
diff --git a/test/unit/lib/blob/bs_dev_common.c b/test/unit/lib/blob/bs_dev_common.c
index 088ef2bc7..9b1d00a9e 100644
--- a/test/unit/lib/blob/bs_dev_common.c
+++ b/test/unit/lib/blob/bs_dev_common.c
@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "bs_scheduler.c"
 
 
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 1fb36598a..e85154b65 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
@@ -36,7 +36,7 @@
 #include "spdk/blobfs.h"
 #include "spdk/env.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/barrier.h"
 
 #include "spdk_cunit.h"
diff --git a/test/unit/lib/lvol/lvol.c/lvol_ut.c b/test/unit/lib/lvol/lvol.c/lvol_ut.c
index 9f9455ded..de6870951 100644
--- a/test/unit/lib/lvol/lvol.c/lvol_ut.c
+++ b/test/unit/lib/lvol/lvol.c/lvol_ut.c
@@ -33,7 +33,7 @@
 
 #include "spdk_cunit.h"
 #include "spdk/blob.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/util.h"
 
 #include "common/lib/test_env.c"
diff --git a/test/unit/lib/vhost/test_vhost.c b/test/unit/lib/vhost/test_vhost.c
index 53ce4eb34..7579bfbd7 100644
--- a/test/unit/lib/vhost/test_vhost.c
+++ b/test/unit/lib/vhost/test_vhost.c
@@ -36,7 +36,7 @@
 #include "CUnit/Basic.h"
 #include "spdk_cunit.h"
 #include "spdk_internal/mock.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "unit/lib/json_mock.c"
 
diff --git a/test/unit/lib/vhost/vhost.c/vhost_ut.c b/test/unit/lib/vhost/vhost.c/vhost_ut.c
index 06b4a9702..49e879ed5 100644
--- a/test/unit/lib/vhost/vhost.c/vhost_ut.c
+++ b/test/unit/lib/vhost/vhost.c/vhost_ut.c
@@ -35,7 +35,7 @@
 
 #include "CUnit/Basic.h"
 #include "spdk_cunit.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk_internal/mock.h"
 #include "common/lib/test_env.c"
 #include "unit/lib/json_mock.c"