diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 9eb832b4326..b54a3a1617f 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 da3d509612d..5febf7a5404 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 53f6809bda6..d45ac649060 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 47d48235b04..50edb6f7b84 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 231d82f0fb8..41299e81ecb 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 a9c4b72e80a..8936221774f 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 1203eb92f2e..1238f9d4e4e 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 d4b283826eb..d7d3d28f12b 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 b738a303510..ffa99cd7195 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 69c8939936e..15165dd8acf 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 4ba542824e4..86112b31ab0 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 36a585bbaa3..bbcfb87dba8 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 d31757000c1..52296fea440 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 5f8af3dc123..51e96cc2f01 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 cc8c6dd8d19..0cded88ef61 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 0431b9b3e32..f7d9ebad9cd 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 e6f6b956b0a..d522ba1226d 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 aa5ccbeb2b8..7870b615fd3 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 9905b1db5db..8b2d9db2f68 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 e86a9ee9b6c..6e69df77393 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 8c7bb9b3746..7cda24af75e 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 9dd6562f159..9f32034434d 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 ab8781d9c8e..51134c00d79 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 80fb1977f09..b39e9235d80 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 50a7a9bae70..59b80b569bb 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 0ef04e0113e..ecf3e4e1963 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 62705e865c3..cc5d339967f 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 fea6c501a5b..a44c3d144c3 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 bbe06dd474c..36d8cc89e79 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 edf8b387c80..6f14e32421f 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 48b5f43a89b..79bc73a7c9a 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 9b27880b072..e1d426f3603 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 9466c731470..bf2d7efe4d9 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 5d08ebf2e89..9780500306a 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 4c808cdc211..172e63d94f9 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 e06ef0b2f2f..521cf185c38 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 fa0a2c036a6..b93a36cadac 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 7249174bceb..c728c8b2af4 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 c8abde10421..bdf2a3203eb 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 7f902e2ec72..51fccf6dad8 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 e2c8086e65e..645f26d82b3 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 8e7e3cefe9a..68a3d6cba16 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 7b8f943e94d..22711090669 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 73883c7fe35..4ff1e3e2766 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 277c5a78a06..7debe4a2262 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 3c9de4949c5..f0b1606a742 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 3d7f1cfba9f..ae13f85f72f 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 a1a55b4dd97..f709f2457e2 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 2994bb85e31..43f8b6872e7 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 792ea7c8c81..43cb8fd0977 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 a2e27937714..67662d90825 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 265d8f91d2b..0190854f00c 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 9d9fe0d46e6..1471ad5deeb 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 54a5e8dce80..6b1a6cf69b6 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 7a7a345bc78..6392a493390 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 1b1ce0df43a..da1818eb80a 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 3f8ec403347..0c60b359fa2 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 7ae15185fd7..c9d150a48fc 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 14517f1093d..06af9c8db4f 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 4ecd9f1bfc2..5081a4b5060 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 7948e262c5c..cddea98a71c 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 3b05bf15dc7..9e33dd3f5f0 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 6918ccecd78..5da907a790c 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 ab007616d9e..1a533fcc8f2 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 4bef2743f08..f7c7ebcccc9 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 42c97af978f..07e232863d4 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 1205577a43f..5fab12b45a1 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 49836b92750..2f4074e3795 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 15e8d00e861..3e03f83dbda 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