Removed most imports of ntdll since we no longer import Wine internal

functions from there.
2002-05-17 03:37:12 +00:00 · 2002-05-17 03:37:12 +00:00 · 2ab7625934
commit 2ab7625934
parent 6044307c3a
98 changed files with 171 additions and 202 deletions
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@ -519,132 +519,127 @@ x11drv.dll$(DLLEXT): x11drv/x11drv.dll$(DLLEXT)
 advapi32/advapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
 	@cd advapi32 && $(MAKE) advapi32.dll$(DLLEXT)

-avicap32/avicap32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+avicap32/avicap32.dll$(DLLEXT): dummy
 	@cd avicap32 && $(MAKE) avicap32.dll$(DLLEXT)

-avifil32/avifil32.dll$(DLLEXT): dummy msvfw32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+avifil32/avifil32.dll$(DLLEXT): dummy msvfw32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd avifil32 && $(MAKE) avifil32.dll$(DLLEXT)

 comcat/comcat.dll$(DLLEXT): dummy ole32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd comcat && $(MAKE) comcat.dll$(DLLEXT)

 comctl32/comctl32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) winmm.dll$(DLLEXT)
+  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) winmm.dll$(DLLEXT)
 	@cd comctl32 && $(MAKE) comctl32.dll$(DLLEXT)

 commdlg/comdlg32.dll$(DLLEXT): dummy shell32.dll$(DLLEXT) shlwapi.dll$(DLLEXT) \
  comctl32.dll$(DLLEXT) winspool.drv$(DLLEXT) user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd commdlg && $(MAKE) comdlg32.dll$(DLLEXT)

-crtdll/crtdll.dll$(DLLEXT): dummy msvcrt.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+crtdll/crtdll.dll$(DLLEXT): dummy msvcrt.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd crtdll && $(MAKE) crtdll.dll$(DLLEXT)

-crypt32/crypt32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+crypt32/crypt32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd crypt32 && $(MAKE) crypt32.dll$(DLLEXT)

-dciman32/dciman32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+dciman32/dciman32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd dciman32 && $(MAKE) dciman32.dll$(DLLEXT)

 ddraw/ddraw.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) libuser32.dll.$(LIBEXT) libgdi32.dll.$(LIBEXT) \
-  libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
+  kernel32.dll$(DLLEXT) libuser32.dll.$(LIBEXT) libgdi32.dll.$(LIBEXT) libkernel32.dll.$(LIBEXT) \
+  libntdll.dll.$(LIBEXT)
 	@cd ddraw && $(MAKE) ddraw.dll$(DLLEXT)

-devenum/devenum.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+devenum/devenum.dll$(DLLEXT): dummy
 	@cd devenum && $(MAKE) devenum.dll$(DLLEXT)

-dinput/dinput.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+dinput/dinput.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd dinput && $(MAKE) dinput.dll$(DLLEXT)

 dplay/dplay.dll$(DLLEXT): dummy dplayx.dll$(DLLEXT)
 	@cd dplay && $(MAKE) dplay.dll$(DLLEXT)

 dplayx/dplayx.dll$(DLLEXT): dummy winmm.dll$(DLLEXT) ole32.dll$(DLLEXT) \
-  user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd dplayx && $(MAKE) dplayx.dll$(DLLEXT)

 dsound/dsound.dll$(DLLEXT): dummy winmm.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd dsound && $(MAKE) dsound.dll$(DLLEXT)

 gdi/gdi32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT) libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
+  libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
 	@cd gdi && $(MAKE) gdi32.dll$(DLLEXT)

 glu32/glu32.dll$(DLLEXT): dummy
 	@cd glu32 && $(MAKE) glu32.dll$(DLLEXT)

-icmp/icmp.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+icmp/icmp.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd icmp && $(MAKE) icmp.dll$(DLLEXT)

-imagehlp/imagehlp.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+imagehlp/imagehlp.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd imagehlp && $(MAKE) imagehlp.dll$(DLLEXT)

-imm32/imm32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+imm32/imm32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd imm32 && $(MAKE) imm32.dll$(DLLEXT)

 kernel/kernel32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT) libntdll.dll.$(LIBEXT)
 	@cd kernel && $(MAKE) kernel32.dll$(DLLEXT)

-lzexpand/lz32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+lzexpand/lz32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd lzexpand && $(MAKE) lz32.dll$(DLLEXT)

-mapi32/mapi32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+mapi32/mapi32.dll$(DLLEXT): dummy
 	@cd mapi32 && $(MAKE) mapi32.dll$(DLLEXT)

-mpr/mpr.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+mpr/mpr.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd mpr && $(MAKE) mpr.dll$(DLLEXT)

 msacm/imaadp32/imaadp32.acm$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd msacm/imaadp32 && $(MAKE) imaadp32.acm$(DLLEXT)

 msacm/msacm32.dll$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd msacm && $(MAKE) msacm32.dll$(DLLEXT)

-msacm/msg711/msg711.drv$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+msacm/msg711/msg711.drv$(DLLEXT): dummy
 	@cd msacm/msg711 && $(MAKE) msg711.drv$(DLLEXT)

-msdmo/msdmo.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+msdmo/msdmo.dll$(DLLEXT): dummy
 	@cd msdmo && $(MAKE) msdmo.dll$(DLLEXT)

-msimg32/msimg32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+msimg32/msimg32.dll$(DLLEXT): dummy
 	@cd msimg32 && $(MAKE) msimg32.dll$(DLLEXT)

-msisys/msisys.ocx$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+msisys/msisys.ocx$(DLLEXT): dummy
 	@cd msisys && $(MAKE) msisys.ocx$(DLLEXT)

-msnet32/msnet32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+msnet32/msnet32.dll$(DLLEXT): dummy
 	@cd msnet32 && $(MAKE) msnet32.dll$(DLLEXT)

-msrle32/msrle32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+msrle32/msrle32.dll$(DLLEXT): dummy
 	@cd msrle32 && $(MAKE) msrle32.dll$(DLLEXT)

 msvcrt/msvcrt.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
 	@cd msvcrt && $(MAKE) msvcrt.dll$(DLLEXT)

-msvcrt20/msvcrt20.dll$(DLLEXT): dummy msvcrt.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+msvcrt20/msvcrt20.dll$(DLLEXT): dummy msvcrt.dll$(DLLEXT)
 	@cd msvcrt20 && $(MAKE) msvcrt20.dll$(DLLEXT)

 msvideo/msvfw32.dll$(DLLEXT): dummy winmm.dll$(DLLEXT) comctl32.dll$(DLLEXT) \
-  version.dll$(DLLEXT) user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+  version.dll$(DLLEXT) user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd msvideo && $(MAKE) msvfw32.dll$(DLLEXT)

-netapi32/netapi32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+netapi32/netapi32.dll$(DLLEXT): dummy
 	@cd netapi32 && $(MAKE) netapi32.dll$(DLLEXT)

 ntdll/ntdll.dll$(DLLEXT): dummy
 	@cd ntdll && $(MAKE) ntdll.dll$(DLLEXT)

-odbc32/odbc32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+odbc32/odbc32.dll$(DLLEXT): dummy
 	@cd odbc32 && $(MAKE) odbc32.dll$(DLLEXT)

 ole32/ole32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) user32.dll$(DLLEXT) \
@ -652,190 +647,181 @@ ole32/ole32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) user32.dll$(DLLEXT) \
 	@cd ole32 && $(MAKE) ole32.dll$(DLLEXT)

 oleaut32/oleaut32.dll$(DLLEXT): dummy ole32.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  gdi32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) \
-  comctl32.dll$(DLLEXT)
+  gdi32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) comctl32.dll$(DLLEXT)
 	@cd oleaut32 && $(MAKE) oleaut32.dll$(DLLEXT)

 olecli/olecli32.dll$(DLLEXT): dummy ole32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd olecli && $(MAKE) olecli32.dll$(DLLEXT)

-oledlg/oledlg.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+oledlg/oledlg.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd oledlg && $(MAKE) oledlg.dll$(DLLEXT)

-olepro32/olepro32.dll$(DLLEXT): dummy oleaut32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+olepro32/olepro32.dll$(DLLEXT): dummy oleaut32.dll$(DLLEXT)
 	@cd olepro32 && $(MAKE) olepro32.dll$(DLLEXT)

-olesvr/olesvr32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+olesvr/olesvr32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd olesvr && $(MAKE) olesvr32.dll$(DLLEXT)

 opengl32/opengl32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd opengl32 && $(MAKE) opengl32.dll$(DLLEXT)

 psapi/psapi.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
 	@cd psapi && $(MAKE) psapi.dll$(DLLEXT)

-qcap/qcap.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+qcap/qcap.dll$(DLLEXT): dummy
 	@cd qcap && $(MAKE) qcap.dll$(DLLEXT)

-quartz/quartz.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+quartz/quartz.dll$(DLLEXT): dummy
 	@cd quartz && $(MAKE) quartz.dll$(DLLEXT)

-rasapi32/rasapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+rasapi32/rasapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd rasapi32 && $(MAKE) rasapi32.dll$(DLLEXT)

-richedit/riched32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+richedit/riched32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd richedit && $(MAKE) riched32.dll$(DLLEXT)

-rpcrt4/rpcrt4.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+rpcrt4/rpcrt4.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd rpcrt4 && $(MAKE) rpcrt4.dll$(DLLEXT)

 serialui/serialui.dll$(DLLEXT): dummy user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd serialui && $(MAKE) serialui.dll$(DLLEXT)

 setupapi/setupapi.dll$(DLLEXT): dummy user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
 	@cd setupapi && $(MAKE) setupapi.dll$(DLLEXT)

-shdocvw/shdocvw.dll$(DLLEXT): dummy ole32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+shdocvw/shdocvw.dll$(DLLEXT): dummy ole32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd shdocvw && $(MAKE) shdocvw.dll$(DLLEXT)

 shell32/shell32.dll$(DLLEXT): dummy ole32.dll$(DLLEXT) shlwapi.dll$(DLLEXT) \
  comctl32.dll$(DLLEXT) user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd shell32 && $(MAKE) shell32.dll$(DLLEXT)

 shfolder/shfolder.dll$(DLLEXT): dummy shell32.dll$(DLLEXT)
 	@cd shfolder && $(MAKE) shfolder.dll$(DLLEXT)

 shlwapi/shlwapi.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd shlwapi && $(MAKE) shlwapi.dll$(DLLEXT)

-snmpapi/snmpapi.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+snmpapi/snmpapi.dll$(DLLEXT): dummy
 	@cd snmpapi && $(MAKE) snmpapi.dll$(DLLEXT)

-sti/sti.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+sti/sti.dll$(DLLEXT): dummy
 	@cd sti && $(MAKE) sti.dll$(DLLEXT)

-tapi32/tapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+tapi32/tapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd tapi32 && $(MAKE) tapi32.dll$(DLLEXT)

 ttydrv/ttydrv.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) libuser32.dll.$(LIBEXT) libgdi32.dll.$(LIBEXT) \
-  libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
+  kernel32.dll$(DLLEXT) libuser32.dll.$(LIBEXT) libgdi32.dll.$(LIBEXT) libkernel32.dll.$(LIBEXT) \
+  libntdll.dll.$(LIBEXT)
 	@cd ttydrv && $(MAKE) ttydrv.dll$(DLLEXT)

 twain/twain_32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd twain && $(MAKE) twain_32.dll$(DLLEXT)

-url/url.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+url/url.dll$(DLLEXT): dummy
 	@cd url && $(MAKE) url.dll$(DLLEXT)

-urlmon/urlmon.dll$(DLLEXT): dummy ole32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+urlmon/urlmon.dll$(DLLEXT): dummy ole32.dll$(DLLEXT)
 	@cd urlmon && $(MAKE) urlmon.dll$(DLLEXT)

 user/user32.dll$(DLLEXT): dummy gdi32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) libgdi32.dll.$(LIBEXT) libkernel32.dll.$(LIBEXT) \
-  libntdll.dll.$(LIBEXT)
+  kernel32.dll$(DLLEXT) libgdi32.dll.$(LIBEXT) libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
 	@cd user && $(MAKE) user32.dll$(DLLEXT)

-version/version.dll$(DLLEXT): dummy lz32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+version/version.dll$(DLLEXT): dummy lz32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd version && $(MAKE) version.dll$(DLLEXT)

-win32s/w32skrnl.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+win32s/w32skrnl.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd win32s && $(MAKE) w32skrnl.dll$(DLLEXT)

-winaspi/wnaspi32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+winaspi/wnaspi32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd winaspi && $(MAKE) wnaspi32.dll$(DLLEXT)

 winedos/winedos.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT) libuser32.dll.$(LIBEXT) libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
+  libuser32.dll.$(LIBEXT) libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
 	@cd winedos && $(MAKE) winedos.dll$(DLLEXT)

 wineps/wineps.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  winspool.drv$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  winspool.drv$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd wineps && $(MAKE) wineps.dll$(DLLEXT)

 wininet/wininet.dll$(DLLEXT): dummy shlwapi.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd wininet && $(MAKE) wininet.dll$(DLLEXT)

-winmm/joystick/joystick.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+winmm/joystick/joystick.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT)
 	@cd winmm/joystick && $(MAKE) joystick.drv$(DLLEXT)

 winmm/mcianim/mcianim.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd winmm/mcianim && $(MAKE) mcianim.drv$(DLLEXT)

 winmm/mciavi/mciavi.drv$(DLLEXT): dummy msvfw32.dll$(DLLEXT) winmm.dll$(DLLEXT) \
-  user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd winmm/mciavi && $(MAKE) mciavi.drv$(DLLEXT)

 winmm/mcicda/mcicda.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT) user32.dll$(DLLEXT)
+  user32.dll$(DLLEXT)
 	@cd winmm/mcicda && $(MAKE) mcicda.drv$(DLLEXT)

 winmm/mciseq/mciseq.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT) user32.dll$(DLLEXT)
+  user32.dll$(DLLEXT)
 	@cd winmm/mciseq && $(MAKE) mciseq.drv$(DLLEXT)

 winmm/mciwave/mciwave.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT) user32.dll$(DLLEXT)
+  user32.dll$(DLLEXT)
 	@cd winmm/mciwave && $(MAKE) mciwave.drv$(DLLEXT)

 winmm/midimap/midimap.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd winmm/midimap && $(MAKE) midimap.drv$(DLLEXT)

 winmm/wavemap/msacm.drv$(DLLEXT): dummy msacm32.dll$(DLLEXT) winmm.dll$(DLLEXT) \
-  user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd winmm/wavemap && $(MAKE) msacm.drv$(DLLEXT)

 winmm/winearts/winearts.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd winmm/winearts && $(MAKE) winearts.drv$(DLLEXT)

 winmm/wineoss/wineoss.drv$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd winmm/wineoss && $(MAKE) wineoss.drv$(DLLEXT)

 winmm/winmm.dll$(DLLEXT): dummy user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
-  kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+  kernel32.dll$(DLLEXT)
 	@cd winmm && $(MAKE) winmm.dll$(DLLEXT)

-winnls/winnls32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
+winnls/winnls32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd winnls && $(MAKE) winnls32.dll$(DLLEXT)

 winsock/ws2_32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
  ntdll.dll$(DLLEXT)
 	@cd winsock && $(MAKE) ws2_32.dll$(DLLEXT)

-winspool/winspool.drv$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+winspool/winspool.drv$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd winspool && $(MAKE) winspool.drv$(DLLEXT)

-wintrust/wintrust.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT)
+wintrust/wintrust.dll$(DLLEXT): dummy
 	@cd wintrust && $(MAKE) wintrust.dll$(DLLEXT)

 wow32/wow32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd wow32 && $(MAKE) wow32.dll$(DLLEXT)

-wsock32/wsock32.dll$(DLLEXT): dummy ws2_32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
-  ntdll.dll$(DLLEXT)
+wsock32/wsock32.dll$(DLLEXT): dummy ws2_32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd wsock32 && $(MAKE) wsock32.dll$(DLLEXT)

 x11drv/x11drv.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
-  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) libuser32.dll.$(LIBEXT) \
-  libgdi32.dll.$(LIBEXT) libkernel32.dll.$(LIBEXT)
+  advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) libuser32.dll.$(LIBEXT) libgdi32.dll.$(LIBEXT) \
+  libkernel32.dll.$(LIBEXT)
 	@cd x11drv && $(MAKE) x11drv.dll$(DLLEXT)

 # Special targets for dlls that we need to link to
--- a/dlls/avicap32/Makefile.in
+++ b/dlls/avicap32/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avicap32.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32.dll
-IMPORTS   = msvfw32 kernel32 ntdll
+IMPORTS   = msvfw32 kernel32
 ALTNAMES  = avifile.dll
 EXTRALIBS = $(LIBUUID)

--- a/dlls/comcat/Makefile.in
+++ b/dlls/comcat/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comcat.dll
-IMPORTS   = ole32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 advapi32 kernel32
 EXTRALIBS = $(LIBUUID)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32.dll
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = winmm
 EXTRALIBS = $(LIBUNICODE)

--- a/dlls/commdlg/Makefile.in
+++ b/dlls/commdlg/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32.dll
-IMPORTS   = shell32 shlwapi comctl32 winspool.drv user32 gdi32 kernel32 ntdll
+IMPORTS   = shell32 shlwapi comctl32 winspool.drv user32 gdi32 kernel32
 ALTNAMES  = commdlg.dll
 EXTRALIBS = $(LIBUUID)

--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll.dll
-IMPORTS   = msvcrt kernel32 ntdll
+IMPORTS   = msvcrt kernel32
 EXTRALIBS = $(LIBUNICODE)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crypt32.dll
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/dciman32/Makefile.in
+++ b/dlls/dciman32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddraw.dll
-IMPORTS   = user32 gdi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 kernel32
 EXTRALIBS = $(LIBUUID) $(LIBTSX11) $(X_LIBS) $(XLIB)
 LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll

--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = devenum.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput.dll
-IMPORTS   = user32 kernel32 ntdll
+IMPORTS   = user32 kernel32
 EXTRALIBS = $(LIBUUID)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx.dll
-IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = winmm ole32 user32 advapi32 kernel32
 EXTRALIBS = $(LIBUUID)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound.dll
-IMPORTS   = winmm advapi32 kernel32 ntdll
+IMPORTS   = winmm advapi32 kernel32
 EXTRALIBS = $(LIBUUID)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi32.dll
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32 kernel32
 ALTNAMES  = gdi.exe dispdib.dll wing.dll
 LDIMPORTS = kernel32.dll ntdll.dll
 EXTRAINCL = @FREETYPEINCL@
--- a/dlls/icmp/Makefile.in
+++ b/dlls/icmp/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 ALTNAMES  = imm.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/lzexpand/Makefile.in
+++ b/dlls/lzexpand/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lz32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 ALTNAMES  = lzexpand.dll
 EXTRALIBS = $(LIBUNICODE)

--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mapi32.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = advapi32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/msacm/Makefile.in
+++ b/dlls/msacm/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.dll
-IMPORTS   = winmm user32 advapi32 kernel32 ntdll
+IMPORTS   = winmm user32 advapi32 kernel32
 ALTNAMES  = msacm.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/msacm/imaadp32/Makefile.in
+++ b/dlls/msacm/imaadp32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imaadp32.acm
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = winmm user32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/msacm/msg711/Makefile.in
+++ b/dlls/msacm/msg711/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msg711.drv
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msdmo.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/msimg32/Makefile.in
+++ b/dlls/msimg32/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msimg32.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/msisys/Makefile.in
+++ b/dlls/msisys/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msisys.ocx
-IMPORTS   = ntdll
 EXTRALIBS = $(LIBUUID)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/msnet32/Makefile.in
+++ b/dlls/msnet32/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msnet32.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/msrle32/Makefile.in
+++ b/dlls/msrle32/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msrle32.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/msvcrt20/Makefile.in
+++ b/dlls/msvcrt20/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt20.dll
-IMPORTS   = msvcrt ntdll
+IMPORTS   = msvcrt
 EXTRALIBS = $(LIBUNICODE)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/msvideo/Makefile.in
+++ b/dlls/msvideo/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32.dll
-IMPORTS   = winmm comctl32 version user32 gdi32 kernel32 ntdll
+IMPORTS   = winmm comctl32 version user32 gdi32 kernel32
 ALTNAMES  = msvideo.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@ -4,7 +4,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = netapi32.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleaut32.dll
-IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = comctl32
 ALTNAMES  = ole2disp.dll typelib.dll
 EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @JPEGLIB@
--- a/dlls/olecli/Makefile.in
+++ b/dlls/olecli/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32.dll
-IMPORTS   = ole32 gdi32 kernel32 ntdll
+IMPORTS   = ole32 gdi32 kernel32
 ALTNAMES  = olecli.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/olepro32/Makefile.in
+++ b/dlls/olepro32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32.dll
-IMPORTS   = oleaut32 ntdll
+IMPORTS   = oleaut32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/olesvr/Makefile.in
+++ b/dlls/olesvr/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 ALTNAMES  = olesvr.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = opengl32.dll
-IMPORTS   = user32 gdi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 kernel32
 EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qcap.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = quartz.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 ALTNAMES  = rasapi16.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/richedit/Makefile.in
+++ b/dlls/richedit/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32.dll
-IMPORTS   = user32 kernel32 ntdll
+IMPORTS   = user32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui.dll
-IMPORTS   = user32 advapi32 kernel32 ntdll
+IMPORTS   = user32 advapi32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
-IMPORTS   = ole32 kernel32 ntdll
+IMPORTS   = ole32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32.dll
 # fixme: avoid ole32.dll import
-IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32
 ALTNAMES  = shell.dll
 EXTRALIBS = $(LIBUUID) $(LIBUNICODE)

--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi.dll
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 kernel32
 EXTRALIBS = $(LIBUUID) $(LIBUNICODE)

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/snmpapi/Makefile.in
+++ b/dlls/snmpapi/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = snmpapi.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sti.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/tapi32/Makefile.in
+++ b/dlls/tapi32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = tapi32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/ttydrv/Makefile.in
+++ b/dlls/ttydrv/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ttydrv.dll
-IMPORTS   = user32 gdi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 kernel32
 LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll
 EXTRALIBS = @CURSESLIBS@

--- a/dlls/twain/Makefile.in
+++ b/dlls/twain/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = twain_32.dll
-IMPORTS   = user32 gdi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 kernel32
 EXTRALIBS = @SANELIBS@
 EXTRAINCL = @SANEINCL@

--- a/dlls/url/Makefile.in
+++ b/dlls/url/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = url.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
-IMPORTS   = ole32 ntdll
+IMPORTS   = ole32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32.dll
-IMPORTS   = gdi32 advapi32 kernel32 ntdll
+IMPORTS   = gdi32 advapi32 kernel32
 ALTNAMES  = user.exe keyboard.dll ddeml.dll display.dll mouse.dll
 LDIMPORTS = gdi32.dll kernel32.dll ntdll.dll

--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version.dll
-IMPORTS   = lz32 kernel32 ntdll
+IMPORTS   = lz32 kernel32
 ALTNAMES  = ver.dll
 EXTRALIBS = $(LIBUNICODE)

--- a/dlls/win32s/Makefile.in
+++ b/dlls/win32s/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = w32skrnl.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 ALTNAMES  = w32sys.dll win32s16.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/winaspi/Makefile.in
+++ b/dlls/winaspi/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wnaspi32.dll
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32 kernel32
 ALTNAMES  = winaspi.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/winedos/Makefile.in
+++ b/dlls/winedos/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedos.dll
-IMPORTS   = user32 kernel32 ntdll
+IMPORTS   = user32 kernel32
 LDIMPORTS = user32.dll kernel32.dll ntdll.dll

 C_SRCS = \
--- a/dlls/wineps/Makefile.in
+++ b/dlls/wineps/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineps.dll
-IMPORTS   = user32 gdi32 winspool.drv advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 winspool.drv advapi32 kernel32
 ALTNAMES  = wineps16.dll
 EXTRALIBS = @CUPSLIBS@
 EXTRAINCL = @FREETYPEINCL@
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet.dll
-IMPORTS   = shlwapi user32 kernel32 ntdll
+IMPORTS   = shlwapi user32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winmm.dll
-IMPORTS   = user32 advapi32 kernel32 ntdll
+IMPORTS   = user32 advapi32 kernel32
 ALTNAMES  = mmsystem.dll sound.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/winmm/joystick/Makefile.in
+++ b/dlls/winmm/joystick/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = joystick.drv
-IMPORTS   = winmm user32 ntdll
+IMPORTS   = winmm user32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/winmm/mcianim/Makefile.in
+++ b/dlls/winmm/mcianim/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcianim.drv
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = winmm user32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/winmm/mciavi/Makefile.in
+++ b/dlls/winmm/mciavi/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi.drv
-IMPORTS   = msvfw32 winmm user32 gdi32 kernel32 ntdll
+IMPORTS   = msvfw32 winmm user32 gdi32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/winmm/mcicda/Makefile.in
+++ b/dlls/winmm/mcicda/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.drv
-IMPORTS   = winmm kernel32 ntdll
+IMPORTS   = winmm kernel32
 DELAYIMPORTS = user32

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/winmm/mciseq/Makefile.in
+++ b/dlls/winmm/mciseq/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
-IMPORTS   = winmm kernel32 ntdll
+IMPORTS   = winmm kernel32
 DELAYIMPORTS = user32

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/winmm/mciwave/Makefile.in
+++ b/dlls/winmm/mciwave/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.drv
-IMPORTS   = winmm kernel32 ntdll
+IMPORTS   = winmm kernel32
 DELAYIMPORTS = user32

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/winmm/midimap/Makefile.in
+++ b/dlls/winmm/midimap/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.drv
-IMPORTS   = winmm user32 advapi32 kernel32 ntdll
+IMPORTS   = winmm user32 advapi32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/winmm/wavemap/Makefile.in
+++ b/dlls/winmm/wavemap/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.drv
-IMPORTS   = msacm32 winmm user32 kernel32 ntdll
+IMPORTS   = msacm32 winmm user32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/winmm/winearts/Makefile.in
+++ b/dlls/winmm/winearts/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winearts.drv
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = winmm user32 kernel32
 EXTRAINCL = @ARTSINCL@
 EXTRALIBS = @ARTSLIBS@

--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = winmm user32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/winnls/Makefile.in
+++ b/dlls/winnls/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winnls32.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32
 ALTNAMES  = winnls.dll

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/winspool/Makefile.in
+++ b/dlls/winspool/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32 kernel32
 EXTRALIBS = @CUPSLIBS@

 LDDLLFLAGS = @LDDLLFLAGS@
--- a/dlls/wintrust/Makefile.in
+++ b/dlls/wintrust/Makefile.in
@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintrust.dll
-IMPORTS   = ntdll

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wsock32.dll
-IMPORTS   = ws2_32 kernel32 ntdll
+IMPORTS   = ws2_32 kernel32

 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
--- a/dlls/x11drv/Makefile.in
+++ b/dlls/x11drv/Makefile.in
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = x11drv.dll
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 kernel32
 EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB)
 LDIMPORTS = user32.dll gdi32.dll kernel32.dll

--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@ -38,52 +38,52 @@ all: $(PROGRAMS) $(PROGRAMS:%=%.so)
@MAKE_RULES@

 expand.spec.c: expand.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym expand.o -o expand.spec.c -exe expand -mgui -L$(DLLDIR) -llz32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym expand.o -o expand.spec.c -exe expand -mgui -L$(DLLDIR) -llz32 -lkernel32
 expand.so: expand.o expand.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o expand.so $+ $(ALL_LIBS)

 hello.spec.c: hello.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello.o -o hello.spec.c -exe hello -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello.o -o hello.spec.c -exe hello -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32
 hello.so: hello.o hello.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello.so $+ $(ALL_LIBS)

 hello2.spec.c: hello2.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello2.o -o hello2.spec.c -exe hello2 -mgui -L$(DLLDIR) -luser32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello2.o -o hello2.spec.c -exe hello2 -mgui -L$(DLLDIR) -luser32 -lkernel32
 hello2.so: hello2.o hello2.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello2.so $+ $(ALL_LIBS)

 hello3.spec.c: hello3.o hello3res.res $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello3.o -res hello3res.res -o hello3.spec.c -exe hello3 -mgui -L$(DLLDIR) -lcomdlg32 -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello3.o -res hello3res.res -o hello3.spec.c -exe hello3 -mgui -L$(DLLDIR) -lcomdlg32 -luser32 -lgdi32 -lkernel32
 hello3.so: hello3.o hello3.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello3.so $+ $(ALL_LIBS)

 hello4.spec.c: hello4.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello4.o -o hello4.spec.c -exe hello4 -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello4.o -o hello4.spec.c -exe hello4 -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32
 hello4.so: hello4.o hello4.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello4.so $+ $(ALL_LIBS)

 hello5.spec.c: hello5.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello5.o -o hello5.spec.c -exe hello5 -mgui -L$(DLLDIR) -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym hello5.o -o hello5.spec.c -exe hello5 -mgui -L$(DLLDIR) -lkernel32
 hello5.so: hello5.o hello5.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello5.so $+ $(ALL_LIBS)

 new.spec.c: new.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym new.o -o new.spec.c -exe new -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym new.o -o new.spec.c -exe new -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32
 new.so: new.o new.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o new.so $+ $(ALL_LIBS)

 rolex.spec.c: rolex.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym rolex.o -o rolex.spec.c -exe rolex -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym rolex.o -o rolex.spec.c -exe rolex -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32
 rolex.so: rolex.o rolex.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o rolex.so $+ $(ALL_LIBS)

 volinfo.spec.c: volinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym volinfo.o -o volinfo.spec.c -exe volinfo -mgui -L$(DLLDIR) -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym volinfo.o -o volinfo.spec.c -exe volinfo -mgui -L$(DLLDIR) -lkernel32
 volinfo.so: volinfo.o volinfo.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o volinfo.so $+ $(ALL_LIBS)

 $(PROGRAMS):
-	$(LN_S) $(TOPOBJDIR)/wine $@
+	$(RM) $@ && $(LN_S) $(TOPOBJDIR)/wine $@

 $(PROGRAMS:%=%.so/_checklink_): $(PROGRAMS:%=%.so)
 	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c `dirname $@` && $(RM) checklink
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@ -13,13 +13,13 @@ all: $(PROGRAMS)
@MAKE_RULES@

 aviinfo.spec.c: aviinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviinfo.o -o aviinfo.spec.c -exe aviinfo -mgui -L$(DLLDIR) -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviinfo.o -o aviinfo.spec.c -exe aviinfo -mgui -L$(DLLDIR) -lkernel32

 aviplay.spec.c: aviplay.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviplay.o -o aviplay.spec.c -exe aviplay -mgui -L$(DLLDIR) -lddraw -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviplay.o -o aviplay.spec.c -exe aviplay -mgui -L$(DLLDIR) -lddraw -lkernel32

 icinfo.spec.c: icinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -sym icinfo.o -o icinfo.spec.c -exe icinfo -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym icinfo.o -o icinfo.spec.c -exe icinfo -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32

 aviinfo.so: aviinfo.o aviinfo.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o aviinfo.so aviinfo.o aviinfo.spec.o $(ALL_LIBS)
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clock
 APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32 ntdll
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32

 LICENSELANG = En

--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmdlgtst
 APPMODE   = gui
-IMPORTS   = comdlg32 user32 gdi32 kernel32 ntdll
+IMPORTS   = comdlg32 user32 gdi32 kernel32

 C_SRCS = \
 	cmdlgtst.c
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = control
 APPMODE   = gui
-IMPORTS   = shell32 user32 kernel32 ntdll
+IMPORTS   = shell32 user32 kernel32

 C_SRCS = control.c

--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad
 APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32 ntdll
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32

 LICENSELANG = En

--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = osversioncheck
 APPMODE   = cui
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 C_SRCS = osversioncheck.c

--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = progman
 APPMODE   = gui
-IMPORTS   = shell32 comdlg32 user32 gdi32 kernel32 ntdll
+IMPORTS   = shell32 comdlg32 user32 gdi32 kernel32

 LICENSELANG = En

--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regapi
 APPMODE   = gui
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32 kernel32

 C_SRCS = \
 	regapi.c
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regedit
 APPMODE   = gui
-IMPORTS   = msvcrt advapi32 kernel32 ntdll
+IMPORTS   = msvcrt advapi32 kernel32

 C_SRCS = \
 	regedit.c \
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regsvr32
 APPMODE   = cui
-IMPORTS   = msvcrt kernel32 ntdll
+IMPORTS   = msvcrt kernel32

 C_SRCS = \
 	regsvr32.c
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regtest
 APPMODE   = gui
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32 kernel32

 C_SRCS = regtest.c

--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uninstaller
 APPMODE   = gui
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 kernel32

 C_SRCS = \
 	main.c
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = view
 APPMODE   = gui
-IMPORTS   = comdlg32 user32 gdi32 kernel32 ntdll
+IMPORTS   = comdlg32 user32 gdi32 kernel32

 C_SRCS = \
 	init.c \
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wcmd
 APPMODE   = cui
-IMPORTS   = shell32 user32 kernel32 ntdll
+IMPORTS   = shell32 user32 kernel32

 C_SRCS = \
 	batch.c \
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemine
 APPMODE   = gui
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 kernel32

 C_SRCS = \
        dialog.c \
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winepath
 APPMODE   = cui
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 C_SRCS = winepath.c

--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@ -8,7 +8,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winetest
 APPMODE   = cui
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32

 C_SRCS = winetest.c

--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhelp
 APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32 ntdll
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
 PROGRAMS  = hlp2sgml

 C_SRCS = \
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winver
 APPMODE   = gui
-IMPORTS   = shell32 kernel32 ntdll
+IMPORTS   = shell32 kernel32

 C_SRCS = winver.c