diff --git a/programs/arp/Makefile.in b/programs/arp/Makefile.in
index 397848b099a..2a7d1cdb89c 100644
--- a/programs/arp/Makefile.in
+++ b/programs/arp/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = arp.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/aspnet_regiis/Makefile.in b/programs/aspnet_regiis/Makefile.in
index 12b8f71a991..38c7a2ff1aa 100644
--- a/programs/aspnet_regiis/Makefile.in
+++ b/programs/aspnet_regiis/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = aspnet_regiis.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in
index 5307a9d080a..26cc9078795 100644
--- a/programs/cacls/Makefile.in
+++ b/programs/cacls/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = cacls.exe
-APPMODE   = -mconsole
+
+EXTRADLLFLAGS = -mconsole -mno-cygwin
 
 C_SRCS = \
 	cacls_main.c
diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in
index 821cb5f3f92..75ec7dfc41a 100644
--- a/programs/conhost/Makefile.in
+++ b/programs/conhost/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = conhost.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = conhost.c
 
diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in
index 834d1439a8e..61d9fa4512d 100644
--- a/programs/dism/Makefile.in
+++ b/programs/dism/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = dism.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = dism.c
diff --git a/programs/dpnsvr/Makefile.in b/programs/dpnsvr/Makefile.in
index 1dac8a40c82..9bcf4ad2ac1 100644
--- a/programs/dpnsvr/Makefile.in
+++ b/programs/dpnsvr/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = dpnsvr.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/fc/Makefile.in b/programs/fc/Makefile.in
index 96d878a4104..0a8f00f7767 100644
--- a/programs/fc/Makefile.in
+++ b/programs/fc/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = fc.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = fc.c
diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in
index ef8d61b7ce7..0c6b334f298 100644
--- a/programs/find/Makefile.in
+++ b/programs/find/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = find.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = find.c
diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in
index 10875af88c7..0f29794591b 100644
--- a/programs/findstr/Makefile.in
+++ b/programs/findstr/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = findstr.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in
index f339c4c093b..64307e83aca 100644
--- a/programs/fsutil/Makefile.in
+++ b/programs/fsutil/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = fsutil.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/icacls/Makefile.in b/programs/icacls/Makefile.in
index af919a5fa41..7e3e50d9350 100644
--- a/programs/icacls/Makefile.in
+++ b/programs/icacls/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = icacls.exe
-APPMODE   = -mconsole
+
+EXTRADLLFLAGS = -mconsole -mno-cygwin
 
 C_SRCS = \
 	icacls_main.c
diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in
index e74b1b83889..af26db5daaa 100644
--- a/programs/lodctr/Makefile.in
+++ b/programs/lodctr/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = lodctr.exe
-APPMODE   = -mconsole
 IMPORTS   = loadperf
 
+EXTRADLLFLAGS = -mconsole -mno-cygwin
+
 C_SRCS = lodctr_main.c
diff --git a/programs/mofcomp/Makefile.in b/programs/mofcomp/Makefile.in
index 43d9e38a73d..77fac00aede 100644
--- a/programs/mofcomp/Makefile.in
+++ b/programs/mofcomp/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = mofcomp.exe
-APPMODE   = -mconsole -municode
-IMPORTS   = kernel32
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = mofcomp.c
diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in
index 3a61c3dcf11..f11d8a469e5 100644
--- a/programs/mshta/Makefile.in
+++ b/programs/mshta/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = mshta.exe
-APPMODE   = -mwindows -municode
+
+EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in
index d752c914628..e3e657baf61 100644
--- a/programs/msinfo32/Makefile.in
+++ b/programs/msinfo32/Makefile.in
@@ -1,7 +1,8 @@
 MODULE    = msinfo32.exe
-APPMODE   = -mwindows -municode
 IMPORTS   = shell32 user32
 
+EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
+
 C_SRCS = \
 	main.c
 
diff --git a/programs/netsh/Makefile.in b/programs/netsh/Makefile.in
index 27e1c3da623..a0c13599ae6 100644
--- a/programs/netsh/Makefile.in
+++ b/programs/netsh/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = netsh.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = netsh.c
diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in
index 3aef1e5b61a..9a8d744b151 100644
--- a/programs/ngen/Makefile.in
+++ b/programs/ngen/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = ngen.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	ngen_main.c
diff --git a/programs/powershell/Makefile.in b/programs/powershell/Makefile.in
index 8a8c319bc5a..ac596fc97ca 100644
--- a/programs/powershell/Makefile.in
+++ b/programs/powershell/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = powershell.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in
index 45faee90a6c..baa4f839d40 100644
--- a/programs/regasm/Makefile.in
+++ b/programs/regasm/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = regasm.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in
index 22eb542e01f..880900af266 100644
--- a/programs/regsvcs/Makefile.in
+++ b/programs/regsvcs/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = regsvcs.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/sdbinst/Makefile.in b/programs/sdbinst/Makefile.in
index 460dd8feeef..05c60c0b80c 100644
--- a/programs/sdbinst/Makefile.in
+++ b/programs/sdbinst/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = sdbinst.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in
index 06dfd72296d..6700655e30a 100644
--- a/programs/secedit/Makefile.in
+++ b/programs/secedit/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = secedit.exe
-APPMODE   = -mconsole
+
+EXTRADLLFLAGS = -mconsole -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/servicemodelreg/Makefile.in b/programs/servicemodelreg/Makefile.in
index d145650f056..bc6e165c093 100644
--- a/programs/servicemodelreg/Makefile.in
+++ b/programs/servicemodelreg/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = servicemodelreg.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in
index 00140218a8c..a84eb892fa9 100644
--- a/programs/shutdown/Makefile.in
+++ b/programs/shutdown/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = shutdown.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/subst/Makefile.in b/programs/subst/Makefile.in
index 63d574f5d23..3a1292bf2a6 100644
--- a/programs/subst/Makefile.in
+++ b/programs/subst/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = subst.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in
index 72e47919cd3..053c52e5858 100644
--- a/programs/systeminfo/Makefile.in
+++ b/programs/systeminfo/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = systeminfo.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in
index 6e97d2e207c..53e6b791db7 100644
--- a/programs/tasklist/Makefile.in
+++ b/programs/tasklist/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = tasklist.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = tasklist.c
 
diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in
index f414ce96772..8985ab1dfa5 100644
--- a/programs/unlodctr/Makefile.in
+++ b/programs/unlodctr/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = unlodctr.exe
-APPMODE   = -mconsole
 IMPORTS   = loadperf
 
+EXTRADLLFLAGS = -mconsole -mno-cygwin
+
 C_SRCS = unlodctr_main.c
diff --git a/programs/wevtutil/Makefile.in b/programs/wevtutil/Makefile.in
index f6882b27c89..9dc0839e636 100644
--- a/programs/wevtutil/Makefile.in
+++ b/programs/wevtutil/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = wevtutil.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c
diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in
index be345a0877c..1a91e2af892 100644
--- a/programs/wmplayer/Makefile.in
+++ b/programs/wmplayer/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = wmplayer.exe
-APPMODE   = -mwindows -municode
+
+EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
 
 RC_SRCS = version.rc
 
diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in
index 5068456a20b..3042e86bf85 100644
--- a/programs/wusa/Makefile.in
+++ b/programs/wusa/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = wusa.exe
-APPMODE   = -mconsole -municode
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 
 C_SRCS = \
 	main.c