diff --git a/dlls/avifile.dll16/Makefile.in b/dlls/avifile.dll16/Makefile.in
index 83407c9b3db..4152c2f9f2a 100644
--- a/dlls/avifile.dll16/Makefile.in
+++ b/dlls/avifile.dll16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = avifile.dll16
 IMPORTS   = avifil32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,avifil32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,avifil32.dll
 
 C_SRCS = \
 	main.c
diff --git a/dlls/commdlg.dll16/Makefile.in b/dlls/commdlg.dll16/Makefile.in
index b1609dd9f40..69731147d07 100644
--- a/dlls/commdlg.dll16/Makefile.in
+++ b/dlls/commdlg.dll16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = commdlg.dll16
 IMPORTS   = comdlg32 user32 gdi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,comdlg32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll
 
 C_SRCS = \
 	colordlg.c \
diff --git a/dlls/compobj.dll16/Makefile.in b/dlls/compobj.dll16/Makefile.in
index 4f29a652734..5b11e840c7f 100644
--- a/dlls/compobj.dll16/Makefile.in
+++ b/dlls/compobj.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = compobj.dll16
 IMPORTS   = uuid ole32 advapi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 C_SRCS = compobj.c
diff --git a/dlls/ctl3d.dll16/Makefile.in b/dlls/ctl3d.dll16/Makefile.in
index 303005b7ce1..e8e0b40956e 100644
--- a/dlls/ctl3d.dll16/Makefile.in
+++ b/dlls/ctl3d.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = ctl3d.dll16
 IMPORTS   = user32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ctl3d32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll
 
 C_SRCS = ctl3d.c
diff --git a/dlls/ctl3dv2.dll16/Makefile.in b/dlls/ctl3dv2.dll16/Makefile.in
index 56c0984d400..6bd224fae09 100644
--- a/dlls/ctl3dv2.dll16/Makefile.in
+++ b/dlls/ctl3dv2.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = ctl3dv2.dll16
 IMPORTS   = user32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ctl3d32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll
 
 C_SRCS = ctl3d.c
diff --git a/dlls/ddeml.dll16/Makefile.in b/dlls/ddeml.dll16/Makefile.in
index 77208b09c13..82a08179b94 100644
--- a/dlls/ddeml.dll16/Makefile.in
+++ b/dlls/ddeml.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = ddeml.dll16
 IMPORTS   = user32
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = ddeml.c
diff --git a/dlls/dispdib.dll16/Makefile.in b/dlls/dispdib.dll16/Makefile.in
index 1edba8659a5..b7c924f95c8 100644
--- a/dlls/dispdib.dll16/Makefile.in
+++ b/dlls/dispdib.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = dispdib.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = dispdib.c
diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in
index 0d776c26bcb..533ff36c0cc 100644
--- a/dlls/display.drv16/Makefile.in
+++ b/dlls/display.drv16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = display.drv16
 IMPORTS   = user32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = display.c
 
diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
index 6cd6279e14b..312641cd513 100644
--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = gdi.exe16
 IMPORTS   = user32 advapi32 gdi32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,gdi32.dll,--heap,65520
+EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520
 
 C_SRCS = \
 	bidi.c \
diff --git a/dlls/keyboard.drv16/Makefile.in b/dlls/keyboard.drv16/Makefile.in
index 91b7c871341..91c82f75b51 100644
--- a/dlls/keyboard.drv16/Makefile.in
+++ b/dlls/keyboard.drv16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = keyboard.drv16
 IMPORTS   = user32
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = keyboard.c
diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in
index 906ea5c5224..c00894ceb4e 100644
--- a/dlls/krnl386.exe16/Makefile.in
+++ b/dlls/krnl386.exe16/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = krnl386.exe16
 IMPORTLIB = kernel
 IMPORTS   = kernel32 ntdll winecrt0
 DELAYIMPORTS = user32
-EXTRADLLFLAGS = -m16 -mno-cygwin -nodefaultlibs -Wb,--dll-name,kernel
+EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel
 
 C_SRCS = \
 	atom.c \
diff --git a/dlls/lzexpand.dll16/Makefile.in b/dlls/lzexpand.dll16/Makefile.in
index 0269e46fc22..b44a1eb82d0 100644
--- a/dlls/lzexpand.dll16/Makefile.in
+++ b/dlls/lzexpand.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = lzexpand.dll16
 IMPORTS   = lz32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,lz32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,lz32.dll
 
 C_SRCS = lzexpand.c
diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in
index e1033b440c8..1eb0ce98c1d 100644
--- a/dlls/mmsystem.dll16/Makefile.in
+++ b/dlls/mmsystem.dll16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = mmsystem.dll16
 IMPORTS   = winmm user32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll
 
 C_SRCS = \
 	driver.c \
diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in
index ce1ea19c573..7fe138660ae 100644
--- a/dlls/mouse.drv16/Makefile.in
+++ b/dlls/mouse.drv16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = mouse.drv16
 IMPORTS   = user32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = mouse.c
 
diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in
index e014ca3321a..dccaf17c721 100644
--- a/dlls/msacm.dll16/Makefile.in
+++ b/dlls/msacm.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = msacm.dll16
 IMPORTS   = msacm32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,msacm32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,msacm32.dll
 
 C_SRCS = msacm.c
diff --git a/dlls/msvideo.dll16/Makefile.in b/dlls/msvideo.dll16/Makefile.in
index a657810be7c..5f7a9a4c33d 100644
--- a/dlls/msvideo.dll16/Makefile.in
+++ b/dlls/msvideo.dll16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = msvideo.dll16
 IMPORTS   = msvfw32 version advapi32 user32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,msvfw32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,msvfw32.dll
 
 C_SRCS = msvideo16.c
diff --git a/dlls/ole2.dll16/Makefile.in b/dlls/ole2.dll16/Makefile.in
index 01f4638523b..bb9fa89fd69 100644
--- a/dlls/ole2.dll16/Makefile.in
+++ b/dlls/ole2.dll16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = ole2.dll16
 IMPORTS   = uuid ole32 user32 gdi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 C_SRCS = \
 	memlockbytes.c \
diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in
index 009e0ded917..86100fe146a 100644
--- a/dlls/ole2disp.dll16/Makefile.in
+++ b/dlls/ole2disp.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = ole2disp.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,oleaut32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll
 
 C_SRCS = ole2disp.c
diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in
index 10478104352..bea15132151 100644
--- a/dlls/ole2nls.dll16/Makefile.in
+++ b/dlls/ole2nls.dll16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = ole2nls.dll16
 
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 C_SRCS = ole2nls.c
 
diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in
index de3e9021a10..40a2446b61e 100644
--- a/dlls/olecli.dll16/Makefile.in
+++ b/dlls/olecli.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = olecli.dll16
 IMPORTS   = gdi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olecli32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll
 
 C_SRCS = olecli.c
diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in
index 02ed8ae0a12..d894b588007 100644
--- a/dlls/olesvr.dll16/Makefile.in
+++ b/dlls/olesvr.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = olesvr.dll16
 IMPORTS   = gdi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olesvr32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll
 
 C_SRCS = olesvr.c
diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in
index fa23cf11f79..d7d6555baf0 100644
--- a/dlls/setupx.dll16/Makefile.in
+++ b/dlls/setupx.dll16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = setupx.dll16
 IMPORTS   = setupapi user32 advapi32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,setupapi.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,setupapi.dll
 
 C_SRCS = \
 	devinst16.c \
diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in
index 97308ee681c..dad637e6081 100644
--- a/dlls/shell.dll16/Makefile.in
+++ b/dlls/shell.dll16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = shell.dll16
 IMPORTS   = shell32 user32 gdi32 advapi32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,shell32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,shell32.dll
 
 C_SRCS = shell.c
 
diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in
index 1a31640a526..8e9b04bfa83 100644
--- a/dlls/sound.drv16/Makefile.in
+++ b/dlls/sound.drv16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = sound.drv16
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll
 
 C_SRCS = sound.c
diff --git a/dlls/storage.dll16/Makefile.in b/dlls/storage.dll16/Makefile.in
index b7a2045d703..f390aca7dd9 100644
--- a/dlls/storage.dll16/Makefile.in
+++ b/dlls/storage.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = storage.dll16
 IMPORTS   = uuid ole32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 C_SRCS = storage.c
diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in
index 3bd34dab801..0c93384c33e 100644
--- a/dlls/stress.dll16/Makefile.in
+++ b/dlls/stress.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = stress.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = stress.c
diff --git a/dlls/system.drv16/Makefile.in b/dlls/system.drv16/Makefile.in
index 192c465ca89..553e6337a68 100644
--- a/dlls/system.drv16/Makefile.in
+++ b/dlls/system.drv16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = system.drv16
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = system.c
diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in
index 3c9b33fddb4..64d0de31528 100644
--- a/dlls/toolhelp.dll16/Makefile.in
+++ b/dlls/toolhelp.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = toolhelp.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = toolhelp.c
diff --git a/dlls/twain.dll16/Makefile.in b/dlls/twain.dll16/Makefile.in
index b92d0a90958..e9b543477d1 100644
--- a/dlls/twain.dll16/Makefile.in
+++ b/dlls/twain.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = twain.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,twain_32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,twain_32.dll
 
 C_SRCS = twain.c
diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in
index 62c5b9339a6..b4d39ee6601 100644
--- a/dlls/typelib.dll16/Makefile.in
+++ b/dlls/typelib.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = typelib.dll16
 IMPORTS   = oleaut32 advapi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,oleaut32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll
 
 C_SRCS = typelib.c
diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in
index 664b8e81e8e..5a82b7590cd 100644
--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = user.exe16
 IMPORTS   = mpr user32 gdi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,user32.dll,--heap,65520
+EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
 
 C_SRCS = \
 	bidi.c \
diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in
index 14651320997..1c68dfc5035 100644
--- a/dlls/ver.dll16/Makefile.in
+++ b/dlls/ver.dll16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = ver.dll16
 IMPORTS   = version lz32
 
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,version.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,version.dll
 
 C_SRCS = version.c
diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in
index 4453492e297..73691b2fa5d 100644
--- a/dlls/w32sys.dll16/Makefile.in
+++ b/dlls/w32sys.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = w32sys.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,w32skrnl.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll
 
 C_SRCS = w32sys.c
diff --git a/dlls/win32s16.dll16/Makefile.in b/dlls/win32s16.dll16/Makefile.in
index 18b671ba2d8..ce8a5d101ae 100644
--- a/dlls/win32s16.dll16/Makefile.in
+++ b/dlls/win32s16.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = win32s16.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,w32skrnl.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll
 
 C_SRCS = win32s16.c
diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in
index 4021382f024..b40ceb0c68d 100644
--- a/dlls/win87em.dll16/Makefile.in
+++ b/dlls/win87em.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = win87em.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = win87em.c
diff --git a/dlls/winaspi.dll16/Makefile.in b/dlls/winaspi.dll16/Makefile.in
index 54a93a49bb7..e248c2abd7f 100644
--- a/dlls/winaspi.dll16/Makefile.in
+++ b/dlls/winaspi.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = winaspi.dll16
 IMPORTS   = wnaspi32 advapi32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,wnaspi32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,wnaspi32.dll
 
 C_SRCS = winaspi.c
diff --git a/dlls/windebug.dll16/Makefile.in b/dlls/windebug.dll16/Makefile.in
index c0b1840e41a..7336c2d2009 100644
--- a/dlls/windebug.dll16/Makefile.in
+++ b/dlls/windebug.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = windebug.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = windebug.c
diff --git a/dlls/wineps16.drv16/Makefile.in b/dlls/wineps16.drv16/Makefile.in
index bf368fa891f..7d82de757b1 100644
--- a/dlls/wineps16.drv16/Makefile.in
+++ b/dlls/wineps16.drv16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = wineps16.drv16
 IMPORTS   = winspool
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = driver.c
diff --git a/dlls/wing.dll16/Makefile.in b/dlls/wing.dll16/Makefile.in
index 87d0f23ba3a..d9b936ea98a 100644
--- a/dlls/wing.dll16/Makefile.in
+++ b/dlls/wing.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = wing.dll16
 IMPORTS   = gdi32
-EXTRADLLFLAGS = -m16 -mno-cygwin
+EXTRADLLFLAGS = -m16
 
 C_SRCS = wing.c
diff --git a/dlls/winnls.dll16/Makefile.in b/dlls/winnls.dll16/Makefile.in
index 73f0ef564e4..7326bf69eef 100644
--- a/dlls/winnls.dll16/Makefile.in
+++ b/dlls/winnls.dll16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = winnls.dll16
 IMPORTS   = winnls32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winnls32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,winnls32.dll
 
 C_SRCS = winnls.c
diff --git a/dlls/winsock.dll16/Makefile.in b/dlls/winsock.dll16/Makefile.in
index 633b4706e29..2491a8cf23a 100644
--- a/dlls/winsock.dll16/Makefile.in
+++ b/dlls/winsock.dll16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = winsock.dll16
 IMPORTS   = ws2_32
 DELAYIMPORTS = user32
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ws2_32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ws2_32.dll
 
 C_SRCS = socket.c
diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in
index 8d0cd7c6b04..05479200a09 100644
--- a/dlls/wintab.dll16/Makefile.in
+++ b/dlls/wintab.dll16/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = wintab.dll16
-EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,wintab32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,wintab32.dll
 
 C_SRCS = wintab.c
diff --git a/programs/rundll.exe16/Makefile.in b/programs/rundll.exe16/Makefile.in
index 4abce90cf16..81e19e95f96 100644
--- a/programs/rundll.exe16/Makefile.in
+++ b/programs/rundll.exe16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = rundll.exe16
 
-EXTRADLLFLAGS = -mconsole -m16 -mno-cygwin
+EXTRADLLFLAGS = -mconsole -m16
 
 C_SRCS = rundll.c
diff --git a/programs/winhelp.exe16/Makefile.in b/programs/winhelp.exe16/Makefile.in
index 16bb32001e7..6437749c776 100644
--- a/programs/winhelp.exe16/Makefile.in
+++ b/programs/winhelp.exe16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = winhelp.exe16
 
-EXTRADLLFLAGS = -mconsole -m16 -mno-cygwin
+EXTRADLLFLAGS = -mconsole -m16
 
 C_SRCS = winhelp.c
diff --git a/programs/winoldap.mod16/Makefile.in b/programs/winoldap.mod16/Makefile.in
index 9e690057f35..8d0c73c0956 100644
--- a/programs/winoldap.mod16/Makefile.in
+++ b/programs/winoldap.mod16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = winoldap.mod16
 
-EXTRADLLFLAGS = -mconsole -m16 -mno-cygwin
+EXTRADLLFLAGS = -mconsole -m16
 
 C_SRCS = winoldap.c
diff --git a/tools/makedep.c b/tools/makedep.c
index 4f19231e7c5..0ff17564d71 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -4204,12 +4204,12 @@ static void load_sources( struct makefile *make )
 
     if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module;
 
-    if ((make->module && make->staticlib) || make->testdll)
-        strarray_add( &make->extradllflags, "-mno-cygwin" );
+    make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );
+    if ((make->module && make->staticlib) || make->testdll || make->is_win16)
+        strarray_add_uniq( &make->extradllflags, "-mno-cygwin" );
 
     strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" ));
     make->disabled   = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir );
-    make->is_win16   = strarray_exists( &make->extradllflags, "-m16" );
     make->use_msvcrt = strarray_exists( &make->extradllflags, "-mno-cygwin" );
     make->is_exe     = strarray_exists( &make->extradllflags, "-mconsole" ) ||
                        strarray_exists( &make->extradllflags, "-mwindows" );