diff --git a/Make.rules.in b/Make.rules.in
index 4a295e48f2c..29c101940e7 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -78,7 +78,6 @@ DLLDIR       = $(TOPOBJDIR)/dlls
 LIBDIR       = $(TOPOBJDIR)/libs
 LIBPORT      = -L$(TOPOBJDIR)/libs/port -lwine_port
 LIBUNICODE   = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode
-LIBUUID      = -luuid -ldxguid
 LIBWINE      = -L$(TOPOBJDIR)/libs/wine -lwine
 
 @SET_MAKE@
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 21b1755c2a5..bec950d81c3 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = avifil32.dll
 IMPORTS   = msacm32 msvfw32 shell32 winmm ole32 user32 advapi32 kernel32
 ALTNAMES  = avifile.dll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in
index 596b1b07a5a..37689c592d5 100644
--- a/dlls/comcat/Makefile.in
+++ b/dlls/comcat/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comcat.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUNICODE) $(LIBUUID)
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	comcat_main.c \
diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in
index f3d024d5196..91949b80fe5 100644
--- a/dlls/commdlg/Makefile.in
+++ b/dlls/commdlg/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = comdlg32.dll
 IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll
 ALTNAMES  = commdlg.dll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index 73bab1e6c88..9d379d805f0 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = d3d8.dll
 IMPORTS   = user32 gdi32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
+EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
 
 C_SRCS = \
 	basetexture.c \
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index be36cc2b30b..f0dd634b0df 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = d3d9.dll
 IMPORTS   = user32 gdi32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
+EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
 
 C_SRCS = \
 	basetexture.c \
diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in
index 9ffda099bcf..abc45c06a36 100644
--- a/dlls/d3dx8/Makefile.in
+++ b/dlls/d3dx8/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = d3dx8.dll
 IMPORTS   = d3d8 user32 gdi32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
+EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
 
 C_SRCS = \
 	d3dx8_main.c \
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index 195bb8a2191..59463f466ed 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ddraw.dll
 IMPORTS   = ole32 user32 gdi32 advapi32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ 
+EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ 
 
 OPENGLFILES = \
 	d3dcommon.c \
diff --git a/dlls/ddraw/tests/Makefile.in b/dlls/ddraw/tests/Makefile.in
index db6f5a2fc33..f25297627e1 100644
--- a/dlls/ddraw/tests/Makefile.in
+++ b/dlls/ddraw/tests/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ddraw.dll
 IMPORTS   = ddraw user32 gdi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 CTESTS = \
 	ddrawmodes.c
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index 0736f2ca8e5..3b03092b778 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = devenum.dll
 IMPORTS   = ole32 oleaut32 winmm user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	createdevenum.c \
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index 5b01ab037fa..d3c11909c20 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput.dll
 IMPORTS   = user32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	device.c \
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index 895935a60bc..691a897cdc3 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput8.dll
 IMPORTS   = dinput
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	dinput8_main.c
@@ -12,4 +12,3 @@ C_SRCS = \
 @MAKE_DLL_RULES@
 
 ### Dependencies:
-
diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in
index 5717e3d8261..380152cb2b9 100644
--- a/dlls/dmband/Makefile.in
+++ b/dlls/dmband/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmband.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	band.c \
diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in
index 1593ca45d80..95a2ccc0b80 100644
--- a/dlls/dmcompos/Makefile.in
+++ b/dlls/dmcompos/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmcompos.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	chordmap.c \
diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in
index 3af42a06813..e9417eaf63f 100644
--- a/dlls/dmime/Makefile.in
+++ b/dlls/dmime/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmime.dll
 IMPORTS   = dsound winmm ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	audiopath.c \
diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in
index 1f6c1efc8c1..bd4ebdefffe 100644
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmloader.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	container.c \
diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in
index c97f988cdb9..a7e9737e2af 100644
--- a/dlls/dmscript/Makefile.in
+++ b/dlls/dmscript/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmscript.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	dmscript_main.c \
diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in
index 0cb36cc8636..93dd542ad00 100644
--- a/dlls/dmstyle/Makefile.in
+++ b/dlls/dmstyle/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmstyle.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	auditiontrack.c \
diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in
index b662d2c446f..0da9f8d2a80 100644
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmsynth.dll
 IMPORTS   = winmm ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	dmsynth_main.c \
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index eead4b5b537..eded608c5c1 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic.dll
 IMPORTS   = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in
index 444ed28d465..6d18c1745a6 100644
--- a/dlls/dmusic32/Makefile.in
+++ b/dlls/dmusic32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic32.dll
 IMPORTS   = winmm user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	dmusic32_main.c
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 49d059023ed..0bdf824a24e 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx.dll
 IMPORTS   = winmm ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	dpclassfactory.c \
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 0a3b5407557..60eb8d2dc3b 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound.dll
 IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in
index 24254f1625c..84bbfd7525f 100644
--- a/dlls/dsound/tests/Makefile.in
+++ b/dlls/dsound/tests/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dsound.dll
 IMPORTS   = dsound user32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 CTESTS = \
 	capture.c \
diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in
index 399b5d61bce..3e5eeb835c3 100644
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dswave.dll
 IMPORTS   = msacm32 ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	dswave.c \
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index e6b73ea870a..3b231a3a79f 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msdmo.dll
 IMPORTS   = ole32 user32 advapi32 kernel32 
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	dmoreg.c \
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 283d4cb544f..082975c10a7 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mshtml.dll
 IMPORTS   = user32 advapi32 kernel32 ntdll
-EXTRALIBS = $(LIBUNICODE) $(LIBUUID)
+EXTRALIBS = $(LIBUNICODE) -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 5c1a20fcadf..242d87df448 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msi.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
+EXTRALIBS = -luuid $(LIBUNICODE)
 
 C_SRCS = \
 	distinct.c \
diff --git a/dlls/msisys/Makefile.in b/dlls/msisys/Makefile.in
index 3f58bbfc27b..86b1535975a 100644
--- a/dlls/msisys/Makefile.in
+++ b/dlls/msisys/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msisys.ocx
 IMPORTS   = kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = msisys.c
 
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 7c8e145dade..88c379e45e9 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = ole32.dll
 IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
 ALTNAMES  = ole2.dll ole2nls.dll ole2conv.dll ole2prox.dll ole2thk.dll storage.dll compobj.dll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 4bc9e162701..31d3ac78a7a 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -7,7 +7,7 @@ MODULE    = oleaut32.dll
 IMPORTS   = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = comctl32
 ALTNAMES  = ole2disp.dll typelib.dll
-EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @GIFLIB@ @JPEGLIB@
+EXTRALIBS = $(LIBUNICODE) -luuid @GIFLIB@ @JPEGLIB@
 
 SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in
index ddf3b2a0355..766ac44b392 100644
--- a/dlls/oleaut32/tests/Makefile.in
+++ b/dlls/oleaut32/tests/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = oleaut32.dll
 IMPORTS   = oleaut32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 CTESTS = \
 	olefont.c \
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index b274fb6bcc1..3da07ce86cb 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = quartz.dll
 IMPORTS   = ole32 oleaut32 advapi32 kernel32 user32
-EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
+EXTRALIBS = -luuid $(LIBUNICODE)
 
 C_SRCS = \
 	avisplit.c \
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index a244caf0606..03e1a9645c0 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4.dll
 IMPORTS   = advapi32 kernel32 ntdll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	cproxy.c \
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index 1012fafb0ed..1bb31d9049a 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	classinfo.c \
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index ff864859655..f4218444a82 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -7,7 +7,7 @@ MODULE    = shell32.dll
 # fixme: avoid ole32.dll import
 IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32
 ALTNAMES  = shell.dll
-EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
+EXTRALIBS = -luuid $(LIBUNICODE)
 
 SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 21d1a525718..828ee7b3951 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi.dll
 IMPORTS   = ole32 user32 gdi32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
+EXTRALIBS = -luuid $(LIBUNICODE)
 
 C_SRCS = \
 	assoc.c \
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index dec989ff741..ea56cf9b978 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
 IMPORTS   = cabinet ole32 wininet user32 kernel32 ntdll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	umon.c \
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index 8a13115c285..e5509609061 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wined3d.dll
 IMPORTS   = user32 gdi32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
+EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
 
 C_SRCS = \
 	vertexshader.c \
diff --git a/dlls/winmm/winealsa/Makefile.in b/dlls/winmm/winealsa/Makefile.in
index ba00aef0b44..1a830c4ab6b 100644
--- a/dlls/winmm/winealsa/Makefile.in
+++ b/dlls/winmm/winealsa/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winealsa.drv
 IMPORTS   = winmm user32 kernel32 ntdll
-EXTRALIBS = $(LIBUUID) @ALSALIBS@
+EXTRALIBS = -ldxguid -luuid @ALSALIBS@
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winmm/winearts/Makefile.in b/dlls/winmm/winearts/Makefile.in
index 353c2b1f52b..4a36fb648d7 100644
--- a/dlls/winmm/winearts/Makefile.in
+++ b/dlls/winmm/winearts/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winearts.drv
 IMPORTS   = winmm user32 kernel32
 EXTRAINCL = @ARTSINCL@
-EXTRALIBS = @ARTSLIBS@ $(LIBUUID)
+EXTRALIBS = @ARTSLIBS@ -luuid
 
 C_SRCS = \
 	arts.c \
diff --git a/dlls/winmm/wineaudioio/Makefile.in b/dlls/winmm/wineaudioio/Makefile.in
index b18351a8936..9949bc56af0 100644
--- a/dlls/winmm/wineaudioio/Makefile.in
+++ b/dlls/winmm/wineaudioio/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineaudioio.drv
 IMPORTS   = winmm user32 kernel32 ntdll
-EXTRALIBS = $(LIBUUID) @AUDIOIOLIBS@
+EXTRALIBS = -luuid @AUDIOIOLIBS@
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winmm/winejack/Makefile.in b/dlls/winmm/winejack/Makefile.in
index d5555e751a3..e1d7ea0f3d1 100644
--- a/dlls/winmm/winejack/Makefile.in
+++ b/dlls/winmm/winejack/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winejack.drv
 IMPORTS   = winmm user32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winmm/winenas/Makefile.in b/dlls/winmm/winenas/Makefile.in
index 5bb2f037b15..644bcc8fe07 100644
--- a/dlls/winmm/winenas/Makefile.in
+++ b/dlls/winmm/winenas/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winenas.drv
 IMPORTS   = winmm user32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = @NASLIBS@ $(LIBUUID)
+EXTRALIBS = -luuid @NASLIBS@
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in
index 8fbbe3092fb..f7a0d78f7b8 100644
--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
 IMPORTS   = winmm user32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	audio.c \
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index a03c7b435a4..9b1596a1358 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = winefile.exe
 APPMODE   = gui
 IMPORTS   = shell32 comctl32 ole32 user32 gdi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	license.c \
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index aa586d8f84a..017d0fce743 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
 APPMODE   = gui
 IMPORTS   = shell32 ole32 user32 advapi32 kernel32
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
 
 C_SRCS = \
 	winemenubuilder.c