diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index fb989bd3947..fa8cf914dc2 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -16,7 +16,6 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o)
 IMPLIBFLAGS = $(TARGETFLAGS) $(EXTRAIMPLIBFLAGS)
 IMPORTLIBFILE = $(IMPORTLIB:%=lib%.@IMPLIBEXT@)
 STATICIMPLIB  = $(IMPORTLIBFILE:.def=.def.a)
-DLL_LDPATH  = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%)
 INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine
 
 @MAKE_RULES@
diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in
index 1e8bd0552b5..f315d224c7e 100644
--- a/dlls/acledit/Makefile.in
+++ b/dlls/acledit/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = acledit.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in
index c0a7e8fd534..a63abcf5cb2 100644
--- a/dlls/aclui/Makefile.in
+++ b/dlls/aclui/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = aclui.dll
 IMPORTLIB = aclui
-IMPORTS   = kernel32
 
 C_SRCS = aclui_main.c
 
diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in
index f99d955fe6c..cd27c4a3b41 100644
--- a/dlls/activeds/Makefile.in
+++ b/dlls/activeds/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = activeds.dll
 IMPORTLIB = activeds
-IMPORTS   = kernel32
 
 C_SRCS = activeds_main.c
 
diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in
index 64f6bf1a8bb..4186fb83ae4 100644
--- a/dlls/actxprxy/Makefile.in
+++ b/dlls/actxprxy/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = actxprxy.dll
-IMPORTS   = uuid oleaut32 ole32 rpcrt4 kernel32 ntdll
+IMPORTS   = uuid oleaut32 ole32 rpcrt4
 EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_DELEGATION
 
 EXTRA_OBJS = dlldata.o
diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index d880360b56d..2bb5c54b57f 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advapi32.dll
 IMPORTLIB = advapi32
-IMPORTS   = kernel32 ntdll
 DELAYIMPORTS = rpcrt4
 EXTRALIBS = @SECURITYLIB@
 
diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in
index 13464d26cda..54744e92492 100644
--- a/dlls/advapi32/tests/Makefile.in
+++ b/dlls/advapi32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = advapi32.dll
-IMPORTS   = ole32 advapi32 kernel32
+IMPORTS   = ole32 advapi32
 
 C_SRCS = \
 	cred.c \
diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in
index 0d63f6ed27a..7798fcc86bf 100644
--- a/dlls/advpack/Makefile.in
+++ b/dlls/advpack/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advpack.dll
 IMPORTLIB = advpack
-IMPORTS   = ole32 setupapi version advapi32 kernel32 ntdll
+IMPORTS   = ole32 setupapi version advapi32
 
 C_SRCS = \
 	advpack.c \
diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in
index 746edfa1493..d0515467cfe 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 advapi32 kernel32
+IMPORTS   = cabinet advapi32
 
 C_SRCS = \
 	advpack.c \
diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in
index ebaa566dd16..dd168700e78 100644
--- a/dlls/amstream/Makefile.in
+++ b/dlls/amstream/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = amstream.dll
-IMPORTS   = strmiids uuid ole32 advapi32 kernel32
+IMPORTS   = strmiids uuid ole32 advapi32
 
 C_SRCS = \
 	amstream.c \
diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in
index f1581f1f8f3..7ab55d373cb 100644
--- a/dlls/amstream/tests/Makefile.in
+++ b/dlls/amstream/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = amstream.dll
-IMPORTS   = quartz ddraw oleaut32 ole32 user32 kernel32
+IMPORTS   = quartz ddraw oleaut32 ole32 user32
 
 C_SRCS = \
 	amstream.c
diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in
index 4a92f35d773..61ec8726ff6 100644
--- a/dlls/appwiz.cpl/Makefile.in
+++ b/dlls/appwiz.cpl/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = appwiz.cpl
-IMPORTS   = kernel32 comctl32 advapi32 shell32 user32 comdlg32
+IMPORTS   = comctl32 advapi32 shell32 user32 comdlg32
 
 C_SRCS = \
 	appwiz.c
diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index 17ca048dcd8..6f234c6025c 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = atl.dll
 IMPORTLIB = atl
-IMPORTS   = uuid ole32 oleaut32 user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid ole32 oleaut32 user32 gdi32 advapi32
 
 C_SRCS = \
 	atl_ax.c \
diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in
index 98d9b03342b..2f1afdf1688 100644
--- a/dlls/atl/tests/Makefile.in
+++ b/dlls/atl/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = atl.dll
-IMPORTS   = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
 
 C_SRCS = \
 	atl_ax.c \
diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in
index b5dfcfacbe7..35e88cf2ec1 100644
--- a/dlls/authz/Makefile.in
+++ b/dlls/authz/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = authz.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	authz.c
diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in
index cb9c6de08c6..63e735ba9b0 100644
--- a/dlls/avicap32/Makefile.in
+++ b/dlls/avicap32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avicap32.dll
 IMPORTLIB = avicap32
-IMPORTS   = kernel32 ntdll
 
 C_SRCS = avicap32_main.c
 
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index d26f6aed8cd..8f86ff86521 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32.dll
 IMPORTLIB = avifil32
-IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32
+IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32
 
 C_SRCS = \
 	acmstream.c \
diff --git a/dlls/avifil32/tests/Makefile.in b/dlls/avifil32/tests/Makefile.in
index ee41e59482f..b8138a69b94 100644
--- a/dlls/avifil32/tests/Makefile.in
+++ b/dlls/avifil32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = avifil32.dll
-IMPORTS   = avifil32 kernel32
+IMPORTS   = avifil32
 
 C_SRCS = \
 	api.c
diff --git a/dlls/avifile.dll16/Makefile.in b/dlls/avifile.dll16/Makefile.in
index b2fc399513c..fbf5cf73d91 100644
--- a/dlls/avifile.dll16/Makefile.in
+++ b/dlls/avifile.dll16/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifile.dll16
-IMPORTS   = avifil32 kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,avifil32.dll
+IMPORTS   = avifil32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,avifil32.dll
 
 @MAKE_DLL_RULES@
diff --git a/dlls/avrt/Makefile.in b/dlls/avrt/Makefile.in
index 3df047990fb..6513a760560 100644
--- a/dlls/avrt/Makefile.in
+++ b/dlls/avrt/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avrt.dll
 IMPORTLIB = avrt
-IMPORTS   = user32 kernel32 ntdll
+IMPORTS   = user32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
index 4976f0ed5d7..b0f27a5a542 100644
--- a/dlls/bcrypt/Makefile.in
+++ b/dlls/bcrypt/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = bcrypt.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	bcrypt_main.c
diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index fc493d5ada9..f5b41df273a 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = browseui.dll
-IMPORTS   = uuid ole32 user32 advapi32 kernel32
+IMPORTS   = uuid ole32 user32 advapi32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in
index 06e82fe19cc..f218e23dafa 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 kernel32
+IMPORTS   = ole32
 
 C_SRCS = \
 	autocomplete.c
diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in
index d9db1c467b8..4982c2ce962 100644
--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cabinet.dll
 IMPORTLIB = cabinet
-IMPORTS   = kernel32
 
 C_SRCS = \
 	cabinet_main.c \
diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in
index d6df0c0ce47..f3de42203b2 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 kernel32
+IMPORTS   = cabinet
 
 C_SRCS = \
 	extract.c \
diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in
index 31419917f86..3ed3b12ae48 100644
--- a/dlls/capi2032/Makefile.in
+++ b/dlls/capi2032/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = capi2032.dll
 IMPORTLIB = capi2032
-IMPORTS   = kernel32
 
 C_SRCS = cap20wxx.c
 
diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in
index 25dfeb79c92..ae3dd103b31 100644
--- a/dlls/cards/Makefile.in
+++ b/dlls/cards/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cards.dll
 IMPORTLIB = cards
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32
 
 C_SRCS = \
 	cards.c
diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in
index 1041e8764cf..711014d8d81 100644
--- a/dlls/cfgmgr32/Makefile.in
+++ b/dlls/cfgmgr32/Makefile.in
@@ -4,6 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cfgmgr32.dll
 IMPORTLIB = cfgmgr32
-IMPORTS   = setupapi kernel32
+IMPORTS   = setupapi
 
 @MAKE_DLL_RULES@
diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in
index f196b7477b7..a5edb7699fb 100644
--- a/dlls/clusapi/Makefile.in
+++ b/dlls/clusapi/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clusapi.dll
 IMPORTLIB = clusapi
-IMPORTS   = kernel32
 
 C_SRCS = \
 	clusapi.c
diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in
index b2dcd53b330..9863eaf80e0 100644
--- a/dlls/comcat/Makefile.in
+++ b/dlls/comcat/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comcat.dll
-IMPORTS   = uuid ole32 user32 advapi32 kernel32
+IMPORTS   = uuid ole32 user32 advapi32
 
 C_SRCS = \
 	comcat_main.c
diff --git a/dlls/comcat/tests/Makefile.in b/dlls/comcat/tests/Makefile.in
index e03742fb0c9..4c58d59afb8 100644
--- a/dlls/comcat/tests/Makefile.in
+++ b/dlls/comcat/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = comcat.dll
-IMPORTS   = ole32 advapi32 kernel32
+IMPORTS   = ole32 advapi32
 
 C_SRCS = \
 	comcat.c
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index 807178d7297..37f2b7c8ebc 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32.dll
 IMPORTLIB = comctl32
-IMPORTS   = uuid user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid user32 gdi32 advapi32
 DELAYIMPORTS = winmm uxtheme
 
 C_SRCS = \
diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in
index 343c9fd51c9..bf19dcb917b 100644
--- a/dlls/comctl32/tests/Makefile.in
+++ b/dlls/comctl32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = comctl32.dll
-IMPORTS   = comctl32 ole32 user32 gdi32 advapi32 kernel32
+IMPORTS   = comctl32 ole32 user32 gdi32 advapi32
 
 C_SRCS = \
 	comboex.c \
diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index 7ea46f6e105..ba13f671235 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32.dll
 IMPORTLIB = comdlg32
-IMPORTS   = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32
 DELAYIMPORTS = ole32
 
 C_SRCS = \
diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in
index 9362cd3e827..7fa92108da5 100644
--- a/dlls/comdlg32/tests/Makefile.in
+++ b/dlls/comdlg32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = comdlg32.dll
-IMPORTS   = comdlg32 winspool user32 gdi32 kernel32
+IMPORTS   = comdlg32 winspool user32 gdi32
 
 C_SRCS = \
 	filedlg.c \
diff --git a/dlls/comm.drv16/Makefile.in b/dlls/comm.drv16/Makefile.in
index 7dffb9f5719..ae609180636 100644
--- a/dlls/comm.drv16/Makefile.in
+++ b/dlls/comm.drv16/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comm.drv16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 @MAKE_DLL_RULES@
diff --git a/dlls/commdlg.dll16/Makefile.in b/dlls/commdlg.dll16/Makefile.in
index f4932d660ef..0394523cb23 100644
--- a/dlls/commdlg.dll16/Makefile.in
+++ b/dlls/commdlg.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = commdlg.dll16
-IMPORTS   = comdlg32 user32 gdi32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,comdlg32.dll
+IMPORTS   = comdlg32 user32 gdi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll
 
 C_SRCS = \
 	colordlg.c \
diff --git a/dlls/compobj.dll16/Makefile.in b/dlls/compobj.dll16/Makefile.in
index f7d7e7b2a2d..473eabc682d 100644
--- a/dlls/compobj.dll16/Makefile.in
+++ b/dlls/compobj.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = compobj.dll16
-IMPORTS   = uuid ole32 advapi32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+IMPORTS   = uuid ole32 advapi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 C_SRCS = compobj.c
 
diff --git a/dlls/compstui/Makefile.in b/dlls/compstui/Makefile.in
index ace41c655d5..7a45442c209 100644
--- a/dlls/compstui/Makefile.in
+++ b/dlls/compstui/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = compstui.dll
 IMPORTLIB = compstui
-IMPORTS   = kernel32
 
 C_SRCS = \
 	compstui_main.c
diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in
index aafe727ce5c..6d8efd9cc48 100644
--- a/dlls/credui/Makefile.in
+++ b/dlls/credui/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = credui.dll
 IMPORTLIB = credui
-IMPORTS   = comctl32 user32 advapi32 kernel32
+IMPORTS   = comctl32 user32 advapi32
 
 C_SRCS = \
 	credui_main.c
diff --git a/dlls/credui/tests/Makefile.in b/dlls/credui/tests/Makefile.in
index 3220aa100c8..029c62d1e63 100644
--- a/dlls/credui/tests/Makefile.in
+++ b/dlls/credui/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = credui.dll
-IMPORTS   = credui kernel32
+IMPORTS   = credui
 
 C_SRCS = \
 	credui.c
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index 5978ec2a117..a618ce90373 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll.dll
 IMPORTLIB = crtdll
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in
index 4600a51a5be..113e4e81ba6 100644
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crypt32.dll
 IMPORTLIB = crypt32
-IMPORTS   = user32 advapi32 kernel32 ntdll
+IMPORTS   = user32 advapi32
 EXTRALIBS = @SECURITYLIB@
 
 C_SRCS = \
diff --git a/dlls/crypt32/tests/Makefile.in b/dlls/crypt32/tests/Makefile.in
index 1e182845a98..7a5523d7b5f 100644
--- a/dlls/crypt32/tests/Makefile.in
+++ b/dlls/crypt32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = crypt32.dll
-IMPORTS   = crypt32 advapi32 kernel32
+IMPORTS   = crypt32 advapi32
 
 C_SRCS = \
 	base64.c \
diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
index 5704ccbc932..5c0620df061 100644
--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cryptdlg.dll
-IMPORTS   = cryptui crypt32 wintrust user32 advapi32 kernel32
+IMPORTS   = cryptui crypt32 wintrust user32 advapi32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/cryptdll/Makefile.in b/dlls/cryptdll/Makefile.in
index aa0947ef05b..cbeef3ff6d6 100644
--- a/dlls/cryptdll/Makefile.in
+++ b/dlls/cryptdll/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cryptdll.dll
 IMPORTLIB = cryptdll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	cryptdll.c
diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in
index 3bee900897d..730f3192060 100644
--- a/dlls/cryptnet/Makefile.in
+++ b/dlls/cryptnet/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cryptnet.dll
 IMPORTLIB = cryptnet
-IMPORTS   = crypt32 kernel32
+IMPORTS   = crypt32
 DELAYIMPORTS = wininet
 
 C_SRCS = \
diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in
index d26a092ccba..4a4a28860d7 100644
--- a/dlls/cryptnet/tests/Makefile.in
+++ b/dlls/cryptnet/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = cryptnet.dll
-IMPORTS   = cryptnet crypt32 kernel32
+IMPORTS   = cryptnet crypt32
 
 C_SRCS = \
 	cryptnet.c
diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in
index 73abdd8d0e9..f44e56143ca 100644
--- a/dlls/cryptui/Makefile.in
+++ b/dlls/cryptui/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cryptui.dll
-IMPORTS   = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32
 DELAYIMPORTS = wintrust urlmon
 IMPORTLIB = cryptui
 
diff --git a/dlls/cryptui/tests/Makefile.in b/dlls/cryptui/tests/Makefile.in
index 97107f38b30..de5583635de 100644
--- a/dlls/cryptui/tests/Makefile.in
+++ b/dlls/cryptui/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = cryptui.dll
-IMPORTS   = cryptui crypt32 kernel32 user32
+IMPORTS   = cryptui crypt32 user32
 
 C_SRCS = \
 	cryptui.c
diff --git a/dlls/ctapi32/Makefile.in b/dlls/ctapi32/Makefile.in
index 1fff08f962e..bff366726f7 100644
--- a/dlls/ctapi32/Makefile.in
+++ b/dlls/ctapi32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ctapi32.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = ctapi32.c
 
diff --git a/dlls/ctl3d.dll16/Makefile.in b/dlls/ctl3d.dll16/Makefile.in
index 3092b7cb971..067b2d3142a 100644
--- a/dlls/ctl3d.dll16/Makefile.in
+++ b/dlls/ctl3d.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ctl3d.dll16
-IMPORTS   = user32 kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ctl3d32.dll
+IMPORTS   = user32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll
 
 C_SRCS = ctl3d.c
 
diff --git a/dlls/ctl3d32/Makefile.in b/dlls/ctl3d32/Makefile.in
index 3d88c1706bf..9e789bfdd82 100644
--- a/dlls/ctl3d32/Makefile.in
+++ b/dlls/ctl3d32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ctl3d32.dll
 IMPORTLIB = ctl3d32
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = ctl3d32.c
 
diff --git a/dlls/ctl3dv2.dll16/Makefile.in b/dlls/ctl3dv2.dll16/Makefile.in
index d31414a6344..8804447eb9c 100644
--- a/dlls/ctl3dv2.dll16/Makefile.in
+++ b/dlls/ctl3dv2.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ctl3dv2.dll16
-IMPORTS   = user32 kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ctl3d32.dll
+IMPORTS   = user32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll
 
 C_SRCS = ctl3d.c
 
diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in
index a274e9077e1..c872984f3f9 100644
--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d10.dll
 IMPORTLIB = d3d10
-IMPORTS   = dxguid uuid d3d10core dxgi kernel32
+IMPORTS   = dxguid uuid d3d10core dxgi
 
 C_SRCS = \
 	d3d10_main.c \
diff --git a/dlls/d3d10/tests/Makefile.in b/dlls/d3d10/tests/Makefile.in
index b63bcfabc97..631e3a1c229 100644
--- a/dlls/d3d10/tests/Makefile.in
+++ b/dlls/d3d10/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3d10.dll
-IMPORTS   = d3d10 kernel32
+IMPORTS   = d3d10
 
 C_SRCS = \
 	device.c \
diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in
index a9907906131..9883709da84 100644
--- a/dlls/d3d10core/Makefile.in
+++ b/dlls/d3d10core/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d10core.dll
 IMPORTLIB = d3d10core
-IMPORTS   = dxguid uuid dxgi kernel32
+IMPORTS   = dxguid uuid dxgi
 
 C_SRCS = \
 	async.c \
diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in
index ce1b6d1f132..c10f06b104c 100644
--- a/dlls/d3d10core/tests/Makefile.in
+++ b/dlls/d3d10core/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3d10core.dll
-IMPORTS   = d3d10core dxgi kernel32
+IMPORTS   = d3d10core dxgi
 
 C_SRCS = \
 	device.c
diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index 04c1a33c1cc..c11727ce7de 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d8.dll
 IMPORTLIB = d3d8
-IMPORTS   = dxguid uuid wined3d kernel32
+IMPORTS   = dxguid uuid wined3d
 
 C_SRCS = \
 	cubetexture.c \
diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in
index 68ea3b9e2a2..90a18e0ecf7 100644
--- a/dlls/d3d8/tests/Makefile.in
+++ b/dlls/d3d8/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3d8.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index bbaf3807db6..aa2fdd8cf6d 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d9.dll
 IMPORTLIB = d3d9
-IMPORTS   = dxguid uuid wined3d kernel32
+IMPORTS   = dxguid uuid wined3d
 
 C_SRCS = \
 	cubetexture.c \
diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in
index 3afcfcbadf6..696f876e2ac 100644
--- a/dlls/d3d9/tests/Makefile.in
+++ b/dlls/d3d9/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3d9.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in
index b21f8100849..af48ab06412 100644
--- a/dlls/d3dim/Makefile.in
+++ b/dlls/d3dim/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dim.dll
 IMPORTLIB = d3dim
-IMPORTS   = kernel32
 
 C_SRCS = d3dim_main.c
 
diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in
index 94118565ad2..08f29293282 100644
--- a/dlls/d3drm/Makefile.in
+++ b/dlls/d3drm/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3drm.dll
 IMPORTLIB = d3drm
-IMPORTS   = dxguid uuid d3dxof kernel32
+IMPORTS   = dxguid uuid d3dxof
 
 C_SRCS = \
 	d3drm.c \
diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in
index eecfd387e80..62a6d08ab74 100644
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3drm.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	d3drm.c \
diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
index 150f62abe7a..c089d160e54 100644
--- a/dlls/d3dx9_24/Makefile.in
+++ b/dlls/d3dx9_24/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_24.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_24_main.c
diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
index e56e04941a2..1a7135d5e35 100644
--- a/dlls/d3dx9_25/Makefile.in
+++ b/dlls/d3dx9_25/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_25.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_25_main.c
diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
index 40ece46cb9b..2bb986ba661 100644
--- a/dlls/d3dx9_26/Makefile.in
+++ b/dlls/d3dx9_26/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_26.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_26_main.c
diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
index 4c8160aa22f..69ef94aa35e 100644
--- a/dlls/d3dx9_27/Makefile.in
+++ b/dlls/d3dx9_27/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_27.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_27_main.c
diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
index 3abab58125b..08a9e9ab5de 100644
--- a/dlls/d3dx9_28/Makefile.in
+++ b/dlls/d3dx9_28/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_28.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_28_main.c
diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
index 14b90113ed0..7888fb5d8c0 100644
--- a/dlls/d3dx9_29/Makefile.in
+++ b/dlls/d3dx9_29/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_29.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_29_main.c
diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
index 5c66d3c2c7f..3ffeca43ff3 100644
--- a/dlls/d3dx9_30/Makefile.in
+++ b/dlls/d3dx9_30/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_30.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_30_main.c
diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
index 16a1eb768d1..5f7dd4122b5 100644
--- a/dlls/d3dx9_31/Makefile.in
+++ b/dlls/d3dx9_31/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_31.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_31_main.c
diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
index d0de0da36fe..a7d179ee400 100644
--- a/dlls/d3dx9_32/Makefile.in
+++ b/dlls/d3dx9_32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_32.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_32_main.c
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
index d839a933cd1..0743490eafb 100644
--- a/dlls/d3dx9_33/Makefile.in
+++ b/dlls/d3dx9_33/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_33.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_33_main.c
diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
index 1a3b966ec94..804732a02c9 100644
--- a/dlls/d3dx9_34/Makefile.in
+++ b/dlls/d3dx9_34/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_34.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_34_main.c
diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
index d815682ad87..25e055517ea 100644
--- a/dlls/d3dx9_35/Makefile.in
+++ b/dlls/d3dx9_35/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_35.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_35_main.c
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index 712077b5227..4c97c0d299a 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_36.dll
 IMPORTLIB = d3dx9
-IMPORTS   = d3d9 ole32 gdi32 user32 kernel32
+IMPORTS   = d3d9 ole32 gdi32 user32
 EXTRALIBS = $(LIBWPP)
 
 C_SRCS = \
diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in
index b9ad40dc3ad..02f48c15e60 100644
--- a/dlls/d3dx9_36/tests/Makefile.in
+++ b/dlls/d3dx9_36/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3dx9_36.dll
-IMPORTS   = d3dx9 d3d9 user32 gdi32 kernel32
+IMPORTS   = d3dx9 d3d9 user32 gdi32
 
 C_SRCS = \
 	asm.c \
diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
index 400c3863f11..bde899001a9 100644
--- a/dlls/d3dx9_37/Makefile.in
+++ b/dlls/d3dx9_37/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_37.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_37_main.c
diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
index 08a09578957..b8dac317a24 100644
--- a/dlls/d3dx9_38/Makefile.in
+++ b/dlls/d3dx9_38/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_38.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_38_main.c
diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
index 2062004b257..a9a3864e7c0 100644
--- a/dlls/d3dx9_39/Makefile.in
+++ b/dlls/d3dx9_39/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_39.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_39_main.c
diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
index c2385a88f78..2a8604e70fc 100644
--- a/dlls/d3dx9_40/Makefile.in
+++ b/dlls/d3dx9_40/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_40.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_40_main.c
diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
index d0ce452bd0e..f09717e0352 100644
--- a/dlls/d3dx9_41/Makefile.in
+++ b/dlls/d3dx9_41/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_41.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_41_main.c
diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
index 2e4c9693695..f75ff9c2751 100644
--- a/dlls/d3dx9_42/Makefile.in
+++ b/dlls/d3dx9_42/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_42.dll
-IMPORTS   = d3d9 kernel32
+IMPORTS   = d3d9
 
 C_SRCS = \
 	d3dx9_42_main.c
diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in
index 897f2e54698..663666f5862 100644
--- a/dlls/d3dxof/Makefile.in
+++ b/dlls/d3dxof/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dxof.dll
 IMPORTLIB = d3dxof
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	d3dxof.c \
diff --git a/dlls/d3dxof/tests/Makefile.in b/dlls/d3dxof/tests/Makefile.in
index 974f8e0aa2e..ba7c9966b6b 100644
--- a/dlls/d3dxof/tests/Makefile.in
+++ b/dlls/d3dxof/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3dxof.dll
-IMPORTS   = d3dxof kernel32
+IMPORTS   = d3dxof
 
 C_SRCS = \
 	d3dxof.c
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index 6a794a50fda..a6ba4e059cc 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dbghelp.dll
 IMPORTLIB = dbghelp
 EXTRADEFS = -D_IMAGEHLP_SOURCE_
-IMPORTS   = psapi kernel32 ntdll
+IMPORTS   = psapi
 DELAYIMPORTS = version
 
 C_SRCS = \
diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in
index c52561bc5ab..f24e4841a20 100644
--- a/dlls/dciman32/Makefile.in
+++ b/dlls/dciman32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32.dll
 IMPORTLIB = dciman32
-IMPORTS   = kernel32
 
 C_SRCS = dciman_main.c
 
diff --git a/dlls/ddeml.dll16/Makefile.in b/dlls/ddeml.dll16/Makefile.in
index a846ed20723..ce0743a3c0d 100644
--- a/dlls/ddeml.dll16/Makefile.in
+++ b/dlls/ddeml.dll16/Makefile.in
@@ -3,9 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddeml.dll16
-IMPORTS   = user32 kernel32 kernel
-
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+IMPORTS   = user32
+EXTRADLLFLAGS = -m16
 
 C_SRCS = ddeml.c
 
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index 4c51fdf91ac..4f1ab7f3dff 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddraw.dll
 IMPORTLIB = ddraw
-IMPORTS   = dxguid uuid ole32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = dxguid uuid ole32 user32 gdi32 advapi32
 
 C_SRCS = \
 	clipper.c \
diff --git a/dlls/ddraw/tests/Makefile.in b/dlls/ddraw/tests/Makefile.in
index c7c55a17d1b..5c7f1a82599 100644
--- a/dlls/ddraw/tests/Makefile.in
+++ b/dlls/ddraw/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ddraw.dll
-IMPORTS   = ddraw user32 gdi32 kernel32
+IMPORTS   = ddraw user32 gdi32
 
 C_SRCS = \
 	d3d.c \
diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in
index ed533898e00..d5ad2ff1164 100644
--- a/dlls/ddrawex/Makefile.in
+++ b/dlls/ddrawex/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddrawex.dll
-IMPORTS   = dxguid uuid ddraw ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ddraw ole32 advapi32
 
 C_SRCS = \
 	ddraw.c \
diff --git a/dlls/ddrawex/tests/Makefile.in b/dlls/ddrawex/tests/Makefile.in
index e2a68584893..8d5a39a7fa2 100644
--- a/dlls/ddrawex/tests/Makefile.in
+++ b/dlls/ddrawex/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ddrawex.dll
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32
 
 C_SRCS = \
 	ddrawex.c \
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index 9169307c4d3..b194a296319 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = devenum.dll
-IMPORTS   = strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32
+IMPORTS   = strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32
 
 C_SRCS = \
 	createdevenum.c \
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index c84a44aff22..ea118f0bb79 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput.dll
 IMPORTLIB = dinput
-IMPORTS   = dxguid uuid ole32 user32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 user32 advapi32
 EXTRALIBS = @CARBONLIB@ @IOKITLIB@
 
 C_SRCS = \
diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in
index 57c5fd4780b..958ace2048b 100644
--- a/dlls/dinput/tests/Makefile.in
+++ b/dlls/dinput/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dinput.dll
-IMPORTS   = dinput ole32 version user32 kernel32
+IMPORTS   = dinput ole32 version user32
 
 C_SRCS = \
 	device.c \
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index 18ff6b29588..408cc3742d3 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput8.dll
 IMPORTLIB = dinput8
-IMPORTS   = uuid dxguid dinput ole32 advapi32 kernel32
+IMPORTS   = uuid dxguid dinput ole32 advapi32
 
 C_SRCS = \
 	dinput8_main.c \
diff --git a/dlls/dispdib.dll16/Makefile.in b/dlls/dispdib.dll16/Makefile.in
index 53018520dd2..167a8e053f4 100644
--- a/dlls/dispdib.dll16/Makefile.in
+++ b/dlls/dispdib.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dispdib.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 C_SRCS = dispdib.c
 
diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in
index bb7a882ec9d..54ca7105183 100644
--- a/dlls/dispex/Makefile.in
+++ b/dlls/dispex/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dispex.dll
-IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32 kernel32 ntdll
+IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_DELEGATION
 
 EXTRA_OBJS = dlldata.o
diff --git a/dlls/dispex/tests/Makefile.in b/dlls/dispex/tests/Makefile.in
index a160fface1b..9d262adafff 100644
--- a/dlls/dispex/tests/Makefile.in
+++ b/dlls/dispex/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dispex.dll
-IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
 
 C_SRCS = \
 	marshal.c
diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in
index 4a451fed691..7f286822fd7 100644
--- a/dlls/display.drv16/Makefile.in
+++ b/dlls/display.drv16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = display.drv16
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 EXTRARCFLAGS  = -O res16
 
 C_SRCS = display.c
diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in
index 42bb92de886..92dcaa7c5a3 100644
--- a/dlls/dmband/Makefile.in
+++ b/dlls/dmband/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmband.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	band.c \
diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in
index 6eeb8f9d329..eb77861cd82 100644
--- a/dlls/dmcompos/Makefile.in
+++ b/dlls/dmcompos/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmcompos.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	chordmap.c \
diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in
index 12b0b9fd78b..5b63988a4ea 100644
--- a/dlls/dmime/Makefile.in
+++ b/dlls/dmime/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmime.dll
-IMPORTS   = dxguid uuid dsound ole32 user32 advapi32 kernel32
+IMPORTS   = dxguid uuid dsound ole32 user32 advapi32
 
 C_SRCS = \
 	audiopath.c \
diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in
index f10c418b84e..8f0bb1831c1 100644
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmloader.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	classfactory.c \
diff --git a/dlls/dmloader/tests/Makefile.in b/dlls/dmloader/tests/Makefile.in
index c838c3809f7..87b156552e4 100644
--- a/dlls/dmloader/tests/Makefile.in
+++ b/dlls/dmloader/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dmloader.dll
-IMPORTS   = ole32 kernel32
+IMPORTS   = ole32
 
 C_SRCS = \
 	loader.c
diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in
index 1d4d842a431..ad78c9cd5b9 100644
--- a/dlls/dmscript/Makefile.in
+++ b/dlls/dmscript/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmscript.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	dmscript_main.c \
diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in
index 8b8658fe8c4..c6280c3dcca 100644
--- a/dlls/dmstyle/Makefile.in
+++ b/dlls/dmstyle/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmstyle.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	auditiontrack.c \
diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in
index ba6df17699d..872d48d62b1 100644
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmsynth.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	dmsynth_main.c \
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index d6a5a7a3c94..7e4dc9126e7 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in
index 8fe9e25d8e6..2b4af1e562d 100644
--- a/dlls/dmusic32/Makefile.in
+++ b/dlls/dmusic32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic32.dll
 IMPORTLIB = dmusic32
-IMPORTS   = uuid kernel32
+IMPORTS   = uuid
 
 C_SRCS = \
 	dmusic32_main.c
diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in
index 61ffe8bfce9..18b11673e12 100644
--- a/dlls/dnsapi/Makefile.in
+++ b/dlls/dnsapi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dnsapi.dll
 IMPORTLIB = dnsapi
-IMPORTS   = netapi32 kernel32
+IMPORTS   = netapi32
 EXTRALIBS = @RESOLVLIBS@
 
 C_SRCS = \
diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in
index eb02a5fdd1d..cd762340c3e 100644
--- a/dlls/dnsapi/tests/Makefile.in
+++ b/dlls/dnsapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dnsapi.dll
-IMPORTS   = dnsapi kernel32
+IMPORTS   = dnsapi
 
 C_SRCS = \
 	name.c \
diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in
index 4d9505eb49c..5b500d07e98 100644
--- a/dlls/dplay/Makefile.in
+++ b/dlls/dplay/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplay.dll
 IMPORTLIB = dplay
-IMPORTS   = dplayx kernel32
+IMPORTS   = dplayx
 
 RC_SRCS = version.rc
 
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 036c557a096..17f632dd2b2 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx.dll
 IMPORTLIB = dplayx
-IMPORTS   = dxguid uuid winmm ole32 user32 advapi32 kernel32
+IMPORTS   = dxguid uuid winmm ole32 user32 advapi32
 
 C_SRCS = \
 	dpclassfactory.c \
diff --git a/dlls/dplayx/tests/Makefile.in b/dlls/dplayx/tests/Makefile.in
index ba381e4d264..2344578050b 100644
--- a/dlls/dplayx/tests/Makefile.in
+++ b/dlls/dplayx/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dplayx.dll
-IMPORTS   = dplayx ole32 kernel32
+IMPORTS   = dplayx ole32
 
 C_SRCS = \
 	dplayx.c
diff --git a/dlls/dpnaddr/Makefile.in b/dlls/dpnaddr/Makefile.in
index 517a8c21bee..dad20c4ed72 100644
--- a/dlls/dpnaddr/Makefile.in
+++ b/dlls/dpnaddr/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dpnaddr.dll
-IMPORTS   = dpnet kernel32
+IMPORTS   = dpnet
 
 RC_SRCS = version.rc
 
diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in
index f485e6c2add..8c8ab5a30c1 100644
--- a/dlls/dpnet/Makefile.in
+++ b/dlls/dpnet/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dpnet.dll
 IMPORTLIB = dpnet
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	address.c \
diff --git a/dlls/dpnhpast/Makefile.in b/dlls/dpnhpast/Makefile.in
index 8750bf01b2c..fc63a6f52a7 100644
--- a/dlls/dpnhpast/Makefile.in
+++ b/dlls/dpnhpast/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dpnhpast.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/dpnlobby/Makefile.in b/dlls/dpnlobby/Makefile.in
index 902eae6137a..ffb1137cf2f 100644
--- a/dlls/dpnlobby/Makefile.in
+++ b/dlls/dpnlobby/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dpnlobby.dll
-IMPORTS   = dpnet kernel32
+IMPORTS   = dpnet
 
 RC_SRCS = version.rc
 
diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in
index acc311c51bd..eb1e13e3b8f 100644
--- a/dlls/dpwsockx/Makefile.in
+++ b/dlls/dpwsockx/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dpwsockx.dll
-IMPORTS   = dxguid kernel32 ws2_32
+IMPORTS   = dxguid ws2_32
 
 C_SRCS = \
 	dpwsockx_main.c
diff --git a/dlls/drmclien/Makefile.in b/dlls/drmclien/Makefile.in
index 6f7ad12954a..8b00523a7b0 100644
--- a/dlls/drmclien/Makefile.in
+++ b/dlls/drmclien/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = drmclien.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 897062f8cfe..4f0fb3a5425 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound.dll
 IMPORTLIB = dsound
-IMPORTS   = dxguid uuid winmm ole32 advapi32 kernel32 ntdll
+IMPORTS   = dxguid uuid winmm ole32 advapi32
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in
index d686b805b16..238f727e3a0 100644
--- a/dlls/dsound/tests/Makefile.in
+++ b/dlls/dsound/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dsound.dll
-IMPORTS   = ole32 version user32 kernel32
+IMPORTS   = ole32 version user32
 
 C_SRCS = \
 	capture.c \
diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in
index cdab9e71f8c..26981e17f0d 100644
--- a/dlls/dssenh/Makefile.in
+++ b/dlls/dssenh/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dssenh.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in
index df068a3d681..99c66f98f7d 100644
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dswave.dll
-IMPORTS   = dxguid uuid ole32 advapi32 kernel32
+IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
 	dswave.c \
diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in
index 76070c4ae17..b768ab6d258 100644
--- a/dlls/dwmapi/Makefile.in
+++ b/dlls/dwmapi/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dwmapi.dll
 IMPORTLIB = dwmapi
-IMPORTS   = kernel32
 
 C_SRCS = \
 	dwmapi_main.c
diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
index dd0d8daad28..862aa503bc2 100644
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dxdiagn.dll
-IMPORTS   = strmiids dxguid uuid ddraw version ole32 oleaut32 user32 advapi32 kernel32
+IMPORTS   = strmiids dxguid uuid ddraw version ole32 oleaut32 user32 advapi32
 
 C_SRCS = \
 	container.c \
diff --git a/dlls/dxdiagn/tests/Makefile.in b/dlls/dxdiagn/tests/Makefile.in
index db75a4ee97c..31bc2d3454a 100644
--- a/dlls/dxdiagn/tests/Makefile.in
+++ b/dlls/dxdiagn/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dxdiagn.dll
-IMPORTS   = oleaut32 ole32 kernel32
+IMPORTS   = oleaut32 ole32
 
 C_SRCS = \
 	container.c \
diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in
index 71b287aed66..f3ace08c7b5 100644
--- a/dlls/dxgi/Makefile.in
+++ b/dlls/dxgi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dxgi.dll
 IMPORTLIB = dxgi
-IMPORTS   = dxguid uuid wined3d kernel32
+IMPORTS   = dxguid uuid wined3d
 
 C_SRCS = \
 	adapter.c \
diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in
index 1a2927e0782..55ea65a0c9d 100644
--- a/dlls/dxgi/tests/Makefile.in
+++ b/dlls/dxgi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dxgi.dll
-IMPORTS   = dxgi kernel32
+IMPORTS   = dxgi
 
 C_SRCS = \
 	device.c
diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in
index 7e3484b17e7..aebfca36f72 100644
--- a/dlls/faultrep/Makefile.in
+++ b/dlls/faultrep/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = faultrep.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = faultrep.c
 
diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in
index e114f57b8a0..44a7f655750 100644
--- a/dlls/fltlib/Makefile.in
+++ b/dlls/fltlib/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = fltlib.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	fltlib.c
diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in
index 5904f07ea92..3b1bba3c902 100644
--- a/dlls/fusion/Makefile.in
+++ b/dlls/fusion/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = fusion.dll
-IMPORTS   = advapi32 dbghelp kernel32 shlwapi version user32
+IMPORTS   = advapi32 dbghelp shlwapi version user32
 
 C_SRCS = \
 	asmcache.c \
diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in
index 890c72e45e7..12853cae34a 100644
--- a/dlls/fusion/tests/Makefile.in
+++ b/dlls/fusion/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = fusion.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	asmcache.c \
diff --git a/dlls/fwpuclnt/Makefile.in b/dlls/fwpuclnt/Makefile.in
index 7ed5d24f69a..89bd977c9b6 100644
--- a/dlls/fwpuclnt/Makefile.in
+++ b/dlls/fwpuclnt/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = fwpuclnt.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
index 14198768ff2..bd8d6dd2497 100644
--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi.exe16
-IMPORTS   = user32 advapi32 gdi32 kernel32 kernel
+IMPORTS   = user32 advapi32 gdi32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,gdi32.dll,--heap,65520
+EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520
 EXTRARCFLAGS  = -O res16
 
 C_SRCS = \
diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in
index ac3300d2491..5ba004922fc 100644
--- a/dlls/gdi32/Makefile.in
+++ b/dlls/gdi32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi32.dll
 IMPORTLIB = gdi32
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32
 EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@
 EXTRALIBS = @CARBONLIB@
 DELAYIMPORTS = usp10
diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in
index 77c8327d47d..87c38ba2f62 100644
--- a/dlls/gdi32/tests/Makefile.in
+++ b/dlls/gdi32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = gdi32.dll
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32
 
 C_SRCS = \
 	bitmap.c \
diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index c1f9032cc67..2c100477c98 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdiplus.dll
 IMPORTLIB = gdiplus
-IMPORTS   = uuid shlwapi oleaut32 ole32 user32 gdi32 kernel32
+IMPORTS   = uuid shlwapi oleaut32 ole32 user32 gdi32
 DELAYIMPORTS = windowscodecs
 
 C_SRCS = \
diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in
index fd6f061e0f4..1ccb909ff3c 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 ole32 user32 gdi32 kernel32
+IMPORTS   = gdiplus ole32 user32 gdi32
 
 C_SRCS = \
 	brush.c \
diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in
index 050d2fdbb05..4c55cdb239d 100644
--- a/dlls/glu32/Makefile.in
+++ b/dlls/glu32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = glu32.dll
 IMPORTLIB = glu32
-IMPORTS   = kernel32
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
 
diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index 4d183161171..935021bb3a2 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
+IMPORTS   = comctl32 user32 gdi32 advapi32
 EXTRALIBS = @GPHOTO2LIBS@
 EXTRAINCL = @GPHOTO2INCL@
 
diff --git a/dlls/gpkcsp/Makefile.in b/dlls/gpkcsp/Makefile.in
index bb37b6d251b..e3c44933b01 100644
--- a/dlls/gpkcsp/Makefile.in
+++ b/dlls/gpkcsp/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gpkcsp.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in
index b5d31d224e5..25d07f5a959 100644
--- a/dlls/hal/Makefile.in
+++ b/dlls/hal/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hal.dll
-IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	hal.c
diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in
index 1dd511b870e..99191049833 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   = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 kernel32
+IMPORTS   = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32
 
 C_SRCS = \
 	chm.c \
diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in
index 5d69d14f43c..27095bb3c2f 100644
--- a/dlls/hid/Makefile.in
+++ b/dlls/hid/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hid.dll
 IMPORTLIB = hid
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in
index 0b02a6d2b6b..539f3eff97a 100644
--- a/dlls/hlink/Makefile.in
+++ b/dlls/hlink/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hlink.dll
 IMPORTLIB = hlink
-IMPORTS   = uuid shell32 ole32 advapi32 kernel32
+IMPORTS   = uuid shell32 ole32 advapi32
 DELAYIMPORTS = urlmon
 
 C_SRCS = \
diff --git a/dlls/hlink/tests/Makefile.in b/dlls/hlink/tests/Makefile.in
index 38a4b649f5a..6096a8bf7d7 100644
--- a/dlls/hlink/tests/Makefile.in
+++ b/dlls/hlink/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = hlink.dll
-IMPORTS   = hlink ole32 kernel32
+IMPORTS   = hlink ole32
 
 C_SRCS = \
 	browse_ctx.c \
diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in
index bee4ddff91f..17d13bdab20 100644
--- a/dlls/hnetcfg/Makefile.in
+++ b/dlls/hnetcfg/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hnetcfg.dll
-IMPORTS   = ole32 advapi32 kernel32
+IMPORTS   = ole32 advapi32
 
 C_SRCS = \
 	apps.c \
diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in
index 6c388077243..73f186b9974 100644
--- a/dlls/httpapi/Makefile.in
+++ b/dlls/httpapi/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = httpapi.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	httpapi_main.c
diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in
index fe08ec0786d..e31790a2791 100644
--- a/dlls/iccvid/Makefile.in
+++ b/dlls/iccvid/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = iccvid.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	iccvid.c
diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in
index 7151649f35f..cb3d0a2d4f7 100644
--- a/dlls/icmp/Makefile.in
+++ b/dlls/icmp/Makefile.in
@@ -3,6 +3,5 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp.dll
-IMPORTS   = kernel32
 
 @MAKE_DLL_RULES@
diff --git a/dlls/ifsmgr.vxd/Makefile.in b/dlls/ifsmgr.vxd/Makefile.in
index 4be03dbb776..1888bac59a9 100644
--- a/dlls/ifsmgr.vxd/Makefile.in
+++ b/dlls/ifsmgr.vxd/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ifsmgr.vxd
-IMPORTS   = kernel32 kernel
+IMPORTS   = kernel
 
 C_SRCS = \
 	ifsmgr.c
diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in
index b7daa735553..b033554fbab 100644
--- a/dlls/imaadp32.acm/Makefile.in
+++ b/dlls/imaadp32.acm/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imaadp32.acm
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = imaadp32.c
 
diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index 157f1d3da33..d83a1843b44 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp.dll
 IMPORTLIB = imagehlp
-IMPORTS   = dbghelp kernel32 ntdll
+IMPORTS   = dbghelp
 
 C_SRCS = \
 	access.c \
diff --git a/dlls/imagehlp/tests/Makefile.in b/dlls/imagehlp/tests/Makefile.in
index 3e17a0d5bcf..d20c4e3450c 100644
--- a/dlls/imagehlp/tests/Makefile.in
+++ b/dlls/imagehlp/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = imagehlp.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	integrity.c
diff --git a/dlls/imm.dll16/Makefile.in b/dlls/imm.dll16/Makefile.in
index c9f8a576c95..e1e43a0b26f 100644
--- a/dlls/imm.dll16/Makefile.in
+++ b/dlls/imm.dll16/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,imm32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,imm32.dll
 
 @MAKE_DLL_RULES@
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index 2a0d2b68145..1cc6d8c99e7 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32.dll
 IMPORTLIB = imm32
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32
 
 C_SRCS = \
 	imm.c
diff --git a/dlls/imm32/tests/Makefile.in b/dlls/imm32/tests/Makefile.in
index 1bb90650f5a..8bfe04df9fe 100644
--- a/dlls/imm32/tests/Makefile.in
+++ b/dlls/imm32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = imm32.dll
-IMPORTS   = imm32 user32 kernel32
+IMPORTS   = imm32 user32
 
 C_SRCS = \
 	imm32.c
diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in
index 1c643aa1545..1b1d1be2f49 100644
--- a/dlls/inetcomm/Makefile.in
+++ b/dlls/inetcomm/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inetcomm.dll
 IMPORTLIB = inetcomm
-IMPORTS   = uuid oleaut32 ole32 ws2_32 user32 advapi32 kernel32
+IMPORTS   = uuid oleaut32 ole32 ws2_32 user32 advapi32
 
 C_SRCS = \
 	imaptransport.c \
diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in
index 9c72c97a0da..958cd453a0c 100644
--- a/dlls/inetcomm/tests/Makefile.in
+++ b/dlls/inetcomm/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = inetcomm.dll
-IMPORTS   = inetcomm oleaut32 ole32 kernel32
+IMPORTS   = inetcomm oleaut32 ole32
 
 C_SRCS = \
 	mimeintl.c \
diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in
index 70b2d03fcf9..6104948a67b 100644
--- a/dlls/inetmib1/Makefile.in
+++ b/dlls/inetmib1/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inetmib1.dll
-IMPORTS   = snmpapi kernel32
+IMPORTS   = snmpapi
 DELAYIMPORTS = iphlpapi
 
 C_SRCS = \
diff --git a/dlls/inetmib1/tests/Makefile.in b/dlls/inetmib1/tests/Makefile.in
index 2dd6f635371..8670969e7d4 100644
--- a/dlls/inetmib1/tests/Makefile.in
+++ b/dlls/inetmib1/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = inetmib1.dll
-IMPORTS   = snmpapi kernel32
+IMPORTS   = snmpapi
 
 C_SRCS = \
 	main.c
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index 8a891c0c699..6fc14845a8e 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = infosoft.dll
-IMPORTS   = uuid advapi32 kernel32
+IMPORTS   = uuid advapi32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/infosoft/tests/Makefile.in b/dlls/infosoft/tests/Makefile.in
index 989207128b8..3f797d81899 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 kernel32
+IMPORTS   = ole32
 
 C_SRCS = \
 	infosoft.c
diff --git a/dlls/initpki/Makefile.in b/dlls/initpki/Makefile.in
index 783e19bd188..80586c07bfa 100644
--- a/dlls/initpki/Makefile.in
+++ b/dlls/initpki/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = initpki.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/inkobj/Makefile.in b/dlls/inkobj/Makefile.in
index 5d723785935..48b77233baa 100644
--- a/dlls/inkobj/Makefile.in
+++ b/dlls/inkobj/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inkobj.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	inkcollector.c \
diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index 374c10e3154..43953972b70 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inseng.dll
-IMPORTS   = uuid ole32 advapi32 kernel32
+IMPORTS   = uuid ole32 advapi32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index c90e372146a..44f8f94db8f 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = iphlpapi.dll
 IMPORTLIB = iphlpapi
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 EXTRALIBS = @RESOLVLIBS@ @LIBKSTAT@
 
 C_SRCS = \
diff --git a/dlls/iphlpapi/tests/Makefile.in b/dlls/iphlpapi/tests/Makefile.in
index bfcdafa7e2b..b8f153f9b2a 100644
--- a/dlls/iphlpapi/tests/Makefile.in
+++ b/dlls/iphlpapi/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = iphlpapi.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	iphlpapi.c
diff --git a/dlls/itircl/Makefile.in b/dlls/itircl/Makefile.in
index 3ca77a1648f..e58a584dac9 100644
--- a/dlls/itircl/Makefile.in
+++ b/dlls/itircl/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = itircl.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	itircl_main.c
diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in
index 2b55715bf8c..4003576ab59 100644
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = itss.dll
-IMPORTS   = uuid urlmon shlwapi ole32 kernel32
+IMPORTS   = uuid urlmon shlwapi ole32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/itss/tests/Makefile.in b/dlls/itss/tests/Makefile.in
index d73b082a5c8..046360b84c4 100644
--- a/dlls/itss/tests/Makefile.in
+++ b/dlls/itss/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = itss.dll
-IMPORTS   = ole32 kernel32
+IMPORTS   = ole32
 
 C_SRCS = \
 	protocol.c
diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index 81c40719353..c9bd85c2138 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = jscript.dll
-IMPORTS   = oleaut32 ole32 user32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 user32 advapi32
 
 RC_SRCS = \
 	jscript_Da.rc \
diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in
index 521741a9f28..686a576c5b8 100644
--- a/dlls/jscript/tests/Makefile.in
+++ b/dlls/jscript/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = jscript.dll
-IMPORTS   = oleaut32 ole32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 advapi32
 
 C_SRCS = \
 	activex.c \
diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in
index ed2d6e69b46..68cdbe4b42a 100644
--- a/dlls/kernel32/tests/Makefile.in
+++ b/dlls/kernel32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = kernel32.dll
-IMPORTS   = user32 advapi32 kernel32
+IMPORTS   = user32 advapi32
 
 C_SRCS = \
 	actctx.c \
diff --git a/dlls/keyboard.drv16/Makefile.in b/dlls/keyboard.drv16/Makefile.in
index 101029962eb..55b2f5c40b4 100644
--- a/dlls/keyboard.drv16/Makefile.in
+++ b/dlls/keyboard.drv16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = keyboard.drv16
-IMPORTS   = user32 kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+IMPORTS   = user32
+EXTRADLLFLAGS = -m16
 
 C_SRCS = keyboard.c
 
diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in
index 093f6e4db50..58c67f18212 100644
--- a/dlls/loadperf/Makefile.in
+++ b/dlls/loadperf/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = loadperf.dll
 IMPORTLIB = loadperf
-IMPORTS   = kernel32
 
 C_SRCS = \
 	loadperf_main.c
diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in
index dd2356d6702..ec4e94be3a5 100644
--- a/dlls/localspl/Makefile.in
+++ b/dlls/localspl/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = localspl.dll
-IMPORTS   = spoolss user32 advapi32 kernel32
+IMPORTS   = spoolss user32 advapi32
 
 C_SRCS = \
 	localmon.c \
diff --git a/dlls/localspl/tests/Makefile.in b/dlls/localspl/tests/Makefile.in
index 1871135516a..5344a6a1cdc 100644
--- a/dlls/localspl/tests/Makefile.in
+++ b/dlls/localspl/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = localspl.dll
-IMPORTS   = kernel32 advapi32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	localmon.c
diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in
index 52f30c5684c..1c3deaa9f9a 100644
--- a/dlls/localui/Makefile.in
+++ b/dlls/localui/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = localui.dll
-IMPORTS   = winspool user32 kernel32
+IMPORTS   = winspool user32
 
 C_SRCS = \
 	localui.c
diff --git a/dlls/localui/tests/Makefile.in b/dlls/localui/tests/Makefile.in
index aa90d574e15..770e17be6d9 100644
--- a/dlls/localui/tests/Makefile.in
+++ b/dlls/localui/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = localui.dll
-IMPORTS   = kernel32 winspool
+IMPORTS   = winspool
 
 C_SRCS = \
 	localui.c
diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in
index 123b349eb9e..752a9e49ced 100644
--- a/dlls/lz32/Makefile.in
+++ b/dlls/lz32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lz32.dll
 IMPORTLIB = lz32
-IMPORTS   = kernel32
 
 RC_SRCS  = version.rc
 
diff --git a/dlls/lz32/tests/Makefile.in b/dlls/lz32/tests/Makefile.in
index a324c3edccc..958ac9404ea 100644
--- a/dlls/lz32/tests/Makefile.in
+++ b/dlls/lz32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = lz32.dll
-IMPORTS   = lz32 kernel32
+IMPORTS   = lz32
 
 C_SRCS = \
 	lzexpand_main.c
diff --git a/dlls/lzexpand.dll16/Makefile.in b/dlls/lzexpand.dll16/Makefile.in
index e984c01f340..8c43e1ac256 100644
--- a/dlls/lzexpand.dll16/Makefile.in
+++ b/dlls/lzexpand.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lzexpand.dll16
-IMPORTS   = lz32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,lz32.dll
+IMPORTS   = lz32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,lz32.dll
 
 C_SRCS = lzexpand.c
 
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index cf16f24dd2c..60dd5e01266 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mapi32.dll
 IMPORTLIB = mapi32
-IMPORTS   = uuid shlwapi shell32 user32 advapi32 kernel32
+IMPORTS   = uuid shlwapi shell32 user32 advapi32
 
 C_SRCS = \
 	imalloc.c \
diff --git a/dlls/mapi32/tests/Makefile.in b/dlls/mapi32/tests/Makefile.in
index e4d9188a8b8..56e3a56a3f0 100644
--- a/dlls/mapi32/tests/Makefile.in
+++ b/dlls/mapi32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mapi32.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	imalloc.c \
diff --git a/dlls/mapistub/Makefile.in b/dlls/mapistub/Makefile.in
index 98a6ad9b3fb..183da7f9baa 100644
--- a/dlls/mapistub/Makefile.in
+++ b/dlls/mapistub/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mapistub.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in
index 248add26d7f..2cb8e09e759 100644
--- a/dlls/mciavi32/Makefile.in
+++ b/dlls/mciavi32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi32.dll
-IMPORTS   = msvfw32 winmm user32 gdi32 kernel32
+IMPORTS   = msvfw32 winmm user32 gdi32
 
 C_SRCS = \
 	info.c \
diff --git a/dlls/mcicda/Makefile.in b/dlls/mcicda/Makefile.in
index b77ea3003de..f54441ac216 100644
--- a/dlls/mcicda/Makefile.in
+++ b/dlls/mcicda/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.dll
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = \
 	mcicda.c
diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in
index 6dbdb8704d1..82f83b3599e 100644
--- a/dlls/mciqtz32/Makefile.in
+++ b/dlls/mciqtz32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciqtz32.dll
-IMPORTS   = strmiids oleaut32 ole32 winmm user32 gdi32 kernel32
+IMPORTS   = strmiids oleaut32 ole32 winmm user32 gdi32
 
 C_SRCS = \
 	mciqtz.c
diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in
index 64951031a2e..ca4328e0b48 100644
--- a/dlls/mciseq/Makefile.in
+++ b/dlls/mciseq/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.dll
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = \
 	mcimidi.c
diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in
index 226a4e4e667..6ae366fd106 100644
--- a/dlls/mciwave/Makefile.in
+++ b/dlls/mciwave/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.dll
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = \
 	mciwave.c
diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in
index f54e615b76e..652b8c05b3a 100644
--- a/dlls/midimap/Makefile.in
+++ b/dlls/midimap/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.dll
-IMPORTS   = winmm user32 advapi32 kernel32
+IMPORTS   = winmm user32 advapi32
 
 C_SRCS = \
 	midimap.c
diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in
index 5c08af88e76..a0e5d347323 100644
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mlang.dll
 IMPORTLIB = mlang
-IMPORTS   = uuid ole32 gdi32 advapi32 kernel32
+IMPORTS   = uuid ole32 gdi32 advapi32
 DELAYIMPORTS = oleaut32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
diff --git a/dlls/mlang/tests/Makefile.in b/dlls/mlang/tests/Makefile.in
index 859793b8b5e..636f0610be7 100644
--- a/dlls/mlang/tests/Makefile.in
+++ b/dlls/mlang/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mlang.dll
-IMPORTS   = mlang oleaut32 ole32 gdi32 kernel32
+IMPORTS   = mlang oleaut32 ole32 gdi32
 
 C_SRCS = \
 	mlang.c
diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in
index ef1b0ce9eef..16deb0e7807 100644
--- a/dlls/mmdevapi/Makefile.in
+++ b/dlls/mmdevapi/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mmdevapi.dll
-IMPORTS   = uuid ole32 oleaut32 user32 advapi32 kernel32 ntdll
+IMPORTS   = uuid ole32 oleaut32 user32 advapi32
 EXTRALIBS = @FRAMEWORK_OPENAL@
 
 C_SRCS = \
diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in
index 687eafb2cc8..fc314a3b3b4 100644
--- a/dlls/mmdevapi/tests/Makefile.in
+++ b/dlls/mmdevapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mmdevapi.dll
-IMPORTS   = ole32 version user32 kernel32
+IMPORTS   = ole32 version user32
 
 C_SRCS = \
 	capture.c \
diff --git a/dlls/mmdevldr.vxd/Makefile.in b/dlls/mmdevldr.vxd/Makefile.in
index feb853b28a6..c4e9644bdbd 100644
--- a/dlls/mmdevldr.vxd/Makefile.in
+++ b/dlls/mmdevldr.vxd/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mmdevldr.vxd
-IMPORTS   = kernel32
 
 C_SRCS = \
 	mmdevldr.c
diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in
index 38bf0ef4d80..587594b3443 100644
--- a/dlls/mmsystem.dll16/Makefile.in
+++ b/dlls/mmsystem.dll16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mmsystem.dll16
-IMPORTS   = winmm user32 kernel32 kernel
+IMPORTS   = winmm user32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll
 
 C_SRCS = \
 	driver.c \
diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in
index 9413aa95587..5faaece994c 100644
--- a/dlls/monodebg.vxd/Makefile.in
+++ b/dlls/monodebg.vxd/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = monodebg.vxd
-IMPORTS   = kernel32
 
 C_SRCS = \
 	monodebg.c
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in
index 30b8937290d..31879e9910e 100644
--- a/dlls/mountmgr.sys/Makefile.in
+++ b/dlls/mountmgr.sys/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mountmgr.sys
-IMPORTS   = uuid advapi32 ntoskrnl.exe kernel32 ntdll
+IMPORTS   = uuid advapi32 ntoskrnl.exe
 DELAYIMPORTS = user32
 EXTRADLLFLAGS = -Wb,--subsystem,native
 EXTRADEFS = @HALINCL@
diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in
index 40f5a67b2d5..d063d5382dd 100644
--- a/dlls/mouse.drv16/Makefile.in
+++ b/dlls/mouse.drv16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mouse.drv16
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 EXTRARCFLAGS  = -O res16
 
 C_SRCS = mouse.c
diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in
index 471eeb6aafe..3855ffdca40 100644
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr.dll
 IMPORTLIB = mpr
-IMPORTS   = user32 advapi32 kernel32
+IMPORTS   = user32 advapi32
 
 C_SRCS = \
 	auth.c \
diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in
index 92c2ed5b5b4..fc8e9e7e832 100644
--- a/dlls/mprapi/Makefile.in
+++ b/dlls/mprapi/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mprapi.dll
 IMPORTLIB = mprapi
-IMPORTS   = kernel32
 
 C_SRCS = \
 	mprapi.c
diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in
index 80d6f07ae83..eb2c44d3c81 100644
--- a/dlls/msacm.dll16/Makefile.in
+++ b/dlls/msacm.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.dll16
-IMPORTS   = msacm32 kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,msacm32.dll
+IMPORTS   = msacm32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,msacm32.dll
 
 C_SRCS = msacm.c
 
diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in
index ca46e47a41d..76d1302e3b3 100644
--- a/dlls/msacm32.drv/Makefile.in
+++ b/dlls/msacm32.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.drv
-IMPORTS   = msacm32 winmm user32 kernel32
+IMPORTS   = msacm32 winmm user32
 
 C_SRCS = \
 	wavemap.c
diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in
index d5a5761bcc9..c1085848e12 100644
--- a/dlls/msacm32/Makefile.in
+++ b/dlls/msacm32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.dll
 IMPORTLIB = msacm32
-IMPORTS   = winmm user32 advapi32 kernel32
+IMPORTS   = winmm user32 advapi32
 
 C_SRCS = \
 	driver.c \
diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in
index f9c0b2a9c0b..ca4e3d5bb73 100644
--- a/dlls/msacm32/tests/Makefile.in
+++ b/dlls/msacm32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msacm32.dll
-IMPORTS   = msacm32 kernel32
+IMPORTS   = msacm32
 
 C_SRCS = \
 	msacm.c
diff --git a/dlls/msadp32.acm/Makefile.in b/dlls/msadp32.acm/Makefile.in
index 458554a1b3d..5fdeeef631a 100644
--- a/dlls/msadp32.acm/Makefile.in
+++ b/dlls/msadp32.acm/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msadp32.acm
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = msadp32.c
 
diff --git a/dlls/mscat32/Makefile.in b/dlls/mscat32/Makefile.in
index f0f83e9801c..0fd9710e51c 100644
--- a/dlls/mscat32/Makefile.in
+++ b/dlls/mscat32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mscat32.dll
-IMPORTS   = wintrust kernel32
+IMPORTS   = wintrust
 
 C_SRCS = \
 	main.c
diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in
index 5542fef34cd..7e46beeba34 100644
--- a/dlls/mscms/Makefile.in
+++ b/dlls/mscms/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mscms.dll
 IMPORTLIB = mscms
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 EXTRALIBS = @LCMSLIBS@
 
 C_SRCS = \
diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in
index 15e92512322..33ac9d5e389 100644
--- a/dlls/mscms/tests/Makefile.in
+++ b/dlls/mscms/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mscms.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	profile.c
diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in
index 96aa6534022..2aedf8d67fc 100644
--- a/dlls/mscoree/Makefile.in
+++ b/dlls/mscoree/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mscoree.dll
-IMPORTS   = uuid shell32 advapi32 kernel32
+IMPORTS   = uuid shell32 advapi32
 
 C_SRCS = \
 	corruntimehost.c \
diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in
index bb1c35a16ea..ae8bff16b53 100644
--- a/dlls/msctf/Makefile.in
+++ b/dlls/msctf/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msctf.dll
-IMPORTS   = uuid ole32 oleaut32 user32 advapi32 kernel32 ntdll
+IMPORTS   = uuid ole32 oleaut32 user32 advapi32
 
 C_SRCS = \
 	categorymgr.c \
diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in
index 7ce66a9876d..515d4e16da5 100644
--- a/dlls/msctf/tests/Makefile.in
+++ b/dlls/msctf/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msctf.dll
-IMPORTS   = ole32 user32 kernel32
+IMPORTS   = ole32 user32
 
 C_SRCS = \
 	inputprocessor.c
diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in
index efa8f4abed8..99bfdf23b71 100644
--- a/dlls/msdaps/Makefile.in
+++ b/dlls/msdaps/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msdaps.dll
-IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32 kernel32 ntdll
+IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" -DENTRY_PREFIX=msdaps_
 EXTRAIDLFLAGS = --win32-align=2
 
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index 3565a92b5ec..2882340a4c8 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msdmo.dll
 IMPORTLIB = msdmo
-IMPORTS   = uuid ole32 user32 advapi32 kernel32 
+IMPORTS   = uuid ole32 user32 advapi32
 
 C_SRCS = \
 	dmoreg.c \
diff --git a/dlls/msftedit/Makefile.in b/dlls/msftedit/Makefile.in
index b741f89318c..e48d0714909 100644
--- a/dlls/msftedit/Makefile.in
+++ b/dlls/msftedit/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msftedit.dll
-IMPORTS   = uuid riched20 kernel32
+IMPORTS   = uuid riched20
 
 C_SRCS = \
 	msftedit_main.c
diff --git a/dlls/msg711.acm/Makefile.in b/dlls/msg711.acm/Makefile.in
index 4d11009c649..6996bc0bdc7 100644
--- a/dlls/msg711.acm/Makefile.in
+++ b/dlls/msg711.acm/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msg711.acm
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = msg711.c
 
diff --git a/dlls/msgsm32.acm/Makefile.in b/dlls/msgsm32.acm/Makefile.in
index 9164efb074f..fd9230103c7 100644
--- a/dlls/msgsm32.acm/Makefile.in
+++ b/dlls/msgsm32.acm/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msgsm32.acm
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = msgsm32.c
 
diff --git a/dlls/mshtml.tlb/Makefile.in b/dlls/mshtml.tlb/Makefile.in
index a58f7226d34..6a47c24f94a 100644
--- a/dlls/mshtml.tlb/Makefile.in
+++ b/dlls/mshtml.tlb/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mshtml.tlb
-IMPORTS   = kernel32
 
 RC_SRCS = rsrc.rc
 IDL_TLB_SRCS = mshtml_tlb.idl
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index dcd81de7669..2b4671765fe 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mshtml.dll
 IMPORTLIB = mshtml
-IMPORTS   = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32
+IMPORTS   = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 DELAYIMPORTS = wininet
 
diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in
index 2c867660381..7c11784e86f 100644
--- a/dlls/mshtml/tests/Makefile.in
+++ b/dlls/mshtml/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mshtml.dll
-IMPORTS   = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32 kernel32
+IMPORTS   = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32
 
 C_SRCS = \
 	dom.c \
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 5b0b3fce049..f1d669143da 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msi.dll
 IMPORTLIB = msi
-IMPORTS   = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32
 DELAYIMPORTS = odbccp32
 
 C_SRCS = \
diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in
index 3f310564e99..cc7f57599c5 100644
--- a/dlls/msi/tests/Makefile.in
+++ b/dlls/msi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msi.dll
-IMPORTS   = cabinet msi shell32 ole32 oleaut32 user32 advapi32 kernel32 version
+IMPORTS   = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version
 
 C_SRCS = \
 	automation.c \
diff --git a/dlls/msimg32/Makefile.in b/dlls/msimg32/Makefile.in
index e9f2fa9a811..31eb233d4da 100644
--- a/dlls/msimg32/Makefile.in
+++ b/dlls/msimg32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msimg32.dll
 IMPORTLIB = msimg32
-IMPORTS   = gdi32 kernel32
+IMPORTS   = gdi32
 
 C_SRCS = msimg32_main.c
 
diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in
index 7abe924d580..0e76c83f57f 100644
--- a/dlls/msimtf/Makefile.in
+++ b/dlls/msimtf/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msimtf.dll
-IMPORTS   = uuid imm32 kernel32
+IMPORTS   = uuid imm32
 
 C_SRCS = \
 	activeimmapp.c \
diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in
index 715fe8030da..c050da2c559 100644
--- a/dlls/msisip/Makefile.in
+++ b/dlls/msisip/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msisip.dll
-IMPORTS   = crypt32 ole32 kernel32
+IMPORTS   = crypt32 ole32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/msisys.ocx/Makefile.in b/dlls/msisys.ocx/Makefile.in
index 31fda2b3477..602a367a111 100644
--- a/dlls/msisys.ocx/Makefile.in
+++ b/dlls/msisys.ocx/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msisys.ocx
-IMPORTS   = uuid kernel32
+IMPORTS   = uuid
 
 C_SRCS = msisys.c
 
diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in
index ff61dc88a77..90e6f482831 100644
--- a/dlls/msnet32/Makefile.in
+++ b/dlls/msnet32/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msnet32.dll
-IMPORTS   = kernel32
 
 C_SRCS = msnet_main.c
 
diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in
index a54f0fe8981..6abd6c21d10 100644
--- a/dlls/msrle32/Makefile.in
+++ b/dlls/msrle32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msrle32.dll
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = msrle32.c
 
diff --git a/dlls/mssign32/Makefile.in b/dlls/mssign32/Makefile.in
index 509277e3d4d..9a01ae9e8b3 100644
--- a/dlls/mssign32/Makefile.in
+++ b/dlls/mssign32/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mssign32.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	mssign32_main.c
diff --git a/dlls/mssip32/Makefile.in b/dlls/mssip32/Makefile.in
index 860380e46c1..57addd81f3e 100644
--- a/dlls/mssip32/Makefile.in
+++ b/dlls/mssip32/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mssip32.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in
index fc3d8d1fdde..6db3d47270b 100644
--- a/dlls/mstask/Makefile.in
+++ b/dlls/mstask/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mstask.dll
-IMPORTS   = uuid ole32 kernel32 ntdll
+IMPORTS   = uuid ole32
 
 C_SRCS = \
 	factory.c \
diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in
index 8a500a56aaa..bafbe4eea36 100644
--- a/dlls/mstask/tests/Makefile.in
+++ b/dlls/mstask/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mstask.dll
-IMPORTS   = ole32 kernel32
+IMPORTS   = ole32
 
 C_SRCS = \
 	task.c \
diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in
index f0433b8d20b..21b5571e735 100644
--- a/dlls/msvcirt/Makefile.in
+++ b/dlls/msvcirt/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcirt.dll
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 
 C_SRCS = \
 	msvcirt.c
diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in
index c3e1e04bf9a..e99e351737f 100644
--- a/dlls/msvcp90/Makefile.in
+++ b/dlls/msvcp90/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcp90.dll
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/msvcp90/tests/Makefile.in b/dlls/msvcp90/tests/Makefile.in
index 37cc9abfa81..b7fb8e596c0 100644
--- a/dlls/msvcp90/tests/Makefile.in
+++ b/dlls/msvcp90/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcp90.dll
 APPMODE   = -mno-cygwin
-IMPORTS   = kernel32
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in
index fc0a0747b44..9d4b43953bd 100644
--- a/dlls/msvcr100/Makefile.in
+++ b/dlls/msvcr100/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcr100.dll
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in
index 7b9a3bf9519..e39419b3732 100644
--- a/dlls/msvcr70/Makefile.in
+++ b/dlls/msvcr70/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcr70.dll
 IMPORTLIB = msvcr70
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 
 C_SRCS = \
 	msvcr70.c
diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in
index 5eeec4815f5..7a1c138f745 100644
--- a/dlls/msvcr71/Makefile.in
+++ b/dlls/msvcr71/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcr71.dll
 IMPORTLIB = msvcr71
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 
 C_SRCS = \
 	msvcr71.c
diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in
index a448e41bbbc..e6f06c56804 100644
--- a/dlls/msvcr80/Makefile.in
+++ b/dlls/msvcr80/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcr80.dll
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 
 C_SRCS = \
 	msvcr80.c
diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in
index 6b311f6c1d8..ee44d698e6d 100644
--- a/dlls/msvcr90/Makefile.in
+++ b/dlls/msvcr90/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcr90.dll
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in
index 39fb4c3fd35..4029e302b0b 100644
--- a/dlls/msvcr90/tests/Makefile.in
+++ b/dlls/msvcr90/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcr90.dll
 APPMODE   = -mno-cygwin
-IMPORTS   = kernel32
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in
index 3b2d293a554..71b23407e26 100644
--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt.dll
 IMPORTLIB = msvcrt
-IMPORTS   = kernel32 ntdll
 DELAYIMPORTS = advapi32 user32
 
 C_SRCS = \
diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in
index 60348f5bf5d..05f1e3643e7 100644
--- a/dlls/msvcrt/tests/Makefile.in
+++ b/dlls/msvcrt/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcrt.dll
 APPMODE   = -mno-cygwin
-IMPORTS   = kernel32
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/..
 
diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in
index 1ab90301262..52e40578766 100644
--- a/dlls/msvcrt20/Makefile.in
+++ b/dlls/msvcrt20/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt20.dll
 IMPORTLIB = msvcrt20
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 
 C_SRCS = msvcrt20.c
 
diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in
index d1f3d57569d..5eef41f3416 100644
--- a/dlls/msvcrt40/Makefile.in
+++ b/dlls/msvcrt40/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt40.dll
 IMPORTLIB = msvcrt40
-IMPORTS   = msvcrt kernel32
+IMPORTS   = msvcrt
 
 C_SRCS = \
 	msvcrt40.c
diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in
index e607924b1c9..72fda012f04 100644
--- a/dlls/msvcrtd/Makefile.in
+++ b/dlls/msvcrtd/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrtd.dll
 IMPORTLIB = msvcrtd
-IMPORTS   = msvcrt kernel32 ntdll
+IMPORTS   = msvcrt
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in
index 9fe485000fc..6260e50d5d8 100644
--- a/dlls/msvcrtd/tests/Makefile.in
+++ b/dlls/msvcrtd/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcrtd.dll
 APPMODE   = -mno-cygwin
-IMPORTS   = kernel32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
 
diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index e431ce54aee..c3eb2951608 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32.dll
 IMPORTLIB = msvfw32
-IMPORTS   = winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = winmm version comctl32 user32 gdi32 advapi32
 
 C_SRCS = \
 	drawdib.c \
diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in
index 7c53a3b4a28..4103469a424 100644
--- a/dlls/msvfw32/tests/Makefile.in
+++ b/dlls/msvfw32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvfw32.dll
-IMPORTS   = msvfw32 kernel32
+IMPORTS   = msvfw32
 
 C_SRCS = \
 	msvfw.c
diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in
index f0c2b882634..a7cbbc9fbf9 100644
--- a/dlls/msvidc32/Makefile.in
+++ b/dlls/msvidc32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvidc32.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	msvideo1.c
diff --git a/dlls/msvideo.dll16/Makefile.in b/dlls/msvideo.dll16/Makefile.in
index 7ae3bf3c86c..a33136de2d1 100644
--- a/dlls/msvideo.dll16/Makefile.in
+++ b/dlls/msvideo.dll16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvideo.dll16
-IMPORTS   = msvfw32 version advapi32 kernel32 kernel
+IMPORTS   = msvfw32 version advapi32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,msvfw32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,msvfw32.dll
 
 C_SRCS = msvideo16.c
 
diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in
index 72eb3fbfb88..378aebf58be 100644
--- a/dlls/mswsock/Makefile.in
+++ b/dlls/mswsock/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mswsock.dll
 IMPORTLIB = mswsock
-IMPORTS   = ws2_32 kernel32
+IMPORTS   = ws2_32
 
 C_SRCS = \
 	mswsock.c
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index a8d1dd5b19e..b94d82f4ce7 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msxml3.dll
-IMPORTS   = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 kernel32
+IMPORTS   = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
 EXTRALIBS = @XML2LIBS@
 EXTRAINCL = @XML2INCL@ @XSLTINCL@
 
diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in
index 9ee416d1714..82dedd4368d 100644
--- a/dlls/msxml3/tests/Makefile.in
+++ b/dlls/msxml3/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msxml3.dll
-IMPORTS   = oleaut32 ole32 user32 kernel32
+IMPORTS   = oleaut32 ole32 user32
 
 C_SRCS = \
 	domdoc.c \
diff --git a/dlls/msxml4/Makefile.in b/dlls/msxml4/Makefile.in
index 957a9a67354..beb49152fa9 100644
--- a/dlls/msxml4/Makefile.in
+++ b/dlls/msxml4/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msxml4.dll
-IMPORTS   = ole32 advapi32 kernel32
+IMPORTS   = ole32 advapi32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in
index 451e9f754e6..63ed6255c80 100644
--- a/dlls/nddeapi/Makefile.in
+++ b/dlls/nddeapi/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = nddeapi.dll
 IMPORTLIB = nddeapi
-IMPORTS   = kernel32
 
 C_SRCS = \
 	nddeapi.c
diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index 62035dfc262..1aa01a4121b 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = netapi32.dll
 IMPORTLIB = netapi32
-IMPORTS   = iphlpapi ws2_32 advapi32 kernel32 ntdll
+IMPORTS   = iphlpapi ws2_32 advapi32
 
 C_SRCS = \
 	access.c \
diff --git a/dlls/netapi32/tests/Makefile.in b/dlls/netapi32/tests/Makefile.in
index 46933d093c0..92541ed42cd 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   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	access.c \
diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in
index 79b47074695..886e1650d73 100644
--- a/dlls/newdev/Makefile.in
+++ b/dlls/newdev/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = newdev.dll
 IMPORTLIB = newdev
-IMPORTS   = kernel32
 
 C_SRCS = main.c
 
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
index be1e359219d..82bc1895e9a 100644
--- a/dlls/ntdll/tests/Makefile.in
+++ b/dlls/ntdll/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ntdll.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	atom.c \
diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in
index 9ac4ca36807..978bc48f246 100644
--- a/dlls/ntdsapi/Makefile.in
+++ b/dlls/ntdsapi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntdsapi.dll
 IMPORTLIB = ntdsapi
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	ntdsapi.c
diff --git a/dlls/ntdsapi/tests/Makefile.in b/dlls/ntdsapi/tests/Makefile.in
index 0451831864b..04fc23c9630 100644
--- a/dlls/ntdsapi/tests/Makefile.in
+++ b/dlls/ntdsapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ntdsapi.dll
-IMPORTS   = ntdsapi kernel32
+IMPORTS   = ntdsapi
 
 C_SRCS = \
 	ntdsapi.c
diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in
index cae10259b12..fbecd8bf327 100644
--- a/dlls/ntoskrnl.exe/Makefile.in
+++ b/dlls/ntoskrnl.exe/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntoskrnl.exe
 IMPORTLIB = ntoskrnl.exe
-IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	instr.c \
diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in
index e22482f2ab8..24fb700f7d1 100644
--- a/dlls/ntprint/Makefile.in
+++ b/dlls/ntprint/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntprint.dll
-IMPORTS   = winspool kernel32
+IMPORTS   = winspool
 
 C_SRCS = \
 	ntprint.c
diff --git a/dlls/ntprint/tests/Makefile.in b/dlls/ntprint/tests/Makefile.in
index 157602c00bf..a4d80e8299b 100644
--- a/dlls/ntprint/tests/Makefile.in
+++ b/dlls/ntprint/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ntprint.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	ntprint.c
diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in
index 177d41b09be..57186f47d9e 100644
--- a/dlls/objsel/Makefile.in
+++ b/dlls/objsel/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = objsel.dll
-IMPORTS   = strmiids uuid ole32 advapi32 kernel32
+IMPORTS   = strmiids uuid ole32 advapi32
 
 C_SRCS = \
 	factory.c \
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index e42b1216071..cd7bbd2267b 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32.dll
 IMPORTLIB = odbc32
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	proxyodbc.c
diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in
index 2945bcc2fd4..2bdf41c31e6 100644
--- a/dlls/odbccp32/Makefile.in
+++ b/dlls/odbccp32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbccp32.dll
 IMPORTLIB = odbccp32
-IMPORTS   = uuid advapi32 kernel32
+IMPORTS   = uuid advapi32
 
 C_SRCS = \
 	odbccp32.c
diff --git a/dlls/odbccp32/tests/Makefile.in b/dlls/odbccp32/tests/Makefile.in
index 9e6212eee62..6b59828ad28 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 kernel32
+IMPORTS   = odbccp32
 
 C_SRCS = \
 	misc.c
diff --git a/dlls/ole2.dll16/Makefile.in b/dlls/ole2.dll16/Makefile.in
index d2829546504..1a07ef49a1a 100644
--- a/dlls/ole2.dll16/Makefile.in
+++ b/dlls/ole2.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2.dll16
-IMPORTS   = uuid ole32 user32 gdi32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+IMPORTS   = uuid ole32 user32 gdi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 C_SRCS = \
 	memlockbytes.c \
diff --git a/dlls/ole2conv.dll16/Makefile.in b/dlls/ole2conv.dll16/Makefile.in
index df4584e4f0c..391116a3e3a 100644
--- a/dlls/ole2conv.dll16/Makefile.in
+++ b/dlls/ole2conv.dll16/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2conv.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 @MAKE_DLL_RULES@
diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in
index 6e58438eb5f..0485335b8aa 100644
--- a/dlls/ole2disp.dll16/Makefile.in
+++ b/dlls/ole2disp.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2disp.dll16
-IMPORTS   = kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll
 
 C_SRCS = ole2disp.c
 
diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in
index b3c50f323fc..83239d60125 100644
--- a/dlls/ole2nls.dll16/Makefile.in
+++ b/dlls/ole2nls.dll16/Makefile.in
@@ -3,9 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2nls.dll16
-IMPORTS   = kernel32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 EXTRARCFLAGS  = -O res16
 
 C_SRCS = ole2nls.c
diff --git a/dlls/ole2prox.dll16/Makefile.in b/dlls/ole2prox.dll16/Makefile.in
index 7fcd26be24e..072786b8792 100644
--- a/dlls/ole2prox.dll16/Makefile.in
+++ b/dlls/ole2prox.dll16/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2prox.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 @MAKE_DLL_RULES@
diff --git a/dlls/ole2thk.dll16/Makefile.in b/dlls/ole2thk.dll16/Makefile.in
index e521eac0c0a..eb4a5141bc8 100644
--- a/dlls/ole2thk.dll16/Makefile.in
+++ b/dlls/ole2thk.dll16/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2thk.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 @MAKE_DLL_RULES@
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 430ec925f56..40a2da6a3c4 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole32.dll
 IMPORTLIB = ole32
-IMPORTS   = uuid advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
+IMPORTS   = uuid advapi32 user32 gdi32 rpcrt4
 EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H \
     -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DREGISTER_PROXY_DLL
 
diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in
index ea71048d938..c564676a620 100644
--- a/dlls/ole32/tests/Makefile.in
+++ b/dlls/ole32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ole32.dll
-IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32
 
 C_SRCS = \
 	clipboard.c \
diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index 5e2d50561c8..4a048c62584 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleacc.dll
 IMPORTLIB = oleacc
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in
index 0e5f85c1ec1..c7b398586f7 100644
--- a/dlls/oleacc/tests/Makefile.in
+++ b/dlls/oleacc/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = oleacc.dll
-IMPORTS   = kernel32 oleacc
+IMPORTS   = oleacc
 
 C_SRCS = \
 	main.c
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 2145d80d031..c73a4af568c 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleaut32.dll
 IMPORTLIB = oleaut32
-IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32
 DELAYIMPORTS = comctl32 urlmon windowscodecs
 EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \
     -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \
diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in
index aba934ca418..571d7e72277 100644
--- a/dlls/oleaut32/tests/Makefile.in
+++ b/dlls/oleaut32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = oleaut32.dll
-IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
 
 C_SRCS = \
 	dispatch.c \
diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in
index 4aba3b73d5b..1cc88efc68f 100644
--- a/dlls/olecli.dll16/Makefile.in
+++ b/dlls/olecli.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli.dll16
-IMPORTS   = gdi32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,olecli32.dll
+IMPORTS   = gdi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll
 
 C_SRCS = olecli.c
 
diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in
index 82a4695c4b9..ee3bb8f5f05 100644
--- a/dlls/olecli32/Makefile.in
+++ b/dlls/olecli32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32.dll
 IMPORTLIB = olecli32
-IMPORTS   = ole32 gdi32 kernel32
+IMPORTS   = ole32 gdi32
 
 C_SRCS = \
 	olecli_main.c
diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in
index 3a96222b6b6..f611168d7fb 100644
--- a/dlls/oledb32/Makefile.in
+++ b/dlls/oledb32/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledb32.dll
-IMPORTS   = uuid oleaut32 ole32 user32 advapi32 kernel32
+IMPORTS   = uuid oleaut32 ole32 user32 advapi32
 
 C_SRCS = \
 	convert.c \
diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in
index 012eb2adc36..77b502b5a75 100644
--- a/dlls/oledb32/tests/Makefile.in
+++ b/dlls/oledb32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = oledb32.dll
-IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32
 
 C_SRCS = \
 	convert.c \
diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 70648f3b708..b7217d61a30 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg.dll
 IMPORTLIB = oledlg
-IMPORTS   = ole32 comdlg32 user32 advapi32 kernel32
+IMPORTS   = ole32 comdlg32 user32 advapi32
 
 C_SRCS = \
 	insobjdlg.c \
diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in
index 607bf16da6c..469e726f516 100644
--- a/dlls/olepro32/Makefile.in
+++ b/dlls/olepro32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32.dll
 IMPORTLIB = olepro32
-IMPORTS   = oleaut32 kernel32
+IMPORTS   = oleaut32
 
 C_SRCS = olepro32stubs.c
 
diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in
index 9049d269ba7..863e8dc3c5b 100644
--- a/dlls/olesvr.dll16/Makefile.in
+++ b/dlls/olesvr.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr.dll16
-IMPORTS   = gdi32 kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,olesvr32.dll
+IMPORTS   = gdi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll
 
 C_SRCS = olesvr.c
 
diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in
index ab76df601b4..874eb0eed44 100644
--- a/dlls/olesvr32/Makefile.in
+++ b/dlls/olesvr32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32.dll
 IMPORTLIB = olesvr32
-IMPORTS   = kernel32
 
 C_SRCS = \
 	olesvr_main.c
diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in
index b7cf2003f5e..c52ee83a99d 100644
--- a/dlls/olethk32/Makefile.in
+++ b/dlls/olethk32/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olethk32.dll
-IMPORTS   = kernel32
 
 C_SRCS = main.c
 
diff --git a/dlls/openal32/Makefile.in b/dlls/openal32/Makefile.in
index edd0785eb93..5f5640ea623 100644
--- a/dlls/openal32/Makefile.in
+++ b/dlls/openal32/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = openal32.dll
-IMPORTS   = kernel32 ntdll
 EXTRALIBS = @LIBOPENAL@ @FRAMEWORK_OPENAL@
 
 C_SRCS = \
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in
index 094615f09dd..c402adc6633 100644
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = opengl32.dll
 IMPORTLIB = opengl32
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
 
diff --git a/dlls/opengl32/tests/Makefile.in b/dlls/opengl32/tests/Makefile.in
index 65570494f6d..a44a8991f66 100644
--- a/dlls/opengl32/tests/Makefile.in
+++ b/dlls/opengl32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = opengl32.dll
-IMPORTS   = opengl32 user32 gdi32 kernel32
+IMPORTS   = opengl32 user32 gdi32
 
 C_SRCS = \
 	opengl.c
diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in
index b8a653d875b..0bc39e172fc 100644
--- a/dlls/pdh/Makefile.in
+++ b/dlls/pdh/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = pdh.dll
 IMPORTLIB = pdh
-IMPORTS   = kernel32
 
 C_SRCS = \
 	pdh_main.c
diff --git a/dlls/pdh/tests/Makefile.in b/dlls/pdh/tests/Makefile.in
index 32c52d37c53..fda66adbff8 100644
--- a/dlls/pdh/tests/Makefile.in
+++ b/dlls/pdh/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = pdh.dll
-IMPORTS   = pdh kernel32
+IMPORTS   = pdh
 
 C_SRCS = \
 	pdh.c
diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in
index 44af793317e..04c8bec12cc 100644
--- a/dlls/pidgen/Makefile.in
+++ b/dlls/pidgen/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = pidgen.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in
index 587502b00cf..057a539a955 100644
--- a/dlls/powrprof/Makefile.in
+++ b/dlls/powrprof/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = powrprof.dll
 IMPORTLIB = powrprof
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32
 
 C_SRCS = powrprof.c
 
diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in
index c6c923b5097..a52558c5c34 100644
--- a/dlls/printui/Makefile.in
+++ b/dlls/printui/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = printui.dll
-IMPORTS   = shell32 kernel32
+IMPORTS   = shell32
 
 C_SRCS = \
 	printui.c
diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in
index ec999f7f145..4170751f495 100644
--- a/dlls/propsys/Makefile.in
+++ b/dlls/propsys/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = propsys.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	propsys_main.c \
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index 05573b7a52b..613e7d47ac9 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = psapi.dll
 IMPORTLIB = psapi
-IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	psapi_main.c
diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in
index 999358a7c63..0818f1c8893 100644
--- a/dlls/psapi/tests/Makefile.in
+++ b/dlls/psapi/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = psapi.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	psapi_main.c
diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in
index d4f77dad2bb..2026fec2172 100644
--- a/dlls/pstorec/Makefile.in
+++ b/dlls/pstorec/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = pstorec.dll
-IMPORTS   = uuid kernel32
+IMPORTS   = uuid
 
 C_SRCS = \
 	pstorec.c
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in
index bd2398b59e8..fb99b5469c0 100644
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qcap.dll
-IMPORTS   = strmiids uuid ole32 gdi32 advapi32 kernel32
+IMPORTS   = strmiids uuid ole32 gdi32 advapi32
 
 C_SRCS = \
 	capturegraph.c \
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index 667b108a7ee..dc621e69d3b 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qedit.dll
-IMPORTS   = strmiids uuid oleaut32 ole32 advapi32 kernel32
+IMPORTS   = strmiids uuid oleaut32 ole32 advapi32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in
index 7a08df09cd8..1443c2fe40c 100644
--- a/dlls/qedit/tests/Makefile.in
+++ b/dlls/qedit/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = qedit.dll
-IMPORTS   = oleaut32 ole32 kernel32
+IMPORTS   = oleaut32 ole32
 
 C_SRCS = \
 	mediadet.c
diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in
index 365f02571dd..5ce3254cb46 100644
--- a/dlls/qmgr/Makefile.in
+++ b/dlls/qmgr/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qmgr.dll
-IMPORTS   = uuid wininet urlmon ole32 advapi32 kernel32
+IMPORTS   = uuid wininet urlmon ole32 advapi32
 
 C_SRCS = \
 	enum_files.c \
diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in
index c85b3560032..4dab95b5509 100644
--- a/dlls/qmgr/tests/Makefile.in
+++ b/dlls/qmgr/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = qmgr.dll
-IMPORTS   = ole32 shlwapi user32 kernel32
+IMPORTS   = ole32 shlwapi user32
 
 C_SRCS = \
 	enum_files.c \
diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in
index da6dd4d1cf5..4033bf79e98 100644
--- a/dlls/qmgrprxy/Makefile.in
+++ b/dlls/qmgrprxy/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qmgrprxy.dll
-IMPORTS   = rpcrt4 kernel32 ntdll
+IMPORTS   = rpcrt4
 EXTRADEFS = -DREGISTER_PROXY_DLL
 
 IDL_I_SRCS = qmgrprxy.idl
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 97962274128..6f86b94e317 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = quartz.dll
 IMPORTLIB = quartz
-IMPORTS   = strmiids uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = strmiids uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32
 EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL
 
 C_SRCS = \
diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in
index fa6254d0546..a83adfcb193 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   = oleaut32 ole32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 advapi32
 
 C_SRCS = \
 	avisplitter.c \
diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in
index f699cb1c496..7b851538619 100644
--- a/dlls/query/Makefile.in
+++ b/dlls/query/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = query.dll
-IMPORTS   = uuid kernel32
+IMPORTS   = uuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
diff --git a/dlls/rasapi16.dll16/Makefile.in b/dlls/rasapi16.dll16/Makefile.in
index 0f57650e58b..baf80b2be5e 100644
--- a/dlls/rasapi16.dll16/Makefile.in
+++ b/dlls/rasapi16.dll16/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi16.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,rasapi32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,rasapi32.dll
 
 @MAKE_DLL_RULES@
diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index e08ecda11b3..12e1c2f81aa 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32.dll
 IMPORTLIB = rasapi32
-IMPORTS   = kernel32
 
 C_SRCS = rasapi.c
 
diff --git a/dlls/rasapi32/tests/Makefile.in b/dlls/rasapi32/tests/Makefile.in
index daebd52b9e5..24854a22ce4 100644
--- a/dlls/rasapi32/tests/Makefile.in
+++ b/dlls/rasapi32/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = rasapi32.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	rasapi.c
diff --git a/dlls/rasdlg/Makefile.in b/dlls/rasdlg/Makefile.in
index ceb8d132772..795e391272b 100644
--- a/dlls/rasdlg/Makefile.in
+++ b/dlls/rasdlg/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasdlg.dll
 IMPORTLIB = rasdlg
-IMPORTS   = kernel32
 
 C_SRCS = \
 	rasdlg_main.c
diff --git a/dlls/resutils/Makefile.in b/dlls/resutils/Makefile.in
index 5682c6d0113..f3b78f75bce 100644
--- a/dlls/resutils/Makefile.in
+++ b/dlls/resutils/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = resutils.dll
 IMPORTLIB = resutils
-IMPORTS   = kernel32
 
 C_SRCS = \
 	resutils.c
diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in
index bbf72d02623..e0a2861e6ea 100644
--- a/dlls/riched20/Makefile.in
+++ b/dlls/riched20/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched20.dll
 IMPORTLIB = riched20
-IMPORTS   = uuid ole32 oleaut32 imm32 user32 gdi32 kernel32
+IMPORTS   = uuid ole32 oleaut32 imm32 user32 gdi32
 
 C_SRCS = \
 	caret.c \
diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in
index 3f02925f2ef..aa247b06437 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   = ole32 oleaut32 user32 gdi32 kernel32
+IMPORTS   = ole32 oleaut32 user32 gdi32
 
 C_SRCS = \
 	editor.c \
diff --git a/dlls/riched32/Makefile.in b/dlls/riched32/Makefile.in
index 2abcf9361df..2803d901e3c 100644
--- a/dlls/riched32/Makefile.in
+++ b/dlls/riched32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32.dll
-IMPORTS   = riched20 user32 kernel32
+IMPORTS   = riched20 user32
 
 C_SRCS = \
 	richedit.c
diff --git a/dlls/riched32/tests/Makefile.in b/dlls/riched32/tests/Makefile.in
index ed794ccd5dd..08304165024 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 kernel32
+IMPORTS   = ole32 user32
 
 C_SRCS = \
 	editor.c
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 686144a3f9f..b1f4cadfd9d 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4.dll
 IMPORTLIB = rpcrt4
-IMPORTS   = uuid advapi32 kernel32 ntdll
+IMPORTS   = uuid advapi32
 DELAYIMPORTS = iphlpapi wininet secur32 user32
 EXTRALIBS = @SOCKETLIBS@
 
diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in
index 29a5e3a410d..a2609dd9ae8 100644
--- a/dlls/rpcrt4/tests/Makefile.in
+++ b/dlls/rpcrt4/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = rpcrt4.dll
-IMPORTS   = ole32 rpcrt4 advapi32 kernel32
+IMPORTS   = ole32 rpcrt4 advapi32
 EXTRAIDLFLAGS = --prefix-server=s_
 
 IDL_C_SRCS = server.idl
diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in
index f72c6c217d7..84158baf926 100644
--- a/dlls/rsabase/Makefile.in
+++ b/dlls/rsabase/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rsabase.dll
-IMPORTS   = rsaenh kernel32
+IMPORTS   = rsaenh
 
 RC_SRCS = version.rc
 
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index ea6f75799e2..c96621eb1f4 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rsaenh.dll
 IMPORTLIB = rsaenh
-IMPORTS   = crypt32 advapi32 kernel32
+IMPORTS   = crypt32 advapi32
 
 C_SRCS = \
 	aes.c \
diff --git a/dlls/rsaenh/tests/Makefile.in b/dlls/rsaenh/tests/Makefile.in
index 6b1691ebcc4..1133a1bd3ec 100644
--- a/dlls/rsaenh/tests/Makefile.in
+++ b/dlls/rsaenh/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = rsaenh.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	rsaenh.c
diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in
index c922c847602..27d721d1688 100644
--- a/dlls/rtutils/Makefile.in
+++ b/dlls/rtutils/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rtutils.dll
 IMPORTLIB = rtutils
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/samlib/Makefile.in b/dlls/samlib/Makefile.in
index 860dc6367cb..8e2e3c22706 100644
--- a/dlls/samlib/Makefile.in
+++ b/dlls/samlib/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = samlib.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in
index 8872a8b4b59..efed65e0aa0 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
+IMPORTS   = comctl32 user32 gdi32
 EXTRAINCL = @SANEINCL@
 
 C_SRCS = \
diff --git a/dlls/sccbase/Makefile.in b/dlls/sccbase/Makefile.in
index cf678c01e4f..d091c2bd017 100644
--- a/dlls/sccbase/Makefile.in
+++ b/dlls/sccbase/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sccbase.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in
index 7a640a1e364..0d19258b0ae 100644
--- a/dlls/schannel/Makefile.in
+++ b/dlls/schannel/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = schannel.dll
-IMPORTS   = secur32 kernel32
+IMPORTS   = secur32
 
 C_SRCS = \
 	lsamode.c \
diff --git a/dlls/schannel/tests/Makefile.in b/dlls/schannel/tests/Makefile.in
index 609e2a9eb82..0cf372bb301 100644
--- a/dlls/schannel/tests/Makefile.in
+++ b/dlls/schannel/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = schannel.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in
index 0e44d4940e7..7ad2397b65d 100644
--- a/dlls/secur32/Makefile.in
+++ b/dlls/secur32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = secur32.dll
 IMPORTLIB = secur32
-IMPORTS   = netapi32 advapi32 kernel32 ntdll
+IMPORTS   = netapi32 advapi32
 DELAYIMPORTS = crypt32
 EXTRAINCL = @GNUTLSINCL@
 
diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in
index 54ea51c1668..5b2d3ca6789 100644
--- a/dlls/secur32/tests/Makefile.in
+++ b/dlls/secur32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = secur32.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/security/Makefile.in b/dlls/security/Makefile.in
index 4edfac33821..344e0c0eb04 100644
--- a/dlls/security/Makefile.in
+++ b/dlls/security/Makefile.in
@@ -3,6 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = security.dll
-IMPORTS   = secur32 kernel32
+IMPORTS   = secur32
 
 @MAKE_DLL_RULES@
diff --git a/dlls/sensapi/Makefile.in b/dlls/sensapi/Makefile.in
index 1d969fce4d8..57a4121ffae 100644
--- a/dlls/sensapi/Makefile.in
+++ b/dlls/sensapi/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sensapi.dll
 IMPORTLIB = sensapi
-IMPORTS   = kernel32
 
 C_SRCS = \
 	sensapi.c
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 5959d9074fc..43499393b0d 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui.dll
 IMPORTLIB = serialui
-IMPORTS   = user32 advapi32 kernel32
+IMPORTS   = user32 advapi32
 
 C_SRCS = \
 	confdlg.c
diff --git a/dlls/serialui/tests/Makefile.in b/dlls/serialui/tests/Makefile.in
index 2b8ecea29fc..e23598279d0 100644
--- a/dlls/serialui/tests/Makefile.in
+++ b/dlls/serialui/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = serialui.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	confdlg.c
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 50293f6f293..61ac61e1a22 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = setupapi.dll
 IMPORTLIB = setupapi
-IMPORTS   = uuid user32 version advapi32 rpcrt4 kernel32 ntdll
+IMPORTS   = uuid user32 version advapi32 rpcrt4
 DELAYIMPORTS = shell32 wintrust ole32 winspool comdlg32
 
 C_SRCS = \
diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in
index 332d8a0da20..27de9ff6954 100644
--- a/dlls/setupapi/tests/Makefile.in
+++ b/dlls/setupapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = setupapi.dll
-IMPORTS   = setupapi user32 advapi32 kernel32
+IMPORTS   = setupapi user32 advapi32
 
 C_SRCS = \
 	devinst.c \
diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in
index 73cecccc121..1847e61eac8 100644
--- a/dlls/setupx.dll16/Makefile.in
+++ b/dlls/setupx.dll16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = setupx.dll16
-IMPORTS   = setupapi user32 advapi32 kernel32 kernel
+IMPORTS   = setupapi user32 advapi32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,setupapi.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,setupapi.dll
 
 C_SRCS = \
 	devinst16.c \
diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in
index dea5def92ce..e14aa8e2e3a 100644
--- a/dlls/sfc/Makefile.in
+++ b/dlls/sfc/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sfc.dll
 IMPORTLIB = sfc
-IMPORTS   = sfc_os kernel32
+IMPORTS   = sfc_os
 
 C_SRCS = sfc_main.c
 
diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in
index 29678e7e93a..d064109bfb6 100644
--- a/dlls/sfc_os/Makefile.in
+++ b/dlls/sfc_os/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sfc_os.dll
 IMPORTLIB = sfc_os
-IMPORTS   = kernel32
 
 C_SRCS = sfc_os.c
 
diff --git a/dlls/shdoclc/Makefile.in b/dlls/shdoclc/Makefile.in
index b6d28676730..c6d54a466ce 100644
--- a/dlls/shdoclc/Makefile.in
+++ b/dlls/shdoclc/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdoclc.dll
-IMPORTS   = kernel32
 
 RC_SRCS = \
 	Bg.rc \
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index f6239329980..e8ee8dd3ec3 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
 IMPORTLIB = shdocvw
-IMPORTS   = uuid shell32 shlwapi user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid shell32 shlwapi user32 gdi32 advapi32
 DELAYIMPORTS = version urlmon ole32 oleaut32
 
 C_SRCS = \
diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in
index 5e4e087bb9f..0ef857e6d0b 100644
--- a/dlls/shdocvw/tests/Makefile.in
+++ b/dlls/shdocvw/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shdocvw.dll
-IMPORTS   = shell32 ole32 oleaut32 user32 gdi32 advapi32 kernel32
+IMPORTS   = shell32 ole32 oleaut32 user32 gdi32 advapi32
 
 C_SRCS = \
 	intshcut.c \
diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in
index ae43d9e3826..f248efbac74 100644
--- a/dlls/shell.dll16/Makefile.in
+++ b/dlls/shell.dll16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell.dll16
-IMPORTS   = shell32 user32 gdi32 advapi32 kernel32 kernel
+IMPORTS   = shell32 user32 gdi32 advapi32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,shell32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,shell32.dll
 EXTRARCFLAGS  = -O res16
 
 C_SRCS = shell.c
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 16f99f8e48f..14a17bd0cd9 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32.dll
 IMPORTLIB = shell32
-IMPORTS   = uuid shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid shlwapi comctl32 user32 gdi32 advapi32
 DELAYIMPORTS = ole32 oleaut32 shdocvw version
 
 C_SRCS = \
diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index 0799944bd32..f02b5462342 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 user32 advapi32 kernel32
+IMPORTS   = shell32 ole32 oleaut32 user32 advapi32
 
 C_SRCS = \
 	appbar.c \
diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in
index f8f0461fbe1..a6061991a76 100644
--- a/dlls/shfolder/Makefile.in
+++ b/dlls/shfolder/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shfolder.dll
 IMPORTLIB = shfolder
-IMPORTS   = shell32 kernel32
+IMPORTS   = shell32
 
 RC_SRCS = version.rc
 
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 57ef9cca139..7f75cae7bca 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi.dll
 IMPORTLIB = shlwapi
-IMPORTS   = uuid user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = uuid user32 gdi32 advapi32
 DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version
 
 C_SRCS = \
diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in
index 1e5cb5eb075..a810f84f069 100644
--- a/dlls/shlwapi/tests/Makefile.in
+++ b/dlls/shlwapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shlwapi.dll
-IMPORTS   = shell32 shlwapi user32 ole32 oleaut32 advapi32 kernel32
+IMPORTS   = shell32 shlwapi user32 ole32 oleaut32 advapi32
 
 C_SRCS = \
 	assoc.c \
diff --git a/dlls/slbcsp/Makefile.in b/dlls/slbcsp/Makefile.in
index ae4d1282fde..94cd4fca4e8 100644
--- a/dlls/slbcsp/Makefile.in
+++ b/dlls/slbcsp/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = slbcsp.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in
index dfc15e783f6..670246da87b 100644
--- a/dlls/slc/Makefile.in
+++ b/dlls/slc/Makefile.in
@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = slc.dll
 IMPORTLIB = slc
-IMPORTS   = kernel32
 
 C_SRCS = \
 	slc.c
diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in
index 3eb4ee144e3..445fcffaed8 100644
--- a/dlls/snmpapi/Makefile.in
+++ b/dlls/snmpapi/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = snmpapi.dll
 IMPORTLIB = snmpapi
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/snmpapi/tests/Makefile.in b/dlls/snmpapi/tests/Makefile.in
index 86ce182dd58..b213339ca28 100644
--- a/dlls/snmpapi/tests/Makefile.in
+++ b/dlls/snmpapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = snmpapi.dll
-IMPORTS   = snmpapi kernel32
+IMPORTS   = snmpapi
 
 C_SRCS = \
 	util.c
diff --git a/dlls/softpub/Makefile.in b/dlls/softpub/Makefile.in
index 34189ee0bee..aff909a6264 100644
--- a/dlls/softpub/Makefile.in
+++ b/dlls/softpub/Makefile.in
@@ -3,6 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = softpub.dll
-IMPORTS   = wintrust kernel32
+IMPORTS   = wintrust
 
 @MAKE_DLL_RULES@
diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in
index 9b93b30a251..9b4264944b0 100644
--- a/dlls/sound.drv16/Makefile.in
+++ b/dlls/sound.drv16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sound.drv16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll
 
 C_SRCS = sound.c
 
diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in
index 325cece5fa6..c5525a8b1f5 100644
--- a/dlls/spoolss/Makefile.in
+++ b/dlls/spoolss/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR      = @srcdir@
 VPATH       = @srcdir@
 MODULE      = spoolss.dll
 IMPORTLIB   = spoolss
-IMPORTS     = winspool kernel32
+IMPORTS     = winspool
 
 C_SRCS = \
 	router.c \
diff --git a/dlls/spoolss/tests/Makefile.in b/dlls/spoolss/tests/Makefile.in
index c3c457d900a..bec919c715a 100644
--- a/dlls/spoolss/tests/Makefile.in
+++ b/dlls/spoolss/tests/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = spoolss.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	spoolss.c
diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in
index 81fc482ca2f..c860abd6c5e 100644
--- a/dlls/stdole2.tlb/Makefile.in
+++ b/dlls/stdole2.tlb/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = stdole2.tlb
-IMPORTS   = kernel32
 
 RC_SRCS = rsrc.rc
 IDL_TLB_SRCS = std_ole_v2.idl
diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in
index d38d37c91ba..9cfb373f647 100644
--- a/dlls/stdole32.tlb/Makefile.in
+++ b/dlls/stdole32.tlb/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = stdole32.tlb
-IMPORTS   = kernel32
 
 RC_SRCS = rsrc.rc
 IDL_TLB_SRCS = std_ole_v1.idl
diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in
index 03f32d4c427..d9ef1a64559 100644
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sti.dll
 IMPORTLIB = sti
-IMPORTS   = uuid ole32 oleaut32 rpcrt4 advapi32 kernel32
+IMPORTS   = uuid ole32 oleaut32 rpcrt4 advapi32
 EXTRADEFS = -DENTRY_PREFIX=STI_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL
 
 C_SRCS = \
diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in
index 754a3f75110..83b76e3f33b 100644
--- a/dlls/sti/tests/Makefile.in
+++ b/dlls/sti/tests/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = sti.dll
-IMPORTS   = ole32 kernel32
+IMPORTS   = ole32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/storage.dll16/Makefile.in b/dlls/storage.dll16/Makefile.in
index f6793d3308b..15a2e59b022 100644
--- a/dlls/storage.dll16/Makefile.in
+++ b/dlls/storage.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = storage.dll16
-IMPORTS   = uuid ole32 kernel32 kernel ntdll
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+IMPORTS   = uuid ole32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
 C_SRCS = storage.c
 
diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in
index faae603f1d3..fd9ce7a058a 100644
--- a/dlls/stress.dll16/Makefile.in
+++ b/dlls/stress.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = stress.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 C_SRCS = stress.c
 
diff --git a/dlls/svrapi/Makefile.in b/dlls/svrapi/Makefile.in
index 4612d4e9e25..61c866421e0 100644
--- a/dlls/svrapi/Makefile.in
+++ b/dlls/svrapi/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = svrapi.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	svrapi_main.c
diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in
index 66e42aaf949..5046aa0a18d 100644
--- a/dlls/sxs/Makefile.in
+++ b/dlls/sxs/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sxs.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	sxs.c
diff --git a/dlls/system.drv16/Makefile.in b/dlls/system.drv16/Makefile.in
index 9b5273e7dfb..e3ba60a5d01 100644
--- a/dlls/system.drv16/Makefile.in
+++ b/dlls/system.drv16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = system.drv16
-IMPORTS   = kernel32 kernel ntdll
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 C_SRCS = system.c
 
diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in
index e85805a8f63..43cd8e9b68b 100644
--- a/dlls/t2embed/Makefile.in
+++ b/dlls/t2embed/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = t2embed.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in
index 11176209e35..cee121a1143 100644
--- a/dlls/tapi32/Makefile.in
+++ b/dlls/tapi32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = tapi32.dll
 IMPORTLIB = tapi32
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	assisted.c \
diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in
index 7ab487e847d..7fe3c813890 100644
--- a/dlls/toolhelp.dll16/Makefile.in
+++ b/dlls/toolhelp.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = toolhelp.dll16
-IMPORTS   = kernel32 kernel ntdll
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 C_SRCS = toolhelp.c
 
diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in
index 6c6fc9f1d32..11a8b87618e 100644
--- a/dlls/traffic/Makefile.in
+++ b/dlls/traffic/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = traffic.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	traffic_main.c
diff --git a/dlls/twain.dll16/Makefile.in b/dlls/twain.dll16/Makefile.in
index 85b51d57a7a..00be9408c54 100644
--- a/dlls/twain.dll16/Makefile.in
+++ b/dlls/twain.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = twain.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,twain_32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,twain_32.dll
 
 C_SRCS = twain.c
 
diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index bc46aad3e84..236cceb55a7 100644
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = twain_32.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	dsm_ctrl.c \
diff --git a/dlls/twain_32/tests/Makefile.in b/dlls/twain_32/tests/Makefile.in
index d07d11ee6e3..b64a5af5cbc 100644
--- a/dlls/twain_32/tests/Makefile.in
+++ b/dlls/twain_32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = twain_32.dll
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32
 
 C_SRCS = \
 	dsm.c
diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in
index 9126d3ee06d..038918f18b7 100644
--- a/dlls/typelib.dll16/Makefile.in
+++ b/dlls/typelib.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = typelib.dll16
-IMPORTS   = oleaut32 advapi32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll
+IMPORTS   = oleaut32 advapi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll
 
 C_SRCS = typelib.c
 
diff --git a/dlls/unicows/Makefile.in b/dlls/unicows/Makefile.in
index 5dd15fa9024..8f2d1dcd88e 100644
--- a/dlls/unicows/Makefile.in
+++ b/dlls/unicows/Makefile.in
@@ -5,6 +5,6 @@ VPATH     = @srcdir@
 MODULE    = unicows.dll
 IMPORTLIB = unicows
 IMPORTS   = avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool \
-            rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 kernel32
+            rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32
 
 @MAKE_DLL_RULES@
diff --git a/dlls/updspapi/Makefile.in b/dlls/updspapi/Makefile.in
index 8ba88805049..18d6d39cc46 100644
--- a/dlls/updspapi/Makefile.in
+++ b/dlls/updspapi/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = updspapi.dll
-IMPORTS   = setupapi kernel32
+IMPORTS   = setupapi
 
 C_SRCS = \
 	main.c
diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in
index 7d82d89ee2a..e3f8ddaf629 100644
--- a/dlls/url/Makefile.in
+++ b/dlls/url/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = url.dll
 IMPORTLIB = url
-IMPORTS   = shell32 shlwapi kernel32
+IMPORTS   = shell32 shlwapi
 
 C_SRCS = url_main.c
 
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index 71567ec259c..35be64edf23 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
 IMPORTLIB = urlmon
-IMPORTS   = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll
+IMPORTS   = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32
 EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \
 	    -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}"
 
diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in
index c87b9e0d23e..8bf05c3b7a0 100644
--- a/dlls/urlmon/tests/Makefile.in
+++ b/dlls/urlmon/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = urlmon.dll
-IMPORTS   = urlmon ole32 oleaut32 user32 advapi32 kernel32
+IMPORTS   = urlmon ole32 oleaut32 user32 advapi32
 
 C_SRCS = \
 	generated.c \
diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in
index 9fe2fedede5..38f1fccafb2 100644
--- a/dlls/usbd.sys/Makefile.in
+++ b/dlls/usbd.sys/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = usbd.sys
 IMPORTLIB = usbd.sys
-IMPORTS   = kernel32 ntoskrnl.exe
+IMPORTS   = ntoskrnl.exe
 EXTRADLLFLAGS = -Wb,--subsystem,native
 
 C_SRCS = \
diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in
index c0ac137b571..f57e9188312 100644
--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user.exe16
-IMPORTS   = mpr user32 gdi32 kernel32 kernel ntdll
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,user32.dll,--heap,65520
+IMPORTS   = mpr user32 gdi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
 EXTRARCFLAGS  = -O res16
 
 C_SRCS = \
diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in
index 48aea120452..ba55db9ac46 100644
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32.dll
 IMPORTLIB = user32
-IMPORTS   = gdi32 advapi32 kernel32 ntdll
+IMPORTS   = gdi32 advapi32
 DELAYIMPORTS = imm32
 
 C_SRCS = \
diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in
index 9018b40d7b6..f6f76160fa2 100644
--- a/dlls/user32/tests/Makefile.in
+++ b/dlls/user32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = user32.dll
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32
 
 C_SRCS = \
 	broadcast.c \
diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in
index 2d4420de2f8..f3a4149d635 100644
--- a/dlls/userenv/Makefile.in
+++ b/dlls/userenv/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = userenv.dll
-IMPORTS   = kernel32 ntdll
 IMPORTLIB = userenv
 
 C_SRCS = \
diff --git a/dlls/userenv/tests/Makefile.in b/dlls/userenv/tests/Makefile.in
index 5c4559eb753..79bc9af48e5 100644
--- a/dlls/userenv/tests/Makefile.in
+++ b/dlls/userenv/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = userenv.dll
-IMPORTS   = userenv advapi32 kernel32
+IMPORTS   = userenv advapi32
 
 C_SRCS = \
 	userenv.c
diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in
index f52aafb5dca..983f29123f8 100644
--- a/dlls/usp10/Makefile.in
+++ b/dlls/usp10/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = usp10.dll
 IMPORTLIB = usp10
-IMPORTS   = gdi32 kernel32
+IMPORTS   = gdi32
 
 C_SRCS = \
 	bidi.c \
diff --git a/dlls/usp10/tests/Makefile.in b/dlls/usp10/tests/Makefile.in
index c461590d8f3..19e2e8844c1 100644
--- a/dlls/usp10/tests/Makefile.in
+++ b/dlls/usp10/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = usp10.dll
-IMPORTS   = usp10 user32 gdi32 kernel32
+IMPORTS   = usp10 user32 gdi32
 
 C_SRCS = \
 	usp10.c
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index 6e7dfb48334..4cdb145344b 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uxtheme.dll
 IMPORTLIB = uxtheme
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32
 DELAYIMPORTS = msimg32
 
 C_SRCS = \
diff --git a/dlls/uxtheme/tests/Makefile.in b/dlls/uxtheme/tests/Makefile.in
index 3420be9ce7e..09bf6b9cdd5 100644
--- a/dlls/uxtheme/tests/Makefile.in
+++ b/dlls/uxtheme/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = uxtheme.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	system.c
diff --git a/dlls/vdhcp.vxd/Makefile.in b/dlls/vdhcp.vxd/Makefile.in
index bec67a37a7a..b54b20f24c9 100644
--- a/dlls/vdhcp.vxd/Makefile.in
+++ b/dlls/vdhcp.vxd/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vdhcp.vxd
-IMPORTS   = kernel32
 
 C_SRCS = \
 	vdhcp.c
diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in
index 094347b2353..ddd637f55fe 100644
--- a/dlls/vdmdbg/Makefile.in
+++ b/dlls/vdmdbg/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vdmdbg.dll
 IMPORTLIB = vdmdbg
-IMPORTS   = kernel32
 
 C_SRCS = \
 	vdmdbg.c
diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in
index 68bc397e9c2..1306784b631 100644
--- a/dlls/ver.dll16/Makefile.in
+++ b/dlls/ver.dll16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ver.dll16
-IMPORTS   = version lz32 kernel32 kernel
+IMPORTS   = version lz32
 
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,version.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,version.dll
 
 C_SRCS = version.c
 
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index 0ae0d407e7f..cb4a84a263c 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version.dll
 IMPORTLIB = version
-IMPORTS   = lz32 kernel32 ntdll
+IMPORTS   = lz32
 
 C_SRCS = \
 	info.c \
diff --git a/dlls/version/tests/Makefile.in b/dlls/version/tests/Makefile.in
index 8b2ce2939bb..ad70bcb7026 100644
--- a/dlls/version/tests/Makefile.in
+++ b/dlls/version/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = version.dll
-IMPORTS   = version kernel32
+IMPORTS   = version
 
 C_SRCS = \
 	info.c \
diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in
index 05880b69a7a..5b3a11d065c 100644
--- a/dlls/vmm.vxd/Makefile.in
+++ b/dlls/vmm.vxd/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vmm.vxd
-IMPORTS   = kernel32
 
 C_SRCS = \
 	vmm.c
diff --git a/dlls/vnbt.vxd/Makefile.in b/dlls/vnbt.vxd/Makefile.in
index e21d5b7a3d6..171a929b10e 100644
--- a/dlls/vnbt.vxd/Makefile.in
+++ b/dlls/vnbt.vxd/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vnbt.vxd
-IMPORTS   = iphlpapi ws2_32 kernel32
+IMPORTS   = iphlpapi ws2_32
 
 C_SRCS = \
 	vnbt.c
diff --git a/dlls/vnetbios.vxd/Makefile.in b/dlls/vnetbios.vxd/Makefile.in
index 0a2603dbd97..47316aceb02 100644
--- a/dlls/vnetbios.vxd/Makefile.in
+++ b/dlls/vnetbios.vxd/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vnetbios.vxd
-IMPORTS   = netapi32 kernel32
+IMPORTS   = netapi32
 
 C_SRCS = \
 	vnetbios.c
diff --git a/dlls/vtdapi.vxd/Makefile.in b/dlls/vtdapi.vxd/Makefile.in
index 8520c20a1d7..89e89cfe692 100644
--- a/dlls/vtdapi.vxd/Makefile.in
+++ b/dlls/vtdapi.vxd/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vtdapi.vxd
-IMPORTS   = kernel32
 
 C_SRCS = \
 	vtdapi.c
diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in
index c288b1342f1..f0c90846054 100644
--- a/dlls/vwin32.vxd/Makefile.in
+++ b/dlls/vwin32.vxd/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vwin32.vxd
-IMPORTS   = kernel32 kernel
+IMPORTS   = kernel
 
 C_SRCS = \
 	vwin32.c
diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in
index 71d86b5fe6a..07618e06b02 100644
--- a/dlls/w32skrnl/Makefile.in
+++ b/dlls/w32skrnl/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = w32skrnl.dll
-IMPORTS   = kernel32 kernel ntdll
+IMPORTS   = kernel
 
 C_SRCS = w32skernel.c
 
diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in
index 68d51b4e5c4..4c3c87134e5 100644
--- a/dlls/w32sys.dll16/Makefile.in
+++ b/dlls/w32sys.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = w32sys.dll16
-IMPORTS   = kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll
 
 C_SRCS = w32sys.c
 
diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in
index 548add49d5b..f07a42037cc 100644
--- a/dlls/wbemprox/Makefile.in
+++ b/dlls/wbemprox/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wbemprox.dll
-IMPORTS   = ole32 advapi32 kernel32
+IMPORTS   = ole32 advapi32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in
index 9574472e102..88eca654b29 100644
--- a/dlls/wiaservc/Makefile.in
+++ b/dlls/wiaservc/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wiaservc.dll
-IMPORTS   = uuid ole32 advapi32 kernel32
+IMPORTS   = uuid ole32 advapi32
 
 C_SRCS = \
 	factory.c \
diff --git a/dlls/win32s16.dll16/Makefile.in b/dlls/win32s16.dll16/Makefile.in
index ef81916113b..b3969da0789 100644
--- a/dlls/win32s16.dll16/Makefile.in
+++ b/dlls/win32s16.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = win32s16.dll16
-IMPORTS   = kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll
 
 C_SRCS = win32s16.c
 
diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in
index ef6bd80004e..1ceca06dbe3 100644
--- a/dlls/win87em.dll16/Makefile.in
+++ b/dlls/win87em.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = win87em.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 C_SRCS = win87em.c
 
diff --git a/dlls/winaspi.dll16/Makefile.in b/dlls/winaspi.dll16/Makefile.in
index ad73410e741..0a25326dbb0 100644
--- a/dlls/winaspi.dll16/Makefile.in
+++ b/dlls/winaspi.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winaspi.dll16
-IMPORTS   = advapi32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,wnaspi32.dll
+IMPORTS   = advapi32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,wnaspi32.dll
 
 C_SRCS = winaspi.c
 
diff --git a/dlls/windebug.dll16/Makefile.in b/dlls/windebug.dll16/Makefile.in
index fbc07c917ad..eb5e7632117 100644
--- a/dlls/windebug.dll16/Makefile.in
+++ b/dlls/windebug.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = windebug.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 C_SRCS = windebug.c
 
diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index 44e17c9e1de..5d60aceb3fd 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = windowscodecs.dll
 IMPORTLIB = windowscodecs
-IMPORTS   = uuid ole32 shlwapi advapi32 kernel32
+IMPORTS   = uuid ole32 shlwapi advapi32
 EXTRAINCL = @PNGINCL@
 
 C_SRCS = \
diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in
index 382fb7efe3a..d78da2e0a0f 100644
--- a/dlls/windowscodecs/tests/Makefile.in
+++ b/dlls/windowscodecs/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = windowscodecs.dll
-IMPORTS   = kernel32 ole32 windowscodecs
+IMPORTS   = ole32 windowscodecs
 
 C_SRCS = \
 	bmpformat.c \
diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
index 0d4552aba8d..934f49c464f 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   = dxguid uuid winmm user32 advapi32 kernel32
+IMPORTS   = dxguid uuid winmm user32 advapi32
 EXTRALIBS = @ALSALIBS@
 
 C_SRCS = \
diff --git a/dlls/wineaudioio.drv/Makefile.in b/dlls/wineaudioio.drv/Makefile.in
index d35961aa51f..ec7c8a0d390 100644
--- a/dlls/wineaudioio.drv/Makefile.in
+++ b/dlls/wineaudioio.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineaudioio.drv
-IMPORTS   = dxguid uuid winmm user32 kernel32 ntdll
+IMPORTS   = dxguid uuid winmm user32
 EXTRALIBS = @AUDIOIOLIBS@
 
 C_SRCS = \
diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in
index e1ca45b54dc..d449e16bd13 100644
--- a/dlls/winecoreaudio.drv/Makefile.in
+++ b/dlls/winecoreaudio.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecoreaudio.drv
-IMPORTS   = uuid winmm user32 kernel32
+IMPORTS   = uuid winmm user32
 EXTRALIBS = @COREAUDIO@
 
 C_SRCS = \
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index 4f74c8e9ed1..bbf8532ec49 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wined3d.dll
 IMPORTLIB = wined3d
-IMPORTS   = uuid user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid user32 gdi32 advapi32
 
 C_SRCS = \
 	arb_program_shader.c \
diff --git a/dlls/wineesd.drv/Makefile.in b/dlls/wineesd.drv/Makefile.in
index ac4f1a92f35..0575bb08607 100644
--- a/dlls/wineesd.drv/Makefile.in
+++ b/dlls/wineesd.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineesd.drv
-IMPORTS   = dxguid uuid winmm user32 kernel32
+IMPORTS   = dxguid uuid winmm user32
 EXTRAINCL = @ESDINCL@
 EXTRALIBS = @ESDLIBS@
 
diff --git a/dlls/winejack.drv/Makefile.in b/dlls/winejack.drv/Makefile.in
index f6b65a5c58d..a0614be12e8 100644
--- a/dlls/winejack.drv/Makefile.in
+++ b/dlls/winejack.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winejack.drv
-IMPORTS   = dxguid uuid winmm user32 kernel32
+IMPORTS   = dxguid uuid winmm user32
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winejoystick.drv/Makefile.in b/dlls/winejoystick.drv/Makefile.in
index c52a6d78869..eeb845d31fa 100644
--- a/dlls/winejoystick.drv/Makefile.in
+++ b/dlls/winejoystick.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winejoystick.drv
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = \
 	joystick.c
diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in
index f3d1a844845..294435ea5e8 100644
--- a/dlls/winemapi/Makefile.in
+++ b/dlls/winemapi/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemapi.dll
-IMPORTS   = shlwapi shell32 kernel32
+IMPORTS   = shlwapi shell32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/winemp3.acm/Makefile.in b/dlls/winemp3.acm/Makefile.in
index bed3e0251e4..d049c06bfd9 100644
--- a/dlls/winemp3.acm/Makefile.in
+++ b/dlls/winemp3.acm/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemp3.acm
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 EXTRALIBS = @LIBMPG123@ @COREAUDIO@
 
 C_SRCS = \
diff --git a/dlls/winenas.drv/Makefile.in b/dlls/winenas.drv/Makefile.in
index 45d0f21d133..301db714dc3 100644
--- a/dlls/winenas.drv/Makefile.in
+++ b/dlls/winenas.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winenas.drv
-IMPORTS   = dxguid uuid winmm user32 kernel32
+IMPORTS   = dxguid uuid winmm user32
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = @NASLIBS@
 
diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in
index a2c5466fbc5..7b77dbc1e16 100644
--- a/dlls/wineoss.drv/Makefile.in
+++ b/dlls/wineoss.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
-IMPORTS   = dxguid uuid winmm user32 kernel32
+IMPORTS   = dxguid uuid winmm user32
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in
index 89f95daae89..7f9e333c588 100644
--- a/dlls/wineps.drv/Makefile.in
+++ b/dlls/wineps.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineps.drv
-IMPORTS   = user32 gdi32 winspool advapi32 kernel32
+IMPORTS   = user32 gdi32 winspool advapi32
 EXTRAINCL = @FREETYPEINCL@ @CUPSINCL@
 
 C_SRCS = \
diff --git a/dlls/wineps16.drv16/Makefile.in b/dlls/wineps16.drv16/Makefile.in
index 023409df215..36ef32e3ae8 100644
--- a/dlls/wineps16.drv16/Makefile.in
+++ b/dlls/wineps16.drv16/Makefile.in
@@ -3,9 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineps16.drv16
-IMPORTS   = kernel32
-
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRADLLFLAGS = -m16
 
 C_SRCS = driver.c
 
diff --git a/dlls/winequartz.drv/Makefile.in b/dlls/winequartz.drv/Makefile.in
index 8e8421fbb03..c2527e15654 100644
--- a/dlls/winequartz.drv/Makefile.in
+++ b/dlls/winequartz.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winequartz.drv
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32
 
 C_SRCS = \
 	quartzdrv_main.c
diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in
index 6e16e38d920..e381b95ac17 100644
--- a/dlls/winex11.drv/Makefile.in
+++ b/dlls/winex11.drv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winex11.drv
-IMPORTS   = user32 gdi32 advapi32 imm32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32 imm32
 DELAYIMPORTS = comctl32
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
diff --git a/dlls/wing.dll16/Makefile.in b/dlls/wing.dll16/Makefile.in
index 23f14cd445a..e64f70f944f 100644
--- a/dlls/wing.dll16/Makefile.in
+++ b/dlls/wing.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wing.dll16
-IMPORTS   = gdi32 kernel32 kernel
-EXTRADLLFLAGS = -Wb,--subsystem,win16
+IMPORTS   = gdi32
+EXTRADLLFLAGS = -m16
 
 C_SRCS = wing.c
 
diff --git a/dlls/wing32/Makefile.in b/dlls/wing32/Makefile.in
index a27e6832ac7..7f95153ed2a 100644
--- a/dlls/wing32/Makefile.in
+++ b/dlls/wing32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wing32.dll
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32
 
 C_SRCS = wing32.c
 
diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in
index b563ce1badd..f256f6685d1 100644
--- a/dlls/winhttp/Makefile.in
+++ b/dlls/winhttp/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhttp.dll
 IMPORTLIB = winhttp
-IMPORTS   = shlwapi kernel32
+IMPORTS   = shlwapi
 DELAYIMPORTS = crypt32 advapi32
 EXTRALIBS = @SOCKETLIBS@
 
diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in
index 6029ecf5c65..1a9e36b9eab 100644
--- a/dlls/winhttp/tests/Makefile.in
+++ b/dlls/winhttp/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = winhttp.dll
-IMPORTS   = winhttp crypt32 advapi32 ws2_32 kernel32
+IMPORTS   = winhttp crypt32 advapi32 ws2_32
 
 C_SRCS = \
 	notification.c \
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 1b24566409c..e9c8dc43762 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet.dll
 IMPORTLIB = wininet
-IMPORTS   = mpr shlwapi shell32 user32 advapi32 kernel32 ntdll
+IMPORTS   = mpr shlwapi shell32 user32 advapi32
 DELAYIMPORTS = secur32 crypt32
 EXTRALIBS = @SOCKETLIBS@ @ZLIB@
 
diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in
index 65f36e1c8a8..7d088d8c438 100644
--- a/dlls/wininet/tests/Makefile.in
+++ b/dlls/wininet/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = wininet.dll
-IMPORTS   = wininet ws2_32 advapi32 kernel32
+IMPORTS   = wininet ws2_32 advapi32
 
 C_SRCS = \
 	ftp.c \
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 03ec80d5c6a..7fa868f71ed 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winmm.dll
 IMPORTLIB = winmm
-IMPORTS   = user32 advapi32 kernel32 ntdll
+IMPORTS   = user32 advapi32
 
 C_SRCS = \
 	driver.c \
diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in
index e280a416f9d..fa32299f36b 100644
--- a/dlls/winmm/tests/Makefile.in
+++ b/dlls/winmm/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = winmm.dll
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32
 
 C_SRCS = \
 	capture.c \
diff --git a/dlls/winnls.dll16/Makefile.in b/dlls/winnls.dll16/Makefile.in
index 66db14b3556..75a7a6813bd 100644
--- a/dlls/winnls.dll16/Makefile.in
+++ b/dlls/winnls.dll16/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winnls.dll16
-IMPORTS   = winnls32 kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winnls32.dll
+IMPORTS   = winnls32
+EXTRADLLFLAGS = -m16 -Wb,--main-module,winnls32.dll
 
 C_SRCS = winnls.c
 
diff --git a/dlls/winnls32/Makefile.in b/dlls/winnls32/Makefile.in
index e84c61e1d78..d14895631de 100644
--- a/dlls/winnls32/Makefile.in
+++ b/dlls/winnls32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winnls32.dll
 IMPORTLIB = winnls32
-IMPORTS   = kernel32
 
 C_SRCS = \
 	winnls.c
diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in
index e806b83eda2..5b54dbedace 100644
--- a/dlls/winscard/Makefile.in
+++ b/dlls/winscard/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winscard.dll
 IMPORTLIB = winscard
-IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	winscard.c
diff --git a/dlls/winsock.dll16/Makefile.in b/dlls/winsock.dll16/Makefile.in
index e095355aeda..2bb1153ee5e 100644
--- a/dlls/winsock.dll16/Makefile.in
+++ b/dlls/winsock.dll16/Makefile.in
@@ -3,9 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winsock.dll16
-IMPORTS   = ws2_32 kernel32 kernel
+IMPORTS   = ws2_32
 DELAYIMPORTS = user32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ws2_32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,ws2_32.dll
 
 C_SRCS = socket.c
 
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 56ff72bc6bc..00eaaca7158 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
 IMPORTLIB = winspool
-IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 advapi32
 EXTRAINCL = @CUPSINCL@
 
 C_SRCS = \
diff --git a/dlls/winspool.drv/tests/Makefile.in b/dlls/winspool.drv/tests/Makefile.in
index f1896fc272c..fddb33aa636 100644
--- a/dlls/winspool.drv/tests/Makefile.in
+++ b/dlls/winspool.drv/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = winspool.drv
-IMPORTS   = winspool advapi32 kernel32
+IMPORTS   = winspool advapi32
 
 C_SRCS = \
 	info.c
diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in
index b8c8433f367..93b319f741d 100644
--- a/dlls/wintab.dll16/Makefile.in
+++ b/dlls/wintab.dll16/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintab.dll16
-IMPORTS   = kernel32
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,wintab32.dll
+EXTRADLLFLAGS = -m16 -Wb,--main-module,wintab32.dll
 
 C_SRCS = wintab.c
 
diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in
index 9b9319dfc44..49fa8f6f178 100644
--- a/dlls/wintab32/Makefile.in
+++ b/dlls/wintab32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintab32.dll
 IMPORTLIB = wintab32
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	context.c \
diff --git a/dlls/wintab32/tests/Makefile.in b/dlls/wintab32/tests/Makefile.in
index fd3e9aec189..347153684ad 100644
--- a/dlls/wintab32/tests/Makefile.in
+++ b/dlls/wintab32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = wintab32.dll
-IMPORTS   = kernel32 user32
+IMPORTS   = user32
 
 C_SRCS = \
 	context.c
diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in
index abfd12a515d..aae7934a61e 100644
--- a/dlls/wintrust/Makefile.in
+++ b/dlls/wintrust/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintrust.dll
 IMPORTLIB = wintrust
-IMPORTS   = crypt32 user32 advapi32 kernel32 ntdll
+IMPORTS   = crypt32 user32 advapi32
 DELAYIMPORTS = cryptui imagehlp
 
 C_SRCS = \
diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in
index 7228481db6b..6b7a0ecb83a 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 advapi32 kernel32
+IMPORTS   = wintrust crypt32 advapi32
 
 C_SRCS = \
 	asn.c \
diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in
index 7c753649ade..8c9c122ad58 100644
--- a/dlls/wldap32/Makefile.in
+++ b/dlls/wldap32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wldap32.dll
 IMPORTLIB = wldap32
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 EXTRALIBS = @LDAPLIBS@
 
 C_SRCS = \
diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in
index e29f8313fb4..8ae16f8b0b5 100644
--- a/dlls/wldap32/tests/Makefile.in
+++ b/dlls/wldap32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = wldap32.dll
-IMPORTS   = wldap32 kernel32
+IMPORTS   = wldap32
 
 C_SRCS = \
 	parse.c
diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in
index d482cf0ef18..8e22a991801 100644
--- a/dlls/wmi/Makefile.in
+++ b/dlls/wmi/Makefile.in
@@ -3,6 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wmi.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 @MAKE_DLL_RULES@
diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in
index 27a040bdc05..3c896189214 100644
--- a/dlls/wmiutils/Makefile.in
+++ b/dlls/wmiutils/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wmiutils.dll
-IMPORTS   = oleaut32 ole32 advapi32 kernel32
+IMPORTS   = oleaut32 ole32 advapi32
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in
index 61269bdd873..df345110451 100644
--- a/dlls/wnaspi32/Makefile.in
+++ b/dlls/wnaspi32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wnaspi32.dll
 IMPORTLIB = wnaspi32
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	aspi.c \
diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in
index bd28ccfb065..56887e80dd6 100644
--- a/dlls/wow32/Makefile.in
+++ b/dlls/wow32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wow32.dll
 IMPORTLIB = wow32
-IMPORTS   = kernel32 kernel
+IMPORTS   = kernel
 
 C_SRCS = wow_main.c
 
diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in
index 69a171cfa1d..6321759cc11 100644
--- a/dlls/ws2_32/Makefile.in
+++ b/dlls/ws2_32/Makefile.in
@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ws2_32.dll
 IMPORTLIB = ws2_32
-IMPORTS   = kernel32 ntdll
 DELAYIMPORTS = iphlpapi user32
 EXTRALIBS = @LIBPOLL@
 
diff --git a/dlls/ws2_32/tests/Makefile.in b/dlls/ws2_32/tests/Makefile.in
index 9e43a403c49..d9b0dde11a4 100644
--- a/dlls/ws2_32/tests/Makefile.in
+++ b/dlls/ws2_32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ws2_32.dll
-IMPORTS   = ws2_32 kernel32 user32
+IMPORTS   = ws2_32 user32
 
 C_SRCS = \
 	protocol.c \
diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in
index e07ed2f5e28..cb371fef844 100644
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wsock32.dll
 IMPORTLIB = wsock32
-IMPORTS   = mswsock ws2_32 iphlpapi kernel32
+IMPORTS   = mswsock ws2_32 iphlpapi
 
 C_SRCS = \
 	protocol.c \
diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in
index 56b002e9b89..e5ea9777168 100644
--- a/dlls/wtsapi32/Makefile.in
+++ b/dlls/wtsapi32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wtsapi32.dll
 IMPORTLIB = wtsapi32
-IMPORTS   = kernel32
 
 C_SRCS = \
 	wtsapi32.c
diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in
index 15d24c08b9c..66953ab49d5 100644
--- a/dlls/wuapi/Makefile.in
+++ b/dlls/wuapi/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wuapi.dll
-IMPORTS   = uuid ole32 advapi32 kernel32
+IMPORTS   = uuid ole32 advapi32
 
 C_SRCS = \
 	downloader.c \
diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in
index 9933fdee781..46b84d79acf 100644
--- a/dlls/wuaueng/Makefile.in
+++ b/dlls/wuaueng/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wuaueng.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c
diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in
index fcd064c9e85..e40104bc4d9 100644
--- a/dlls/xinput1_1/Makefile.in
+++ b/dlls/xinput1_1/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = xinput1_1.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	xinput1_1_main.c
diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in
index d5e31ac1352..6f64628ef95 100644
--- a/dlls/xinput1_2/Makefile.in
+++ b/dlls/xinput1_2/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = xinput1_2.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	xinput1_2_main.c
diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in
index e1500b80e56..3fc79c8d9c3 100644
--- a/dlls/xinput1_3/Makefile.in
+++ b/dlls/xinput1_3/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = xinput1_3.dll
 IMPORTLIB = xinput
-IMPORTS   = kernel32
 
 C_SRCS = \
 	xinput1_3_main.c
diff --git a/dlls/xinput1_3/tests/Makefile.in b/dlls/xinput1_3/tests/Makefile.in
index dd0ee26b436..a1fc7b40932 100644
--- a/dlls/xinput1_3/tests/Makefile.in
+++ b/dlls/xinput1_3/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = xinput1_3.dll
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 
 C_SRCS = \
 	xinput.c
diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in
index 2a6f2ee1b8e..0b940760229 100644
--- a/dlls/xinput9_1_0/Makefile.in
+++ b/dlls/xinput9_1_0/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = xinput9_1_0.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	xinput9_1_0_main.c
diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in
index b43b272e1e3..7702bc31126 100644
--- a/dlls/xmllite/Makefile.in
+++ b/dlls/xmllite/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = xmllite.dll
-IMPORTS   = kernel32
 
 C_SRCS = \
 	reader.c \
diff --git a/dlls/xmllite/tests/Makefile.in b/dlls/xmllite/tests/Makefile.in
index 883a66e8e96..73dda82032c 100644
--- a/dlls/xmllite/tests/Makefile.in
+++ b/dlls/xmllite/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = xmllite.dll
-IMPORTS   = kernel32 ole32
+IMPORTS   = ole32
 
 C_SRCS = \
 	reader.c