programs: Remove explicit imports of kernel32 and ntdll.

programs/attrib/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = attrib.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = kernel32
 
 C_SRCS = attrib.c
 

programs/cacls/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cacls.exe
 APPMODE   = -mconsole
-IMPORTS   = kernel32
 
 C_SRCS = \
 	cacls_main.c

programs/clock/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clock.exe
 APPMODE   = -mwindows
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
+IMPORTS   = comdlg32 shell32 user32 gdi32
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \

programs/cmd/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = cmd.exe
 APPMODE   = -mconsole -municode
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
-IMPORTS   = shell32 user32 advapi32 kernel32
+IMPORTS   = shell32 user32 advapi32
 
 C_SRCS = \
 	batch.c \

programs/cmd/tests/Makefile.in

@@ -3,7 +3,6 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = cmd.exe
-IMPORTS   = kernel32
 
 C_SRCS = \
 	batch.c

programs/cmdlgtst/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmdlgtst.exe
 APPMODE   = -mwindows
-IMPORTS   = comdlg32 user32 gdi32 kernel32
+IMPORTS   = comdlg32 user32 gdi32
 
 C_SRCS = \
 	cmdlgtst.c

programs/control/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = control.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = shell32 user32 kernel32
+IMPORTS   = shell32 user32
 
 C_SRCS = control.c
 

programs/dxdiag/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dxdiag.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c

programs/eject/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = eject.exe
 APPMODE   = -mconsole
-IMPORTS   = kernel32
 
 C_SRCS = eject.c
 

programs/expand/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = expand.exe
 APPMODE   = -mconsole
-IMPORTS   = setupapi kernel32
+IMPORTS   = setupapi
 
 C_SRCS = expand.c
 

programs/explorer/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = explorer.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = rpcrt4 user32 gdi32 advapi32
 DELAYIMPORTS = comctl32
 
 C_SRCS = \

programs/extrac32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = extrac32.exe
 APPMODE   = -mwindows -municode
 EXTRADEFS = -DWINE_NO_UNICODE
-IMPORTS   = shell32 setupapi shlwapi user32 kernel32
+IMPORTS   = shell32 setupapi shlwapi user32
 
 C_SRCS = \
 	extrac32.c

programs/hh/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hh.exe
 APPMODE   = -mwindows
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c

programs/icinfo/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icinfo.exe
 APPMODE   = -mwindows
-IMPORTS   = msvfw32 kernel32
+IMPORTS   = msvfw32
 
 C_SRCS = icinfo.c
 

programs/iexplore/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = iexplore.exe
 APPMODE   = -mwindows
-IMPORTS   = shdocvw user32 gdi32 kernel32
+IMPORTS   = shdocvw user32 gdi32
 
 C_SRCS = \
 	main.c

programs/lodctr/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lodctr.exe
 APPMODE   = -mconsole
-IMPORTS   = loadperf kernel32
+IMPORTS   = loadperf
 
 C_SRCS = lodctr_main.c
 

programs/mshta/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mshta.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c

programs/msiexec/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msiexec.exe
 APPMODE   = -mwindows
-IMPORTS   = msi ole32 advapi32 user32 kernel32
+IMPORTS   = msi ole32 advapi32 user32
 
 C_SRCS = \
 	msiexec.c \

programs/net/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = net.exe
 APPMODE   = -mconsole
-IMPORTS   = netapi32 user32 advapi32 kernel32
+IMPORTS   = netapi32 user32 advapi32
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = net.c

programs/ngen/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ngen.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = kernel32
 
 C_SRCS = \
 	ngen_main.c

programs/notepad/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad.exe
 APPMODE   = -mwindows -mno-cygwin
-IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 advapi32 kernel32
+IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 advapi32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
 EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS

programs/oleview/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleview.exe
 APPMODE   = -mwindows
-IMPORTS   = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32
+IMPORTS   = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \

programs/ping/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ping.exe
 APPMODE   = -mconsole
-IMPORTS   = kernel32
 
 C_SRCS = \
 	ping_main.c

programs/progman/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = progman.exe
 APPMODE   = -mwindows
-IMPORTS   = shell32 comdlg32 user32 gdi32 kernel32
+IMPORTS   = shell32 comdlg32 user32 gdi32
 
 C_SRCS = \
 	dialog.c \

programs/reg/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = reg.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 DELAYIMPORTS = user32
 
 C_SRCS = reg.c

programs/regedit/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regedit.exe
 APPMODE   = -mwindows -mno-cygwin
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT

programs/regsvr32/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regsvr32.exe
 APPMODE   = -mconsole
-IMPORTS   = ole32 kernel32
+IMPORTS   = ole32
 
 C_SRCS = \
 	regsvr32.c

programs/rpcss/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcss.exe
 APPMODE   = -mconsole
-IMPORTS   = rpcrt4 kernel32 ntdll
+IMPORTS   = rpcrt4
 
 C_SRCS = \
 	epmp.c \

programs/rundll.exe16/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rundll.exe16
-APPMODE   = -mwindows -Wb,--subsystem,win16
-IMPORTS   = kernel32 kernel
+APPMODE   = -m16
 
 C_SRCS = rundll.c
 

programs/rundll32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rundll32.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = user32 kernel32
+IMPORTS   = user32
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \

programs/sc/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sc.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = sc.c

programs/secedit/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = secedit.exe
 APPMODE   = -mconsole
-IMPORTS   = kernel32
 
 C_SRCS = \
 	main.c

programs/services/Makefile.in

@@ -5,8 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = services.exe
 APPMODE   = -mconsole
-IMPORTS   = kernel32
-IMPORTS   = rpcrt4 advapi32 kernel32 ntdll
+IMPORTS   = rpcrt4 advapi32
 
 C_SRCS = \
 	rpc.c \

programs/spoolsv/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = spoolsv.exe
 APPMODE   = -mconsole
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	main.c

programs/start/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = start.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = shell32 user32 kernel32
+IMPORTS   = shell32 user32
 
 C_SRCS = start.c
 

programs/svchost/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = svchost.exe
 APPMODE   = -municode
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	svchost.c

programs/taskmgr/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = taskmgr.exe
 APPMODE   = -mwindows -mno-cygwin
-IMPORTS   = psapi shell32 comctl32 user32 gdi32 advapi32 kernel32
+IMPORTS   = psapi shell32 comctl32 user32 gdi32 advapi32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@

programs/termsv/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = termsv.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 
 C_SRCS = \
 	main.c

programs/uninstaller/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uninstaller.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32
 DELAYIMPORTS = shlwapi shell32 user32 gdi32
 
 C_SRCS = \

programs/unlodctr/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = unlodctr.exe
 APPMODE   = -mconsole
-IMPORTS   = loadperf kernel32
+IMPORTS   = loadperf
 
 C_SRCS = unlodctr_main.c
 

programs/view/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = view.exe
 APPMODE   = -mwindows
-IMPORTS   = comdlg32 user32 gdi32 kernel32
+IMPORTS   = comdlg32 user32 gdi32
 
 C_SRCS = \
 	init.c \

programs/wineboot/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineboot.exe
 APPMODE   = -mconsole
-IMPORTS   = uuid advapi32 kernel32 ntdll
+IMPORTS   = uuid advapi32
 DELAYIMPORTS = shell32 shlwapi version user32
 
 C_SRCS = \

programs/winebrowser/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winebrowser.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = shlwapi user32 advapi32 kernel32
+IMPORTS   = shlwapi user32 advapi32
 
 C_SRCS = \
 	main.c

programs/winecfg/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecfg.exe
 APPMODE   = -mwindows
-IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32
 
 C_SRCS = \
 	about.c \

programs/wineconsole/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineconsole.exe
 APPMODE   = -mwindows
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = advapi32
 DELAYIMPORTS = comctl32 user32 gdi32
 
 C_SRCS = \

programs/winedbg/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedbg.exe
 APPMODE   = -mconsole
-IMPORTS   = psapi dbghelp advapi32 kernel32 ntdll
+IMPORTS   = psapi dbghelp advapi32
 DELAYIMPORTS = user32 gdi32
 EXTRALIBS = @LIBPOLL@
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS

programs/winedevice/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedevice.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = advapi32 ntoskrnl.exe kernel32 ntdll
+IMPORTS   = advapi32 ntoskrnl.exe
 
 C_SRCS = \
 	device.c

programs/winefile/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
 APPMODE   = -mwindows
-IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32
 
 C_SRCS = \
 	splitpath.c \

programs/winemenubuilder/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows -municode
-IMPORTS   = uuid shell32 shlwapi ole32 user32 advapi32 kernel32
+IMPORTS   = uuid shell32 shlwapi ole32 user32 advapi32
 EXTRAINCL = @PNGINCL@
 
 C_SRCS = \

programs/winemine/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemine.exe
 APPMODE   = -mwindows
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32
 DELAYIMPORTS = shell32
 
 C_SRCS = \

programs/winepath/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winepath.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = kernel32
 
 C_SRCS = winepath.c
 

programs/winetest/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winetest.exe
 APPMODE   = -mconsole
-IMPORTS   = uuid comctl32 version user32 gdi32 advapi32 wsock32 kernel32
+IMPORTS   = uuid comctl32 version user32 gdi32 advapi32 wsock32
 DELAYIMPORTS = ole32
 
 C_SRCS = \

programs/winevdm/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winevdm.exe
 APPMODE   = -mconsole
-IMPORTS   = user32 kernel32 kernel
+IMPORTS   = user32 kernel
 
 C_SRCS = \
 	winevdm.c

programs/winhelp.exe16/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhelp.exe16
-APPMODE   = -mwindows -Wb,--subsystem,win16
-IMPORTS   = kernel32 kernel
+APPMODE   = -m16
 
 C_SRCS = winhelp.c
 

programs/winhlp32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhlp32.exe
 APPMODE   = -mwindows
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32
 DELAYIMPORTS = shell32 comctl32 comdlg32
 
 C_SRCS = \

programs/winoldap.mod16/Makefile.in

@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winoldap.mod16
-APPMODE   = -mwindows -Wb,--subsystem,win16
-IMPORTS   = kernel32 kernel ntdll
+APPMODE   = -m16
 
 C_SRCS = winoldap.c
 

programs/winver/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winver.exe
 APPMODE   = -mwindows
-IMPORTS   = shell32 kernel32
+IMPORTS   = shell32
 
 C_SRCS = winver.c
 

programs/wordpad/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wordpad.exe
 APPMODE   = -mwindows -mno-cygwin
-IMPORTS   = comdlg32 shell32 user32 gdi32 advapi32 kernel32 comctl32
+IMPORTS   = comdlg32 shell32 user32 gdi32 advapi32 comctl32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
 MODCFLAGS = @BUILTINFLAG@

programs/write/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = write.exe
 APPMODE   = -mwindows
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32
 
 C_SRCS = write.c
 

programs/xcopy/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = xcopy.exe
 APPMODE   = -mconsole -municode -mno-cygwin
-IMPORTS   = shell32 user32 kernel32
+IMPORTS   = shell32 user32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@