diff --git a/uisimulator/common/filesystem-sim.c b/uisimulator/common/filesystem-sim.c
index d3db25d02b..df914ebcd7 100644
--- a/uisimulator/common/filesystem-sim.c
+++ b/uisimulator/common/filesystem-sim.c
@@ -193,7 +193,7 @@ static inline int readdir_volume(struct dirstr_desc *dirstr,
 
 /** Internal functions **/
 
-#ifdef HAVE_MULTIDRIVE
+#ifdef HAVE_HOTSWAP
 /**
  * Handle drive extraction by pretending the files' volumes no longer exist
  * and invalidating their I/O for the remainder of their lifetimes as would
diff --git a/uisimulator/common/sim_tasks.c b/uisimulator/common/sim_tasks.c
index 3367982c27..e5646e62d3 100644
--- a/uisimulator/common/sim_tasks.c
+++ b/uisimulator/common/sim_tasks.c
@@ -51,7 +51,7 @@ enum {
 #endif
 };
 
-#ifdef HAVE_MULTIDRIVE
+#ifdef HAVE_HOTSWAP
 extern void sim_ext_extracted(int drive);
 #endif