diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile
index dc594e5a59..430bcbac0c 100644
--- a/lib/bdev/Makefile
+++ b/lib/bdev/Makefile
@@ -46,4 +46,6 @@ C_SRCS = bdev.c bdev_rpc.c bdev_zone.c part.c scsi_nvme.c
 C_SRCS-$(CONFIG_VTUNE) += vtune.c
 LIBNAME = bdev
 
+SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_bdev.map)
+
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/bdev/spdk_bdev.map b/lib/bdev/spdk_bdev.map
new file mode 100644
index 0000000000..7cbbccc265
--- /dev/null
+++ b/lib/bdev/spdk_bdev.map
@@ -0,0 +1,152 @@
+{
+	global:
+
+	# Public functions in bdev.h
+	spdk_bdev_get_opts;
+	spdk_bdev_set_opts;
+	spdk_bdev_initialize;
+	spdk_bdev_finish;
+	spdk_bdev_config_text;
+	spdk_bdev_subsystem_config_json;
+	spdk_bdev_get_by_name;
+	spdk_bdev_first;
+	spdk_bdev_next;
+	spdk_bdev_first_leaf;
+	spdk_bdev_next_leaf;
+	spdk_bdev_open;
+	spdk_bdev_open_ext;
+	spdk_bdev_close;
+	spdk_bdev_desc_get_bdev;
+	spdk_bdev_set_timeout;
+	spdk_bdev_io_type_supported;
+	spdk_bdev_dump_info_json;
+	spdk_bdev_get_name;
+	spdk_bdev_get_product_name;
+	spdk_bdev_get_block_size;
+	spdk_bdev_get_write_unit_size;
+	spdk_bdev_get_num_blocks;
+	spdk_bdev_get_qos_rpc_type;
+	spdk_bdev_get_qos_rate_limits;
+	spdk_bdev_set_qos_rate_limits;
+	spdk_bdev_get_buf_align;
+	spdk_bdev_get_optimal_io_boundary;
+	spdk_bdev_has_write_cache;
+	spdk_bdev_get_uuid;
+	spdk_bdev_get_acwu;
+	spdk_bdev_get_md_size;
+	spdk_bdev_is_md_interleaved;
+	spdk_bdev_is_md_separate;
+	spdk_bdev_is_zoned;
+	spdk_bdev_get_data_block_size;
+	spdk_bdev_get_dif_type;
+	spdk_bdev_is_dif_head_of_md;
+	spdk_bdev_is_dif_check_enabled;
+	spdk_bdev_get_qd;
+	spdk_bdev_get_qd_sampling_period;
+	spdk_bdev_set_qd_sampling_period;
+	spdk_bdev_get_io_time;
+	spdk_bdev_get_weighted_io_time;
+	spdk_bdev_get_io_channel;
+	spdk_bdev_read;
+	spdk_bdev_read_blocks;
+	spdk_bdev_read_blocks_with_md;
+	spdk_bdev_readv;
+	spdk_bdev_readv_blocks;
+	spdk_bdev_readv_blocks_with_md;
+	spdk_bdev_write;
+	spdk_bdev_write_blocks;
+	spdk_bdev_write_blocks_with_md;
+	spdk_bdev_writev;
+	spdk_bdev_writev_blocks;
+	spdk_bdev_writev_blocks_with_md;
+	spdk_bdev_compare_blocks;
+	spdk_bdev_compare_blocks_with_md;
+	spdk_bdev_comparev_blocks;
+	spdk_bdev_comparev_blocks_with_md;
+	spdk_bdev_comparev_and_writev_blocks;
+	spdk_bdev_zcopy_start;
+	spdk_bdev_zcopy_end;
+	spdk_bdev_write_zeroes;
+	spdk_bdev_write_zeroes_blocks;
+	spdk_bdev_unmap;
+	spdk_bdev_unmap_blocks;
+	spdk_bdev_flush;
+	spdk_bdev_flush_blocks;
+	spdk_bdev_reset;
+	spdk_bdev_nvme_admin_passthru;
+	spdk_bdev_nvme_io_passthru;
+	spdk_bdev_nvme_io_passthru_md;
+	spdk_bdev_free_io;
+	spdk_bdev_queue_io_wait;
+	spdk_bdev_get_io_stat;
+	spdk_bdev_get_device_stat;
+	spdk_bdev_io_get_nvme_status;
+	spdk_bdev_io_get_nvme_fused_status;
+	spdk_bdev_io_get_scsi_status;
+	spdk_bdev_io_get_iovec;
+	spdk_bdev_io_get_md_buf;
+	spdk_bdev_histogram_enable;
+	spdk_bdev_histogram_get;
+	spdk_bdev_get_media_events;
+
+	# Public functions in bdev_module.h
+	spdk_bdev_register;
+	spdk_bdev_unregister;
+	spdk_bdev_destruct_done;
+	spdk_vbdev_register;
+	spdk_bdev_module_examine_done;
+	spdk_bdev_module_init_done;
+	spdk_bdev_module_finish_done;
+	spdk_bdev_module_claim_bdev;
+	spdk_bdev_module_release_bdev;
+	spdk_bdev_alias_add;
+	spdk_bdev_alias_del;
+	spdk_bdev_alias_del_all;
+	spdk_bdev_get_aliases;
+	spdk_bdev_io_get_buf;
+	spdk_bdev_io_get_aux_buf;
+	spdk_bdev_io_put_aux_buf;
+	spdk_bdev_io_set_buf;
+	spdk_bdev_io_set_md_buf;
+	spdk_bdev_io_complete;
+	spdk_bdev_io_complete_nvme_status;
+	spdk_bdev_io_complete_scsi_status;
+	spdk_bdev_io_get_thread;
+	spdk_bdev_io_get_io_channel;
+	spdk_bdev_notify_blockcnt_change;
+	spdk_scsi_nvme_translate;
+	spdk_bdev_module_list_add;
+	spdk_bdev_module_list_find;
+	spdk_bdev_part_base_get_bdev;
+	spdk_bdev_part_base_get_bdev_name;
+	spdk_bdev_part_base_get_desc;
+	spdk_bdev_part_base_get_tailq;
+	spdk_bdev_part_base_get_ctx;
+	spdk_bdev_part_base_free;
+	spdk_bdev_part_free;
+	spdk_bdev_part_base_hotremove;
+	spdk_bdev_part_base_construct;
+	spdk_bdev_part_construct;
+	spdk_bdev_part_submit_request;
+	spdk_bdev_part_get_bdev;
+	spdk_bdev_part_get_base;
+	spdk_bdev_part_get_base_bdev;
+	spdk_bdev_part_get_offset_blocks;
+	spdk_bdev_push_media_events;
+	spdk_bdev_notify_media_management;
+
+	# Public functions in bdev_zone.h
+	spdk_bdev_get_zone_size;
+	spdk_bdev_get_max_open_zones;
+	spdk_bdev_get_optimal_open_zones;
+	spdk_bdev_get_zone_info;
+	spdk_bdev_zone_management;
+	spdk_bdev_zone_append;
+	spdk_bdev_zone_appendv;
+	spdk_bdev_zone_append_with_md;
+	spdk_bdev_zone_appendv_with_md;
+	spdk_bdev_io_get_append_location;
+
+	# Everything else
+	local: *;
+};
diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh
index c1d031f312..c765f26210 100755
--- a/test/make/check_so_deps.sh
+++ b/test/make/check_so_deps.sh
@@ -26,7 +26,11 @@ function confirm_abi_deps() {
 		return 1
 	fi
 
-	touch $suppression_file
+	cat <<EOF > ${suppression_file}
+[suppress_variable]
+	name = SPDK_LOG_BDEV
+
+EOF
 
 	for object in "$libdir"/libspdk_*.so; do
 		so_file=$(basename $object)