From 27939f00fd49a2a31b33b3717e9c9388007efee7 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sun, 12 Nov 2000 03:50:10 +0000
Subject: [PATCH] Start using import tables for dlls that can already support
 it.

---
 dlls/Makefile.in                | 8 ++++----
 dlls/avifil32/Makefile.in       | 6 ++++--
 dlls/comctl32/Makefile.in       | 5 ++++-
 dlls/commdlg/Makefile.in        | 6 ++++--
 dlls/commdlg/filedlgbrowser.c   | 9 ++++-----
 dlls/crtdll/Makefile.in         | 7 +++++--
 dlls/dciman32/Makefile.in       | 5 +++--
 dlls/dplay/Makefile.in          | 5 +++--
 dlls/dplayx/Makefile.in         | 6 ++++--
 dlls/dsound/Makefile.in         | 5 +++--
 dlls/icmp/Makefile.in           | 5 +++--
 dlls/imagehlp/Makefile.in       | 6 ++++--
 dlls/imm32/Makefile.in          | 5 +++--
 dlls/lzexpand/Makefile.in       | 6 ++++--
 dlls/mpr/Makefile.in            | 6 ++++--
 dlls/msacm/Makefile.in          | 6 ++++--
 dlls/msnet32/Makefile.in        | 5 +++--
 dlls/msvideo/Makefile.in        | 6 ++++--
 dlls/odbc32/Makefile.in         | 5 +++--
 dlls/oleaut32/Makefile.in       | 6 ++++--
 dlls/olecli/Makefile.in         | 6 ++++--
 dlls/oledlg/Makefile.in         | 5 +++--
 dlls/olepro32/Makefile.in       | 5 +++--
 dlls/olesvr/Makefile.in         | 4 +++-
 dlls/psapi/Makefile.in          | 5 +++--
 dlls/rasapi32/Makefile.in       | 4 +++-
 dlls/richedit/Makefile.in       | 5 +++--
 dlls/rpcrt4/Makefile.in         | 5 +++--
 dlls/rpcrt4/rpcrt4.spec         | 1 +
 dlls/serialui/Makefile.in       | 5 +++--
 dlls/setupapi/Makefile.in       | 5 ++++-
 dlls/shell32/Makefile.in        | 7 +++++--
 dlls/shell32/shell32.spec       | 8 ++++----
 dlls/shfolder/Makefile.in       | 5 +++--
 dlls/shlwapi/Makefile.in        | 7 +++++--
 dlls/tapi32/Makefile.in         | 5 +++--
 dlls/tapi32/tapi32.spec         | 1 +
 dlls/ttydrv/Makefile.in         | 3 +++
 dlls/urlmon/Makefile.in         | 5 +++--
 dlls/version/Makefile.in        | 7 +++++--
 dlls/win32s/Makefile.in         | 3 +++
 dlls/winaspi/Makefile.in        | 6 ++++--
 dlls/wininet/Makefile.in        | 6 ++++--
 dlls/winmm/joystick/Makefile.in | 5 +++--
 dlls/winmm/mcicda/Makefile.in   | 6 ++++--
 dlls/winmm/mciseq/Makefile.in   | 5 ++++-
 dlls/winmm/mciwave/Makefile.in  | 5 +++--
 dlls/winmm/midimap/Makefile.in  | 5 +++--
 dlls/winmm/wavemap/Makefile.in  | 5 +++--
 dlls/winmm/wineoss/Makefile.in  | 5 +++--
 dlls/wow32/Makefile.in          | 5 +++--
 51 files changed, 176 insertions(+), 96 deletions(-)

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index aa2d7f9720c..7ab144323d1 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -418,13 +418,13 @@ opengl32/libopengl32.so: libx11drv.so libkernel32.so
 psapi/libpsapi.so: libkernel32.so libntdll.so
 rasapi32/librasapi32.so: libntdll.so
 richedit/libriched32.so: libuser32.so libkernel32.so libntdll.so
-rpcrt4/librpcrt4.so: libntdll.so
+rpcrt4/librpcrt4.so: libkernel32.so libntdll.so
 serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so libntdll.so
 setupapi/libsetupapi.so: libadvapi32.so libkernel32.so libntdll.so
 shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
-shfolder/libshfolder.so: libshell32.so libntdll.so
+shfolder/libshfolder.so: libshell32.so
 shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
-tapi32/libtapi32.so: libkernel32.so
+tapi32/libtapi32.so: libkernel32.so libntdll.so
 ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so libntdll.so
 urlmon/liburlmon.so: libole32.so libntdll.so
 user/libuser32.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
@@ -445,7 +445,7 @@ winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.
 winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
 winsock/libws2_32.so: libuser32.so libkernel32.so libntdll.so
 winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
-wow32/libwow32.so: libkernel32.so libntdll.so
+wow32/libwow32.so: libkernel32.so
 wsock32/libwsock32.so: libws2_32.so libkernel32.so libntdll.so
 x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so
 
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 4a14a7ffefe..8b414583439 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32
-SOVERSION = 1.0
 ALTNAMES  = avifile
-IMPORTS   = msvfw32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	avifile.c
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index d0a6f60d095..45eb6a19b54 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -3,9 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32
-SOVERSION = 1.0
+EXTRALIBS = -lwine_unicode
 IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	animate.c \
 	comboex.c \
diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in
index 0fcd3993de6..4a59932fe0a 100644
--- a/dlls/commdlg/Makefile.in
+++ b/dlls/commdlg/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32
-SOVERSION = 1.0
 ALTNAMES  = commdlg
-IMPORTS   = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	cdlg32.c \
diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c
index 0ccca3f969a..452132c563a 100644
--- a/dlls/commdlg/filedlgbrowser.c
+++ b/dlls/commdlg/filedlgbrowser.c
@@ -6,20 +6,19 @@
 
 #include <stdio.h>
 
-#include "filedlgbrowser.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "unknwn.h"
 #include "wine/winestring.h"
 #include "heap.h"
-#include "shlguid.h"
-#include "wine/obj_dataobject.h"
 #include "debugtools.h"
-#include "cdlg.h"
 
 #define INITGUID
 #include "initguid.h"
+#include "unknwn.h"
+#include "filedlgbrowser.h"
+#include "cdlg.h"
+#include "shlguid.h"
 #include "wine/obj_serviceprovider.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg);
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index 62e2703a98a..51852e078d2 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -3,8 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	crtdll_main.c \
diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in
index fa4b6dca4ef..672218dcd80 100644
--- a/dlls/dciman32/Makefile.in
+++ b/dlls/dciman32/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = dciman_main.c
 
diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in
index 5872532bdd7..a7264a1c6ca 100644
--- a/dlls/dplay/Makefile.in
+++ b/dlls/dplay/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplay
-SOVERSION = 1.0
-IMPORTS   = dplayx
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = dplay_main.c
 
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index d9f7f0dfc7b..61ce0f2cc5f 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx
-SOVERSION = 1.0
-IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	dpclassfactory.c \
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index c9fa8beee87..d9cc4ab43bf 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound
-SOVERSION = 1.0
-IMPORTS   = winmm kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	dsound_main.c
diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in
index df1688bf5d4..9cd6c96072e 100644
--- a/dlls/icmp/Makefile.in
+++ b/dlls/icmp/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = icmp_main.c 
 
diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index 66a83401ab7..badc3639aa9 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	access.c \
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index 215f0fbd01f..1ead045e4e5 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	imm.c
diff --git a/dlls/lzexpand/Makefile.in b/dlls/lzexpand/Makefile.in
index ac80c860ba6..833c3396c4d 100644
--- a/dlls/lzexpand/Makefile.in
+++ b/dlls/lzexpand/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lz32
-SOVERSION = 1.0
 ALTNAMES  = lzexpand
-IMPORTS   = kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	lzexpand_main.c
diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in
index 88e8f2c4fa1..15f934a8fb0 100644
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	auth.c \
diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in
index f73bc2b8153..8677a7d82c8 100644
--- a/dlls/msacm/Makefile.in
+++ b/dlls/msacm/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32
-SOVERSION = 1.0
 ALTNAMES  = msacm
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	driver.c \
diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in
index d1a0a5527cd..660fd4e46e1 100644
--- a/dlls/msnet32/Makefile.in
+++ b/dlls/msnet32/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msnet32
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = msnet_main.c
 
diff --git a/dlls/msvideo/Makefile.in b/dlls/msvideo/Makefile.in
index 67b7a4e1077..313285cd234 100644
--- a/dlls/msvideo/Makefile.in
+++ b/dlls/msvideo/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32
-SOVERSION = 1.0
 ALTNAMES  = msvideo
-IMPORTS   = winmm user32 gdi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	msvideo_main.c \
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index b5d27ca3869..74b00e4b5e6 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	proxyodbc.c 
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 41289940a7b..09834f1b9f9 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleaut32
-SOVERSION = 1.0
 ALTNAMES  = ole2disp typelib
-IMPORTS   = ole32 user32 gdi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	connpt.c \
diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in
index bbbadac349c..11b653610a5 100644
--- a/dlls/olecli/Makefile.in
+++ b/dlls/olecli/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32
-SOVERSION = 1.0
 ALTNAMES  = olecli
-IMPORTS   = ole32 olesvr32 gdi32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	olecli_main.c
diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 6ee62d1c0be..e047e301314 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	oledlg_main.c
diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in
index d8f5f0db956..6b2c7d0c437 100644
--- a/dlls/olepro32/Makefile.in
+++ b/dlls/olepro32/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32
-SOVERSION = 1.0
-IMPORTS   = oleaut32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = olepro32stubs.c
 
diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in
index 1635a56320b..188452d02d5 100644
--- a/dlls/olesvr/Makefile.in
+++ b/dlls/olesvr/Makefile.in
@@ -3,10 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32
-SOVERSION = 1.0
 ALTNAMES  = olesvr
 IMPORTS   = ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	olesvr_main.c
 
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index 834a4f27188..14e20196979 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = psapi
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	psapi_main.c
diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index f26c9bcebc7..58beb5db5b1 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -3,10 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32
-SOVERSION = 1.0
 ALTNAMES  = rasapi16
 IMPORTS   = ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = rasapi.c 
 
 @MAKE_DLL_RULES@
diff --git a/dlls/richedit/Makefile.in b/dlls/richedit/Makefile.in
index 93e6a09bcbb..c13d2697406 100644
--- a/dlls/richedit/Makefile.in
+++ b/dlls/richedit/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
-SOVERSION = 1.0
-IMPORTS   = user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	charlist.c \
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index cd594a63fc5..d81e03d9771 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	rpcrt4_main.c
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index 0c33ce999da..f8a8368d3c6 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -2,6 +2,7 @@ name	rpcrt4
 type	win32
 init	RPCRT4_LibMain
 
+import	kernel32.dll
 import	ntdll.dll
 
 debug_channels (ole)
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 8565bdf7713..7543482a05d 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui
-SOVERSION = 1.0
-IMPORTS   = user32 advapi32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	confdlg.c
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index c7dda9de54e..9d00e8d4704 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -5,7 +5,10 @@ VPATH     = @srcdir@
 MODULE    = setupapi
 SOVERSION = 1.0
 ALTNAMES  = setupx
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	infparse.c \
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 90c0d3c9c0b..87d88591b3c 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -3,9 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32
-SOVERSION = 1.0
 ALTNAMES  = shell
-IMPORTS   = ole32 shlwapi comctl32 advapi32 user32 gdi32 kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	brsfolder.c \
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 4d3a864c8c0..75a8979bf36 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -272,10 +272,10 @@ debug_channels (exec pidl shell)
  322 stub StrRStrIA
  323 stub StrRStrIW
  324 stub StrRStrW
- 325 stdcall StrStrA(str str)StrStrA
- 326 stdcall StrStrIA(str str)StrStrIA
- 327 stdcall StrStrIW(wstr wstr)StrStrIW
- 328 stdcall StrStrW(wstr wstr)StrStrW
+ 325 forward StrStrA shlwapi.StrStrA
+ 326 forward StrStrIA shlwapi.StrStrIA
+ 327 forward StrStrIW shlwapi.StrStrIW
+ 328 forward StrStrW shlwapi.StrStrW
 
  505 stdcall SHRegCloseKey (long) SHRegCloseKey
  506 stdcall SHRegOpenKeyA (long str long) SHRegOpenKeyA
diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in
index f2bbc8c1489..2138443a425 100644
--- a/dlls/shfolder/Makefile.in
+++ b/dlls/shfolder/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shfolder
-SOVERSION = 1.0
-IMPORTS   = shell32
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = shfolder_main.c
 
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 30d9327db08..c9fbaf6801f 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -3,8 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi
-SOVERSION = 1.0
-IMPORTS   = advapi32 user32 gdi32 kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	ordinal.c \
diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in
index 6332a0d2301..a0f79feea44 100644
--- a/dlls/tapi32/Makefile.in
+++ b/dlls/tapi32/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = tapi32
-SOVERSION = 1.0
-IMPORTS   = kernel32
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	assisted.c \
diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec
index c4b1cd88cfd..030740dd0c2 100644
--- a/dlls/tapi32/tapi32.spec
+++ b/dlls/tapi32/tapi32.spec
@@ -2,6 +2,7 @@ name	tapi32
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
 
 debug_channels (tapi)
 
diff --git a/dlls/ttydrv/Makefile.in b/dlls/ttydrv/Makefile.in
index 2b9c7d84908..33e048cdbee 100644
--- a/dlls/ttydrv/Makefile.in
+++ b/dlls/ttydrv/Makefile.in
@@ -6,6 +6,9 @@ MODULE    = ttydrv
 SOVERSION = 1.0
 IMPORTS   = user32 gdi32 kernel32 ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	bitmap.c \
 	dc.c \
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index b4497226c49..a617d2994b5 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon
-SOVERSION = 1.0
-IMPORTS   = ole32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	umon.c \
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index 5bd76a9afed..a9e4ab5904b 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -3,9 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version
-SOVERSION = 1.0
 ALTNAMES  = ver
-IMPORTS   = lz32 kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	info.c \
diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in
index f64f781aa13..40d8cd7372d 100644
--- a/dlls/win32s/Makefile.in
+++ b/dlls/win32s/Makefile.in
@@ -7,6 +7,9 @@ SOVERSION = 1.0
 ALTNAMES  = w32sys win32s16
 IMPORTS   = kernel32 ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	w32skernel.c \
 	w32sys.c \
diff --git a/dlls/winaspi/Makefile.in b/dlls/winaspi/Makefile.in
index ea756b816b4..0a15a60989e 100644
--- a/dlls/winaspi/Makefile.in
+++ b/dlls/winaspi/Makefile.in
@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wnaspi32
-SOVERSION = 1.0
 ALTNAMES  = winaspi
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	aspi.c \
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 8c7532f0c29..cb0ccec2e47 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet
-SOVERSION = 1.0
-IMPORTS   = user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	ftp.c \
diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in
index dd48054bc24..0f967f24fb7 100644
--- a/dlls/winmm/joystick/Makefile.in
+++ b/dlls/winmm/joystick/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = joystick.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	joystick.c
diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in
index 83256f524c1..14780b84545 100644
--- a/dlls/winmm/mcicda/Makefile.in
+++ b/dlls/winmm/mcicda/Makefile.in
@@ -3,8 +3,10 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	mcicda.c
diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in
index 732bac84aed..7de805d04d0 100644
--- a/dlls/winmm/mciseq/Makefile.in
+++ b/dlls/winmm/mciseq/Makefile.in
@@ -4,7 +4,10 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	mcimidi.c
diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in
index 9b4f4338be8..2fd61487d87 100644
--- a/dlls/winmm/mciwave/Makefile.in
+++ b/dlls/winmm/mciwave/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	mciwave.c
diff --git a/dlls/winmm/midimap/Makefile.in b/dlls/winmm/midimap/Makefile.in
index e28d024b290..292e59d675b 100644
--- a/dlls/winmm/midimap/Makefile.in
+++ b/dlls/winmm/midimap/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	midimap.c
diff --git a/dlls/winmm/wavemap/Makefile.in b/dlls/winmm/wavemap/Makefile.in
index 77736d6c9b0..727b6e2a820 100644
--- a/dlls/winmm/wavemap/Makefile.in
+++ b/dlls/winmm/wavemap/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	wavemap.c
diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in
index a8123c4e7db..05969da6b95 100644
--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in
index edb0f6d407c..6c6a6d87197 100644
--- a/dlls/wow32/Makefile.in
+++ b/dlls/wow32/Makefile.in
@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wow32
-SOVERSION = 1.0
-IMPORTS   = kernel32
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = wow_main.c
 
-- 
GitLab