Compile all programs with -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT.
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index cee885d..00a80cf 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 f52bb28..c96f24c 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 6e2586a..409c357 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 37d0cd2..4f362a8 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 90f5343..8158e7d 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 0630595..e757de1 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 7eff285..e725115 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 e677f4e..deb8c67 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 bb27ff9..0eb1b24 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 90b3cd6..f296f5c 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 ab4d545..7b6e08c 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 be222dd..393f0f3 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 a000e09..6f221e8 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 672de8f..5149214 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 b177ea7..1eee283 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 37f3b93..bca3806 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 c051324..f0dd862 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 e1ec4e0..bbedff7 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
