diff --git a/debugger/Makefile.in b/debugger/Makefile.in
index 1d23073c08881f94c5265aa9deecce164569cc09..848f14b2c5df1078f86e766d1639f47118fd91e3 100644
--- a/debugger/Makefile.in
+++ b/debugger/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winedbg
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	break.c \
diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index 0b22ab35e74ff65a063ee98229fa1d6662b31346..cd4159d327085a1e32b9efa22f0ca04362ce664e 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advapi32
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	advapi.c \
diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in
index 029ecb9c3d1200851848e78ded1ebe7849e71a2b..0fcd3993de679244daa6eb86a15221a636b3d6b6 100644
--- a/dlls/commdlg/Makefile.in
+++ b/dlls/commdlg/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = comdlg32
 SOVERSION = 1.0
 ALTNAMES  = commdlg
-IMPORTS   = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32
+IMPORTS   = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32 ntdll
 
 C_SRCS = \
 	cdlg32.c \
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index 805ae768d92f8c3f975ec2e845c161bc88ba2d41..dda4f9e0799594b8874a2e5387d5548852135cbd 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	crtdll_main.c \
diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in
index 02958ccda108d6cd22f20b75fc516bd8ecd28568..fa4b6dca4ef5a65b2b6789412138d7ef5ae8d0b1 100644
--- a/dlls/dciman32/Makefile.in
+++ b/dlls/dciman32/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = dciman_main.c
 
diff --git a/dlls/dciman32/dciman32.spec b/dlls/dciman32/dciman32.spec
index 9d1c782db23008e5b18f11d35ebfa80cf18d4cc5..a6aeb765dc088719926371ea9263fa42d807c5e3 100644
--- a/dlls/dciman32/dciman32.spec
+++ b/dlls/dciman32/dciman32.spec
@@ -1,6 +1,8 @@
 name	dciman32
 type	win32
 
+import	ntdll.dll
+
 @ stub    DCIBeginAccess
 @ stub    DCICloseProvider
 @ stub    DCICreateOffscreen
diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index d4f3c42ca1b3c03c6e2dfc9994854e1b3ba6debf..1e655ef7eb5ed066dfdf1f2bf15655a8aab77951 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = kernel32
 SOVERSION = 1.0
 ALTNAMES  = comm kernel stress system toolhelp windebug win87em wprocs
+IMPORTS   = ntdll
 
 C_SRCS = \
 	comm.c \
diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in
index 9aae29e17fa6eb50617b6a96caaccba65db3a0d3..d1a0a5527cdf62c0749642fcab1cc6cdcdb6432b 100644
--- a/dlls/msnet32/Makefile.in
+++ b/dlls/msnet32/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msnet32
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = msnet_main.c
 
diff --git a/dlls/msnet32/msnet32.spec b/dlls/msnet32/msnet32.spec
index 7b316dd3a8e2b01a0658c5ca62a9778a04e9d4b3..384dc446c46d187287bef14968fe0560e0b8dee9 100644
--- a/dlls/msnet32/msnet32.spec
+++ b/dlls/msnet32/msnet32.spec
@@ -1,6 +1,8 @@
 name msnet32
 type win32
 
+import ntdll.dll
+
   1 stub MSNET32_1
   2 stub MSNET32_2
   3 stub MSNET32_3
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index 2ec209010c9bfc1de2790ef638970168c8c87379..b5d27ca3869a569a73324194c541956736bf8c5e 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = \
 	proxyodbc.c 
diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec
index 6f64b9ea521e013fdf8c0eeb79f0e16dadead6fa..07a293f985cee5df04c4564fa9e1ba835992799d 100644
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@@ -2,6 +2,8 @@ name	odbc32
 type	win32
 init    MAIN_OdbcInit
 
+import	ntdll.dll
+
 001 stdcall SQLAllocConnect(long ptr) SQLAllocConnect
 002 stdcall SQLAllocEnv(ptr)  SQLAllocEnv
 003 stdcall SQLAllocStmt(long ptr) SQLAllocStmt
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 3b5603ce2010d4ad3ef241e11441240d421a0588..4761600cc814af20f4da43e53965fb73b2c4bda2 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ole32
 SOVERSION = 1.0
 ALTNAMES  = ole2 ole2nls ole2conv ole2prox ole2thk storage compobj
-IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32
+IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
 
 C_SRCS = \
 	antimoniker.c \
diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 4c9d16918d5607c9e21ee3bace3002a0bcc26bb3..6ee62d1c0be893811ac704a5f562718b3e348fd7 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = \
 	oledlg_main.c
diff --git a/dlls/oledlg/oledlg.spec b/dlls/oledlg/oledlg.spec
index 171702c43cbae6111f5473b43d7989129334ce32..594a10fe4babc25d3af299865cdfb914f4a8e522 100644
--- a/dlls/oledlg/oledlg.spec
+++ b/dlls/oledlg/oledlg.spec
@@ -1,6 +1,8 @@
 name	oledlg
 type	win32
 
+import	ntdll.dll
+
   1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
   2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
   3 stdcall OleUIInsertObjectA(ptr) OleUIInsertObjectA
diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in
index 8f5faadb7fa40cc0463b5b515f126eab6cf6b4ee..1635a56320b81af0c6ac4578d3bc1a97afa5dcc3 100644
--- a/dlls/olesvr/Makefile.in
+++ b/dlls/olesvr/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = olesvr32
 SOVERSION = 1.0
 ALTNAMES  = olesvr
+IMPORTS   = ntdll
 
 C_SRCS = \
 	olesvr_main.c
diff --git a/dlls/olesvr/olesvr32.spec b/dlls/olesvr/olesvr32.spec
index 46df44657eb52bf8974eba796e9151de203d9502..41892c3f3182de02e06cf45f7002597d79511683 100644
--- a/dlls/olesvr/olesvr32.spec
+++ b/dlls/olesvr/olesvr32.spec
@@ -1,6 +1,8 @@
 name	olesvr32
 type	win32
 
+import	ntdll.dll
+
  1 stub WEP
  2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
  3 stub OleRevokeServer
diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index c560e31b837cc8af57a56f43798fbb8708a5f46e..f26c9bcebc70f06a9633507d730a8db291f5bb46 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = rasapi32
 SOVERSION = 1.0
 ALTNAMES  = rasapi16
+IMPORTS   = ntdll
 
 C_SRCS = rasapi.c 
 
diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec
index d3b0b77bb835e56c31785fa814a07826e3bffc76..920903df97a21a36b56ce72334219166caf4d04b 100644
--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
@@ -1,6 +1,8 @@
 name	rasapi32
 type	win32
 
+import	ntdll.dll
+
 500 stub	RnaEngineRequest
 501 stub	DialEngineRequest
 502 stub	SuprvRequest
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 7c78e71b309c99fabb2b6233658a37f255adcff8..cd594a63fc5d194ef4b32096ae3cb9cd0b81b2a6 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = \
 	rpcrt4_main.c
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index c82e32ba8e188af35fa3c3ee219cc581edff61b7..8d9b149a8b833f157cfb6ba57f06711a028fd036 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -2,6 +2,7 @@ name	rpcrt4
 type	win32
 init	RPCRT4_LibMain
 
+import	ntdll.dll
 
 @ stdcall UuidCreate(ptr) UuidCreate
 @ stdcall RpcStringFreeA(ptr) RpcStringFreeA
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 9039cdf0ddb951f205b5d56f7e8f3bcbe9bf8ddf..f0720b3be670ff81fcf7a4996013d4ddeeba3e7c 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = user32
 SOVERSION = 1.0
 ALTNAMES  = user keyboard ddeml display mouse
-IMPORTS   = gdi32 advapi32 kernel32
+IMPORTS   = gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	bidi16.c \
@@ -42,7 +42,7 @@ EXTRASUBDIRS = \
 
 @MAKE_DLL_RULES@
 
-$(EXTRA_OBJS): $(TOOLSUBDIRS) dummy
+$(EXTRA_OBJS): dummy
 	@cd `dirname $@` && $(MAKE) `basename $@`
 
 # Special rules for 16-bit resource files
diff --git a/dlls/winsock/Makefile.in b/dlls/winsock/Makefile.in
index f7f195c019b0280374c8f6221b657140f87b20a1..b50ac50d2a242b9b3ac377eb934cd63819c01497 100644
--- a/dlls/winsock/Makefile.in
+++ b/dlls/winsock/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ws2_32
 SOVERSION = 1.0
 ALTNAMES  = winsock
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	async.c \
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 90e8714bb991f1ad9256d0342257735b4130d39a..bf8a05d304a9bc56d1206cab6dcbfd03eba7de30 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -26,35 +26,35 @@ all: $(PROGRAMS)
 @MAKE_RULES@
 
 expand: expand.o expand.spec.o
-	$(CC) -o expand $+ -L$(DLLDIR) -llz32 $(DLL_LINK) $(LIBS)
+	$(CC) -o expand $+ -L$(DLLDIR) -llz32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello: hello.o hello.spec.o
-	$(CC) -o hello $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o hello $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello2: hello2.o hello2.spec.o
-	$(CC) -o hello2 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o hello2 $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello3: hello3.o hello3.spec.o
-	$(CC) -o hello3 $+  -L$(DLLDIR) -ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -lrpcrt4 -lshell32 -lshlwapi -luser32 -lwinspool.drv $(DLL_LINK) $(LIBS)
+	$(CC) -o hello3 $+  -L$(DLLDIR) -ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -lrpcrt4 -lshell32 -lshlwapi -luser32 -lwinspool.drv -lntdll $(DLL_LINK) $(LIBS)
 
 hello3.spec.c: hello3res.res
 
 hello4: hello4.o hello4.spec.o
-	$(CC) -o hello4 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o hello4 $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello5: hello5.o hello5.spec.o
-	$(CC) -o hello5 $+ $(DLL_LINK) $(LIBS)
+	$(CC) -o hello5 $+ -L$(DLLDIR) -lntdll $(DLL_LINK) $(LIBS)
 
 new: new.o new.spec.o
-	$(CC) -o new $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o new $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 rolex: rolex.o rolex.spec.o
-	$(CC) -o rolex $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o rolex $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 vartest: vartest.o vartest.spec.o
-	$(CC) -o vartest $+ -L$(DLLDIR) -ladvapi32 -lcomctl32 -lgdi32 -lkernel32 -lole32 -loleaut32 -lrpcrt4 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o vartest $+ -L$(DLLDIR) -ladvapi32 -lcomctl32 -lgdi32 -lkernel32 -lole32 -loleaut32 -lrpcrt4 -luser32 -lntdll $(DLL_LINK) $(LIBS)
 
 volinfo: volinfo.o volinfo.spec.o
-	$(CC) -o volinfo $+ $(DLL_LINK) $(LIBS)
+	$(CC) -o volinfo $+ -L$(DLLDIR) -lntdll $(DLL_LINK) $(LIBS)
 
 ### Dependencies:
diff --git a/miscemu/wine.spec b/miscemu/wine.spec
index 02ced9437e2b189fb9d87ebf66312ad6281060a7..9917659b4aba5f2b141c7ca08c5ea6bacdf73798 100644
--- a/miscemu/wine.spec
+++ b/miscemu/wine.spec
@@ -2,3 +2,5 @@ name	wine
 mode	cuiexe_no_main
 type	win32
 init	wine_initial_task
+
+import	ntdll.dll
diff --git a/programs/Makefile.in b/programs/Makefile.in
index d50d97494d7de7e48c95273e93931161bf927c0c..1e49f00f13cc89e27f5c97890c90835bca7bd828 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -9,8 +9,8 @@ SUBDIRS = \
 	clock \
 	cmdlgtst \
 	control \
-	osversioncheck \
 	notepad \
+	osversioncheck \
 	progman \
 	regapi \
 	regtest \
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 2f7e97f111f6bb1591d8c037ab27c637f6566b35..1ba2e94670e73266cbea9cc0c9bd15e15204fdff 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = icinfo aviinfo aviplay
-IMPORTS   = msvfw32 winmm ddraw x11drv user32 gdi32 kernel32
+IMPORTS   = msvfw32 winmm ddraw x11drv user32 gdi32 kernel32 ntdll
 
 SPEC_SRCS = \
 	icinfo.spec \
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index b2453d576476df60f4ec1fceef932ab708cefb3e..78355d1272717955268da983dfe0f4b4315073de 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = clock
-IMPORTS   = advapi32 comctl32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index 1e023b2cac91acb29db65625cfc3b1b9c8b01caf..7b98415f3f5ef05fe3141ea3eebbe1e95028cd13 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = cmdlgtst
-IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	cmdlgtst.c
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index cb615940688c1c58acb60239a3e8a5cbf5142aef..a43f96aabfbe628adf0a97eb2951320b9f5cb1aa 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = control
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32 ntdll
 
 C_SRCS = control.c
 
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index d7cda1effaf28d2d66b1f0417435f02de363b216..c6c23a53ecf66b63d8e34c82abe2a9a14a0cd207 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = notepad
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in
index 48aded9c4b35ce416098d535dd852d1a282aaa0d..db86709d8e2d0a10f9bee126f0d647222ffb151a 100644
--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = osversioncheck
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = osversioncheck.c
 
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index 98b426445cb91bd92c08e983b123a465dad896bb..e498f9bb8246820bfc286ef26f7555e9d17c9762 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = progman
-IMPORTS   = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index ef1aa0a4f48138ca1656b36797411b3047086a9e..a7d9a9657ee28105b427ccbee9d3c67940e81994 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regapi
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	regapi.c
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index e5a2b4480d5668c3ddaa334e311794c72638ccb8..48fa909e368abd38c30d82c0afe2b26e2a8d6bbe 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regtest
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = regtest.c
 
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index 62e008366acba44094a97b3f306a170744f506d1..5bc6be83d926dde64335527a0360798b467112fe 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = uninstaller
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index 4f4c4fcf633ec434288d0672281930819d5c402b..bd45f438572bd0b2cceb1140659fae35c076e754 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = view
-IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	init.c \
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 2b960e06cf4b30cf7342786c51f7d9aa2c4dffce..3d7e3a4f32d7c6c7b167de2a3c170abf4f275522 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = wcmd
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	batch.c \
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index c9bc2d1937e31e0c6eac9bbde854ea54808a24de..ad023f1930fc8894a24e01791952d3ae0621ce46 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winemine
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index 831c7d7cfcb916c7ecc54e4b3cd7e6e36f0241fd..696fa28a32dec9e12fc2c0cd157c5e3269fd0341 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winhelp hlp2sgml
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	winhelp.c \
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index ce5b9735ceb4ee5218847d1c7518cc8021832f48..e9bf966b50111a6f0f48df07a5fe3184d54219f0 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winver
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32 ntdll
 
 C_SRCS = winver.c