diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 4b60cb930..9c18ae72a 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -248,7 +248,7 @@ VPATH := $(EXPATH) . $(CODEGEN) minitrace cpu cpu/softfloat \
          sound/munt sound/munt/c_interface sound/munt/sha1 \
          sound/munt/srchelper sound/munt/srchelper/srctools/src \
          sound/resid-fp sound/ymfm \
-         scsi video network network/slirp win
+         scsi video network win
 
 WINDRES := windres
 STRIP   := strip
@@ -545,7 +545,7 @@ MAINOBJ := 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.
            usb.o device.o nvr.o nvr_at.o nvr_ps2.o machine_status.o ini.o \
            $(VNCOBJ)
 
-MEMOBJ := catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o rom.o smram.o spd.o sst_flash.o
+MEMOBJ := catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o rom.o row.o smram.o spd.o sst_flash.o
 
 CPUOBJ := $(DYNARECOBJ) \
           $(CGTOBJ) \
@@ -654,18 +654,9 @@ SCSIOBJ := scsi.o scsi_device.o \
            scsi_ncr5380.o scsi_ncr53c8xx.o \
            scsi_pcscsi.o scsi_spock.o
 
-SLIRPOBJ := net_slirp.o tinyglib.o \
-          arp_table.o bootp.o cksum.o dhcpv6.o dnssearch.o if.o \
-          ip_icmp.o ip_input.o ip_output.o \
-          ip6_icmp.o ip6_input.o ip6_output.o \
-          mbuf.o misc.o sbuf.o slirp.o socket.o \
-          tcp_input.o tcp_output.o tcp_subr.o tcp_timer.o \
-          udp.o udp6.o \
-          util.o version.o \
-
 NETOBJ := network.o \
           net_pcap.o \
-          ${SLIRPOBJ} \
+          net_slirp.o \
           net_dp8390.o net_3c501.o \
           net_3c503.o net_ne2000.o \
           net_pcnet.o net_wd8003.o \
@@ -795,13 +786,15 @@ else
  MWIN := -mwindows
 endif
 
+LIBS := -lfluidsynth -lslirp -lgomp -lsndfile -lflac -lmp3lame -lmpg123 -lopus -lvorbis -lvorbisenc -logg -ldsound -lshlwapi -lksuser -lreadline -ltermcap -lportaudio -lgmodule-2.0 -lglib-2.0 -lintl -liconv
+
 ifeq ($(OPENAL), y)
- LIBS := $(MWIN) -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
+ LIBS += $(MWIN) -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
 else
  ifeq ($(FAUDIO), y)
-  LIBS := $(MWIN) -lfaudio -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
+  LIBS += $(MWIN) -lfaudio -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
  else
-  LIBS := $(MWIN) -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
+  LIBS += $(MWIN) -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
  endif
 endif