Added imports of kernel32.dll where necessary.

dlls/Makefile.in

@@ -372,8 +372,9 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 
 # Inter-dll dependencies (only necessary for .so)
 
+advapi32/libadvapi32.so: libkernel32.so
 avifil32/libavifil32.so: libmsvfw32.so libkernel32.so
-comctl32/libcomctl32.so: libuser32.so libgdi32.so
+comctl32/libcomctl32.so: libuser32.so libgdi32.so libkernel32.so
 commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libuser32.so libwinspool.drv.so libgdi32.so libkernel32.so
 crtdll/libcrtdll.so: libkernel32.so
 ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so
@@ -382,15 +383,20 @@ dplay/libdplay.so: libdplayx.so
 dplayx/libdplayx.so: libole32.so libadvapi32.so libkernel32.so
 dsound/libdsound.so: libwinmm.so libkernel32.so
 gdi/libgdi32.so: libkernel32.so
-msacm/libmsacm32.so: libwinmm.so
+icmp/libicmp.so: libkernel32.so
+imagehlp/libimagehlp.so: libkernel32.so
+lzexpand/liblz32.so: libkernel32.so
+mpr/libmpr.so: libkernel32.so
+msacm/libmsacm32.so: libwinmm.so libkernel32.so
 msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so
 ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so
 oleaut32/liboleaut32.so: libole32.so libgdi32.so libkernel32.so
 olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so
 olepro32/libolepro32.so: liboleaut32.so
 opengl32/libopengl32.so: libx11drv.so
-richedit/libriched32.so: libuser32.so
-serialui/libserialui.so: libuser32.so
+richedit/libriched32.so: libuser32.so libkernel32.so
+serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so
+setupapi/libsetupapi.so: libkernel32.so
 shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so
 shfolder/libshfolder.so: libshell32.so
 shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libkernel32.so
@@ -399,9 +405,11 @@ urlmon/liburlmon.so: libole32.so
 user/libuser32.so: libgdi32.so libkernel32.so
 version/libversion.so: liblz32.so libkernel32.so
 win32s/libw32skrnl.so: libkernel32.so
-wineps/libwineps.so: libgdi32.so
+winaspi/libwnaspi32.so: libkernel32.so
+wineps/libwineps.so: libgdi32.so libkernel32.so
+wininet/libwininet.so: libkernel32.so
 winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so
-winmm/libwinmm.so: libuser32.so
+winmm/libwinmm.so: libuser32.so libkernel32.so
 winmm/mcianim/libmcianim.drv.so: libwinmm.so libuser32.so libkernel32.so
 winmm/mciavi/libmciavi.drv.so: libwinmm.so libuser32.so libkernel32.so
 winmm/mcicda/libmcicda.drv.so: libwinmm.so libuser32.so libkernel32.so
@@ -410,8 +418,8 @@ winmm/mciwave/libmciwave.drv.so: libwinmm.so libuser32.so libkernel32.so
 winmm/midimap/libmidimap.drv.so: libwinmm.so libuser32.so libkernel32.so
 winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so
 winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so
-winsock/libws2_32.so: libuser32.so
-winspool/libwinspool.drv.so: libgdi32.so
+winsock/libws2_32.so: libuser32.so libkernel32.so
+winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so
 wow32/libwow32.so: libkernel32.so
 wsock32/libwsock32.so: libws2_32.so
 x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so

dlls/advapi32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advapi32
 SOVERSION = 1.0
+IMPORTS   = kernel32
 
 C_SRCS = \
 	advapi.c \

dlls/advapi32/advapi32.spec

@@ -1,6 +1,9 @@
 name	advapi32
 type	win32
 
+import	kernel32.dll
+import	ntdll.dll
+
 @ stub AbortSystemShutdownA
 @ stub AbortSystemShutdownW
 @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck

dlls/comctl32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = comctl32
 SOVERSION = 1.0
 WRCEXTRA  = -s -p$(MODULE)
-IMPORTS   = user32 gdi32
+IMPORTS   = user32 gdi32 kernel32
 
 C_SRCS = \
 	animate.c \

dlls/comctl32/comctl32.spec

@@ -5,6 +5,7 @@ rsrc	comctl32
 
 import	user32.dll
 import	gdi32.dll
+import	kernel32.dll
 
 # Functions exported by the Win95 comctl32.dll 
 # (these need to have these exact ordinals, because some win95 dlls 

dlls/icmp/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp
 SOVERSION = 1.0
+IMPORTS   = kernel32
 
 C_SRCS = icmp_main.c 
 

dlls/icmp/icmp.spec

@@ -1,6 +1,8 @@
 name icmp
 type win32
 
+import kernel32.dll
+
 @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
 @ stdcall IcmpCreateFile() IcmpCreateFile
 @ stub  IcmpParseReplies

dlls/imagehlp/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp
 SOVERSION = 1.0
+IMPORTS   = kernel32
 
 C_SRCS = \
 	access.c \

dlls/imagehlp/imagehlp.spec

@@ -2,6 +2,8 @@ name	imagehlp
 type	win32
 init	IMAGEHLP_LibMain
 
+import	kernel32.dll
+
 @ stdcall BindImage(str str str) BindImage
 @ stdcall BindImageEx(long str str str ptr) BindImageEx
 @ stdcall CheckSumMappedFile(ptr long ptr ptr) CheckSumMappedFile

dlls/lzexpand/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = lz32
 SOVERSION = 1.0
 ALTNAMES  = lzexpand
+IMPORTS   = kernel32
 
 C_SRCS = \
 	lzexpand_main.c

dlls/lzexpand/lz32.spec

@@ -1,6 +1,8 @@
 name	lz32
 type	win32
 
+import	kernel32.dll
+
 @ stdcall CopyLZFile(long long) CopyLZFile
 @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
 @ stdcall GetExpandedNameW(wstr ptr) GetExpandedNameW

dlls/mpr/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr
 SOVERSION = 1.0
+IMPORTS   = kernel32
 
 C_SRCS = \
 	auth.c \

dlls/mpr/mpr.spec

@@ -1,6 +1,8 @@
 name mpr
 type win32
 
+import kernel32.dll
+
 # ordinal exports
  1 stub @
  2 stub @

dlls/msacm/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msacm32
 SOVERSION = 1.0
 ALTNAMES  = msacm
-IMPORTS   = winmm
+IMPORTS   = winmm kernel32
 
 C_SRCS = \
 	driver.c \

dlls/msacm/msacm32.spec

@@ -3,6 +3,7 @@ type win32
 init MSACM32_LibMain
 
 import winmm.dll
+import kernel32.dll
 
  1 stub XRegThunkEntry
  2 stdcall acmDriverAddA(ptr long long long long) acmDriverAddA

dlls/richedit/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
 SOVERSION = 1.0
-IMPORTS   = user32
+IMPORTS   = user32 kernel32
 
 C_SRCS = \
 	charlist.c \

dlls/richedit/riched32.spec

@@ -3,5 +3,6 @@ type	win32
 init	RICHED32_LibMain
 
 import	user32.dll
+import	kernel32.dll
 
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion

dlls/serialui/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui
 SOVERSION = 1.0
-IMPORTS   = user32
+IMPORTS   = user32 advapi32 kernel32
 
 C_SRCS = \
 	confdlg.c

dlls/serialui/serialui.spec

@@ -4,6 +4,8 @@ init	SERIALUI_LibMain
 rsrc	serialui_rc
 
 import	user32.dll
+import	advapi32.dll
+import	kernel32.dll
 
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages
 3 stdcall drvCommConfigDialog(ptr long ptr) SERIALUI_CommConfigDialog

dlls/setupapi/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = setupapi
 SOVERSION = 1.0
 ALTNAMES  = setupx
+IMPORTS   = kernel32
 
 C_SRCS = \
 	setupx_main.c \

dlls/setupapi/setupapi.spec

@@ -1,6 +1,8 @@
 name setupapi
 type win32
 
+import kernel32.dll
+
 # almost all functions are commented out for now. Ordinals are from setupapi.dll 4.0
 
 # 45 stdcall SetupAddInstallSectionToDiskSpaceListA()         SetupAddInstallSectionToDiskSpaceListA

dlls/winaspi/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wnaspi32
 SOVERSION = 1.0
 ALTNAMES  = winaspi
+IMPORTS   = kernel32
 
 C_SRCS = \
 	aspi.c \

dlls/winaspi/wnaspi32.spec

@@ -2,6 +2,8 @@ name	wnaspi32
 type	win32
 init	WNASPI32_LibMain
 
+import	kernel32.dll
+
 1 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo
 2 cdecl SendASPI32Command(ptr) SendASPI32Command
 4 stdcall GetASPI32DLLVersion() GetASPI32DLLVersion

dlls/wineps/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wineps
 SOVERSION = 1.0
 ALTNAMES  = wineps16
-IMPORTS   = gdi32
+IMPORTS   = gdi32 kernel32
 
 C_SRCS = \
 	afm.c \

dlls/wineps/wineps.spec

@@ -3,3 +3,4 @@ type	win32
 init	PSDRV_Init
 
 import	gdi32.dll
+import	kernel32.dll

dlls/wininet/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet
 SOVERSION = 1.0
+IMPORTS   = kernel32
 
 C_SRCS = \
 	http.c \

dlls/wininet/wininet.spec

@@ -2,6 +2,8 @@ name    wininet
 type    win32
 init    WININET_LibMain
 
+import	kernel32.dll
+
 @ stub InternetInitializeAutoProxyDll
 @ stub ShowCertificate
 @ stub CommitUrlCacheEntryA

dlls/winmm/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winmm
 SOVERSION = 1.0
 ALTNAMES  = mmsystem sound
-IMPORTS   = user32
+IMPORTS   = user32 kernel32
 
 C_SRCS = \
 	joystick.c \

dlls/winmm/winmm.spec

@@ -4,6 +4,7 @@ init WINMM_LibMain
 rsrc winmm_res
 
 import user32.dll
+import kernel32.dll
 
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA

dlls/winsock/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ws2_32
 SOVERSION = 1.0
 ALTNAMES  = winsock
-IMPORTS   = user32
+IMPORTS   = user32 kernel32
 
 C_SRCS = \
 	async.c \

dlls/winsock/ws2_32.spec

@@ -7,6 +7,7 @@ type win32
 init WSOCK32_LibMain
 
 import user32.dll
+import kernel32.dll
 
 #  EXPORTS ***********
 1   stdcall  accept(long ptr ptr) WSOCK32_accept

dlls/winspool/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
 SOVERSION = 1.0
-IMPORTS   = gdi32
+IMPORTS   = gdi32 advapi32 kernel32
 
 C_SRCS = \
 	info.c \

dlls/winspool/winspool.drv.spec

@@ -4,6 +4,8 @@ file	winspool.drv
 init	WINSPOOL_EntryPoint
 
 import	gdi32.dll
+import	advapi32.dll
+import	kernel32.dll
 
 101 stub ADVANCEDSETUPDIALOG
 102 stub AbortPrinter