diff --git a/debugger/Makefile.in b/debugger/Makefile.in
index 57bc9b5403d4dbdd2e7ca960e20b417934f1e68f..9711664a70e3118a0334e4bda6ce538bae8150f9 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 9cce6bfd2ed3584d51273165414c83feb67c506d..e9884a26cb322c2c4a9709981cfad13eb7cd1af2 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 c2535f81989aacafd45cbe0f8b0a20824fbe6fe8..afd8c1dbeefed7031f8627faaa7de78a62a3765a 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 72ae8a66f26ca403243249e6cf0728e8761cee42..c9f48a0498ca61cc5b19866167e5795241af2f99 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 8a22cab09908f3b33094ace8be41c8e7c485aef8..02377c82ec46d59d917cc9a60126fdef13333e0c 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 2814a882289a9daf4bee8077f751b68347e9c16d..ff672c0b002c6b13dfd433e5587c14cf53e98edd 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 c440185d32ffecfc63aace4fcd8a8e3d069095f3..6d12e9b82c6ee8be6815fb2a9abc44bde5cfe631 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 df76f9cc623ace73659bbc1f9293f46258835e3c..ef1aa0a4f48138ca1656b36797411b3047086a9e 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 b82e294ce774f100f931e5dd41dfcc210c13966b..e5a2b4480d5668c3ddaa334e311794c72638ccb8 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 41fad5c0fc1d8291d4d6654464c844c96383cf00..99b1564f0cf88465caaae3b2c8b444c6036fa467 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 f0d1e3a2bdc80e8e4baba2ba3be10b56234b2be4..6c4933f03e210cf96454c86454e7e59c82afe89e 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 bb364e8036d7a5a322ff61ed81d62f14b63ba7a0..87812b2cb2dfa987161aea97d4cd7d82583e6cd6 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 36f60183217a6183e3a9b1fdb00fd1999bb1553e..5934a75a40aef606fb099459238df8853108e4f7 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 25e7566ee144e9b52378027e6df80894d448d9a2..f0fdcf8d4d6c85cc660f9ad2ba4ee7c842e9ddec 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 5a916d72834755d9581dd7ceda48339b2ec9865a..d1a9cbf3a6a8f8556edd8e7e0643bac4bc621d0f 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