diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 209b9531469..ac41de16f20 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -79,7 +79,9 @@ struct st_partition_ft_info
 };
 
 
+#ifdef HAVE_PSI_MUTEX_INTERFACE
 extern PSI_mutex_key key_partition_auto_inc_mutex;
+#endif
 
 /**
   Partition specific Handler_share.
diff --git a/sql/semisync_master_ack_receiver.cc b/sql/semisync_master_ack_receiver.cc
index f986c629f65..244e9396889 100644
--- a/sql/semisync_master_ack_receiver.cc
+++ b/sql/semisync_master_ack_receiver.cc
@@ -17,9 +17,13 @@
 #include "semisync_master.h"
 #include "semisync_master_ack_receiver.h"
 
+#ifdef HAVE_PSI_MUTEX_INTERFACE
 extern PSI_mutex_key key_LOCK_ack_receiver;
 extern PSI_cond_key key_COND_ack_receiver;
+#endif
+#ifdef HAVE_PSI_THREAD_INTERFACE
 extern PSI_thread_key key_thread_ack_receiver;
+#endif
 extern Repl_semi_sync_master repl_semisync;
 
 /* Callback function of ack receive thread */