makefiles: List the static libraries as normal imports instead of extra libs.

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 \

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 \

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 \

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 \

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 = \

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

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 \

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

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 \

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

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 \

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 \

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 \

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 \

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
 

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 \

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
 

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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

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 \

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

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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

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 \

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

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 = \

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 = \

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 = \

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

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

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 \

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 \

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 = \

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

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 \

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 \

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 \

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@
 

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 = \

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 \

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 \

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 \

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

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
 

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 = \

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 \

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 \

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

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 \

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 \

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 \

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 \

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

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 \

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 \

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

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 \

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 \

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 \

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 = \

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 \

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 \

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

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 = \

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 \

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 \

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 \

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