diff --git a/Visual Studio Projects/B5500.vcproj b/Visual Studio Projects/B5500.vcproj
index 15483ebd..dc7a958e 100644
--- a/Visual Studio Projects/B5500.vcproj	
+++ b/Visual Studio Projects/B5500.vcproj	
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="./;../;../../windows-build/PCRE/include/"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SIM_CARD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
 				KeepComments="false"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -125,7 +125,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="./;../;../../windows-build/PCRE/include/"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SIM_CARD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -225,7 +225,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\B5500\sim_card.c"
+				RelativePath="..\sim_card.c"
 				>
 			</File>
 			<File
@@ -282,7 +282,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\B5500\sim_card.h"
+				RelativePath="..\sim_card.h"
 				>
 			</File>
 			<File
diff --git a/descrip.mms b/descrip.mms
index d022a5c6..48bec0e4 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -671,8 +671,8 @@ B5500_DIR = SYS$DISK:[.B5500]
 B5500_LIB = $(LIB_DIR)B5500-$(ARCH).OLB
 B5500_SOURCE = $(B5500_DIR)B5500_CPU.C,$(B5500_DIR)B5500_DK.C,$(B5500_DIR)B5500_DR.C,\
 	$(B5500_DIR)B5500_DTC.C,$(B5500_DIR)B5500_IO.C,$(B5500_DIR)B5500_MT.C,\
-	$(B5500_DIR)B5500_SYS.C,$(B5500_DIR)B5500_UREC.C,$(B5500_DIR)SIM_CARD.C
-B5500_OPTIONS = /INCL=($(SIMH_DIR),$(B5500_DIR))/DEF=($(CC_DEFS),"USE_INT64=1")
+	$(B5500_DIR)B5500_SYS.C,$(B5500_DIR)B5500_UREC.C,$(SIMH_DIR)SIM_CARD.C
+B5500_OPTIONS = /INCL=($(SIMH_DIR),$(B5500_DIR))/DEF=($(CC_DEFS),"USE_INT64=1","USE_SIM_CARD=1")
 
 #
 # Digital Equipment VAX 3900 Simulator Definitions.
diff --git a/makefile b/makefile
index cfdc35c7..07338de9 100644
--- a/makefile
+++ b/makefile
@@ -991,7 +991,7 @@ LDFLAGS := $(OS_LDFLAGS) $(NETWORK_LDFLAGS) $(LDFLAGS_O)
 BIN = BIN/
 SIM = scp.c sim_console.c sim_fio.c sim_timer.c sim_sock.c \
 	sim_tmxr.c sim_ether.c sim_tape.c sim_disk.c sim_serial.c \
-	sim_video.c sim_imd.c
+	sim_video.c sim_imd.c sim_card.c
 
 DISPLAYD = display
   
@@ -1356,8 +1356,8 @@ SSEM_OPT = -I ${SSEMD}
 B5500D = B5500
 B5500 = ${B5500D}/b5500_cpu.c ${B5500D}/b5500_io.c ${B5500D}/b5500_sys.c \
 	${B5500D}/b5500_dk.c ${B5500D}/b5500_mt.c ${B5500D}/b5500_urec.c \
-	${B5500D}/b5500_dr.c ${B5500D}/b5500_dtc.c ${B5500D}/sim_card.c
-B5500_OPT = -I.. -DUSE_INT64 -DB5500
+	${B5500D}/b5500_dr.c ${B5500D}/b5500_dtc.c
+B5500_OPT = -I.. -DUSE_INT64 -DB5500 -DUSE_SIM_CARD
 
 ###
 ### Experimental simulators
diff --git a/B5500/sim_card.c b/sim_card.c
similarity index 97%
rename from B5500/sim_card.c
rename to sim_card.c
index 0e5e4909..a0a05366 100644
--- a/B5500/sim_card.c
+++ b/sim_card.c
@@ -61,6 +61,8 @@
     The card module uses up7 to hold a buffer for the card being translated
     and the backward translation table. Which is generated from the table.
 */
+
+#if defined(USE_SIM_CARD)
 
 #include <ctype.h>
 #include "sim_defs.h"
@@ -1034,3 +1036,4 @@ t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, cons
 }
 
 
+#endif /* USE_SIM_CARD */
diff --git a/B5500/sim_card.h b/sim_card.h
similarity index 94%
rename from B5500/sim_card.h
rename to sim_card.h
index ee323546..0dcf4e7e 100644
--- a/B5500/sim_card.h
+++ b/sim_card.h
@@ -59,6 +59,12 @@
     or card format binary.
 */
 
+#ifndef SIM_CARD_H_
+#define SIM_CARD_H_     0
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 #define DEBUG_CARD      0x0000010       /* Show details */
 
@@ -111,3 +117,9 @@ t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, cons
 extern const char      sim_six_to_ascii[64];
 extern const char      sim_ascii_to_six[128];
 extern const uint8     sim_parity_table[64];
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif