diff --git a/scp.c b/scp.c
index 0fe2165d..ba355176 100644
--- a/scp.c
+++ b/scp.c
@@ -314,14 +314,6 @@
     else if (sz == sizeof (uint16)) *(((uint16 *) mb) + ((uint32) j)) = (uint16) v; \
     else *(((uint32 *) mb) + ((uint32) j)) = v;
 #endif
-#define GET_SWITCHES(cp) \
-    if ((cp = get_sim_sw (cp)) == NULL) return SCPE_INVSW
-#define GET_RADIX(val,dft) \
-    if (sim_switches & SWMASK ('O')) val = 8; \
-    else if (sim_switches & SWMASK ('D')) val = 10; \
-    else if (sim_switches & SWMASK ('H')) val = 16; \
-    else if ((sim_switch_number >= 2) && (sim_switch_number <= 36)) val = sim_switch_number; \
-    else val = dft;
 
 #define SIM_DBG_EVENT       0x02000000      /* event dispatch activities */
 #define SIM_DBG_ACTIVATE    0x04000000      /* queue insertion activities */
diff --git a/scp.h b/scp.h
index 7d795fd2..7bda9a9e 100644
--- a/scp.h
+++ b/scp.h
@@ -365,6 +365,14 @@ extern UNIT *sim_dfunit;
 extern int32 sim_interval;
 extern int32 sim_switches;
 extern int32 sim_switch_number;
+#define GET_SWITCHES(cp) \
+    if ((cp = get_sim_sw (cp)) == NULL) return SCPE_INVSW
+#define GET_RADIX(val,dft) \
+    if (sim_switches & SWMASK ('O')) val = 8; \
+    else if (sim_switches & SWMASK ('D')) val = 10; \
+    else if (sim_switches & SWMASK ('H')) val = 16; \
+    else if ((sim_switch_number >= 2) && (sim_switch_number <= 36)) val = sim_switch_number; \
+    else val = dft;
 extern int32 sim_show_message;
 extern int32 sim_quiet;
 extern int32 sim_step;