ole32 now requires linking with kernel32
shell32 now requires linking with kernel32 and shlwapi

libtest/Makefile.in

diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 11c775f..4be60f7 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -50,7 +50,7 @@
 	$(CC) -o rolex $+ $(DLL_LINK) $(LIBS)
 
 vartest: vartest.o vartest.spec.o
-	$(CC) -o vartest $+ -L$(DLLDIR) -loleaut32 -lcomctl32 -lole32 -lrpcrt4 $(DLL_LINK) $(LIBS)
+	$(CC) -o vartest $+ -L$(DLLDIR) -lkernel32 -loleaut32 -lcomctl32 -lole32 -lrpcrt4 $(DLL_LINK) $(LIBS)
 
 volinfo: volinfo.o volinfo.spec.o
 	$(CC) -o volinfo $+ $(DLL_LINK) $(LIBS)

programs/clock/Makefile.in

diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 5927128..c2535f8 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = clock
-IMPORTS   = shell32 comdlg32 ole32 rpcrt4 winspool.drv
+IMPORTS   = kernel32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv
 WRCEXTRA  = -s -p clock
 
 LICENSELANG = En

programs/control/Makefile.in

diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 6a82068..8a22cab 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = control
-IMPORTS   = shell32 ole32 rpcrt4
+IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4
 
 C_SRCS = control.c
 

programs/notepad/Makefile.in

diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 644430b..2814a88 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = notepad
-IMPORTS   = shell32 ole32 rpcrt4 comdlg32 winspool.drv
+IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv
 WRCEXTRA  = -s -p notepad
 
 LICENSELANG = En

programs/osversioncheck/Makefile.in

diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in
index 9b2231e..48aded9 100644
--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@@ -5,6 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = osversioncheck
+IMPORTS   = kernel32
 
 C_SRCS = osversioncheck.c
 

programs/progman/Makefile.in

diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index 9f08dea..c440185 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = progman
-IMPORTS   = shell32 comdlg32 ole32 rpcrt4 winspool.drv
+IMPORTS   = kernel32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv
 WRCEXTRA  = -s -p progman
 
 LICENSELANG = En

programs/wcmd/Makefile.in

diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 1fbacc8..5385ffe 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -5,6 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = wcmd
+IMPORTS   = kernel32
 WRCEXTRA  = -s -p wcmd
 
 C_SRCS = \

programs/winhelp/Makefile.in

diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index cac5dc4..25e7566 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winhelp hlp2sgml
-IMPORTS   = shell32 ole32 rpcrt4 comdlg32 winspool.drv
+IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv
 WRCEXTRA  = -s -p winhelp
 
 C_SRCS = \

programs/winver/Makefile.in

diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index 5a1fbb3..5a916d7 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winver
-IMPORTS   = shell32 ole32 rpcrt4
+IMPORTS   = kernel32 shlwapi shell32 ole32 rpcrt4
 
 C_SRCS = winver.c