diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 56bdf7049..e57844970 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -355,10 +355,8 @@ extern int	machine_at_excalibur_init(const machine_t *);
 
 extern int	machine_at_batman_init(const machine_t *);
 extern int	machine_at_ambradp60_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(USE_DELLS4)
 extern int	machine_at_dellxp60_init(const machine_t *);
 extern int	machine_at_opti560l_init(const machine_t *);
-#endif
 extern int	machine_at_valuepointp60_init(const machine_t *);
 extern int	machine_at_p5mp3_init(const machine_t *);
 extern int	machine_at_pb520r_init(const machine_t *);
@@ -377,11 +375,9 @@ extern int	machine_at_vectra54_init(const machine_t *);
 extern int	machine_at_powermate_v_init(const machine_t *);
 extern int	machine_at_acerv30_init(const machine_t *);
 
-#if defined(DEV_BRANCH) && defined(USE_SIS_85C50X)
 extern int	machine_at_p5sp4_init(const machine_t *);
 extern int	machine_at_p54sp4_init(const machine_t *);
 extern int	machine_at_sq588_init(const machine_t *);
-#endif
 
 #ifdef EMU_DEVICE_H
 extern const device_t	*at_endeavor_get_device(void);
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index 2cbdaa0d1..84c6e97d2 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -122,7 +122,6 @@ machine_at_batman_init(const machine_t *model)
 }
 
 
-#if defined(DEV_BRANCH) && defined(USE_DELLS4)
 int
 machine_at_dellxp60_init(const machine_t *model)
 {
@@ -184,7 +183,6 @@ machine_at_opti560l_init(const machine_t *model)
 
     return ret;
 }
-#endif 
 
 
 int
@@ -648,7 +646,6 @@ machine_at_acerv30_init(const machine_t *model)
 }
 
 
-#if defined(DEV_BRANCH) && defined(USE_SIS_85C50X)
 static void
 machine_at_sp4_common_init(const machine_t *model)
 {
@@ -737,4 +734,3 @@ machine_at_sq588_init(const machine_t *model)
 
     return ret;
 }
-#endif
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 3dfa8c015..e69b102b7 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -231,10 +231,8 @@ const machine_t machines[] = {
     /* Socket 4 machines */
     /* 430LX */
     { "[i430LX] ASUS P/I-P5MP3",		"p5mp3",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE,		 			 2048, 196608, 2048, 127,	        machine_at_p5mp3_init, NULL			},
-#if defined(DEV_BRANCH) && defined(USE_DELLS4)
     { "[i430LX] Dell Dimension XPS P60",	"dellxp60",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE,					 2048, 131072, 2048, 127,	     machine_at_dellxp60_init, NULL			},
     { "[i430LX] Dell OptiPlex 560/L",		"opti560l",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,	     machine_at_opti560l_init, NULL			},
-#endif
     { "[i430LX] IBM Ambra DP60 PCI",		"ambradp60",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,	    machine_at_ambradp60_init, NULL			},
     { "[i430LX] IBM PS/ValuePoint P60",		"valuepointp60",	MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 2048, 131072, 2048, 127,	machine_at_valuepointp60_init, NULL			},
     { "[i430LX] Intel Premiere/PCI",		"revenge",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,	       machine_at_batman_init, NULL			},
@@ -245,9 +243,7 @@ const machine_t machines[] = {
     { "[OPTi 597] AMI Excalibur VLB",		"excalibur",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_VLB | MACHINE_IDE,							 2048,  65536, 2048, 127,	    machine_at_excalibur_init, NULL			},
 
     /* SiS 85C50x */
-    #if defined(DEV_BRANCH) && defined(USE_SIS_85C50X)
     { "[SiS 85C50x] ASUS PCI/I-P5SP4",		"p5sp4",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	      machine_at_p5sp4_init, NULL			},
-    #endif
 
     /* Socket 5 machines */
     /* 430NX */
@@ -264,10 +260,8 @@ const machine_t machines[] = {
     { "[i430FX] PC Partner MB500N",		"mb500n",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_IDE_DUAL,							 8192, 131072, 8192, 127,	       machine_at_mb500n_init, NULL			},
 
     /* SiS 85C50x */
-    #if defined(DEV_BRANCH) && defined(USE_SIS_85C50X)
     { "[SiS 85C50x] ASUS PCI/I-P54SP4",		"p54sp4",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	     machine_at_p54sp4_init, NULL			},
     { "[SiS 85C50x] BCM SQ-588",		"sq588",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	      machine_at_sq588_init, NULL			},
-    #endif
     
     /* Socket 7 machines */
     /* 430FX */
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 4a9d2b4e5..c7cba0b80 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -75,9 +75,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef SIO_DETECT
   SIO_DETECT	:= y
  endif
- ifndef USE_SIS_85C50X
-  USE_SIS_85C50X	:= y
- endif
  ifndef STPC
   STPC		:= y
  endif
@@ -99,9 +96,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef USE_VECT486VL
   USE_VECT486VL	:= y
  endif
- ifndef USE_DELLS4
-  USE_DELLS4	:= y
- endif
 else
  ifndef DEBUG
   DEBUG		:= n
@@ -151,9 +145,6 @@ else
  ifndef SIO_DETECT
   SIO_DETECT	:= n
  endif
- ifndef USE_SIS_85C50X
-  USE_SIS_85C50X	:= n
- endif
  ifndef STPC
   STPC		:= y
  endif
@@ -175,9 +166,6 @@ else
  ifndef USE_VECT486VL
   USE_VECT486VL	:= n
  endif
- ifndef USE_DELLS4
-  USE_DELLS4	:= n
- endif
 endif
 
 # Defaults for several build options (possibly defined in a chained file.)
@@ -549,11 +537,6 @@ OPTS		+= -DUSE_SIO_DETECT
 DEVBROBJ	+= sio_detect.o
 endif
 
-ifeq ($(USE_SIS_85C50X), y)
-OPTS		+= -DUSE_SIS_85C50X
-DEVBROBJ	+= sis_85c50x.o
-endif
-
 ifeq ($(STPC), y)
 OPTS		+= -DUSE_STPC
 DEVBROBJ	+= stpc.o
@@ -581,10 +564,6 @@ ifeq ($(USE_VECT486VL), y)
 OPTS		+= -DUSE_VECT486VL
 endif
 
-ifeq ($(USE_DELLS4), y)
-OPTS		+= -DUSE_DELLS4
-endif
-
 endif
 
 
@@ -617,7 +596,7 @@ CPUOBJ		:= cpu.o cpu_table.o \
 CHIPSETOBJ	:= acc2168.o cs8230.o ali1429.o headland.o intel_82335.o cs4031.o \
 		    intel_420ex.o intel_4x0.o intel_sio.o intel_piix.o ioapic.o \
 		    neat.o opti495.o opti895.o opti5x7.o scamp.o scat.o via_vt82c49x.o via_vt82c505.o \
-		    sis_85c310.o sis_85c4xx.o sis_85c496.o opti283.o opti291.o umc491.o \
+		    sis_85c310.o sis_85c4xx.o sis_85c496.o sis_85c50x.o opti283.o opti291.o umc491.o \
 		    via_apollo.o via_pipc.o wd76c10.o vl82c480.o
 
 MCHOBJ		:= machine.o machine_table.o \