Added a few missing imports.

diff --git a/debugger/Makefile.in b/debugger/Makefile.in
index 3d36caa..57bc9b5 100644
--- a/debugger/Makefile.in
+++ b/debugger/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winedbg
-IMPORTS   = kernel32
+IMPORTS   = user32 kernel32
 
 C_SRCS = \
 	break.c \
diff --git a/debugger/winedbg.spec b/debugger/winedbg.spec
index 6a6feac..40bfae4 100644
--- a/debugger/winedbg.spec
+++ b/debugger/winedbg.spec
@@ -3,3 +3,5 @@
 type	win32
 init	DEBUG_main
 
+import	user32.dll
+import	kernel32.dll
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 4980497..79b589d 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -374,13 +374,14 @@
 
 avifil32/libavifil32.so: libmsvfw32.so libkernel32.so
 comctl32/libcomctl32.so: libuser32.so libgdi32.so
-commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libwinspool.drv.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
 dinput/libdinput.so: libuser32.so libkernel32.so
 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
 msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so
 ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so
@@ -395,7 +396,7 @@
 shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libkernel32.so
 ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so
 urlmon/liburlmon.so: libole32.so
-user/libuser32.so: libgdi32.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
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index 96036b9..4ebe2d4 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -5,6 +5,7 @@
 MODULE    = gdi32
 SOVERSION = 1.0
 ALTNAMES  = gdi dispdib wing
+IMPORTS   = kernel32
 
 C_SRCS = \
 	bidi16.c \
diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec
index 0e01cb8..e216d6d 100644
--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
@@ -2,6 +2,8 @@
 type    win32
 init    MAIN_GdiInit
 
+import	kernel32.dll
+
 # ordinal exports
 100 stdcall @(long long str str str) GDI_CallDevInstall16
 101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index 7e3885c..ce6c1c1 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -4,6 +4,7 @@
 rsrc	user32
 
 import	gdi32.dll
+import	kernel32.dll
 
   1 stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout
   2 stdcall AdjustWindowRect(ptr long long) AdjustWindowRect
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index e284f8f..41fad5c 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -6,6 +6,7 @@
 MODULE    = none
 PROGRAMS  = uninstaller
 WRCEXTRA  = -s -p uninstaller
+IMPORTS   = user32
 
 LICENSELANG = En
 
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 5385ffe..bb364e8 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = wcmd
-IMPORTS   = kernel32
+IMPORTS   = user32 kernel32
 WRCEXTRA  = -s -p wcmd
 
 C_SRCS = \
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index c8ee482..36f6018 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -6,6 +6,7 @@
 MODULE    = none
 PROGRAMS  = winemine
 WRCEXTRA  = -s -p winemine
+IMPORTS   = user32
 
 LICENSELANG = En