diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in
index eb756ddf39d..48b07d1b097 100644
--- a/dlls/amstream/tests/Makefile.in
+++ b/dlls/amstream/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = amstream.dll
 IMPORTS   = strmbase strmiids uuid ddraw ole32 user32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	amstream.c
diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in
index 5af77584055..3f170beaeba 100644
--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = combase.dll
 IMPORTLIB = combase
 IMPORTS   = advapi32 ole32 user32 gdi32 uuid rpcrt4
 DELAYIMPORTS = oleaut32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in
index db9e40d2e60..5f664007444 100644
--- a/dlls/d3d11/Makefile.in
+++ b/dlls/d3d11/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = d3d11.dll
 IMPORTLIB = d3d11
 IMPORTS   = dxguid uuid dxgi wined3d
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index 6ce1967a6dd..b50339dcfd6 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = devenum.dll
 IMPORTS   = dmoguids strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo
 DELAYIMPORTS = msvfw32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 909b38c0632..f9f61e501f0 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = dsound.dll
 IMPORTLIB = dsound
 IMPORTS   = dxguid uuid winmm ole32 advapi32 user32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in
index 234b49b1bba..733516853bb 100644
--- a/dlls/dsound/tests/Makefile.in
+++ b/dlls/dsound/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = dsound.dll
 IMPORTS   = dmoguids dsound msdmo ole32 version user32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	capture.c \
diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in
index 8b612989386..e975812eae5 100644
--- a/dlls/dwrite/Makefile.in
+++ b/dlls/dwrite/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = dwrite.dll
 IMPORTLIB = dwrite
 IMPORTS   = user32 gdi32 advapi32
 EXTRAINCL = $(FREETYPE_CFLAGS)
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	analyzer.c \
diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
index 5099f01461a..db44ea3a40e 100644
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = dxdiagn.dll
 IMPORTS   = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index e73e7d4e897..d4f6d2a8705 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = gdiplus.dll
 IMPORTLIB = gdiplus
 IMPORTS   = uuid shlwapi ole32 user32 gdi32
 DELAYIMPORTS = windowscodecs
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in
index 61037143f2e..1ddb02598cc 100644
--- a/dlls/ieframe/Makefile.in
+++ b/dlls/ieframe/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = ieframe.dll
 IMPORTLIB = ieframe
 IMPORTS   = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in
index b73879a006c..2b6eda3454f 100644
--- a/dlls/inetcomm/Makefile.in
+++ b/dlls/inetcomm/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = inetcomm.dll
 IMPORTLIB = inetcomm
 IMPORTS   = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in
index 5a5b16d538d..afdbb7ee824 100644
--- a/dlls/inetcomm/tests/Makefile.in
+++ b/dlls/inetcomm/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = inetcomm.dll
 IMPORTS   = inetcomm urlmon oleaut32 ole32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	mimeintl.c \
diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index 3a2227f5ebb..e65e9c7e474 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = iphlpapi.dll
 IMPORTLIB = iphlpapi
 IMPORTS   = advapi32
 EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS)
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	icmp.c \
diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in
index 9e5c607deae..a69672966a3 100644
--- a/dlls/mfplat/Makefile.in
+++ b/dlls/mfplat/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = mfplat.dll
 IMPORTLIB = mfplat
 IMPORTS   = advapi32 ole32 mfuuid propsys rtworkq
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in
index 191cfc20f0b..cddb5109222 100644
--- a/dlls/mfreadwrite/Makefile.in
+++ b/dlls/mfreadwrite/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = mfreadwrite.dll
 IMPORTLIB = mfreadwrite
 IMPORTS   = mfuuid uuid mfplat ole32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in
index 903b14335a9..6ac491f980d 100644
--- a/dlls/mmdevapi/Makefile.in
+++ b/dlls/mmdevapi/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = mmdevapi.dll
 IMPORTS   = uuid ole32 oleaut32 user32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in
index dd180a253b9..4b43b900b31 100644
--- a/dlls/mmdevapi/tests/Makefile.in
+++ b/dlls/mmdevapi/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = mmdevapi.dll
 IMPORTS   = ole32 version user32 advapi32 winmm
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	capture.c \
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index cf6d498e344..bc000573d98 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = msi.dll
 IMPORTLIB = msi
 IMPORTS   = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRAIDLFLAGS = --prefix-server=s_
 
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index bb06faebe49..6aff4815ae5 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = ole32.dll
 IMPORTLIB = ole32
 IMPORTS   = uuid advapi32 user32 gdi32 combase rpcrt4
 DELAYIMPORTS = oleaut32
-EXTRADEFS = -D_OLE32_
+EXTRADEFS = -D_OLE32_ -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in
index d8a7a7888bb..3b1236a5c9e 100644
--- a/dlls/propsys/Makefile.in
+++ b/dlls/propsys/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = propsys.dll
 IMPORTLIB = propsys
 IMPORTS   = ole32 oleaut32 uuid
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
diff --git a/dlls/propsys/tests/Makefile.in b/dlls/propsys/tests/Makefile.in
index 19e30afde77..b59cfaea18f 100644
--- a/dlls/propsys/tests/Makefile.in
+++ b/dlls/propsys/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = propsys.dll
 IMPORTS   = propsys ole32 oleaut32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	propsys.c
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in
index 417e7f332c0..ff90788ff14 100644
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = qcap.dll
 IMPORTS   = strmbase strmiids uuid ole32 oleaut32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 DELAYIMPORTS = msvfw32
 
 EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index 4eb57322f5e..6576db84de6 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = qedit.dll
 IMPORTS   = strmiids strmbase uuid oleaut32 ole32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 110377bec79..a03d84a7d13 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = quartz.dll
 IMPORTLIB = quartz
 IMPORTS   = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in
index f4d88272857..8e03946c7af 100644
--- a/dlls/sechost/Makefile.in
+++ b/dlls/sechost/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = sechost.dll
 IMPORTLIB = sechost
 IMPORTS   = kernelbase
 DELAYIMPORTS = rpcrt4
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index fe49bf09f98..e89177c3a73 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_SHELL32_
+EXTRADEFS = -D_SHELL32_ -DWINE_NO_NAMELESS_EXTENSION
 MODULE    = shell32.dll
 IMPORTLIB = shell32
 IMPORTS   = uuid shlwapi user32 gdi32 advapi32
diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index 08a7d3af3a6..3820fe4101e 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = shell32.dll
 IMPORTS   = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	appbar.c \
diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index 440a638e96f..72cd648a615 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -3,6 +3,7 @@ IMPORTLIB = windowscodecs
 IMPORTS   = windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32
 EXTRAINCL = $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS)
 EXTRALIBS = $(APPLICATIONSERVICES_LIBS)
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
index 3158371a64f..d14a0628076 100644
--- a/dlls/winealsa.drv/Makefile.in
+++ b/dlls/winealsa.drv/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = winealsa.drv
 IMPORTS   = uuid ole32 advapi32
 DELAYIMPORTS = winmm
 EXTRALIBS = $(ALSA_LIBS)
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	midi.c \
diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 4d5dece64b3..bd95a38316f 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -3,6 +3,7 @@ IMPORTS   = strmbase strmiids uuid ole32 mfuuid
 DELAYIMPORTS = mfplat
 EXTRAINCL = $(GSTREAMER_CFLAGS)
 EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
index d6600632360..3082ed8a69e 100644
--- a/dlls/winepulse.drv/Makefile.in
+++ b/dlls/winepulse.drv/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = winepulse.drv
 IMPORTS   = dxguid uuid winmm user32 advapi32 ole32
 EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS)
 EXTRAINCL = $(PULSE_CFLAGS)
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	mmdevdrv.c
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 88b70464f5c..615433ea0fb 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_WINX32_
+EXTRADEFS = -D_WINX32_ -DWINE_NO_NAMELESS_EXTENSION
 MODULE    = wininet.dll
 IMPORTLIB = wininet
 IMPORTS   = mpr shlwapi shell32 user32 ws2_32 advapi32
diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in
index ae18bb72faf..6c1f5fd5c61 100644
--- a/dlls/wininet/tests/Makefile.in
+++ b/dlls/wininet/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = wininet.dll
 IMPORTS   = wininet crypt32 ws2_32 user32 advapi32 shell32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	ftp.c \
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index c05115d5c58..d003a53afe4 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_WINMM_
+EXTRADEFS = -D_WINMM_ -DWINE_NO_NAMELESS_EXTENSION
 MODULE    = winmm.dll
 IMPORTLIB = winmm
 IMPORTS   = uuid user32 advapi32 ole32 msacm32
diff --git a/include/winnt.h b/include/winnt.h
index 9025e965b4d..0a6027118fe 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -291,7 +291,7 @@ extern "C" {
 #undef __C89_NAMELESSUNIONNAME7
 #undef __C89_NAMELESSUNIONNAME8
 
-#if !defined(__WINESRC__) && !defined(WINE_NO_NAMELESS_EXTENSION)
+#if !defined(WINE_NO_NAMELESS_EXTENSION)
 # ifdef __GNUC__
    /* Anonymous structs support starts with gcc 2.96/g++ 2.95 */
 #  if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus))))
diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in
index 560e277a9bf..46d4c820a9e 100644
--- a/programs/services/Makefile.in
+++ b/programs/services/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = services.exe
 IMPORTS   = rpcrt4 advapi32 userenv setupapi
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mconsole -mno-cygwin
 
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index a2746f7d4ac..20b67680956 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = winecfg.exe
 APPMODE   = -mwindows
 IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	about.c \
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index 07e2702843b..3cca593462b 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows -municode
 IMPORTS   = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32
+EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	winemenubuilder.c