diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 9eb832b4326eae0bcf1b768c18cdbfcf5627faa2..b54a3a1617f9c2258887b452da522229da6caba6 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -10,7 +10,7 @@
 #
 
 DLLFLAGS    = @DLLFLAGS@
-DEFS        = -DWINE_STRICT_PROTOTYPES $(EXTRADEFS)
+DEFS        = -DWINE_STRICT_PROTOTYPES -DWINE_NO_UNICODE_MACROS $(EXTRADEFS)
 ALL_LIBS    = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
 INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
 
diff --git a/programs/aspnet_regiis/Makefile.in b/programs/aspnet_regiis/Makefile.in
index da3d509612d809f4d9e14eb78fe7586675c017a7..5febf7a54041999e91ab63a22be113e9c0caba33 100644
--- a/programs/aspnet_regiis/Makefile.in
+++ b/programs/aspnet_regiis/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = aspnet_regiis.exe
 APPMODE   = -mconsole -municode
 
diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in
index 53f6809bda69a11306fb686f837565ec4a8159f5..d45ac649060b4069d92e8c69c857300fe90a854c 100644
--- a/programs/attrib/Makefile.in
+++ b/programs/attrib/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = attrib.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = user32
diff --git a/programs/cabarc/Makefile.in b/programs/cabarc/Makefile.in
index 47d48235b0460c3a62e73f3aac856a5a12721bba..50edb6f7b843b35143ccb44fceb2654f9ce95ddf 100644
--- a/programs/cabarc/Makefile.in
+++ b/programs/cabarc/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = cabarc.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = cabinet
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = cabarc.c
 
diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in
index 231d82f0fb8f5af4b99df60d55ba29b204fd251f..41299e81ecb29c838ade6c14068e013fd65c9799 100644
--- a/programs/cacls/Makefile.in
+++ b/programs/cacls/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = cacls.exe
 APPMODE   = -mconsole
 
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index a9c4b72e80ab97f08c8bcacd801a9166491f30d0..8936221774fbf81757e7771855efae007155957a 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = clock.exe
 APPMODE   = -mwindows
 IMPORTS   = comdlg32 shell32 user32 gdi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	main.c \
diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in
index 1203eb92f2eb7fcbf80b4554e7a0600aa407911a..1238f9d4e4e33941f7fede6288fa4f1e120d121f 100644
--- a/programs/cmd/Makefile.in
+++ b/programs/cmd/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = cmd.exe
 APPMODE   = -mconsole -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = shell32 user32 advapi32
 
 C_SRCS = \
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index d4b283826eb9386134998e19ec07925f448732dd..d7d3d28f12bd60db5cf38cd907e6364472cbe096 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = control.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = shell32 user32
diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in
index b738a303510e27f1b025f04dd41070ff8c2c209f..ffa99cd719563714a058d2b7bb34df9b9ef6389e 100644
--- a/programs/cscript/Makefile.in
+++ b/programs/cscript/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = cscript.exe
 APPMODE   = -mwindows -municode
 
diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in
index 69c8939936e1eca779b9b2f76de746f283277311..15165dd8acf37d758b09fdffac8d6d4de8fe9a3a 100644
--- a/programs/dxdiag/Makefile.in
+++ b/programs/dxdiag/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = dxdiag.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = dxguid ole32 oleaut32 user32
diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in
index 4ba542824e40fceccd12256110288cf058bfc592..86112b31ab0bcf5dc58364d2c9cd44df7db57d7f 100644
--- a/programs/eject/Makefile.in
+++ b/programs/eject/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = eject.exe
 APPMODE   = -mconsole
 
diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in
index 36a585bbaa3189c868472e2844067898f61253c3..bbcfb87dba8ff99c1d909297a13ec044b89e2ac2 100644
--- a/programs/expand/Makefile.in
+++ b/programs/expand/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = expand.exe
 APPMODE   = -mconsole
 IMPORTS   = setupapi
diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in
index d31757000c1d90bfea94ac289b5af503c37689b3..52296fea4400b23dca48089cbaa9be268fcaf8d2 100644
--- a/programs/explorer/Makefile.in
+++ b/programs/explorer/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = explorer.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = rpcrt4 user32 gdi32 advapi32
diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in
index 5f8af3dc1237bdea54e7568d260f70f8eaca77c6..51e96cc2f0153b40f10524ab14374163c98edc97 100644
--- a/programs/extrac32/Makefile.in
+++ b/programs/extrac32/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = extrac32.exe
 APPMODE   = -mwindows -municode
-EXTRADEFS = -DWINE_NO_UNICODE
 IMPORTS   = shell32 setupapi shlwapi user32
 
 C_SRCS = \
diff --git a/programs/hh/Makefile.in b/programs/hh/Makefile.in
index cc8c6dd8d197f11bf0a16a7f28d1df73d3ee6ea9..0cded88ef619a87c51a4e423421ce49fda71d701 100644
--- a/programs/hh/Makefile.in
+++ b/programs/hh/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = hh.exe
 APPMODE   = -mwindows
 
diff --git a/programs/hostname/Makefile.in b/programs/hostname/Makefile.in
index 0431b9b3e326a020b4050ef03cba85f84b3f7548..f7d9ebad9cd8ed1edc83114d4e2ba1cbb3d99a5a 100644
--- a/programs/hostname/Makefile.in
+++ b/programs/hostname/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = hostname.exe
 APPMODE   = -mconsole -municode
 EXTRALIBS = @SOCKETLIBS@
diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in
index e6f6b956b0a8ba513e829a0367bf2e8e535be961..d522ba1226da9b32983bd4d0288c6696dbffe894 100644
--- a/programs/icinfo/Makefile.in
+++ b/programs/icinfo/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = icinfo.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = msvfw32
diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in
index aa5ccbeb2b88992716837de4f07a0fe0804775b0..7870b615fd345b3e046f6c9bd7e6b53cbe40366b 100644
--- a/programs/iexplore/Makefile.in
+++ b/programs/iexplore/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = iexplore.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = ieframe
diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in
index 9905b1db5db14f9a039613a16ed9c82bb224550f..8b2d9db2f6881229af10ec1b1ad1c85fc5c58270 100644
--- a/programs/ipconfig/Makefile.in
+++ b/programs/ipconfig/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = ipconfig.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = iphlpapi ws2_32 user32
diff --git a/programs/mofcomp/Makefile.in b/programs/mofcomp/Makefile.in
index e86a9ee9b6cfddb597979106ab2d73a6ac7fc301..6e69df77393822686e93151db5b6f20b7a1f77bb 100644
--- a/programs/mofcomp/Makefile.in
+++ b/programs/mofcomp/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = mofcomp.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = kernel32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = mofcomp.c
 
diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in
index 8c7bb9b3746626d273ff3ab42a35dffec08d3335..7cda24af75ea607978e3110ab795ce6e5679d55a 100644
--- a/programs/mshta/Makefile.in
+++ b/programs/mshta/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = mshta.exe
 APPMODE   = -mwindows -municode
 
diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in
index 9dd6562f159cb8ff0145a3131771f7300e6d9952..9f32034434d74175ee5ecbbe0735f98df702ae27 100644
--- a/programs/msiexec/Makefile.in
+++ b/programs/msiexec/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = msiexec.exe
 APPMODE   = -mwindows
 IMPORTS   = msi ole32 advapi32 user32
diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in
index ab8781d9c8e59c50304e80b032c074e77149b867..51134c00d797ce7043fae1e59529403ee135e059 100644
--- a/programs/net/Makefile.in
+++ b/programs/net/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = net.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = netapi32 user32 advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = net.c
 
diff --git a/programs/netsh/Makefile.in b/programs/netsh/Makefile.in
index 80fb1977f0928b3e0c0540cd1cf5dbc156ed4cee..b39e9235d80452820e8bf1e441541aa2489c8b88 100644
--- a/programs/netsh/Makefile.in
+++ b/programs/netsh/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = netsh.exe
 APPMODE   = -mconsole -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = netsh.c
 
diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in
index 50a7a9bae7046c46cc04259bd8270bc86a5007e7..59b80b569bb5346508b47a0d121bf39e47611d48 100644
--- a/programs/ngen/Makefile.in
+++ b/programs/ngen/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = ngen.exe
 APPMODE   = -mconsole -municode
 
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 0ef04e0113e2a72187c5150b542b919468964bc5..ecf3e4e1963fdd3bda546d530ea53f61bce4ce18 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -3,7 +3,7 @@ APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 advapi32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 
 C_SRCS = \
 	dialog.c \
diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in
index 62705e865c3af3a7d91bb7d3df2baf7736affdf3..cc5d339967f72533981c4ac72168464844c75008 100644
--- a/programs/oleview/Makefile.in
+++ b/programs/oleview/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = oleview.exe
 APPMODE   = -mwindows
 IMPORTS   = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	details.c \
diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in
index fea6c501a5b256a4321648c59cafe2048d102371..a44c3d144c3a0f61ce6351a02e835a4de15b8b5a 100644
--- a/programs/ping/Makefile.in
+++ b/programs/ping/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = ping.exe
 APPMODE   = -mconsole
 
diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in
index bbe06dd474cb0ffdfa10fde9fdbd7330f7a8fcd8..36d8cc89e799d20cb4236b18545e3e81d7a66c2b 100644
--- a/programs/plugplay/Makefile.in
+++ b/programs/plugplay/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = plugplay.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32
diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in
index edf8b387c80f33139cf59c21a1a1f6db8669c4cf..6f14e32421f01c5872a6dff989491a122a872222 100644
--- a/programs/presentationfontcache/Makefile.in
+++ b/programs/presentationfontcache/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = presentationfontcache.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index 48b5f43a89b12a4b3ddd5f5767924cabf28c7f5b..79bc73a7c9aee9261136295f50b36ca3acb28c24 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = progman.exe
 APPMODE   = -mwindows
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = shell32 comdlg32 user32 gdi32
 
 C_SRCS = \
diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in
index 9b27880b072b52c880839cd8ea2ab2db32cb2990..e1d426f36038597a68819cd55ad3e86f75d1ee12 100644
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = reg.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32
diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in
index 9466c731470bbd20e792abdf62f9632ab68a3642..bf2d7efe4d9645cc3599e4f92e0c5eabdc041127 100644
--- a/programs/regasm/Makefile.in
+++ b/programs/regasm/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = regasm.exe
 APPMODE   = -mconsole -municode
 
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index 5d08ebf2e89887ead8ada552aaa2022310af192d..9780500306a487823c3bfbe87fb26a1059e1c663 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -3,7 +3,7 @@ APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = advapi32
 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
 
 C_SRCS = \
diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in
index 4c808cdc21147c751021135c782efdbe3da51948..172e63d94f9ede68af9b66653bf56aebe1c1d507 100644
--- a/programs/regsvcs/Makefile.in
+++ b/programs/regsvcs/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = regsvcs.exe
 APPMODE   = -mconsole -municode
 
diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in
index e06ef0b2f2fcc1e91d5fd6d096ce4dd22460f5d5..521cf185c38815ede02923ba016684ec4a116fe0 100644
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = regsvr32.exe
 APPMODE   = -mconsole
 IMPORTS   = ole32
diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in
index fa0a2c036a6d0afb34258822ff76d183b6fd0578..b93a36cadac0b8f05db3d30b6f86d0ade3256f3e 100644
--- a/programs/rundll32/Makefile.in
+++ b/programs/rundll32/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = rundll32.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = user32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	rundll32.c
diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in
index 7249174bcebe33a5c4127a4fe3d147c25f0dcbed..c728c8b2af4799b0248d308a61f981c321f320a9 100644
--- a/programs/sc/Makefile.in
+++ b/programs/sc/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = sc.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = sc.c
 
diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in
index c8abde104213acdb8444523b325c501c44ebdf82..bdf2a3203eb13baeff55a13771b7526dfdd38954 100644
--- a/programs/secedit/Makefile.in
+++ b/programs/secedit/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = secedit.exe
 APPMODE   = -mconsole
 
diff --git a/programs/servicemodelreg/Makefile.in b/programs/servicemodelreg/Makefile.in
index 7f902e2ec72e6ff9c993beba7a089754e88a5161..51fccf6dad8487a6208928239344c4b0460874d3 100644
--- a/programs/servicemodelreg/Makefile.in
+++ b/programs/servicemodelreg/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = servicemodelreg.exe
 APPMODE   = -mconsole -municode
 
diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in
index e2c8086e65e3e3432f0228be4272dac0e2d64aa9..645f26d82b35e5983c7f768379d5809f8e1057f9 100644
--- a/programs/services/Makefile.in
+++ b/programs/services/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = services.exe
 APPMODE   = -mconsole
 IMPORTS   = rpcrt4 advapi32 userenv
diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in
index 8e7e3cefe9ab92965e9d9079cb6a3cd787358689..68a3d6cba16743e3b2cac435c6da0af24f07466d 100644
--- a/programs/spoolsv/Makefile.in
+++ b/programs/spoolsv/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = spoolsv.exe
 APPMODE   = -mconsole
 IMPORTS   = advapi32
diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in
index 7b8f943e94d422b50f291094d30473691f4db622..227110906697f827e1ff6334eab3e602ac2af302 100644
--- a/programs/start/Makefile.in
+++ b/programs/start/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = start.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = shell32 user32
diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in
index 73883c7fe35d4c9033931391d7d49f3c26a84c2a..4ff1e3e276631e8648be971263c2c09baa61b00e 100644
--- a/programs/svchost/Makefile.in
+++ b/programs/svchost/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = svchost.exe
 APPMODE   = -municode
 IMPORTS   = advapi32
diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in
index 277c5a78a06aefb95a82cf4f2f84de0db0fd5891..7debe4a2262c28f6d1bec332bb67d122c77d8d31 100644
--- a/programs/taskkill/Makefile.in
+++ b/programs/taskkill/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = taskkill.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = psapi user32
diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in
index 3c9de4949c5bcf5294029a436d97a0467c96fc20..f0b1606a7420484ab43621b03e34efebf4cdb440 100644
--- a/programs/taskmgr/Makefile.in
+++ b/programs/taskmgr/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = taskmgr.exe
 APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = psapi shell32 comctl32 user32 gdi32 advapi32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
 
 C_SRCS = \
diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in
index 3d7f1cfba9fd340bb0aa5637d39dfa68ce27ae53..ae13f85f72f3f1e4ca7beb883a9a95ffa26f908f 100644
--- a/programs/termsv/Makefile.in
+++ b/programs/termsv/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = termsv.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index a1a55b4dd979254777976b93aa86e7cc1f42e82b..f709f2457e2e359722817b75a92f1b59bb216504 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = uninstaller.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index 2994bb85e312b6df7080a1b4d989d9e43ffe6396..43f8b6872e7a8b351c7e007b961b2795527b5a3a 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = view.exe
 APPMODE   = -mwindows -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = comdlg32 user32 gdi32
 
 C_SRCS = \
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index 792ea7c8c810adb65fdea3759b10571e54d80e76..43cb8fd09773ec98214ee65d5d725fb23c8eabb7 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = wineboot.exe
 APPMODE   = -mconsole
 IMPORTS   = uuid advapi32
diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in
index a2e27937714d93673ee6063a6eba50b09bebbf19..67662d90825dcfb962e2498c38948c5b17c8a88a 100644
--- a/programs/winebrowser/Makefile.in
+++ b/programs/winebrowser/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winebrowser.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = urlmon oleaut32 user32 advapi32
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 265d8f91d2b6197f73e97d981002b949fb4b42ef..0190854f00c52f70c2c5584ca35a24db2d2e64b7 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = winecfg.exe
 APPMODE   = -mwindows
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32
 
 C_SRCS = \
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index 9d9fe0d46e65887f19e26259e6ccaf3f1561fa4f..1471ad5deeb4d9b09259d0e310a12dfd2098b876 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = wineconsole.exe
 APPMODE   = -mwindows
 IMPORTS   = advapi32
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 54a5e8dce8034f23bd99d5dd32177e74dcf77e2a..6b1a6cf69b6c1d83c7f2352dafb6e5227b344ac1 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -3,7 +3,6 @@ APPMODE   = -mconsole
 IMPORTS   = psapi dbghelp advapi32
 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32
 EXTRALIBS = @LIBPOLL@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	be_arm.c \
diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in
index 7a7a345bc78dd47f47d910623b1c3c29eda4fd86..6392a4933909085213013239188bb7917c6f49e3 100644
--- a/programs/winedevice/Makefile.in
+++ b/programs/winedevice/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winedevice.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = advapi32 ntoskrnl.exe
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index 1b1ce0df43a17fc0cfd374a9f58b800adf3fd144..da1818eb80ad70db6678e622e11f3af641467c15 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D__WINE__ -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -D__WINE__
 MODULE    = winefile.exe
 APPMODE   = -mwindows
 IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index 3f8ec4033476e9fd02b70e666c8a6f9668292e82..0c60b359fa20f9b718f2dc43d2bbd0ed3fb9deca 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index 7ae15185fd77a3a650ca44b88452570fe7552263..c9d150a48fc6aadd11239e54281b3f076b6289c8 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = winemine.exe
 APPMODE   = -mwindows -municode
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = user32 gdi32 advapi32
 DELAYIMPORTS = shell32
 
diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in
index 14517f1093d7b0f178b9a06df455ff617d2486fc..06af9c8db4fddc8071cec7212205f7ecbdedaa62 100644
--- a/programs/winemsibuilder/Makefile.in
+++ b/programs/winemsibuilder/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = winemsibuilder.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = msi ole32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = main.c
 
diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in
index 4ecd9f1bfc2c34e42d5f99b139a4bfd8364f370f..5081a4b5060c11425eb9d47071aa73a9046fbed2 100644
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winepath.exe
 APPMODE   = -mconsole -municode
 
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 7948e262c5c8b75b85c88bd54f4690a1e72d0a4b..cddea98a71c61ebbb3933b6ed890c5100e672550 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = winetest.exe
 APPMODE   = -mconsole
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = uuid comctl32 version user32 gdi32 advapi32 wsock32
 DELAYIMPORTS = ole32
 
diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in
index 3b05bf15dc7ad9023b9679d2cace7adbec066688..9e33dd3f5f009e48dc459e97d2a9a581a019c823 100644
--- a/programs/winevdm/Makefile.in
+++ b/programs/winevdm/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winevdm.exe
 APPMODE   = -mconsole
 IMPORTS   = user32 kernel
diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in
index 6918ccecd7895d264a32961b3931a7b96109391c..5da907a790cb34990f2112a8733fb9b958be7e58 100644
--- a/programs/winhlp32/Makefile.in
+++ b/programs/winhlp32/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = winhlp32.exe
 APPMODE   = -mwindows
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = user32 gdi32
 DELAYIMPORTS = shell32 comctl32 comdlg32
 
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index ab007616d9ee78d54d8c658375ecfdc61641613d..1a533fcc8f249e4156fbc96f7a9191b76d29fbc5 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = winver.exe
 APPMODE   = -mwindows
 IMPORTS   = shell32
diff --git a/programs/wmic/Makefile.in b/programs/wmic/Makefile.in
index 4bef2743f085054793ce9b76f08c1d38c658486b..f7c7ebcccc9115093d8f1fb3883af1ed8cb27a24 100644
--- a/programs/wmic/Makefile.in
+++ b/programs/wmic/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = wmic.exe
 APPMODE   = -mconsole -municode
 
diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in
index 42c97af978f3cb971c5e9843b35c38eb812c16f4..07e232863d401026e00dc17275a06b727a67adb8 100644
--- a/programs/wordpad/Makefile.in
+++ b/programs/wordpad/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = wordpad.exe
 APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32
 EXTRAINCL = -I$(top_srcdir)/include/msvcrt
-EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
+EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@
 
 C_SRCS = \
diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in
index 1205577a43fbeb06f0912ecf23bba630c0e7186e..5fab12b45a1c81f81648e95050d25699a26f5efb 100644
--- a/programs/write/Makefile.in
+++ b/programs/write/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = write.exe
 APPMODE   = -mwindows
 IMPORTS   = user32 gdi32
diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in
index 49836b92750ea6a7e81b489ec19c19a26be3af81..2f4074e3795b3d52103fb6b5918e3e232014afab 100644
--- a/programs/wscript/Makefile.in
+++ b/programs/wscript/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = wscript.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = uuid shell32 oleaut32 ole32 advapi32
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 RC_SRCS = \
 	rsrc.rc
diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in
index 15e8d00e861b786c602c396abee3ff7b2c4c63b1..3e03f83dbda33d503903570e7ec72d87eb307a43 100644
--- a/programs/xcopy/Makefile.in
+++ b/programs/xcopy/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = xcopy.exe
 APPMODE   = -mconsole -municode -mno-cygwin
 IMPORTS   = shell32 user32