diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4bb131bd2..a3cbc2e76 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,9 +14,9 @@
 #
 
 # WIN32 marks us as a GUI app on Windows
-add_executable(86Box WIN32 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
-	dma.c ddma.c nmi.c pic.c pit.c port_6x.c port_92.c ppi.c pci.c mca.c usb.c
-	device.c nvr.c nvr_at.c nvr_ps2.c)
+add_executable(86Box WIN32 86box.c config.c random.c timer.c io.c acpi.c apm.c
+	dma.c ddma.c nmi.c pic.c pit.c port_92.c ppi.c pci.c mca.c usb.c
+	device.c nvr.c nvr_at.c nvr_ps2.c thread.c)
 
 if(NEW_DYNAREC)
 	add_compile_definitions(USE_NEW_DYNAREC)
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index ba4ecef21..29d0c3456 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -585,8 +585,14 @@ CXXFLAGS	:= $(CFLAGS)
 #########################################################################
 #		Create the (final) list of objects to build.		#
 #########################################################################
-MAINOBJ		:= 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
-		   nmi.o pic.o pit.o port_6x.o port_92.o ppi.o pci.o mca.o \
+ifeq ($(PTHREAD), y)
+MAINOBJ		:= 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
+		   nmi.o pic.o pit.o port_92.o ppi.o pci.o mca.o \
+		   usb.o device.o nvr.o nvr_at.o nvr_ps2.o thread.o \
+		   $(VNCOBJ)
+else
+MAINOBJ		:= 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
+		   nmi.o pic.o pit.o port_92.o ppi.o pci.o mca.o \
 		   usb.o device.o nvr.o nvr_at.o nvr_ps2.o \
 		   $(VNCOBJ)