diff --git a/debugger/Makefile.in b/debugger/Makefile.in
index 57bc9b5403d..9711664a70e 100644
--- a/debugger/Makefile.in
+++ b/debugger/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winedbg
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 gdi32 kernel32
 
 C_SRCS = \
 	break.c \
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 9cce6bfd2ed..e9884a26cb3 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = icinfo aviinfo aviplay
-IMPORTS   = msvfw32 winmm ddraw x11drv
+IMPORTS   = msvfw32 winmm ddraw x11drv user32 gdi32 kernel32
 
 SPEC_SRCS = \
 	icinfo.spec \
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index c2535f81989..afd8c1dbeef 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = clock
-IMPORTS   = kernel32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv
+IMPORTS   = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
 WRCEXTRA  = -s -p clock
 
 LICENSELANG = En
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index 72ae8a66f26..c9f48a0498c 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = cmdlgtst
-IMPORTS   = comdlg32 winspool.drv
+IMPORTS   = comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
 WRCEXTRA  = -s -p cmdlgtst
 
 C_SRCS = \
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 8a22cab0990..02377c82ec4 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = control
-IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4
+IMPORTS   = shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32
 
 C_SRCS = control.c
 
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 2814a882289..ff672c0b002 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = notepad
-IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv
+IMPORTS   = shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
 WRCEXTRA  = -s -p notepad
 
 LICENSELANG = En
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index c440185d32f..6d12e9b82c6 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = progman
-IMPORTS   = kernel32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv
+IMPORTS   = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
 WRCEXTRA  = -s -p progman
 
 LICENSELANG = En
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index df76f9cc623..ef1aa0a4f48 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -5,6 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regapi
+IMPORTS   = kernel32
 
 C_SRCS = \
 	regapi.c
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index b82e294ce77..e5a2b4480d5 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -5,6 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regtest
+IMPORTS   = kernel32
 
 C_SRCS = regtest.c
 
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index 41fad5c0fc1..99b1564f0cf 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = uninstaller
 WRCEXTRA  = -s -p uninstaller
-IMPORTS   = user32
+IMPORTS   = user32 gdi32 kernel32
 
 LICENSELANG = En
 
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index f0d1e3a2bdc..6c4933f03e2 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = view
-IMPORTS   = comdlg32 winspool.drv
+IMPORTS   = comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
 WRCEXTRA  = -s -p view
 
 C_SRCS = \
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index bb364e8036d..87812b2cb2d 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = wcmd
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 gdi32 kernel32
 WRCEXTRA  = -s -p wcmd
 
 C_SRCS = \
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index 36f60183217..5934a75a40a 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winemine
 WRCEXTRA  = -s -p winemine
-IMPORTS   = user32
+IMPORTS   = user32 gdi32 kernel32
 
 LICENSELANG = En
 
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index 25e7566ee14..f0fdcf8d4d6 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winhelp hlp2sgml
-IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv
+IMPORTS   = shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
 WRCEXTRA  = -s -p winhelp
 
 C_SRCS = \
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index 5a916d72834..d1a9cbf3a6a 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winver
-IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4
+IMPORTS   = shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32
 
 C_SRCS = winver.c