diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in
index aa4003e832c..2c67bf4eea5 100644
--- a/dlls/capi2032/Makefile.in
+++ b/dlls/capi2032/Makefile.in
@@ -2,4 +2,6 @@ MODULE    = capi2032.dll
 IMPORTLIB = capi2032
 EXTRAINCL = $(CAPI20_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = cap20wxx.c
diff --git a/dlls/ctapi32/Makefile.in b/dlls/ctapi32/Makefile.in
index 8432ae78378..e0fbf771358 100644
--- a/dlls/ctapi32/Makefile.in
+++ b/dlls/ctapi32/Makefile.in
@@ -1,4 +1,6 @@
 MODULE    = ctapi32.dll
 IMPORTS   = advapi32
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = ctapi32.c
diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in
index 5b92997ecde..71c2c879f4b 100644
--- a/dlls/d3d12/Makefile.in
+++ b/dlls/d3d12/Makefile.in
@@ -4,5 +4,7 @@ IMPORTS   = dxgi dxguid gdi32 user32 uuid
 EXTRALIBS = $(VKD3D_LIBS)
 EXTRAINCL = $(VKD3D_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	d3d12_main.c
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index 29d3e8ece65..0db023ee7fe 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -4,6 +4,8 @@ IMPORTS   = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700
 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	ansi.c \
 	config.c \
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index 5032c7689bc..23017cb5983 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -5,6 +5,8 @@ EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800
 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
 PARENTSRC = ../dinput
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	ansi.c \
 	config.c \
diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in
index c21cb18d8ff..7460d5098b6 100644
--- a/dlls/dxgi/Makefile.in
+++ b/dlls/dxgi/Makefile.in
@@ -3,6 +3,8 @@ IMPORTLIB = dxgi
 IMPORTS   = gdi32 dxguid uuid wined3d user32
 EXTRAINCL = $(VKD3D_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	adapter.c \
 	device.c \
diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index f2921beb2b8..65a4d8e4d2a 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = comctl32 user32 gdi32 advapi32
 EXTRALIBS = $(GPHOTO2_LIBS) $(GPHOTO2_PORT_LIBS)
 EXTRAINCL = $(GPHOTO2_CFLAGS) $(GPHOTO2_PORT_CFLAGS) $(JPEG_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	capability.c \
 	ds_image.c \
diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index 9d7345251bd..d5f7818be5f 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = iphlpapi.dll
 IMPORTLIB = iphlpapi
 IMPORTS   = advapi32 dnsapi nsi uuid
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	icmp.c \
 	iphlpapi_main.c
diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in
index d46523a557a..e527ec28675 100644
--- a/dlls/l3codeca.acm/Makefile.in
+++ b/dlls/l3codeca.acm/Makefile.in
@@ -3,5 +3,7 @@ IMPORTS   = winmm user32
 EXTRAINCL = $(MPG123_CFLAGS)
 EXTRALIBS = $(MPG123_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	mpegl3.c
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in
index 83204e66504..2f147d00c63 100644
--- a/dlls/mountmgr.sys/Makefile.in
+++ b/dlls/mountmgr.sys/Makefile.in
@@ -1,10 +1,11 @@
 MODULE    = mountmgr.sys
 IMPORTS   = uuid advapi32 ntoskrnl
 DELAYIMPORTS = user32 iphlpapi
-EXTRADLLFLAGS = -Wl,--subsystem,native
 EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS)
 EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_LIBS) $(SECURITY_LIBS)
 
+EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin
+
 C_SRCS = \
 	dbus.c \
 	device.c \
diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in
index 56a5ef38eb5..49d3ceba590 100644
--- a/dlls/mp3dmod/Makefile.in
+++ b/dlls/mp3dmod/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = dmoguids msdmo ole32 uuid wmcodecdspuuid
 EXTRAINCL = $(MPG123_CFLAGS)
 EXTRALIBS = $(MPG123_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	mp3dmod.c
 
diff --git a/dlls/msgsm32.acm/Makefile.in b/dlls/msgsm32.acm/Makefile.in
index 088fb198e68..c5e99d63911 100644
--- a/dlls/msgsm32.acm/Makefile.in
+++ b/dlls/msgsm32.acm/Makefile.in
@@ -1,4 +1,6 @@
 MODULE    = msgsm32.acm
 IMPORTS   = winmm user32
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = msgsm32.c
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 936c745895d..ff530ba0eb4 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
 EXTRALIBS = $(XML2_LIBS)
 EXTRAINCL = $(XML2_CFLAGS) $(XSLT_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	attribute.c \
 	bsc.c \
diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in
index 183a6374144..b33ea0e4c8a 100644
--- a/dlls/nsiproxy.sys/Makefile.in
+++ b/dlls/nsiproxy.sys/Makefile.in
@@ -1,7 +1,8 @@
 MODULE    = nsiproxy.sys
 IMPORTS   = ntoskrnl uuid
 EXTRALIBS = $(PROCSTAT_LIBS)
-EXTRADLLFLAGS = -Wl,--subsystem,native
+
+EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin
 
 C_SRCS = \
 	device.c \
diff --git a/dlls/openal32/Makefile.in b/dlls/openal32/Makefile.in
index c787d96f886..6572fcf56eb 100644
--- a/dlls/openal32/Makefile.in
+++ b/dlls/openal32/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = openal32.dll
 EXTRALIBS = $(OPENAL_LIBS)
 
-EXTRADLLFLAGS = -Wb,--prefer-native
+EXTRADLLFLAGS = -Wb,--prefer-native -mcygwin
 
 C_SRCS = \
 	openal.c
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in
index 196bb5d1777..2e8fe657f40 100644
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@@ -3,7 +3,8 @@ EXTRADEFS = -D_OPENGL32_
 IMPORTLIB = opengl32
 IMPORTS   = user32 gdi32 advapi32
 DELAYIMPORTS = glu32
-EXTRADLLFLAGS = -Wl,--image-base,0x7a800000
+
+EXTRADLLFLAGS = -Wl,--image-base,0x7a800000 -mcygwin
 
 C_SRCS = \
 	opengl_ext.c \
diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in
index a0310d37dd2..74368c7a989 100644
--- a/dlls/sane.ds/Makefile.in
+++ b/dlls/sane.ds/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = sane.ds
 IMPORTS   = comctl32 user32 gdi32
 EXTRAINCL = $(SANE_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	capability.c \
 	ds_ctrl.c \
diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
index 3158371a64f..39ae55f3802 100644
--- a/dlls/winealsa.drv/Makefile.in
+++ b/dlls/winealsa.drv/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = uuid ole32 advapi32
 DELAYIMPORTS = winmm
 EXTRALIBS = $(ALSA_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	midi.c \
 	mmdevdrv.c
diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in
index 9ac8487e6a4..87818fd7499 100644
--- a/dlls/wineandroid.drv/Makefile.in
+++ b/dlls/wineandroid.drv/Makefile.in
@@ -1,6 +1,8 @@
 MODULE  = wineandroid.drv
 IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	device.c \
 	init.c \
diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in
index 25c6db20d1f..afbc50c7148 100644
--- a/dlls/winecoreaudio.drv/Makefile.in
+++ b/dlls/winecoreaudio.drv/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = uuid ole32 user32 advapi32
 DELAYIMPORTS = winmm
 EXTRALIBS = $(COREAUDIO_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	audiounit.c \
 	coreaudio.c \
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index 9b0ad83006c..1d1782855de 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -3,6 +3,8 @@ IMPORTLIB = wined3d
 IMPORTS   = opengl32 user32 gdi32 advapi32
 EXTRAINCL = $(VKD3D_SHADER_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	adapter_gl.c \
 	adapter_vk.c \
diff --git a/dlls/winejoystick.drv/Makefile.in b/dlls/winejoystick.drv/Makefile.in
index f6d3052767e..52564855994 100644
--- a/dlls/winejoystick.drv/Makefile.in
+++ b/dlls/winejoystick.drv/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = winejoystick.drv
 IMPORTS   = winmm user32
 EXTRALIBS = $(IOKIT_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	joystick.c \
 	joystick_linux.c \
diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in
index c6ae9733bdd..96f14edb55c 100644
--- a/dlls/winemac.drv/Makefile.in
+++ b/dlls/winemac.drv/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = uuid setupapi rpcrt4 user32 gdi32 advapi32
 DELAYIMPORTS = ole32 shell32 imm32
 EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	clipboard.c \
 	display.c \
diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in
index a2ae5f53a5c..e6019e89eb4 100644
--- a/dlls/wineoss.drv/Makefile.in
+++ b/dlls/wineoss.drv/Makefile.in
@@ -4,6 +4,8 @@ DELAYIMPORTS = winmm
 EXTRALIBS = $(OSS4_LIBS)
 EXTRAINCL = $(OSS4_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	midi.c \
 	midipatch.c \
diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in
index 41a96709beb..aa92939cd16 100644
--- a/dlls/wineqtdecoder/Makefile.in
+++ b/dlls/wineqtdecoder/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = strmiids uuid ole32 advapi32
 EXTRALIBS = $(QUICKTIME_LIBS)
 PARENTSRC = ../strmbase
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	filter.c \
 	main.c \
diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in
index 12441435eeb..1bee6e76773 100644
--- a/dlls/wineusb.sys/Makefile.in
+++ b/dlls/wineusb.sys/Makefile.in
@@ -2,7 +2,8 @@ MODULE    = wineusb.sys
 IMPORTS   = ntoskrnl
 EXTRALIBS = $(USB_LIBS)
 EXTRAINCL = $(USB_CFLAGS)
-EXTRADLLFLAGS = -Wl,--subsystem,native
+
+EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin
 
 C_SRCS = \
 	wineusb.c
diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in
index 3e2d7ef8956..e6451c849c8 100644
--- a/dlls/winex11.drv/Makefile.in
+++ b/dlls/winex11.drv/Makefile.in
@@ -4,6 +4,8 @@ DELAYIMPORTS = comctl32 ole32 shell32 imm32
 EXTRAINCL = $(X_CFLAGS)
 EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	bitblt.c \
 	brush.c \
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 3cf6388b824..a0d0f9504f2 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -5,6 +5,8 @@ IMPORTS   = user32 gdi32 advapi32
 EXTRAINCL = $(CUPS_CFLAGS)
 EXTRALIBS = $(APPLICATIONSERVICES_LIBS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	info.c \
 	wspool.c
diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in
index 5c3fa66e9d0..7b19b1bd1e4 100644
--- a/dlls/wnaspi32/Makefile.in
+++ b/dlls/wnaspi32/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = wnaspi32.dll
 IMPORTLIB = wnaspi32
 IMPORTS   = advapi32
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	aspi.c \
 	winaspi32.c
diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in
index d2305be6f17..7293aa43c24 100644
--- a/dlls/x3daudio1_0/Makefile.in
+++ b/dlls/x3daudio1_0/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in
index efe8d74539f..05ab3b81ef7 100644
--- a/dlls/x3daudio1_1/Makefile.in
+++ b/dlls/x3daudio1_1/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in
index 3b52e063fc0..c414d7c4a99 100644
--- a/dlls/x3daudio1_2/Makefile.in
+++ b/dlls/x3daudio1_2/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in
index 9afd1e64312..7d0d6ef6698 100644
--- a/dlls/x3daudio1_3/Makefile.in
+++ b/dlls/x3daudio1_3/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in
index e481567cce0..4a3b38cd4fa 100644
--- a/dlls/x3daudio1_4/Makefile.in
+++ b/dlls/x3daudio1_4/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in
index 0a97959e7eb..50aefbeb21a 100644
--- a/dlls/x3daudio1_5/Makefile.in
+++ b/dlls/x3daudio1_5/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in
index c88374a381f..1b1e6b1bed6 100644
--- a/dlls/x3daudio1_6/Makefile.in
+++ b/dlls/x3daudio1_6/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in
index 267a93fd6da..499530371bf 100644
--- a/dlls/x3daudio1_7/Makefile.in
+++ b/dlls/x3daudio1_7/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/xactengine2_0/Makefile.in b/dlls/xactengine2_0/Makefile.in
index 3196ecd9b5a..11e10218b1e 100644
--- a/dlls/xactengine2_0/Makefile.in
+++ b/dlls/xactengine2_0/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine2_4/Makefile.in b/dlls/xactengine2_4/Makefile.in
index 51c7e5eb45a..a1b75fbbd51 100644
--- a/dlls/xactengine2_4/Makefile.in
+++ b/dlls/xactengine2_4/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine2_7/Makefile.in b/dlls/xactengine2_7/Makefile.in
index 8807677e44a..1b349fd4d77 100644
--- a/dlls/xactengine2_7/Makefile.in
+++ b/dlls/xactengine2_7/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine2_9/Makefile.in b/dlls/xactengine2_9/Makefile.in
index eae7c26b9fb..961a38091f8 100644
--- a/dlls/xactengine2_9/Makefile.in
+++ b/dlls/xactengine2_9/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in
index e5c77dcccd7..966ecb11236 100644
--- a/dlls/xactengine3_0/Makefile.in
+++ b/dlls/xactengine3_0/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in
index f95ea04624c..4d6b05ba76f 100644
--- a/dlls/xactengine3_1/Makefile.in
+++ b/dlls/xactengine3_1/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in
index 911888ec6e5..a08a4e383d2 100644
--- a/dlls/xactengine3_2/Makefile.in
+++ b/dlls/xactengine3_2/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in
index cf0155f1bee..f34f0777500 100644
--- a/dlls/xactengine3_3/Makefile.in
+++ b/dlls/xactengine3_3/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in
index f90ca3d32cd..ce48a588148 100644
--- a/dlls/xactengine3_4/Makefile.in
+++ b/dlls/xactengine3_4/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in
index b9f3f09ff37..559303ffa34 100644
--- a/dlls/xactengine3_5/Makefile.in
+++ b/dlls/xactengine3_5/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in
index fad71a2fd57..13845987d5d 100644
--- a/dlls/xactengine3_6/Makefile.in
+++ b/dlls/xactengine3_6/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in
index 6d486171622..46c8791097b 100644
--- a/dlls/xactengine3_7/Makefile.in
+++ b/dlls/xactengine3_7/Makefile.in
@@ -4,6 +4,8 @@ EXTRADEFS = -DXACT3_VER=0x0307
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xact_dll.c
 
diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in
index df40978ecde..26b956a22fe 100644
--- a/dlls/xapofx1_1/Makefile.in
+++ b/dlls/xapofx1_1/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \
diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in
index 5e70ad2625a..704dff657f8 100644
--- a/dlls/xapofx1_2/Makefile.in
+++ b/dlls/xapofx1_2/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \
diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in
index 5cf91a7c2c0..2bf695adf1b 100644
--- a/dlls/xapofx1_3/Makefile.in
+++ b/dlls/xapofx1_3/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \
diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in
index ab1106fcf65..3ccf999af56 100644
--- a/dlls/xapofx1_4/Makefile.in
+++ b/dlls/xapofx1_4/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \
diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in
index bda50c04866..56fa94c59a6 100644
--- a/dlls/xapofx1_5/Makefile.in
+++ b/dlls/xapofx1_5/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \
diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in
index 4f766b82450..a72ce351fc4 100644
--- a/dlls/xaudio2_0/Makefile.in
+++ b/dlls/xaudio2_0/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	xapo.c \
diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in
index 9e50adfa8e2..273140c6385 100644
--- a/dlls/xaudio2_1/Makefile.in
+++ b/dlls/xaudio2_1/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	xapo.c \
diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in
index b7076fea4e1..5a43e66886c 100644
--- a/dlls/xaudio2_2/Makefile.in
+++ b/dlls/xaudio2_2/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	xapo.c \
diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in
index a1140f83363..ab8587b66fc 100644
--- a/dlls/xaudio2_3/Makefile.in
+++ b/dlls/xaudio2_3/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	xapo.c \
diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in
index 6d1f5e4e71f..f74cbb37a0a 100644
--- a/dlls/xaudio2_4/Makefile.in
+++ b/dlls/xaudio2_4/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	xapo.c \
diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in
index d65b4bd1ed2..c3424c7ae2c 100644
--- a/dlls/xaudio2_5/Makefile.in
+++ b/dlls/xaudio2_5/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	xapo.c \
diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in
index 3bcc930e265..0e902590794 100644
--- a/dlls/xaudio2_6/Makefile.in
+++ b/dlls/xaudio2_6/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	xapo.c \
diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in
index 294f841b019..fd7f5bedc5f 100644
--- a/dlls/xaudio2_7/Makefile.in
+++ b/dlls/xaudio2_7/Makefile.in
@@ -4,6 +4,8 @@ IMPORTS   = advapi32 ole32 user32 uuid
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	x3daudio.c \
diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in
index 566ddb6b3f1..cc8d2e67da3 100644
--- a/dlls/xaudio2_8/Makefile.in
+++ b/dlls/xaudio2_8/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	x3daudio.c \
diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in
index 86f7b99e5eb..75a428f6c25 100644
--- a/dlls/xaudio2_9/Makefile.in
+++ b/dlls/xaudio2_9/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -mcygwin
+
 C_SRCS = \
 	compat.c \
 	x3daudio.c \
diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in
index 4a300a6e820..8655236d794 100644
--- a/programs/winebrowser/Makefile.in
+++ b/programs/winebrowser/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = winebrowser.exe
-APPMODE   = -mwindows -municode
 IMPORTS   = urlmon oleaut32 shell32 user32 advapi32
 
+EXTRADLLFLAGS = -mwindows -municode -mcygwin
+
 C_SRCS = \
 	main.c
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index ca60d566288..bf036fc9b01 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -1,9 +1,10 @@
 MODULE    = winedbg.exe
-APPMODE   = -mconsole
 IMPORTS   = dbghelp advapi32
 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32
 EXTRALIBS = $(POLL_LIBS)
 
+EXTRADLLFLAGS = -mconsole -mcygwin
+
 C_SRCS = \
 	be_arm.c \
 	be_arm64.c \
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index 07e2702843b..f42cc0abdf2 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = winemenubuilder.exe
-APPMODE   = -mwindows -municode
 IMPORTS   = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32
 
+EXTRADLLFLAGS = -mwindows -municode -mcygwin
+
 C_SRCS = \
 	winemenubuilder.c
diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in
index c841f3c4d46..bce66758a7a 100644
--- a/programs/winevdm/Makefile.in
+++ b/programs/winevdm/Makefile.in
@@ -1,7 +1,8 @@
 MODULE    = winevdm.exe
-APPMODE   = -mwindows
 IMPORTS   = user32 kernel comctl32
 
+EXTRADLLFLAGS = -mwindows -mcygwin
+
 C_SRCS = \
 	winevdm.c
 
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 5f8e6c0e086..3877a19e173 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1888,6 +1888,11 @@ int main(int argc, char **argv)
                         raw_compiler_arg = 0;
                         raw_winebuild_arg = 1;
                     }
+		    if (strcmp("-mcygwin", opts.args->base[i]) == 0)
+                    {
+			opts.use_msvcrt = 0;
+                        raw_compiler_arg = 0;
+                    }
 		    else if (strcmp("-mwindows", opts.args->base[i]) == 0)
                     {
 			opts.gui_app = 1;