Avoid linking with ntdll where possible.
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 7ab1443..9bdb628 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -389,7 +389,7 @@
advapi32/libadvapi32.so: libkernel32.so libntdll.so
avifil32/libavifil32.so: libmsvfw32.so libkernel32.so libntdll.so
comctl32/libcomctl32.so: libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so
-commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libuser32.so libwinspool.drv.so libgdi32.so libkernel32.so libntdll.so
+commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libwinspool.drv.so libuser32.so libgdi32.so libkernel32.so libntdll.so
crtdll/libcrtdll.so: libkernel32.so libntdll.so
dciman32/libdciman32.so: libntdll.so
ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so
@@ -404,24 +404,24 @@
kernel/libkernel32.so: libntdll.so
lzexpand/liblz32.so: libkernel32.so libntdll.so
mpr/libmpr.so: libkernel32.so libntdll.so
-msacm/libmsacm32.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+msacm/libmsacm32.so: libwinmm.so libuser32.so libadvapi32.so libkernel32.so libntdll.so
msnet32/libmsnet32.so: libntdll.so
msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so libntdll.so
odbc32/libodbc32.so: libntdll.so
ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so libntdll.so
-oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
-olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so libntdll.so
+oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so
+olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so libkernel32.so libntdll.so
oledlg/liboledlg.so: libntdll.so
olepro32/libolepro32.so: liboleaut32.so libntdll.so
-olesvr/libolesvr32.so: libntdll.so
+olesvr/libolesvr32.so: libkernel32.so libntdll.so
opengl32/libopengl32.so: libx11drv.so libkernel32.so
psapi/libpsapi.so: libkernel32.so libntdll.so
-rasapi32/librasapi32.so: libntdll.so
+rasapi32/librasapi32.so: libkernel32.so libntdll.so
richedit/libriched32.so: libuser32.so libkernel32.so libntdll.so
rpcrt4/librpcrt4.so: libkernel32.so libntdll.so
serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so libntdll.so
setupapi/libsetupapi.so: libadvapi32.so libkernel32.so libntdll.so
-shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
+shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so
shfolder/libshfolder.so: libshell32.so
shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
tapi32/libtapi32.so: libkernel32.so libntdll.so
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 8b41458..4a97b8a 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -4,7 +4,6 @@
VPATH = @srcdir@
MODULE = avifil32
ALTNAMES = avifile
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 61ce0f2..951860f 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -3,7 +3,6 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dplayx
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index badc363..a33be7f 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -3,7 +3,6 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = imagehlp
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in
index 8677a7d..e7df77b 100644
--- a/dlls/msacm/Makefile.in
+++ b/dlls/msacm/Makefile.in
@@ -4,7 +4,6 @@
VPATH = @srcdir@
MODULE = msacm32
ALTNAMES = msacm
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec
index 51184d504..6094701 100644
--- a/dlls/msacm/msacm32.spec
+++ b/dlls/msacm/msacm32.spec
@@ -5,6 +5,7 @@
import winmm.dll
import user32.dll
+import advapi32.dll
import kernel32.dll
import ntdll.dll
diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec
index a99c932..e9b475c 100644
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@@ -4,6 +4,7 @@
import ole32.dll
import user32.dll
import gdi32.dll
+import advapi32.dll
import kernel32.dll
import ntdll.dll
diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in
index 11b6536..50fa196 100644
--- a/dlls/olecli/Makefile.in
+++ b/dlls/olecli/Makefile.in
@@ -4,7 +4,6 @@
VPATH = @srcdir@
MODULE = olecli32
ALTNAMES = olecli
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/olecli/olecli32.spec b/dlls/olecli/olecli32.spec
index 40985a8..1ca7ec6 100644
--- a/dlls/olecli/olecli32.spec
+++ b/dlls/olecli/olecli32.spec
@@ -4,6 +4,7 @@
import ole32.dll
import olesvr32.dll
import gdi32.dll
+import kernel32.dll
import ntdll.dll
debug_channels (ole)
diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in
index 188452d..840980a 100644
--- a/dlls/olesvr/Makefile.in
+++ b/dlls/olesvr/Makefile.in
@@ -4,7 +4,6 @@
VPATH = @srcdir@
MODULE = olesvr32
ALTNAMES = olesvr
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/olesvr/olesvr32.spec b/dlls/olesvr/olesvr32.spec
index aca7656..0752546 100644
--- a/dlls/olesvr/olesvr32.spec
+++ b/dlls/olesvr/olesvr32.spec
@@ -1,6 +1,7 @@
name olesvr32
type win32
+import kernel32.dll
import ntdll.dll
debug_channels (ole)
diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index 58beb5d..ea72b8f 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -4,7 +4,6 @@
VPATH = @srcdir@
MODULE = rasapi32
ALTNAMES = rasapi16
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec
index eb402d7..810e230 100644
--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
@@ -1,6 +1,7 @@
name rasapi32
type win32
+import kernel32.dll
import ntdll.dll
debug_channels (ras)
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index a9e4ab5..96951f0 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -5,7 +5,6 @@
MODULE = version
ALTNAMES = ver
EXTRALIBS = -lwine_unicode
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index cb0ccec..115acff 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -3,7 +3,6 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wininet
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in
index 7de805d..e55a1e7 100644
--- a/dlls/winmm/mciseq/Makefile.in
+++ b/dlls/winmm/mciseq/Makefile.in
@@ -3,8 +3,6 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciseq.drv
-SOVERSION = 1.0
-IMPORTS = ntdll
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
