diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index cee885d6c741b7c174c3150c139b2d101a129cc9..00a80cfc184d3690d71df0faeb6401d5a546afa3 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -8,7 +8,7 @@
 # plus all variables required by the global Make.rules.in
 #
 
-DEFS       = @DLLFLAGS@ $(EXTRADEFS)
+DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
 LDDLLFLAGS = @LDDLLFLAGS@
 ALL_OBJS   = $(MODULE).spec.o $(OBJS)
 ALL_LIBS   = $(LIBWINE) $(EXTRALIBS) $(LIBS)
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index f52bb28b6f2b5b452634d5d84b6c74387023565b..c96f24c9d5b0db948e9017569b93610f1a29a47d 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -1,4 +1,4 @@
-DEFS       = @DLLFLAGS@
+DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT
 LDDLLFLAGS = @LDDLLFLAGS@
 TOPSRCDIR  = @top_srcdir@
 TOPOBJDIR  = ../..
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 6e2586a4f43dd60a539e00cd70c787cd856d183f..409c357fa71b65c29698d93e9821a1e0abab87a5 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index 37d0cd2b0d8bfe81b3f7833bfaa0caf85777c088..4f362a8a1dba5f33015d94cbcaedd552e2b59249 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 90f5343cb02e4c28c5f988b965e20565fa514a59..8158e7d0e7f86f72ed8f338bfb881ff316db7a3a 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 0630595dfa651c7b99c155a386b8dbb1af72df98..e757de17a8ff5982b2083a2509e8b493f27109d5 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in
index 7eff28508e6f0f626f9ea2dcb755736e21dab5ee..e725115a5f1f32eee5d583b462dad95e3a04a317 100644
--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index e677f4e5e84eef10a48dabba177eaea34222c7e9..deb8c67ca50ccf944e4b0c814b034fcff0effcaf 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -1,4 +1,3 @@
-DEFS      = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index bb27ff92fbdef59a7e8e77e2de1c5f39279ad394..0eb1b24dadb646e0af1506c67e36f72b480b2aea 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index 90b3cd6d6e19b8bd367a0e45792cc1209c092b1b..f296f5cea1e695cf2456696cc563455812ac7a15 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index ab4d545b65754234a5149ac22e294f4094414e4e..7b6e08c70151d1227316115ebab58c0c254db343 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index be222dd58b58e960ad2d233daab016e607b67731..393f0f3c35df3fe32bd47c4654e535e85f776805 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index a000e09f0512c67b39009834c1d81b0a31b1c8c8..6f221e8c8c386c304e32431af9a306392e7641d3 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index 672de8f15906e0f0737ebb046f5511647fa8d059..51492149778858b7a96714b5050d9b13cfdc7bf3 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DSTRICT -DUNICODE
+EXTRADEFS = -DUNICODE
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index b177ea743cbb7f4577e740ad228ce638fd834821..1eee283973c03c1cf0c11416f63f3ba081733ad1 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 37f3b936570148c7b181191bc85a7e7f5a168a82..bca3806d053b08432dd69b977723acc7bbb96686 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DSTRICT `perl -MExtUtils::Embed -e ccflags`
+EXTRADEFS = `perl -MExtUtils::Embed -e ccflags`
 EXTRALIBS = `perl -MExtUtils::Embed -e ldopts`
 EXTRAINCL = `perl -MExtUtils::Embed -e perl_inc`
 XSUBPPDIR = `perl -MConfig -e 'print $$Config::Config{privlibexp}'`/ExtUtils
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index c0513242505f44f57e1d4630ea501535539fe1f8..f0dd8629c314700f2469c819bdad40faac96137d 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINELIB -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index e1ec4e03179d2944e7d65f0320a8209aeb80b19d..bbedff708034bde103b56830ca450cabf7cace88 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@