diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 210f623da92..0cb468426eb 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -9,7 +9,7 @@
 # plus all variables required by the global Make.rules.in
 #
 
-DEFS        = @DLLFLAGS@ -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
+DEFS        = @DLLFLAGS@ $(EXTRADEFS)
 LDDLLFLAGS  = @LDDLLFLAGS@
 ALL_OBJS    = $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBS)
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 0d4515a8741..5dfa71fce01 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -1,4 +1,4 @@
-DEFS       = @DLLFLAGS@ -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
+DEFS       = @DLLFLAGS@ $(EXTRADEFS)
 LDDLLFLAGS = @LDDLLFLAGS@
 TOPSRCDIR  = @top_srcdir@
 TOPOBJDIR  = ../..
diff --git a/programs/avitools/aviplay.c b/programs/avitools/aviplay.c
index 64e857d1288..aad111c729a 100644
--- a/programs/avitools/aviplay.c
+++ b/programs/avitools/aviplay.c
@@ -35,6 +35,9 @@
 #include <time.h>
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windows.h"
 #include "wingdi.h"
 #include "mmsystem.h"
diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c
index 5b70c2b37a7..7fcb847be08 100644
--- a/programs/rpcss/rpcss_main.c
+++ b/programs/rpcss/rpcss_main.c
@@ -58,6 +58,8 @@
 #include <limits.h>
 #include <assert.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "rpcss.h"
 #include "winnt.h"
 
diff --git a/programs/wcmd/directory.c b/programs/wcmd/directory.c
index 061ccaada6d..0f6a2b2d90f 100644
--- a/programs/wcmd/directory.c
+++ b/programs/wcmd/directory.c
@@ -25,6 +25,8 @@
  * environment-variable and batch parameter substitution already done.
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wcmd.h"
 
 int WCMD_dir_sort (const void *a, const void *b);
diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c
index d41b74b885c..ca124254886 100644
--- a/programs/wineconsole/dialog.c
+++ b/programs/wineconsole/dialog.c
@@ -19,6 +19,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "commctrl.h"
 #include "prsht.h"
 #include "winecon_user.h"