From dad21bbcbfdd4811c5a90d0c695c34c0a8a3a1ad Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 30 Apr 2008 14:23:55 +0200
Subject: [PATCH] makefiles: List the static libraries as normal imports
 instead of extra libs.

---
 dlls/advapi32/tests/Makefile.in      | 3 +--
 dlls/amstream/Makefile.in            | 3 +--
 dlls/atl/Makefile.in                 | 3 +--
 dlls/avifil32/Makefile.in            | 3 +--
 dlls/browseui/Makefile.in            | 3 +--
 dlls/browseui/tests/Makefile.in      | 3 +--
 dlls/comcat/Makefile.in              | 3 +--
 dlls/comcat/tests/Makefile.in        | 3 +--
 dlls/comdlg32/Makefile.in            | 3 +--
 dlls/d3d10/Makefile.in               | 3 +--
 dlls/d3d8/Makefile.in                | 3 +--
 dlls/d3d8/tests/Makefile.in          | 3 +--
 dlls/d3d9/Makefile.in                | 3 +--
 dlls/d3d9/tests/Makefile.in          | 3 +--
 dlls/d3drm/tests/Makefile.in         | 3 +--
 dlls/d3dx8/Makefile.in               | 3 +--
 dlls/d3dx8/tests/Makefile.in         | 3 +--
 dlls/d3dxof/Makefile.in              | 3 +--
 dlls/ddraw/Makefile.in               | 3 +--
 dlls/ddraw/tests/Makefile.in         | 3 +--
 dlls/ddrawex/Makefile.in             | 3 +--
 dlls/devenum/Makefile.in             | 3 +--
 dlls/dinput/Makefile.in              | 3 +--
 dlls/dinput/tests/Makefile.in        | 3 +--
 dlls/dinput8/Makefile.in             | 3 +--
 dlls/dmband/Makefile.in              | 3 +--
 dlls/dmcompos/Makefile.in            | 3 +--
 dlls/dmime/Makefile.in               | 3 +--
 dlls/dmloader/Makefile.in            | 3 +--
 dlls/dmscript/Makefile.in            | 3 +--
 dlls/dmstyle/Makefile.in             | 3 +--
 dlls/dmsynth/Makefile.in             | 3 +--
 dlls/dmusic/Makefile.in              | 3 +--
 dlls/dmusic32/Makefile.in            | 3 +--
 dlls/dplayx/Makefile.in              | 3 +--
 dlls/dplayx/tests/Makefile.in        | 3 +--
 dlls/dpnet/Makefile.in               | 3 +--
 dlls/dsound/Makefile.in              | 3 +--
 dlls/dsound/tests/Makefile.in        | 3 +--
 dlls/dswave/Makefile.in              | 3 +--
 dlls/dxdiagn/Makefile.in             | 3 +--
 dlls/gdiplus/Makefile.in             | 3 +--
 dlls/hhctrl.ocx/Makefile.in          | 3 +--
 dlls/hlink/Makefile.in               | 3 +--
 dlls/hlink/tests/Makefile.in         | 3 +--
 dlls/inetcomm/Makefile.in            | 3 +--
 dlls/inetcomm/tests/Makefile.in      | 3 +--
 dlls/infosoft/Makefile.in            | 3 +--
 dlls/inseng/Makefile.in              | 3 +--
 dlls/itss/Makefile.in                | 3 +--
 dlls/itss/tests/Makefile.in          | 3 +--
 dlls/jscript/tests/Makefile.in       | 3 +--
 dlls/mapi32/Makefile.in              | 3 +--
 dlls/mapi32/tests/Makefile.in        | 3 +--
 dlls/mlang/Makefile.in               | 3 +--
 dlls/mlang/tests/Makefile.in         | 3 +--
 dlls/mountmgr.sys/Makefile.in        | 4 ++--
 dlls/mscoree/Makefile.in             | 3 +--
 dlls/msdmo/Makefile.in               | 3 +--
 dlls/msftedit/Makefile.in            | 3 +--
 dlls/mshtml/Makefile.in              | 3 +--
 dlls/mshtml/tests/Makefile.in        | 3 +--
 dlls/msi/Makefile.in                 | 3 +--
 dlls/msi/tests/Makefile.in           | 3 +--
 dlls/msimtf/Makefile.in              | 3 +--
 dlls/msisys.ocx/Makefile.in          | 3 +--
 dlls/msxml3/Makefile.in              | 4 ++--
 dlls/msxml3/tests/Makefile.in        | 3 +--
 dlls/objsel/Makefile.in              | 3 +--
 dlls/odbccp32/Makefile.in            | 3 +--
 dlls/ole32/Makefile.in               | 3 +--
 dlls/ole32/tests/Makefile.in         | 3 +--
 dlls/oleaut32/Makefile.in            | 3 +--
 dlls/oleaut32/tests/Makefile.in      | 3 +--
 dlls/pstorec/Makefile.in             | 3 +--
 dlls/qcap/Makefile.in                | 3 +--
 dlls/qedit/Makefile.in               | 3 +--
 dlls/qedit/tests/Makefile.in         | 3 +--
 dlls/qmgr/Makefile.in                | 3 +--
 dlls/quartz/Makefile.in              | 3 +--
 dlls/quartz/tests/Makefile.in        | 3 +--
 dlls/query/Makefile.in               | 3 +--
 dlls/riched20/Makefile.in            | 3 +--
 dlls/rpcrt4/Makefile.in              | 3 +--
 dlls/rpcrt4/tests/Makefile.in        | 3 +--
 dlls/setupapi/Makefile.in            | 3 +--
 dlls/shdocvw/Makefile.in             | 3 +--
 dlls/shdocvw/tests/Makefile.in       | 3 +--
 dlls/shell32/Makefile.in             | 3 +--
 dlls/shell32/tests/Makefile.in       | 3 +--
 dlls/shlwapi/Makefile.in             | 3 +--
 dlls/shlwapi/tests/Makefile.in       | 3 +--
 dlls/urlmon/Makefile.in              | 3 +--
 dlls/urlmon/tests/Makefile.in        | 3 +--
 dlls/winealsa.drv/Makefile.in        | 4 ++--
 dlls/wineaudioio.drv/Makefile.in     | 4 ++--
 dlls/winecoreaudio.drv/Makefile.in   | 4 ++--
 dlls/wined3d/Makefile.in             | 3 +--
 dlls/wineesd.drv/Makefile.in         | 4 ++--
 dlls/winejack.drv/Makefile.in        | 3 +--
 dlls/winenas.drv/Makefile.in         | 4 ++--
 dlls/wineoss.drv/Makefile.in         | 3 +--
 programs/oleview/Makefile.in         | 3 +--
 programs/wineboot/Makefile.in        | 3 +--
 programs/winecfg/Makefile.in         | 3 +--
 programs/winefile/Makefile.in        | 3 +--
 programs/winemenubuilder/Makefile.in | 3 +--
 107 files changed, 114 insertions(+), 214 deletions(-)

diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in
index 5e5911c3b80..b75e440c104 100644
--- a/dlls/advapi32/tests/Makefile.in
+++ b/dlls/advapi32/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = advapi32.dll
-IMPORTS   = ole32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 advapi32 kernel32
 
 CTESTS = \
 	cred.c \
diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in
index 33f8d23c3e4..63d4093bde1 100644
--- a/dlls/amstream/Makefile.in
+++ b/dlls/amstream/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = amstream.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	amstream.c \
diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index 124dc77da97..031a855b2bb 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = atl.dll
 IMPORTLIB = atl
-IMPORTS   = ole32 oleaut32 user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 oleaut32 user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	atl_ax.c \
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 9c5a9d22667..856ecb47c78 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32.dll
 IMPORTLIB = avifil32
-IMPORTS   = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	acmstream.c \
diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index 70de186412c..c1e85cc6f05 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = browseui.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 user32 advapi32 kernel32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in
index e3b08ce34ca..41841d3a752 100644
--- a/dlls/browseui/tests/Makefile.in
+++ b/dlls/browseui/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = browseui.dll
-IMPORTS   = ole32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 kernel32
 
 CTESTS = \
 	autocomplete.c
diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in
index 2eeee6303d2..e43e3a877de 100644
--- a/dlls/comcat/Makefile.in
+++ b/dlls/comcat/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comcat.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	comcat_main.c \
diff --git a/dlls/comcat/tests/Makefile.in b/dlls/comcat/tests/Makefile.in
index c0e5b0c7ce2..95f380661e8 100644
--- a/dlls/comcat/tests/Makefile.in
+++ b/dlls/comcat/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = comcat.dll
-IMPORTS   = ole32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 advapi32 kernel32
 
 CTESTS = \
 	comcat.c
diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index 23ece55897e..f63260a60b4 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -4,9 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32.dll
 IMPORTLIB = comdlg32
-IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = ole32
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	cdlg32.c \
diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in
index 99b3e80d602..5ee45c12b32 100644
--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d10.dll
-IMPORTS   = wined3d kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid wined3d kernel32
 
 C_SRCS = \
 	d3d10_main.c
diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index 003b6f4ea77..11a46fc87df 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d8.dll
 IMPORTLIB = d3d8
-IMPORTS   = wined3d kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid wined3d kernel32
 
 C_SRCS = \
 	basetexture.c \
diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in
index 58f963cb809..87345ade463 100644
--- a/dlls/d3d8/tests/Makefile.in
+++ b/dlls/d3d8/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3d8.dll
-IMPORTS   = user32 kernel32
-EXTRALIBS = -ldxerr8 -luuid -ldxguid
+IMPORTS   = dxerr8 uuid dxguid user32 kernel32
 
 CTESTS = \
 	d3d8_main.c \
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index 6ffdb4456c6..f581b68eb8c 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d9.dll
 IMPORTLIB = d3d9
-IMPORTS   = wined3d kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid wined3d kernel32
 
 C_SRCS = \
 	basetexture.c \
diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in
index 2135adb671b..b68a449714d 100644
--- a/dlls/d3d9/tests/Makefile.in
+++ b/dlls/d3d9/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3d9.dll
-IMPORTS   = user32 kernel32
-EXTRALIBS = -ldxerr9 -luuid -ldxguid
+IMPORTS   = dxerr9 uuid dxguid user32 kernel32
 
 CTESTS = \
 	d3d9ex.c \
diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in
index cb96a6a4e4e..254d13ecb9f 100644
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3drm.dll
-IMPORTS   = kernel32
-EXTRALIBS = -ldxguid
+IMPORTS   = dxguid kernel32
 
 CTESTS = vector.c
 
diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in
index 35e4d83b095..4e45b53272c 100644
--- a/dlls/d3dx8/Makefile.in
+++ b/dlls/d3dx8/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx8.dll
 IMPORTLIB = d3dx8
-IMPORTS   = kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid kernel32
 
 C_SRCS = \
 	d3dx8_main.c \
diff --git a/dlls/d3dx8/tests/Makefile.in b/dlls/d3dx8/tests/Makefile.in
index 77737f7f926..530663496f7 100644
--- a/dlls/d3dx8/tests/Makefile.in
+++ b/dlls/d3dx8/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3dx8.dll
-IMPORTS   = d3dx8 kernel32
-EXTRALIBS = -ldxguid
+IMPORTS   = dxguid d3dx8 kernel32
 
 CTESTS = math.c
 
diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in
index 89c0f9a8f5e..2319c8b2cc5 100644
--- a/dlls/d3dxof/Makefile.in
+++ b/dlls/d3dxof/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dxof.dll
 IMPORTLIB = d3dxof
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index dc91284a5c5..cda0581bcb8 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddraw.dll
 IMPORTLIB = ddraw
-IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	clipper.c \
diff --git a/dlls/ddraw/tests/Makefile.in b/dlls/ddraw/tests/Makefile.in
index d41f695b86b..685ae7c60b4 100644
--- a/dlls/ddraw/tests/Makefile.in
+++ b/dlls/ddraw/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ddraw.dll
-IMPORTS   = ddraw user32 gdi32 kernel32
-EXTRALIBS = -ldxguid
+IMPORTS   = dxguid ddraw user32 gdi32 kernel32
 
 CTESTS = \
 	d3d.c \
diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in
index 4237534e85c..8cf514b628a 100644
--- a/dlls/ddrawex/Makefile.in
+++ b/dlls/ddrawex/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddrawex.dll
-IMPORTS   = ddraw ole32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ddraw ole32 advapi32 kernel32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index 257c0fb8c72..c1ada78bec5 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = devenum.dll
-IMPORTS   = ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32
 
 C_SRCS = \
 	createdevenum.c \
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index 38436774441..49083e86357 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput.dll
 IMPORTLIB = dinput
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	data_formats.c \
diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in
index d310494ee28..be5b0fc9886 100644
--- a/dlls/dinput/tests/Makefile.in
+++ b/dlls/dinput/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dinput.dll
-IMPORTS   = dinput ole32 version user32 kernel32
-EXTRALIBS = -ldxguid -luuid -ldxerr8
+IMPORTS   = dxguid uuid dxerr8 dinput ole32 version user32 kernel32
 
 CTESTS = \
 	device.c \
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index 0f09c2793b1..1a466398d7c 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput8.dll
 IMPORTLIB = dinput8
-IMPORTS   = dinput ole32 advapi32 kernel32
-EXTRALIBS = -luuid -ldxguid
+IMPORTS   = uuid dxguid dinput ole32 advapi32 kernel32
 
 C_SRCS = \
 	dinput8_main.c \
diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in
index 5a2539d20a9..26b8976d98a 100644
--- a/dlls/dmband/Makefile.in
+++ b/dlls/dmband/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmband.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	band.c \
diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in
index b412536e0bb..4fdb3559e13 100644
--- a/dlls/dmcompos/Makefile.in
+++ b/dlls/dmcompos/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmcompos.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	chordmap.c \
diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in
index 3e4e939cdf1..9efdd080a54 100644
--- a/dlls/dmime/Makefile.in
+++ b/dlls/dmime/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmime.dll
-IMPORTS   = dsound ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid dsound ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	audiopath.c \
diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in
index 400d788ed6a..1dde79dcca1 100644
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmloader.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	classfactory.c \
diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in
index 24337d19df4..46ac121bfc1 100644
--- a/dlls/dmscript/Makefile.in
+++ b/dlls/dmscript/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmscript.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	dmscript_main.c \
diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in
index 7f1fbd3b106..b01f419c05f 100644
--- a/dlls/dmstyle/Makefile.in
+++ b/dlls/dmstyle/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmstyle.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	auditiontrack.c \
diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in
index 0ca602b516f..35cadc5e095 100644
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmsynth.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	dmsynth_main.c \
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index 2158c76a415..a3c114a90ea 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in
index 99a17ab0c84..7d358e33d47 100644
--- a/dlls/dmusic32/Makefile.in
+++ b/dlls/dmusic32/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic32.dll
 IMPORTLIB = dmusic32
-IMPORTS   = kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid kernel32
 
 C_SRCS = \
 	dmusic32_main.c
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 0ed86953dfa..525ff8579c2 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -5,8 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx.dll
 IMPORTLIB = dplayx
-IMPORTS   = winmm ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid winmm ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	dpclassfactory.c \
diff --git a/dlls/dplayx/tests/Makefile.in b/dlls/dplayx/tests/Makefile.in
index 82a9064ec5b..b8dc9a163ac 100644
--- a/dlls/dplayx/tests/Makefile.in
+++ b/dlls/dplayx/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dplayx.dll
-IMPORTS   = ole32 kernel32
-EXTRALIBS = -ldxguid
+IMPORTS   = dxguid ole32 kernel32
 
 CTESTS = \
 	dplayx.c
diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in
index 881eca1ec54..044eabafddb 100644
--- a/dlls/dpnet/Makefile.in
+++ b/dlls/dpnet/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dpnet.dll
 IMPORTLIB = dpnet
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	address.c \
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 1ed40a5f187..e6892c10018 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound.dll
 IMPORTLIB = dsound
-IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid winmm ole32 user32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in
index 097d4636a06..e2a7a89731b 100644
--- a/dlls/dsound/tests/Makefile.in
+++ b/dlls/dsound/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dsound.dll
-IMPORTS   = ole32 version user32 kernel32
-EXTRALIBS = -ldxguid -luuid -ldxerr8
+IMPORTS   = dxguid uuid dxerr8 ole32 version user32 kernel32
 
 CTESTS = \
 	capture.c \
diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in
index f47fceeffa4..fb13f1d02cb 100644
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dswave.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	dswave.c \
diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
index 132d8285cbe..56ca6569a34 100644
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dxdiagn.dll
-IMPORTS   = ddraw version ole32 oleaut32 user32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -ldxguid -luuid
+IMPORTS   = strmiids dxguid uuid ddraw version ole32 oleaut32 user32 advapi32 kernel32
 
 C_SRCS = \
 	container.c \
diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index f1e9e929f05..de88d5e375b 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdiplus.dll
 IMPORTLIB = gdiplus
-IMPORTS   = shlwapi oleaut32 ole32 user32 gdi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shlwapi oleaut32 ole32 user32 gdi32 kernel32
 
 C_SRCS = \
 	brush.c \
diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in
index 7f9e14ad19f..229bd2abaf8 100644
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hhctrl.ocx
-IMPORTS   = advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 kernel32
 
 C_SRCS = \
 	chm.c \
diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in
index 1c8eebf5e73..59b64de4395 100644
--- a/dlls/hlink/Makefile.in
+++ b/dlls/hlink/Makefile.in
@@ -3,10 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hlink.dll
-IMPORTS   = shell32 ole32 advapi32 kernel32
 IMPORTLIB = hlink
+IMPORTS   = uuid shell32 ole32 advapi32 kernel32
 DELAYIMPORTS = urlmon
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	browse_ctx.c \
diff --git a/dlls/hlink/tests/Makefile.in b/dlls/hlink/tests/Makefile.in
index 2cc3cffb5fd..eeb2503cb95 100644
--- a/dlls/hlink/tests/Makefile.in
+++ b/dlls/hlink/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = hlink.dll
-IMPORTS   = hlink ole32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid hlink ole32 kernel32
 
 CTESTS = \
 	hlink.c
diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in
index bca5305e38a..462294c713b 100644
--- a/dlls/inetcomm/Makefile.in
+++ b/dlls/inetcomm/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inetcomm.dll
 IMPORTLIB = inetcomm
-IMPORTS   = ole32 ws2_32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 ws2_32 user32 advapi32 kernel32
 
 C_SRCS = \
 	inetcomm_main.c \
diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in
index 9c001cc5eeb..41b6e24c44e 100644
--- a/dlls/inetcomm/tests/Makefile.in
+++ b/dlls/inetcomm/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = inetcomm.dll
-IMPORTS   = inetcomm ole32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid inetcomm ole32 kernel32
 
 CTESTS = \
 	mimeole.c
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index ecbbbee1d2a..4076d6452e5 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = infosoft.dll
-IMPORTS   = advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid advapi32 kernel32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index 13880804d37..4173760685c 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inseng.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 user32 advapi32 kernel32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in
index ec0bd9aa05b..9614ab6469c 100644
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = itss.dll
-IMPORTS   = urlmon shlwapi ole32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid urlmon shlwapi ole32 kernel32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/itss/tests/Makefile.in b/dlls/itss/tests/Makefile.in
index f6fb55ca0ac..148c944091a 100644
--- a/dlls/itss/tests/Makefile.in
+++ b/dlls/itss/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = itss.dll
-IMPORTS   = ole32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 kernel32
 
 CTESTS = \
 	protocol.c
diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in
index d707ed5d9d7..18d6c765219 100644
--- a/dlls/jscript/tests/Makefile.in
+++ b/dlls/jscript/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = jscript.dll
-IMPORTS   = ole32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 kernel32
 
 CTESTS = \
 	jscript.c
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index d5873813562..26ebf06157e 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mapi32.dll
 IMPORTLIB = mapi32
-IMPORTS   = shlwapi shell32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shlwapi shell32 kernel32
 
 C_SRCS = \
 	imalloc.c \
diff --git a/dlls/mapi32/tests/Makefile.in b/dlls/mapi32/tests/Makefile.in
index 4f118514ca5..bc01a9f6441 100644
--- a/dlls/mapi32/tests/Makefile.in
+++ b/dlls/mapi32/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mapi32.dll
-IMPORTS   = kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid kernel32
 
 CTESTS = \
 	imalloc.c \
diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in
index c4ba2deacd6..6bf166122d9 100644
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@@ -4,9 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mlang.dll
 IMPORTLIB = mlang
-IMPORTS   = ole32 user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid ole32 user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = oleaut32
-EXTRALIBS = -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/mlang/tests/Makefile.in b/dlls/mlang/tests/Makefile.in
index cfedbb79e37..0df144021cf 100644
--- a/dlls/mlang/tests/Makefile.in
+++ b/dlls/mlang/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mlang.dll
-IMPORTS   = ole32 gdi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 gdi32 kernel32
 
 CTESTS = \
 	mlang.c
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in
index fd36a139f78..2996c1c10aa 100644
--- a/dlls/mountmgr.sys/Makefile.in
+++ b/dlls/mountmgr.sys/Makefile.in
@@ -3,11 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mountmgr.sys
-IMPORTS   = advapi32 ntoskrnl.exe kernel32 ntdll
+IMPORTS   = uuid advapi32 ntoskrnl.exe kernel32 ntdll
 DELAYIMPORTS = user32
 EXTRADLLFLAGS = -Wb,--subsystem,native
 EXTRADEFS = @HALINCL@
-EXTRALIBS = @DISKARBITRATIONLIB@ -luuid
+EXTRALIBS = @DISKARBITRATIONLIB@
 
 C_SRCS = \
 	device.c \
diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in
index d98d02dac4d..cbdff510d50 100644
--- a/dlls/mscoree/Makefile.in
+++ b/dlls/mscoree/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mscoree.dll
-IMPORTS   = advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid advapi32 kernel32
 
 C_SRCS = \
 	corruntimehost.c \
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index 207a1505d42..2e50dbe278e 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msdmo.dll
 IMPORTLIB = msdmo
-IMPORTS   = ole32 user32 advapi32 kernel32 
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 user32 advapi32 kernel32 
 
 C_SRCS = \
 	dmoreg.c \
diff --git a/dlls/msftedit/Makefile.in b/dlls/msftedit/Makefile.in
index 8c08ade7b63..829b83442a9 100644
--- a/dlls/msftedit/Makefile.in
+++ b/dlls/msftedit/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msftedit.dll
-IMPORTS   = riched20 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid riched20 kernel32
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 51b57b4b650..0794ccbb86f 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mshtml.dll
 IMPORTLIB = mshtml
-IMPORTS   = urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in
index 88cf740506b..9e77e3cc05a 100644
--- a/dlls/mshtml/tests/Makefile.in
+++ b/dlls/mshtml/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mshtml.dll
-IMPORTS   = ole32 oleaut32 user32 urlmon advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 oleaut32 user32 urlmon advapi32 kernel32
 
 CTESTS = \
 	dom.c \
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 6568c31245f..bcaa7e98498 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -4,9 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msi.dll
 IMPORTLIB = msi
-IMPORTS   = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = odbccp32
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	action.c \
diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in
index 11c8cd0a9bc..27aba87b31d 100644
--- a/dlls/msi/tests/Makefile.in
+++ b/dlls/msi/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msi.dll
-IMPORTS   = cabinet msi shell32 ole32 oleaut32 advapi32 kernel32 version
-EXTRALIBS = -luuid
+IMPORTS   = uuid cabinet msi shell32 ole32 oleaut32 advapi32 kernel32 version
 
 CTESTS = \
 	automation.c \
diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in
index 2de6646fcb8..5edbd084be6 100644
--- a/dlls/msimtf/Makefile.in
+++ b/dlls/msimtf/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msimtf.dll
-IMPORTS   = kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid kernel32
 
 C_SRCS	  = main.c
 RC_SRCS   = rsrc.rc
diff --git a/dlls/msisys.ocx/Makefile.in b/dlls/msisys.ocx/Makefile.in
index 6ddd71f2606..915aa9466f9 100644
--- a/dlls/msisys.ocx/Makefile.in
+++ b/dlls/msisys.ocx/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msisys.ocx
-IMPORTS   = kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid kernel32
 
 C_SRCS = msisys.c
 
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 5b6703044e9..ef82edceab8 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msxml3.dll
-IMPORTS   = urlmon shlwapi oleaut32 ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid @XML2LIBS@ @XSLTLIBS@
+IMPORTS   = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 kernel32
+EXTRALIBS = @XML2LIBS@ @XSLTLIBS@
 EXTRAINCL = @XML2INCL@ @XSLTINCL@
 
 C_SRCS = \
diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in
index a88ecacf28e..e65916bd2bb 100644
--- a/dlls/msxml3/tests/Makefile.in
+++ b/dlls/msxml3/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msxml3.dll
-IMPORTS   = oleaut32 ole32 user32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid oleaut32 ole32 user32 kernel32
 
 CTESTS = \
 	domdoc.c \
diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in
index e5660d64396..6c90bc00136 100644
--- a/dlls/objsel/Makefile.in
+++ b/dlls/objsel/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = objsel.dll
-IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	factory.c \
diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in
index 71d1a855222..be1ac4a54dc 100644
--- a/dlls/odbccp32/Makefile.in
+++ b/dlls/odbccp32/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbccp32.dll
 IMPORTLIB = odbccp32
-IMPORTS   = advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid advapi32 kernel32
 
 C_SRCS = \
 	odbccp32.c
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index d9369d45063..49a2c775be0 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -5,8 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole32.dll
 IMPORTLIB = ole32
-IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
-EXTRALIBS = -luuid
+IMPORTS   = uuid advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
 
 C_SRCS = \
 	antimoniker.c \
diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in
index a0e811d1d89..2ac90c9b014 100644
--- a/dlls/ole32/tests/Makefile.in
+++ b/dlls/ole32/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ole32.dll
-IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid oleaut32 ole32 user32 gdi32 advapi32 kernel32
 
 CTESTS = \
 	clipboard.c \
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 6a8f821acf8..c6a7dae36c2 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -5,9 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleaut32.dll
 IMPORTLIB = oleaut32
-IMPORTS   = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = comctl32 urlmon
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	connpt.c \
diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in
index 49b87063ac4..c824862fa57 100644
--- a/dlls/oleaut32/tests/Makefile.in
+++ b/dlls/oleaut32/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = oleaut32.dll
-IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid -luser32
+IMPORTS   = uuid oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
 
 CTESTS = \
 	olefont.c \
diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in
index 4371a346f26..4ffedc8f10c 100644
--- a/dlls/pstorec/Makefile.in
+++ b/dlls/pstorec/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = pstorec.dll
-IMPORTS   = kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid kernel32
 
 C_SRCS = \
 	pstorec.c
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in
index 94b9a128d89..c273bcb6a86 100644
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qcap.dll
-IMPORTS   = ole32 gdi32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid ole32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	capturegraph.c \
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index d4db2a4a82f..c4dc37895eb 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qedit.dll
-IMPORTS   = oleaut32 ole32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid oleaut32 ole32 advapi32 kernel32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in
index 94c5e60dbb4..0eea3ecb266 100644
--- a/dlls/qedit/tests/Makefile.in
+++ b/dlls/qedit/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = qedit.dll
-IMPORTS   = oleaut32 ole32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid oleaut32 ole32 kernel32
 
 CTESTS = \
 	mediadet.c
diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in
index 57609ca23c9..3143c5ad05b 100644
--- a/dlls/qmgr/Makefile.in
+++ b/dlls/qmgr/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qmgr.dll
-IMPORTS   = wininet urlmon ole32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid wininet urlmon ole32 advapi32 kernel32
 
 C_SRCS = \
 	enum_files.c \
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index ca47a414ec3..c5114b9475d 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = quartz.dll
 IMPORTLIB = quartz
-IMPORTS   = dsound msacm32 msvfw32 ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	acmwrapper.c \
diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in
index 0e3d389bda0..10f1046d917 100644
--- a/dlls/quartz/tests/Makefile.in
+++ b/dlls/quartz/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = quartz.dll
-IMPORTS   = ole32 kernel32
-EXTRALIBS = -lstrmiids -luuid
+IMPORTS   = strmiids uuid ole32 kernel32
 
 CTESTS = \
 	filtergraph.c \
diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in
index 501c7d293c2..e4059a45f8f 100644
--- a/dlls/query/Makefile.in
+++ b/dlls/query/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = query.dll
-IMPORTS   = kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid kernel32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in
index 1f2e451d232..4e443a1a691 100644
--- a/dlls/riched20/Makefile.in
+++ b/dlls/riched20/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched20.dll
 IMPORTLIB = riched20
-IMPORTS   = ole32 imm32 user32 gdi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 imm32 user32 gdi32 kernel32
 
 C_SRCS = \
 	caret.c \
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 2daa69dd24b..fed47461e18 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -5,9 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4.dll
 IMPORTLIB = rpcrt4
-IMPORTS   = iphlpapi advapi32 kernel32 ntdll
+IMPORTS   = uuid iphlpapi advapi32 kernel32 ntdll
 DELAYIMPORTS = secur32 user32
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	cproxy.c \
diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in
index 3191973c69b..6c6155d3956 100644
--- a/dlls/rpcrt4/tests/Makefile.in
+++ b/dlls/rpcrt4/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = rpcrt4.dll
-IMPORTS   = ole32 rpcrt4 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 rpcrt4 kernel32
 EXTRAIDLFLAGS = --prefix-server=s_
 
 IDL_C_SRCS = server.idl
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 28303355aa4..314500350e5 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -5,9 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = setupapi.dll
 IMPORTLIB = setupapi
-IMPORTS   = user32 version advapi32 rpcrt4 kernel32 ntdll
+IMPORTS   = uuid user32 version advapi32 rpcrt4 kernel32 ntdll
 DELAYIMPORTS = shell32
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	devinst.c \
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index a73e3c4176c..e4f573a1e79 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -5,9 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
 IMPORTLIB = shdocvw
-IMPORTS   = shell32 shlwapi user32 advapi32 kernel32
+IMPORTS   = uuid shell32 shlwapi user32 advapi32 kernel32
 DELAYIMPORTS = urlmon ole32 oleaut32
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	classinfo.c \
diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in
index 77647da24d2..9e1749e36a8 100644
--- a/dlls/shdocvw/tests/Makefile.in
+++ b/dlls/shdocvw/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shdocvw.dll
-IMPORTS   = shell32 ole32 oleaut32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shell32 ole32 oleaut32 user32 advapi32 kernel32
 
 CTESTS = \
 	shortcut.c \
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index dda960a38e4..d98bdb33ac1 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -5,9 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32.dll
 IMPORTLIB = shell32
-IMPORTS   = shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = ole32 oleaut32
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	autocomplete.c \
diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index 374f746b362..dd77c7c2f9d 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shell32.dll
-IMPORTS   = shell32 ole32 oleaut32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shell32 ole32 oleaut32 user32 advapi32 kernel32
 
 CTESTS = \
 	generated.c \
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 5420ee5d118..c178148bc25 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -5,9 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi.dll
 IMPORTLIB = shlwapi
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	assoc.c \
diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in
index f4c81f236ed..0b4d0199606 100644
--- a/dlls/shlwapi/tests/Makefile.in
+++ b/dlls/shlwapi/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shlwapi.dll
-IMPORTS   = shlwapi advapi32 ole32 oleaut32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shlwapi advapi32 ole32 oleaut32 kernel32
 
 CTESTS = \
 	clist.c \
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index c82c1e96e45..d853541e096 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
 IMPORTLIB = urlmon
-IMPORTS   = ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
-EXTRALIBS = -luuid
+IMPORTS   = uuid ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	bindctx.c \
diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in
index 9cdff83484a..f69e94c55f3 100644
--- a/dlls/urlmon/tests/Makefile.in
+++ b/dlls/urlmon/tests/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = urlmon.dll
-IMPORTS   = urlmon ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid urlmon ole32 user32 advapi32 kernel32
 
 CTESTS = \
 	generated.c \
diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
index 492c7891c42..3e07ef2a219 100644
--- a/dlls/winealsa.drv/Makefile.in
+++ b/dlls/winealsa.drv/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winealsa.drv
-IMPORTS   = winmm user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid @ALSALIBS@
+IMPORTS   = dxguid uuid winmm user32 advapi32 kernel32
+EXTRALIBS = @ALSALIBS@
 
 C_SRCS = \
 	alsa.c \
diff --git a/dlls/wineaudioio.drv/Makefile.in b/dlls/wineaudioio.drv/Makefile.in
index e077b6e761c..668d83693a4 100644
--- a/dlls/wineaudioio.drv/Makefile.in
+++ b/dlls/wineaudioio.drv/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineaudioio.drv
-IMPORTS   = winmm user32 kernel32 ntdll
-EXTRALIBS = -ldxguid -luuid @AUDIOIOLIBS@
+IMPORTS   = dxguid uuid winmm user32 kernel32 ntdll
+EXTRALIBS = @AUDIOIOLIBS@
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in
index 50d8cc8619e..584ca2eb9c6 100644
--- a/dlls/winecoreaudio.drv/Makefile.in
+++ b/dlls/winecoreaudio.drv/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecoreaudio.drv
-IMPORTS   = winmm user32 kernel32
-EXTRALIBS = $(LIBUUID) @COREAUDIO@
+IMPORTS   = uuid winmm user32 kernel32
+EXTRALIBS = @COREAUDIO@
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index e8bffa6f50c..61acef9d466 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wined3d.dll
 IMPORTLIB = wined3d
-IMPORTS   = user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	arb_program_shader.c \
diff --git a/dlls/wineesd.drv/Makefile.in b/dlls/wineesd.drv/Makefile.in
index 6bce027693e..b34e374dcf0 100644
--- a/dlls/wineesd.drv/Makefile.in
+++ b/dlls/wineesd.drv/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineesd.drv
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = dxguid uuid winmm user32 kernel32
 EXTRAINCL = @ESDINCL@
-EXTRALIBS = @ESDLIBS@ -ldxguid -luuid
+EXTRALIBS = @ESDLIBS@
 
 C_SRCS = \
 	esound.c \
diff --git a/dlls/winejack.drv/Makefile.in b/dlls/winejack.drv/Makefile.in
index df2792822d6..46e14430c49 100644
--- a/dlls/winejack.drv/Makefile.in
+++ b/dlls/winejack.drv/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winejack.drv
-IMPORTS   = winmm user32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid winmm user32 kernel32
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winenas.drv/Makefile.in b/dlls/winenas.drv/Makefile.in
index 242ce3dde38..94bbb2e21ec 100644
--- a/dlls/winenas.drv/Makefile.in
+++ b/dlls/winenas.drv/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winenas.drv
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = dxguid uuid winmm user32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = -ldxguid -luuid @NASLIBS@
+EXTRALIBS = @NASLIBS@
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in
index 9dd7b59375d..beb2ba72e1b 100644
--- a/dlls/wineoss.drv/Makefile.in
+++ b/dlls/wineoss.drv/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
-IMPORTS   = winmm user32 kernel32
-EXTRALIBS = -ldxguid -luuid
+IMPORTS   = dxguid uuid winmm user32 kernel32
 
 C_SRCS = \
 	audio.c \
diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in
index 53553571343..2bd6b4c4986 100644
--- a/programs/oleview/Makefile.in
+++ b/programs/oleview/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleview.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32
 EXTRADEFS = -DUNICODE
 
 C_SRCS = \
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index adee3a42d19..cdbab2e81e0 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -4,9 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineboot.exe
 APPMODE   = -mconsole
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = uuid advapi32 kernel32 ntdll
 DELAYIMPORTS = setupapi shell32 shlwapi version user32
-EXTRALIBS = -luuid
 
 C_SRCS = \
 	shutdown.c \
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 95285268779..823084f0b2d 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecfg.exe
 APPMODE   = -mwindows
-IMPORTS   = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	appdefaults.c \
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index d14eb7aee8c..804e349de28 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -5,8 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
 APPMODE   = -mwindows
-IMPORTS   = shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	splitpath.c \
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index 8eeca86d0c3..24d3157bba9 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -4,8 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows
-IMPORTS   = shell32 ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shell32 ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	winemenubuilder.c
-- 
2.11.4.GIT