Avoid linking with ntdll where possible.

dlls/Makefile.in

@@ -389,7 +389,7 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 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 @@ imm32/libimm32.so: libkernel32.so libntdll.so
 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
+oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so
-olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.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

dlls/avifil32/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32
 ALTNAMES  = avifile
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/dplayx/Makefile.in

@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/imagehlp/Makefile.in

@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/msacm/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32
 ALTNAMES  = msacm
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/msacm/msacm32.spec

@@ -5,6 +5,7 @@ rsrc msacm.res
 
 import winmm.dll
 import user32.dll
+import advapi32.dll
 import kernel32.dll
 import ntdll.dll
 

dlls/oleaut32/oleaut32.spec

@@ -4,6 +4,7 @@ type win32
 import ole32.dll
 import user32.dll
 import gdi32.dll
+import advapi32.dll
 import kernel32.dll
 import ntdll.dll
 

dlls/olecli/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32
 ALTNAMES  = olecli
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/olecli/olecli32.spec

@@ -4,6 +4,7 @@ type win32
 import ole32.dll
 import olesvr32.dll
 import gdi32.dll
+import kernel32.dll
 import ntdll.dll
 
 debug_channels (ole)

dlls/olesvr/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32
 ALTNAMES  = olesvr
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/olesvr/olesvr32.spec

@@ -1,6 +1,7 @@
 name	olesvr32
 type	win32
 
+import	kernel32.dll
 import	ntdll.dll
 
 debug_channels (ole)

dlls/rasapi32/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32
 ALTNAMES  = rasapi16
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/rasapi32/rasapi32.spec

@@ -1,6 +1,7 @@
 name	rasapi32
 type	win32
 
+import	kernel32.dll
 import	ntdll.dll
 
 debug_channels (ras)

dlls/version/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = version
 ALTNAMES  = ver
 EXTRALIBS = -lwine_unicode
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/wininet/Makefile.in

@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/winmm/mciseq/Makefile.in

@@ -3,8 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
-SOVERSION = 1.0
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o