diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in
index 88029d3340c..0cdfc832c1b 100644
--- a/dlls/advpack/Makefile.in
+++ b/dlls/advpack/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advpack.dll
 IMPORTLIB = libadvpack.$(IMPLIBEXT)
-IMPORTS   = ole32 setupapi version user32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 setupapi version advapi32 kernel32 ntdll
 
 C_SRCS = \
 	advpack.c \
diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in
index d0bdcbcc1f6..69559789244 100644
--- a/dlls/advpack/tests/Makefile.in
+++ b/dlls/advpack/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = advpack.dll
-IMPORTS   = cabinet user32 advapi32 kernel32
+IMPORTS   = cabinet advapi32 kernel32
 
 CTESTS = \
 	advpack.c \
diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in
index 1267aaa26aa..e3b08ce34ca 100644
--- a/dlls/browseui/tests/Makefile.in
+++ b/dlls/browseui/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = browseui.dll
-IMPORTS   = ole32 user32 kernel32
+IMPORTS   = ole32 kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in
index e6e3c875668..0870833957b 100644
--- a/dlls/cabinet/tests/Makefile.in
+++ b/dlls/cabinet/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = cabinet.dll
-IMPORTS   = cabinet user32 kernel32
+IMPORTS   = cabinet kernel32
 
 CTESTS = \
 	extract.c \
diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index 15bc92aed3b..fea37f66223 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d8.dll
 IMPORTLIB = libd3d8.$(IMPLIBEXT)
-IMPORTS   = wined3d user32 gdi32 advapi32 kernel32
+IMPORTS   = wined3d kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index 904dda9923c..1367e76e20b 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d9.dll
 IMPORTLIB = libd3d9.$(IMPLIBEXT)
-IMPORTS   = wined3d user32 gdi32 kernel32
+IMPORTS   = wined3d kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in
index 800bb541ad0..cbee6e5d4cf 100644
--- a/dlls/d3dx8/Makefile.in
+++ b/dlls/d3dx8/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx8.dll
 IMPORTLIB = libd3dx8.$(IMPLIBEXT)
-IMPORTS   = d3d8 user32 gdi32 kernel32
+IMPORTS   = kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in
index be223353023..3e4e939cdf1 100644
--- a/dlls/dmime/Makefile.in
+++ b/dlls/dmime/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmime.dll
-IMPORTS   = dsound winmm ole32 user32 advapi32 kernel32
+IMPORTS   = dsound ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in
index 88224f499b5..0ca602b516f 100644
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmsynth.dll
-IMPORTS   = winmm ole32 user32 advapi32 kernel32
+IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index e21c8fc1ccd..2158c76a415 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic.dll
-IMPORTS   = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in
index b354ca7fe8d..8daeff29e06 100644
--- a/dlls/dmusic32/Makefile.in
+++ b/dlls/dmusic32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic32.dll
 IMPORTLIB = libdmusic32.$(IMPLIBEXT)
-IMPORTS   = winmm user32 advapi32 kernel32
+IMPORTS   = kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in
index f1d75b2a029..f47fceeffa4 100644
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dswave.dll
-IMPORTS   = msacm32 ole32 user32 advapi32 kernel32
+IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in
index 9db8589c7bf..4a48e72fdfb 100644
--- a/dlls/dwmapi/Makefile.in
+++ b/dlls/dwmapi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dwmapi.dll
 IMPORTLIB = libdwmapi.$(IMPLIBEXT)
-IMPORTS   = user32 kernel32
+IMPORTS   = kernel32
 
 C_SRCS = \
 	dwmapi_main.c
diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index e47592b5ad3..1ab0377e6ee 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdiplus.dll
 IMPORTLIB = libgdiplus.$(IMPLIBEXT)
-IMPORTS   = shlwapi oleaut32 ole32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = shlwapi oleaut32 ole32 user32 gdi32 kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in
index 28b29590b16..3102f17edfc 100644
--- a/dlls/gdiplus/tests/Makefile.in
+++ b/dlls/gdiplus/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = gdiplus.dll
-IMPORTS   = gdiplus user32 gdi32 kernel32
+IMPORTS   = gdiplus user32 kernel32
 
 CTESTS = \
 	brush.c \
diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in
index c8ce5fbcbe0..83c245ced6b 100644
--- a/dlls/glu32/Makefile.in
+++ b/dlls/glu32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = glu32.dll
 IMPORTLIB = libglu32.$(IMPLIBEXT)
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
 
diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index 4858200f4d9..3b786cd1db5 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gphoto2.ds
-IMPORTS   = comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = comctl32 user32 gdi32 advapi32 kernel32
 EXTRALIBS = @GPHOTO2LIBS@
 EXTRAINCL = @GPHOTO2INCL@
 
diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in
index 98bdad8c5d7..7f9e14ad19f 100644
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hhctrl.ocx
-IMPORTS   = advapi32 comctl32 shell32 shlwapi ole32 oleaut32 user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in
index f1734e516e2..e1a12ac3542 100644
--- a/dlls/hid/Makefile.in
+++ b/dlls/hid/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hid.dll
 IMPORTLIB = libhid.$(IMPLIBEXT)
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index 206545b96e5..ecbbbee1d2a 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = infosoft.dll
-IMPORTS   = ole32 advapi32 kernel32 ntdll
+IMPORTS   = advapi32 kernel32
 EXTRALIBS = -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
diff --git a/dlls/infosoft/tests/Makefile.in b/dlls/infosoft/tests/Makefile.in
index 722b3bfa1c9..c19e3f43e66 100644
--- a/dlls/infosoft/tests/Makefile.in
+++ b/dlls/infosoft/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = infosoft.dll
-IMPORTS   = ole32 advapi32 kernel32
+IMPORTS   = ole32 kernel32
 
 CTESTS = \
 	infosoft.c
diff --git a/dlls/inkobj/Makefile.in b/dlls/inkobj/Makefile.in
index 0f12d18e1ae..aec1ba32c83 100644
--- a/dlls/inkobj/Makefile.in
+++ b/dlls/inkobj/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inkobj.dll
-IMPORTS   = ole32 kernel32
+IMPORTS   = kernel32
 
 C_SRCS = \
 	inkcollector.c \
diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index a8db0e43aab..13880804d37 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inseng.dll
-IMPORTS   = ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
diff --git a/dlls/iphlpapi/tests/Makefile.in b/dlls/iphlpapi/tests/Makefile.in
index 60262c039fa..4dcb0b5f350 100644
--- a/dlls/iphlpapi/tests/Makefile.in
+++ b/dlls/iphlpapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = iphlpapi.dll
-IMPORTS   = iphlpapi kernel32
+IMPORTS   = kernel32
 
 CTESTS = \
 	iphlpapi.c
diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in
index 1a07a660221..ec0bd9aa05b 100644
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = itss.dll
-IMPORTS   = urlmon shlwapi ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = urlmon shlwapi ole32 kernel32
 EXTRALIBS = -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 4018c295ff2..2251c276faa 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mapi32.dll
 IMPORTLIB = libmapi32.$(IMPLIBEXT)
-IMPORTS   = shlwapi shell32 ole32 user32 kernel32 ntdll
+IMPORTS   = shlwapi shell32 kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in
index 956fd89788d..a76105ae643 100644
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mlang.dll
 IMPORTLIB = libmlang.$(IMPLIBEXT)
-IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = oleaut32
 EXTRALIBS = -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
diff --git a/dlls/mscat32/Makefile.in b/dlls/mscat32/Makefile.in
index dc6c4c11862..ba982abc03c 100644
--- a/dlls/mscat32/Makefile.in
+++ b/dlls/mscat32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mscat32.dll
-IMPORTS   = kernel32
+IMPORTS   = wintrust kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in
index addcd242d8a..e59ec6ceb57 100644
--- a/dlls/mscms/Makefile.in
+++ b/dlls/mscms/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mscms.dll
 IMPORTLIB = libmscms.$(IMPLIBEXT)
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 EXTRALIBS = @LCMSLIBS@
 
 C_SRCS = \
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index c8da454bf7d..3b51849d875 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mshtml.dll
 IMPORTLIB = libmshtml.$(IMPLIBEXT)
-IMPORTS   = urlmon ole32 oleaut32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = urlmon ole32 oleaut32 user32 gdi32 advapi32 kernel32
 EXTRALIBS = -lstrmiids -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in
index bf6a2939109..257c3d802eb 100644
--- a/dlls/msvcrtd/Makefile.in
+++ b/dlls/msvcrtd/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrtd.dll
 IMPORTLIB = libmsvcrtd.$(IMPLIBEXT)
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt kernel32 ntdll
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index 47fb4167c9b..4014d5dada9 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32.dll
 IMPORTLIB = libmsvfw32.$(IMPLIBEXT)
-IMPORTS   = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = winmm comctl32 user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	mciwnd.c \
diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in
index d5e7783cdc2..dd059d32329 100644
--- a/dlls/mswsock/Makefile.in
+++ b/dlls/mswsock/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mswsock.dll
 IMPORTLIB = libmswsock.$(IMPLIBEXT)
-IMPORTS   = ws2_32 iphlpapi kernel32
+IMPORTS   = ws2_32 kernel32
 
 C_SRCS = \
 	mswsock.c
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index ad5d9bc75e6..63c10d8fa17 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msxml3.dll
-IMPORTS   = urlmon shlwapi oleaut32 ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = urlmon shlwapi oleaut32 ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid @XML2LIBS@ @XSLTLIBS@
 EXTRAINCL = @XML2INCL@ @XSLTINCL@
 
diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index 29646592137..208fdca2842 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = netapi32.dll
 IMPORTLIB = libnetapi32.$(IMPLIBEXT)
-IMPORTS   = iphlpapi ws2_32 advapi32 kernel32
+IMPORTS   = iphlpapi ws2_32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	access.c \
diff --git a/dlls/netapi32/tests/Makefile.in b/dlls/netapi32/tests/Makefile.in
index 3c8971a90d5..3ad5c7482bd 100644
--- a/dlls/netapi32/tests/Makefile.in
+++ b/dlls/netapi32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = netapi32.dll
-IMPORTS   = netapi32 advapi32 kernel32
+IMPORTS   = advapi32 kernel32
 
 CTESTS = \
 	access.c \
diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in
index 7b79678f383..e5660d64396 100644
--- a/dlls/objsel/Makefile.in
+++ b/dlls/objsel/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = objsel.dll
-IMPORTS   = ole32 oleaut32 user32 advapi32 kernel32
+IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -lstrmiids -luuid
 
 C_SRCS = \
diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in
index 09b0468fc0e..ab715e124a0 100644
--- a/dlls/odbccp32/Makefile.in
+++ b/dlls/odbccp32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbccp32.dll
 IMPORTLIB = libodbccp32.$(IMPLIBEXT)
-IMPORTS   = ole32 advapi32 kernel32
+IMPORTS   = advapi32 kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/odbccp32/tests/Makefile.in b/dlls/odbccp32/tests/Makefile.in
index e4abcc61c62..ef67fdbeb6d 100644
--- a/dlls/odbccp32/tests/Makefile.in
+++ b/dlls/odbccp32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = odbccp32.dll
-IMPORTS   = odbccp32 user32 kernel32
+IMPORTS   = odbccp32 kernel32
 
 CTESTS = \
 	misc.c
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in
index 7c06f5e654b..7e32d6b4e36 100644
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = opengl32.dll
 IMPORTLIB = libopengl32.$(IMPLIBEXT)
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 kernel32
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
 
diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in
index b4fdd2db18c..4371a346f26 100644
--- a/dlls/pstorec/Makefile.in
+++ b/dlls/pstorec/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = pstorec.dll
-IMPORTS   = ole32 shlwapi advapi32 kernel32
+IMPORTS   = kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in
index 0b6805ab551..94b9a128d89 100644
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qcap.dll
-IMPORTS   = ole32 oleaut32 user32 gdi32 advapi32 kernel32
+IMPORTS   = ole32 gdi32 advapi32 kernel32
 EXTRALIBS = -lstrmiids -luuid
 
 C_SRCS = \
diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in
index ce6794412ae..5163157a53b 100644
--- a/dlls/quartz/tests/Makefile.in
+++ b/dlls/quartz/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = quartz.dll
-IMPORTS   = ole32 user32 gdi32 kernel32
+IMPORTS   = ole32 kernel32
 EXTRALIBS = -lstrmiids
 
 CTESTS = \
diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in
index 1990e12fb70..501c7d293c2 100644
--- a/dlls/query/Makefile.in
+++ b/dlls/query/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = query.dll
-IMPORTS   = ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = kernel32
 EXTRALIBS = -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in
index 387e868eb7a..74a5686bf38 100644
--- a/dlls/riched20/tests/Makefile.in
+++ b/dlls/riched20/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = riched20.dll
-IMPORTS   = riched20 ole32 user32 gdi32 kernel32
+IMPORTS   = ole32 user32 gdi32 kernel32
 
 CTESTS = \
 	editor.c
diff --git a/dlls/riched32/tests/Makefile.in b/dlls/riched32/tests/Makefile.in
index 06de4daf295..adb6881c7e5 100644
--- a/dlls/riched32/tests/Makefile.in
+++ b/dlls/riched32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = riched32.dll
-IMPORTS   = ole32 user32 gdi32 kernel32
+IMPORTS   = ole32 user32 kernel32
 
 CTESTS = \
 	editor.c
diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in
index 2b94ee2c5b4..d8646fecb38 100644
--- a/dlls/sane.ds/Makefile.in
+++ b/dlls/sane.ds/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sane.ds
-IMPORTS   = comctl32 user32 gdi32 kernel32 ntdll
+IMPORTS   = comctl32 user32 gdi32 kernel32
 EXTRAINCL = @SANEINCL@
 
 C_SRCS = \
diff --git a/dlls/schannel/tests/Makefile.in b/dlls/schannel/tests/Makefile.in
index 02621079aad..3efbbb32eae 100644
--- a/dlls/schannel/tests/Makefile.in
+++ b/dlls/schannel/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = schannel.dll
-IMPORTS   = crypt32 advapi32 kernel32
+IMPORTS   = kernel32
 
 CTESTS = \
 	main.c
diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in
index 43efc1caf47..36ae0573fb0 100644
--- a/dlls/secur32/Makefile.in
+++ b/dlls/secur32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = secur32.dll
 IMPORTLIB = libsecur32.$(IMPLIBEXT)
-IMPORTS   = netapi32 user32 advapi32 kernel32 ntdll
+IMPORTS   = netapi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = crypt32
 
 C_SRCS = \
diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index f66b34d279a..cd15eb3166d 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shell32.dll
-IMPORTS   = shell32 ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32
+IMPORTS   = shell32 ole32 oleaut32 shlwapi user32 advapi32 kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index 79bb3b91003..3fc9776bbe8 100644
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = twain_32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 
 C_SRCS = \
 	dsm_ctrl.c \
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index 46a2e7e8440..3fcd1278e47 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uxtheme.dll
 IMPORTLIB = libuxtheme.$(IMPLIBEXT)
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = msimg32
 
 C_SRCS = \
diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in
index eaacf3fa738..ce1603fa1a0 100644
--- a/dlls/vmm.vxd/Makefile.in
+++ b/dlls/vmm.vxd/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vmm.vxd
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 
 C_SRCS = \
 	vmm.c
diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
index aeafed85ae1..492c7891c42 100644
--- a/dlls/winealsa.drv/Makefile.in
+++ b/dlls/winealsa.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winealsa.drv
-IMPORTS   = winmm user32 advapi32 kernel32 ntdll
+IMPORTS   = winmm user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid @ALSALIBS@
 
 C_SRCS = \
diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in
index b602b309079..aae66eceb35 100644
--- a/dlls/winedos/Makefile.in
+++ b/dlls/winedos/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedos.dll
 IMPORTLIB = libwinedos.$(IMPLIBEXT)
-IMPORTS   = user32 advapi32 kernel32 ntdll
+IMPORTS   = user32 kernel32 ntdll
 
 SPEC_SRCS16 = wprocs.spec
 
diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in
index 45b15a0781f..f580015c444 100644
--- a/dlls/wintrust/tests/Makefile.in
+++ b/dlls/wintrust/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = wintrust.dll
-IMPORTS   = wintrust crypt32 user32 advapi32 kernel32
+IMPORTS   = wintrust crypt32 advapi32 kernel32
 
 CTESTS = \
 	asn.c \