diff --git a/source/Card.h b/source/Card.h
index 6d2ccb3f..64170098 100644
--- a/source/Card.h
+++ b/source/Card.h
@@ -23,7 +23,7 @@ enum SS_CARDTYPE
 	CT_Saturn128K,		// Saturn 128K (but may be populated with less RAM, in multiples of 16K)
 };
 
-enum SLOTS { SLOT0=0, SLOT1, SLOT2, SLOT3, SLOT4, SLOT5, SLOT6, SLOT7 };
+enum SLOTS { SLOT0=0, SLOT1, SLOT2, SLOT3, SLOT4, SLOT5, SLOT6, SLOT7, NUM_SLOTS };
 
 class Card
 {
diff --git a/source/Common.h b/source/Common.h
index e5ea19e7..43920691 100644
--- a/source/Common.h
+++ b/source/Common.h
@@ -6,8 +6,6 @@ const double CLK_6502_NTSC = (_14M_NTSC * 65.0) / (65.0*14.0+2.0); // 65 cycles
 const double CLK_6502_PAL  = (_14M_PAL  * 65.0) / (65.0*14.0+2.0);
 //const double CLK_6502 = 23 * 44100;			// 1014300
 
-#define NUM_SLOTS 8
-
 #define  MAX(a,b)          (((a) > (b)) ? (a) : (b))
 #define  MIN(a,b)          (((a) < (b)) ? (a) : (b))
 
diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp
index 6b77f8a9..c9159af8 100644
--- a/source/Harddisk.cpp
+++ b/source/Harddisk.cpp
@@ -175,7 +175,7 @@ static BYTE	g_nHD_Command;
 static HDD g_HardDisk[NUM_HARDDISKS];
 
 static bool g_bSaveDiskImage = true;	// Save the DiskImage name to Registry
-static UINT g_uSlot = 7;
+static UINT g_uSlot = SLOT7;
 
 //===========================================================================
 
diff --git a/source/LanguageCard.h b/source/LanguageCard.h
index 6f236cb9..8f98c3db 100644
--- a/source/LanguageCard.h
+++ b/source/LanguageCard.h
@@ -29,7 +29,7 @@ public:
 	static BYTE __stdcall IO(WORD PC, WORD uAddr, BYTE bWrite, BYTE uValue, ULONG nExecutedCycles);
 
 	static const UINT kMemModeInitialState;
-	static const UINT kSlot0 = 0;
+	static const UINT kSlot0 = SLOT0;
 
 private:
 	UINT m_uLastRamWrite;
diff --git a/source/Mockingboard.cpp b/source/Mockingboard.cpp
index 9578e38a..1ec86f89 100644
--- a/source/Mockingboard.cpp
+++ b/source/Mockingboard.cpp
@@ -98,9 +98,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define SY6522_DEVICE_A 0
 #define SY6522_DEVICE_B 1
 
-#define SLOT4 4
-#define SLOT5 5
-
 #define NUM_MB 2
 #define NUM_DEVS_PER_MB 2
 #define NUM_AY8910 (NUM_MB*NUM_DEVS_PER_MB)