diff --git a/module/zfs/spa_errlog.c b/module/zfs/spa_errlog.c
index a1d7d5457c..68592c42be 100644
--- a/module/zfs/spa_errlog.c
+++ b/module/zfs/spa_errlog.c
@@ -440,7 +440,6 @@ spa_errlog_sync(spa_t *spa, uint64_t txg)
 /* error handling */
 EXPORT_SYMBOL(spa_log_error);
 EXPORT_SYMBOL(zfs_ereport_post);
-EXPORT_SYMBOL(zfs_post_ok);
 EXPORT_SYMBOL(zfs_post_remove);
 EXPORT_SYMBOL(zfs_post_autoreplace);
 EXPORT_SYMBOL(spa_get_errlog_size);
diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c
index 032cb7cc74..187dd53e02 100644
--- a/module/zfs/spa_misc.c
+++ b/module/zfs/spa_misc.c
@@ -1432,6 +1432,7 @@ EXPORT_SYMBOL(spa_close);
 EXPORT_SYMBOL(spa_refcount_zero);
 
 /* Pool configuration lock */
+EXPORT_SYMBOL(spa_config_tryenter);
 EXPORT_SYMBOL(spa_config_enter);
 EXPORT_SYMBOL(spa_config_exit);
 EXPORT_SYMBOL(spa_config_held);
@@ -1440,9 +1441,12 @@ EXPORT_SYMBOL(spa_config_held);
 EXPORT_SYMBOL(spa_vdev_enter);
 EXPORT_SYMBOL(spa_vdev_exit);
 
+/* Pool vdev state change lock */
+EXPORT_SYMBOL(spa_vdev_state_enter);
+EXPORT_SYMBOL(spa_vdev_state_exit);
+
 /* Accessor functions */
-EXPORT_SYMBOL(spa_traverse_rwlock);
-EXPORT_SYMBOL(spa_traverse_wanted);
+EXPORT_SYMBOL(spa_shutting_down);
 EXPORT_SYMBOL(spa_get_dsl);
 EXPORT_SYMBOL(spa_get_rootblkptr);
 EXPORT_SYMBOL(spa_set_rootblkptr);
@@ -1462,6 +1466,7 @@ EXPORT_SYMBOL(spa_get_asize);
 EXPORT_SYMBOL(spa_max_replication);
 EXPORT_SYMBOL(spa_busy);
 EXPORT_SYMBOL(spa_get_failmode);
+EXPORT_SYMBOL(spa_suspended);
 
 /* Miscellaneous support routines */
 EXPORT_SYMBOL(spa_rename);
@@ -1477,6 +1482,7 @@ EXPORT_SYMBOL(spa_lookup_by_guid);
 EXPORT_SYMBOL(spa_has_spare);
 EXPORT_SYMBOL(bp_get_dasize);
 EXPORT_SYMBOL(spa_has_slogs);
+EXPORT_SYMBOL(spa_is_root);
 
 EXPORT_SYMBOL(spa_namespace_lock);
 #endif