diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 48324bc99..69784b1e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,10 +44,6 @@ if(VNC)
 	target_link_libraries(86Box vnc vncserver ws2_32)
 endif()
 
-if(STPC)
-	add_compile_definitions(USE_STPC)
-endif()
-
 target_link_libraries(86Box cpu chipset mch dev mem fdd game cdrom zip mo hdd
 	net print scsi sio snd vid plat ui)
 
diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index 293888836..dda032c19 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -506,9 +506,7 @@ const cpu_family_t cpu_families[] = {
 		{"133",   CPU_Cx5x86,   fpus_internal, 133333333, 4.0, 5000, 0x480, 0, 0x002f, CPU_SUPPORTS_DYNAREC, 24,24,12,12, 16},
 		{"", 0}
 	}
-    },
-#if defined(DEV_BRANCH) && defined(USE_STPC)
-    {
+    }, {
 	.package = CPU_PKG_STPC,
 	.manufacturer = "ST",
 	.name = "STPC-DX",
@@ -527,9 +525,7 @@ const cpu_family_t cpu_families[] = {
 		{"133",    CPU_Cx486DX2, fpus_internal, 133333333, 2.0, 3300, 0x430, 0, 0x0b1b, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
 		{"", 0}
 	}
-    },
-#endif
-    {
+    }, {
 	.package = CPU_PKG_SOCKET4,
 	.manufacturer = "Intel",
 	.name = "Pentium",
diff --git a/src/include/86box/chipset.h b/src/include/86box/chipset.h
index 9767e7681..60a9e8d73 100644
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -106,14 +106,12 @@ extern const device_t	sis_5571_device;
 #endif
 
 /* ST */
-#if defined(DEV_BRANCH) && defined(USE_STPC)
 extern const device_t	stpc_client_device;
 extern const device_t	stpc_consumer2_device;
 extern const device_t	stpc_elite_device;
 extern const device_t	stpc_atlas_device;
 extern const device_t	stpc_serial_device;
 extern const device_t	stpc_lpt_device;
-#endif
 
 /* VIA */
 extern const device_t   via_vt82c49x_device;
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 7107829dc..74cafc50d 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -338,12 +338,10 @@ extern int	machine_at_486vipio2_init(const machine_t *);
 extern int	machine_at_abpb4_init(const machine_t *);
 extern int	machine_at_win486pci_init(const machine_t *);
 #endif
-#if defined(DEV_BRANCH) && defined(USE_STPC)
 extern int	machine_at_itoxstar_init(const machine_t *);
 extern int	machine_at_arb1479_init(const machine_t *);
 extern int	machine_at_pcm9340_init(const machine_t *);
 extern int	machine_at_pcm5330_init(const machine_t *);
-#endif
 
 #ifdef EMU_DEVICE_H
 extern const device_t 	*at_acera1g_get_device(void);
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index a0f8494b3..03f397255 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -979,7 +979,6 @@ machine_at_win486pci_init(const machine_t *model)
 #endif
 
 
-#if defined(DEV_BRANCH) && defined(USE_STPC)
 int
 machine_at_itoxstar_init(const machine_t *model)
 {
@@ -1094,4 +1093,3 @@ machine_at_pcm5330_init(const machine_t *model)
 
     return ret;
 }
-#endif
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 6a1ba1896..d49e1a65a 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -234,12 +234,10 @@ const machine_t machines[] = {
     { "[SiS 496] Rise Computer R418",		"r418",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 261120, 1024, 255,		 machine_at_r418_init, NULL			},
     { "[SiS 496] Soyo 4SA2",			"4sa2",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 261120, 1024, 255,		 machine_at_4sa2_init, NULL			},
     { "[SiS 496] Zida Tomato 4DP",		"4dps",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 261120, 1024, 255,		 machine_at_4dps_init, NULL			},
-#if defined(DEV_BRANCH) && defined(USE_STPC)
     { "[STPC Client] ITOX STAR",		"itoxstar",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 75000000, 0, 0, 1.0, 1.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 255,	     machine_at_itoxstar_init, NULL			},
     { "[STPC Consumer-II] Acrosser AR-B1479",	"arb1479",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				32768, 163840, 8192, 255,	      machine_at_arb1479_init, NULL			},
     { "[STPC Elite] Advantech PCM-9340",	"pcm9340",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				32768,  98304, 8192, 255,	      machine_at_pcm9340_init, NULL			},
     { "[STPC Atlas] AAEON PCM-5330",		"pcm5330",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				32768, 131072,32768, 255,	      machine_at_pcm5330_init, NULL			},
-#endif
 #if defined(DEV_BRANCH) && defined(NO_SIO)
     { "[VIA VT82C496G] FIC VIP-IO2",		"486vipio2",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCIV | MACHINE_IDE_DUAL,						 1024, 131072, 1024, 255,	    machine_at_486vipio2_init, NULL			},
 #endif
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index b4aaa599d..3dbef49ff 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 STPC
-  STPC		:= y
- endif
  ifndef M1489
   M1489		:= y
  endif
@@ -151,9 +148,6 @@ else
  ifndef SIO_DETECT
   SIO_DETECT	:= n
  endif
- ifndef STPC
-  STPC		:= y
- endif
  ifndef M1489
   M1489		:= n
  endif
@@ -549,11 +543,6 @@ OPTS		+= -DUSE_SIO_DETECT
 DEVBROBJ	+= sio_detect.o
 endif
 
-ifeq ($(STPC), y)
-OPTS		+= -DUSE_STPC
-DEVBROBJ	+= stpc.o
-endif
-
 ifeq ($(M1489), y)
 OPTS		+= -DUSE_M1489
 DEVBROBJ	+= ali1489.o