diff --git a/src/memory.S b/src/memory.S
index 8d2b1e05..b160d4bb 100644
--- a/src/memory.S
+++ b/src/memory.S
@@ -149,25 +149,6 @@
 	  			enabled.
 	   ----------------------------------------------------------------- */
 
-
-		.comm	SN(softswitches),4
-		
-		.comm	SN(base_ramrd),4
-		.comm	SN(base_ramwrt),4
-		.comm	SN(base_textrd),4
-		.comm	SN(base_textwrt),4
-		.comm	SN(base_hgrrd),4
-		.comm	SN(base_hgrwrt),4
-
-		.comm	SN(base_stackzp),4
-		.comm	SN(base_d000_rd),4
-		.comm	SN(base_d000_wrt),4
-		.comm	SN(base_e000_rd),4
-		.comm	SN(base_e000_wrt),4
-
-		.comm	SN(base_cxrom),4
-		.comm	SN(base_c3rom),4
-
 /* ram_nop, read_ram_default, write_ram_default: default ram/rom
    read/write functions. */
 E(ram_nop)
diff --git a/src/misc.c b/src/misc.c
index 3242e2ed..928fb018 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -72,6 +72,26 @@ GLUE_BANK_READ(iie_read_slot3,base_c3rom)
 GLUE_BANK_READ(iie_read_slotx,base_cxrom)
 
 
+int32_t softswitches;
+
+uint8_t *base_ramrd;
+uint8_t *base_ramwrt;
+uint8_t *base_textrd;
+uint8_t *base_textwrt;
+uint8_t *base_hgrrd;
+uint8_t *base_hgrwrt;
+
+uint8_t *base_stackzp;
+uint8_t *base_d000_rd;
+uint8_t *base_e000_rd;
+uint8_t *base_d000_wrt;
+uint8_t *base_e000_wrt;
+
+uint8_t *base_c3rom;
+void *base_c4rom;
+void *base_c5rom;
+uint8_t *base_cxrom;
+
 
 /* -------------------------------------------------------------------------
     c_set_altchar() - set alternate character set
diff --git a/src/misc.h b/src/misc.h
index d14e4a67..afb82a95 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -63,25 +63,27 @@ char temp[ TEMPSIZE ];   /* should be >=4096 (stuff depends on this) */
 /* memory offsets from softswitches */
 int c8rom_offset;
 
-extern unsigned char *base_ramrd;
-extern unsigned char *base_ramwrt;
-extern unsigned char *base_textrd;
-extern unsigned char *base_textwrt;
-extern unsigned char *base_hgrrd;
-extern unsigned char *base_hgrwrt;
+extern uint8_t *base_ramrd;
+extern uint8_t *base_ramwrt;
+extern uint8_t *base_textrd;
+extern uint8_t *base_textwrt;
+extern uint8_t *base_hgrrd;
+extern uint8_t *base_hgrwrt;
 
-extern unsigned char *base_stackzp;
-extern unsigned char *base_d000_rd;
-extern unsigned char *base_e000_rd;
-extern unsigned char *base_d000_wrt;
-extern unsigned char *base_e000_wrt;
+extern uint8_t *base_stackzp;
+extern uint8_t *base_d000_rd;
+extern uint8_t *base_e000_rd;
+extern uint8_t *base_d000_wrt;
+extern uint8_t *base_e000_wrt;
 
-extern unsigned char *base_c3rom;
-extern unsigned char *base_cxrom;
+extern uint8_t *base_c3rom;
+extern void *base_c4rom; // points to function or memory vector
+extern void *base_c5rom; // points to function or memory vector
+extern uint8_t *base_cxrom;
 
 /* softswitches */
 
-extern int softswitches;
+extern int32_t softswitches;
 
 #endif /* !__ASSEMBLER__ */