diff --git a/Make.rules.in b/Make.rules.in
index 10694abf773..54a7907b0bd 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -68,7 +68,6 @@ WRC       = $(TOPOBJDIR)/tools/wrc/wrc
 WMC       = $(TOPOBJDIR)/tools/wmc/wmc
 LDPATH    = @LDPATH@
 DLLDIR    = $(TOPOBJDIR)/dlls
-MAINSPEC  = $(MODULE:%.dll=%).spec
 LIBWINE   = -L$(TOPOBJDIR)/library -lwine
 LIBTSX11  = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11
 LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode
@@ -104,7 +103,7 @@ includedir      = @includedir@/wine
 CLEAN_FILES     = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
                   *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
 
-OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
+OBJS = $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
        $(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
 
 LINTS = $(C_SRCS:.c=.ln)
@@ -157,15 +156,10 @@ filter:
 
 # Rule for main module intermediate object
 
-$(MODULE).tmp.o: $(OBJS) Makefile.in
-	$(LDCOMBINE) $(OBJS) -o $@
+$(MODULE).tmp.o: $(SPEC_SRCS:.spec=.spec.o) $(OBJS) Makefile.in
+	$(LDCOMBINE) $(SPEC_SRCS:.spec=.spec.o) $(OBJS) -o $@
 	-strip --strip-unneeded $@
 
-# Rule for main module spec file
-
-$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MAINSPEC) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
-
 # Rule to rebuild the resource compiler
 
 $(WRC):
@@ -283,15 +277,13 @@ $(TESTPROGRAM).tmp.o: $(TESTOBJS)
 	$(LDCOMBINE) $(TESTOBJS) -o $@
 	-strip --strip-unneeded $@
 
-$(TESTPROGRAM).spec.c: $(TESTPROGRAM).spec $(TESTPROGRAM).tmp.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym $(TESTPROGRAM).tmp.o -o $@ -spec $(SRCDIR)/$(TESTPROGRAM).spec -L$(DLLDIR) $(TESTIMPORTS:%=-l%)
+$(TESTPROGRAM).spec.c: $(TESTPROGRAM).tmp.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym $(TESTPROGRAM).tmp.o -o $@ -exe $(TESTPROGRAM) -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%)
 
 # Misc. rules
 
 $(SPEC_SRCS:.spec=.spec.c): $(WINEBUILD)
 
-$(SPEC_SRCS:.spec=.spec.def): $(WINEBUILD)
-
 $(GLUE:.c=.glue.c): $(WINEBUILD)
 
 $(RC_SRCS:.rc=.res): $(WRC)
diff --git a/debugger/Makefile.in b/debugger/Makefile.in
index 154fac4885c..ab06a1190cb 100644
--- a/debugger/Makefile.in
+++ b/debugger/Makefile.in
@@ -4,8 +4,9 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedbg
-IMPORTS   = advapi32.dll kernel32.dll ntdll.dll
-DELAYIMPORTS = user32.dll
+APPMODE   = cui
+IMPORTS   = advapi32 kernel32 ntdll
+DELAYIMPORTS = user32
 
 C_SRCS = \
 	break.c \
diff --git a/debugger/winedbg.c b/debugger/winedbg.c
index 26b29111deb..2532857a023 100644
--- a/debugger/winedbg.c
+++ b/debugger/winedbg.c
@@ -961,7 +961,7 @@ static void DEBUG_InitConsole(void)
         SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), mode | WINE_ENABLE_LINE_INPUT_EMACS);
 }
 
-int DEBUG_main(int argc, char** argv)
+int main(int argc, char** argv)
 {
     DWORD	retv = 0;
 
diff --git a/debugger/winedbg.spec b/debugger/winedbg.spec
deleted file mode 100644
index 7c926867338..00000000000
--- a/debugger/winedbg.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	winedbg
-mode	cuiexe
-type	win32
-init	DEBUG_main
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 03960da2f2d..a999792e3af 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -12,15 +12,21 @@ DEFS        = @DLLFLAGS@ -D__WINE__ $(EXTRADEFS)
 DLLEXT      = @DLLEXT@
 ALTSPECS    = $(ALTNAMES:%.dll=%)
 SPEC_SRCS   = $(ALTSPECS:%=%.spec)
-ALL_OBJS    = $(MODULE:%.dll=%).spec.o $(OBJS)
+MAINSPEC    = $(MODULE:%.dll=%).spec
+SPEC_DEF    = $(MAINSPEC).def
+ALL_OBJS    = $(MAINSPEC).o $(SPEC_SRCS:.spec=.spec.o) $(OBJS)
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBS)
-SPEC_DEF    = $(MODULE:%.dll=%).spec.def
 TESTIMPORTS = $(MODULE) $(DELAYIMPORTS) $(IMPORTS)
 
 all: $(MODULE)$(DLLEXT)
 
 @MAKE_RULES@
 
+# Rule for main module spec file
+
+$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:%.rc=-res %.res) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
+
 # Rules for .so files
 
 $(MODULE).so: $(ALL_OBJS) Makefile.in
@@ -28,8 +34,10 @@ $(MODULE).so: $(ALL_OBJS) Makefile.in
 
 # Rules for .dll files
 
-$(MODULE): $(ALL_OBJS) $(SPEC_DEF) Makefile.in
-	$(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(ALL_OBJS) -L$(DLLDIR) $(LDIMPORTS:%=-l%) $(ALL_LIBS)
+$(MODULE): $(OBJS) $(SPEC_DEF) Makefile.in
+	$(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS)
+
+$(SPEC_DEF): $(WINEBUILD)
 
 # Rules for checking that no imports are missing
 
diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index b50443a89e5..d652fb2baee 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advapi32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in
index 317c527139d..618c776b766 100644
--- a/dlls/avicap32/Makefile.in
+++ b/dlls/avicap32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avicap32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 032dedaa9c0..f20173e6448 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32.dll
-IMPORTS   = msvfw32.dll kernel32.dll ntdll.dll
+IMPORTS   = msvfw32 kernel32 ntdll
 ALTNAMES  = avifile.dll
 EXTRALIBS = $(LIBUUID)
 
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index b05c94d6493..47bd482e1ea 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32.dll
-IMPORTS   = user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll
-DELAYIMPORTS = winmm.dll
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+DELAYIMPORTS = winmm
 EXTRALIBS = $(LIBUNICODE)
 
 LDDLLFLAGS = @LDDLLFLAGS@
@@ -39,8 +39,7 @@ C_SRCS = \
 	treeview.c \
 	updown.c
 
-RC_SRCS= \
-	rsrc.rc
+RC_SRCS= rsrc.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index df980ec1f68..8921e74f3a5 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -1,7 +1,6 @@
 name	comctl32
 type	win32
 init	COMCTL32_LibMain
-rsrc	rsrc.res
 
 debug_channels (animate comboex commctrl datetime header hotkey imagelist ipaddress
                 listview message monthcal nativefont pager progress propsheet
diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in
index 82ae9d1d722..1db8dfc877d 100644
--- a/dlls/commdlg/Makefile.in
+++ b/dlls/commdlg/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32.dll
-IMPORTS   = shell32.dll shlwapi.dll comctl32.dll winspool.drv user32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = shell32 shlwapi comctl32 winspool.drv user32 gdi32 kernel32 ntdll
 ALTNAMES  = commdlg.dll
 EXTRALIBS = $(LIBUUID)
 
@@ -23,8 +23,7 @@ C_SRCS = \
 	generic.c \
 	printdlg.c
 
-RC_SRCS= \
-	rsrc.rc
+RC_SRCS= rsrc.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/commdlg/comdlg32.spec b/dlls/commdlg/comdlg32.spec
index 1aa8c0fa245..d5693a45750 100644
--- a/dlls/commdlg/comdlg32.spec
+++ b/dlls/commdlg/comdlg32.spec
@@ -1,7 +1,6 @@
 name	comdlg32
 type	win32
 init	COMDLG32_DllEntryPoint
-rsrc	rsrc.res
 
 debug_channels (commdlg)
 
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index d9ceea309d8..55384bc2e51 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll.dll
-IMPORTS   = msvcrt.dll kernel32.dll ntdll.dll
+IMPORTS   = msvcrt kernel32 ntdll
 EXTRALIBS = $(LIBUNICODE)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in
index 1af3f76ada6..ee4537b9ae6 100644
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crypt32.dll
-IMPORTS   = advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = advapi32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in
index c89d0b75242..7ccdee04574 100644
--- a/dlls/dciman32/Makefile.in
+++ b/dlls/dciman32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index 2262ddccc63..1531e1c0bc2 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddraw.dll
-IMPORTS   = user32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 gdi32 kernel32 ntdll
 EXTRALIBS = $(LIBUUID) $(LIBTSX11) $(X_LIBS) $(XLIB)
 LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll
 
@@ -42,8 +42,7 @@ C_SRCS = \
 	main.c \
 	struct_convert.c
 
-RC_SRCS = \
-	version.rc
+RC_SRCS = version.rc
 
 EXTRASUBDIRS = \
 	d3ddevice \
diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec
index ea4d46d7042..a4c4f90d902 100644
--- a/dlls/ddraw/ddraw.spec
+++ b/dlls/ddraw/ddraw.spec
@@ -1,7 +1,6 @@
 name ddraw
 type win32
 init DDRAW_DllMain
-rsrc version.res
 
 debug_channels (ddraw)
 
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index c0bb04a1453..2a03c25f4d7 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = devenum.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index fe24beccc97..b1dcba2efdb 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput.dll
-IMPORTS   = user32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 kernel32 ntdll
 EXTRALIBS = $(LIBUUID)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in
index f13efb1feab..b5f3d4a69ba 100644
--- a/dlls/dplay/Makefile.in
+++ b/dlls/dplay/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplay.dll
-IMPORTS   = dplayx.dll
+IMPORTS   = dplayx
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 447fec9d40b..402e702929f 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx.dll
-IMPORTS   = winmm.dll ole32.dll user32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
 EXTRALIBS = $(LIBUUID)
 
 LDDLLFLAGS = @LDDLLFLAGS@
@@ -20,8 +20,7 @@ C_SRCS = \
 	lobbysp.c \
 	name_server.c
 
-RC_SRCS = \
-	version.rc
+RC_SRCS = version.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec
index 06754c16522..7391aaebd17 100644
--- a/dlls/dplayx/dplayx.spec
+++ b/dlls/dplayx/dplayx.spec
@@ -1,7 +1,6 @@
 name dplayx
 type win32
 init DPLAYX_LibMain
-rsrc version.res
 
 debug_channels (dplay)
 
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 60a09e97f98..530834ac276 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound.dll
-IMPORTS   = winmm.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm advapi32 kernel32 ntdll
 EXTRALIBS = $(LIBUUID)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index 64783b4faa8..f52dfe5114e 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi32.dll
-IMPORTS   = advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = advapi32 kernel32 ntdll
 ALTNAMES  = gdi.exe dispdib.dll wing.dll
 LDIMPORTS = kernel32.dll ntdll.dll
 EXTRAINCL = @FREETYPEINCL@
@@ -35,11 +35,8 @@ C_SRCS = \
 	win16drv/text.c \
 	wing.c
 
-RC_SRCS= \
-	version.rc
-
-RC_SRCS16= \
-	version16.rc
+RC_SRCS = version.rc
+RC_SRCS16 = version16.rc
 
 GLUE = \
 	printdrv.c \
diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec
index 98c5ab5999c..31b90ed0ad7 100644
--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
@@ -1,7 +1,6 @@
 name    gdi32
 type    win32
 init    MAIN_GdiInit
-rsrc    version.res
 
 debug_channels (bitblt bitmap clipping dc ddraw driver enhmetafile font gdi
                 metafile palette print region text win16drv wing)
diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in
index 6bc157bec84..10780ae5c0e 100644
--- a/dlls/icmp/Makefile.in
+++ b/dlls/icmp/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index a5e45775649..0ba9c77ba5f 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index 783f47b21b2..f0bc0510664 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 ALTNAMES  = imm.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index 05cd32bc5ea..977fb6fe00f 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = kernel32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 ALTNAMES  = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll win87em.dll wprocs.dll
 LDIMPORTS = ntdll.dll
 
@@ -24,8 +24,7 @@ C_SRCS = \
 	windebug.c \
 	wowthunk.c
 
-RC_SRCS = \
-	kernel.rc
+RC_SRCS = kernel.rc
 
 RC_SRCS16 = \
 	version16.rc
diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec
index 25bc1ae1264..3e99c79395d 100644
--- a/dlls/kernel/kernel32.spec
+++ b/dlls/kernel/kernel32.spec
@@ -1,7 +1,6 @@
 name	kernel32
 type	win32
 init	MAIN_KernelInit
-rsrc	kernel.res
 
 debug_channels (comm console debugstr dll int resource stress thunk toolhelp
                 win32)
diff --git a/dlls/kernel/tests/kernel32_test.spec b/dlls/kernel/tests/kernel32_test.spec
deleted file mode 100644
index 99d0a50e950..00000000000
--- a/dlls/kernel/tests/kernel32_test.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	kernel32_test
-type	win32
-mode	cuiexe
diff --git a/dlls/lzexpand/Makefile.in b/dlls/lzexpand/Makefile.in
index d365e4ecaaf..45f14e396ad 100644
--- a/dlls/lzexpand/Makefile.in
+++ b/dlls/lzexpand/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lz32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 ALTNAMES  = lzexpand.dll
 EXTRALIBS = $(LIBUNICODE)
 
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 0ba88031a9d..055cb6c569c 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mapi32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in
index 5eb3974b0b9..f9468c8bba2 100644
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in
index b2db1fcf5f5..c37e3ef5c35 100644
--- a/dlls/msacm/Makefile.in
+++ b/dlls/msacm/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.dll
-IMPORTS   = winmm.dll user32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm user32 advapi32 kernel32 ntdll
 ALTNAMES  = msacm.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
@@ -19,8 +19,7 @@ C_SRCS = \
 	pcmconverter.c \
 	stream.c
 
-RC_SRCS = \
-	msacm.rc
+RC_SRCS = msacm.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec
index 8e207764f9e..b8900fba74a 100644
--- a/dlls/msacm/msacm32.spec
+++ b/dlls/msacm/msacm32.spec
@@ -1,7 +1,6 @@
 name msacm32
 type win32
 init MSACM32_LibMain
-rsrc msacm.res
 
 debug_channels (msacm)
 
diff --git a/dlls/msacm/msg711/Makefile.in b/dlls/msacm/msg711/Makefile.in
index f444c24de80..5b4f895cfa2 100644
--- a/dlls/msacm/msg711/Makefile.in
+++ b/dlls/msacm/msg711/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msg711.drv
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index 7a9c6e81bb9..532e8fb2f27 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msdmo.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msimg32/Makefile.in b/dlls/msimg32/Makefile.in
index 0db384291cf..cedf23ebf08 100644
--- a/dlls/msimg32/Makefile.in
+++ b/dlls/msimg32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msimg32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msisys/Makefile.in b/dlls/msisys/Makefile.in
index acaf1f94331..f46aceae1dc 100644
--- a/dlls/msisys/Makefile.in
+++ b/dlls/msisys/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msisys.ocx
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 EXTRALIBS = $(LIBUUID)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in
index a46ef65851e..45827e49d87 100644
--- a/dlls/msnet32/Makefile.in
+++ b/dlls/msnet32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msnet32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in
index 350060678a0..bdc501f172e 100644
--- a/dlls/msrle32/Makefile.in
+++ b/dlls/msrle32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msrle32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in
index 3440c0f982b..3b91fda9d66 100644
--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 EXTRALIBS = $(LIBUNICODE)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in
index dd887e918f8..8857a6e78bc 100644
--- a/dlls/msvcrt20/Makefile.in
+++ b/dlls/msvcrt20/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt20.dll
-IMPORTS   = msvcrt.dll ntdll.dll
+IMPORTS   = msvcrt ntdll
 EXTRALIBS = $(LIBUNICODE)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/msvideo/Makefile.in b/dlls/msvideo/Makefile.in
index 1839fe245a2..43abf53bb60 100644
--- a/dlls/msvideo/Makefile.in
+++ b/dlls/msvideo/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32.dll
-IMPORTS   = winmm.dll comctl32.dll version.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm comctl32 version user32 gdi32 kernel32 ntdll
 ALTNAMES  = msvideo.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index af978ec5c8b..02d1f28a20f 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = netapi32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index 1a1615a6de9..375fbbb6f32 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 8b68cc8d784..d3ef10be3f9 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole32.dll
-IMPORTS   = advapi32.dll user32.dll gdi32.dll rpcrt4.dll kernel32.dll ntdll.dll
+IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
 ALTNAMES  = ole2.dll ole2nls.dll ole2conv.dll ole2prox.dll ole2thk.dll storage.dll compobj.dll
 EXTRALIBS = $(LIBUUID)
 
@@ -40,8 +40,7 @@ C_SRCS = \
 	storage.c \
 	storage32.c
 
-RC_SRCS = \
-	ole32res.rc
+RC_SRCS = ole32res.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 179b04ccda7..8cfb6f891b0 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -1,7 +1,6 @@
 name	ole32
 type	win32
 init	OLE32_DllEntryPoint
-rsrc	ole32res.res
 
 debug_channels (accel ole relay storage)
 
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 35c13e26763..7e0b2b7d4ac 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleaut32.dll
-IMPORTS   = ole32.dll user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll
-DELAYIMPORTS = comctl32.dll
+IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
+DELAYIMPORTS = comctl32
 ALTNAMES  = ole2disp.dll typelib.dll
 EXTRALIBS = $(LIBUUID) @JPEGLIB@
 
@@ -26,8 +26,7 @@ C_SRCS = \
 	typelib.c \
 	variant.c
 
-RC_SRCS = \
-	version.rc
+RC_SRCS = version.rc
 
 CTESTS = tests/vartest.c
 
diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec
index 995c5b62f9f..3e62b9ed829 100644
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@@ -1,6 +1,5 @@
 name oleaut32
 type win32
-rsrc version.res
 
 debug_channels (ole olerelay typelib)
 
diff --git a/dlls/oleaut32/tests/oleaut32_test.spec b/dlls/oleaut32/tests/oleaut32_test.spec
deleted file mode 100644
index 1a0374b4173..00000000000
--- a/dlls/oleaut32/tests/oleaut32_test.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	oleaut32_tests
-mode	cuiexe
-type	win32
diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in
index 2daf62c815f..44ec3629efb 100644
--- a/dlls/olecli/Makefile.in
+++ b/dlls/olecli/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32.dll
-IMPORTS   = ole32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = ole32 gdi32 kernel32 ntdll
 ALTNAMES  = olecli.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 3a993fdcba3..e7dbe1c619f 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in
index 38446efebe3..1bfcfb003f6 100644
--- a/dlls/olepro32/Makefile.in
+++ b/dlls/olepro32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32.dll
-IMPORTS   = oleaut32.dll ntdll.dll
+IMPORTS   = oleaut32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in
index 75c62d24cc5..710043a7e9f 100644
--- a/dlls/olesvr/Makefile.in
+++ b/dlls/olesvr/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 ALTNAMES  = olesvr.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in
index 34dff133dda..9c746ca65e7 100644
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = opengl32.dll
-IMPORTS   = user32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 gdi32 kernel32 ntdll
 EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index af28ed3b8d3..066c8f6bb95 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = psapi.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in
index 1015a0aa37e..8d05a15edbc 100644
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = qcap.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 5e14022300a..ee11adcd05e 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = quartz.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index a8625ef3822..f6ee3e9bfd3 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 ALTNAMES  = rasapi16.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/richedit/Makefile.in b/dlls/richedit/Makefile.in
index 14511633395..353508fc0fc 100644
--- a/dlls/richedit/Makefile.in
+++ b/dlls/richedit/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32.dll
-IMPORTS   = user32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 2674482c785..076ba5fcf8e 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 9cf48533577..7713836927f 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui.dll
-IMPORTS   = user32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 advapi32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
@@ -11,8 +11,7 @@ SYMBOLFILE = $(MODULE).tmp.o
 C_SRCS = \
 	confdlg.c
 
-RC_SRCS= \
-	serialui_rc.rc
+RC_SRCS= serialui_rc.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec
index 4c85e55ad60..665d5536bec 100644
--- a/dlls/serialui/serialui.spec
+++ b/dlls/serialui/serialui.spec
@@ -1,7 +1,6 @@
 name	serialui
 type	win32
 init	SERIALUI_LibMain
-rsrc	serialui_rc.res
 
 debug_channels (comm)
 
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 12b14d1265a..b5d14b0ee77 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = setupapi.dll
-IMPORTS   = user32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 advapi32 kernel32 ntdll
 ALTNAMES  = setupx.dll
 EXTRALIBS = $(LIBUNICODE)
 
@@ -25,8 +25,7 @@ C_SRCS = \
 GLUE = \
 	virtcopy.c
 
-RC_SRCS= \
-	setupapi.rc
+RC_SRCS= setupapi.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 82e6487bec1..e6af34df93b 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -1,6 +1,5 @@
 name setupapi
 type win32
-rsrc setupapi.res
 
 debug_channels (setupapi)
 
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index d505c67b6b7..93ffeb4dcab 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
-IMPORTS   = ole32.dll kernel32.dll ntdll.dll
+IMPORTS   = ole32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 8e33a547239..76b3b5031f1 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32.dll
 # fixme: avoid ole32.dll import
-IMPORTS   = ole32.dll shlwapi.dll comctl32.dll user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
 ALTNAMES  = shell.dll
 EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
 
@@ -44,8 +44,7 @@ C_SRCS = \
 	shv_item_cmenu.c \
 	systray.c
 
-RC_SRCS= \
-	shres.rc
+RC_SRCS= shres.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 105b00c6d72..bf358748cd3 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -1,7 +1,6 @@
 name	shell32
 type	win32
 init	Shell32LibMain
-rsrc	shres.res
 
 debug_channels (exec pidl shell shlctrl)
 
diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in
index 277cbe95e8e..e14da2bc4e9 100644
--- a/dlls/shfolder/Makefile.in
+++ b/dlls/shfolder/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shfolder.dll
-IMPORTS   = shell32.dll
+IMPORTS   = shell32
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 58565be3f3a..e0d785b95f5 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi.dll
-IMPORTS   = user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/shlwapi/tests/shlwapi_test.spec b/dlls/shlwapi/tests/shlwapi_test.spec
deleted file mode 100644
index 46becfc2530..00000000000
--- a/dlls/shlwapi/tests/shlwapi_test.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name    shlwapi_test
-type    win32
-mode    cuiexe
diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in
index 689955cb533..8a6938240f9 100644
--- a/dlls/snmpapi/Makefile.in
+++ b/dlls/snmpapi/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = snmpapi.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in
index ea8baea3465..d22ca716660 100644
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sti.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in
index 2ddf6195326..1b7b28b7ce3 100644
--- a/dlls/tapi32/Makefile.in
+++ b/dlls/tapi32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = tapi32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/ttydrv/Makefile.in b/dlls/ttydrv/Makefile.in
index f41680b0cba..7c5782c1a49 100644
--- a/dlls/ttydrv/Makefile.in
+++ b/dlls/ttydrv/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ttydrv.dll
-IMPORTS   = user32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 gdi32 kernel32 ntdll
 LDIMPORTS = user32.dll gdi32.dll kernel32.dll ntdll.dll
 EXTRALIBS = @CURSESLIBS@
 
diff --git a/dlls/twain/Makefile.in b/dlls/twain/Makefile.in
index d53d1a26d83..902f5deb9fe 100644
--- a/dlls/twain/Makefile.in
+++ b/dlls/twain/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = twain_32.dll
-IMPORTS   = user32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 gdi32 kernel32 ntdll
 EXTRALIBS = @SANELIBS@
 EXTRAINCL = @SANEINCL@
 
diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in
index ebf200725a4..4707f62728b 100644
--- a/dlls/url/Makefile.in
+++ b/dlls/url/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = url.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index c7b4c544f77..deb736a4d90 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
-IMPORTS   = ole32.dll ntdll.dll
+IMPORTS   = ole32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 7bb922542c3..6f62d9f044a 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32.dll
-IMPORTS   = gdi32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = gdi32 advapi32 kernel32 ntdll
 ALTNAMES  = user.exe keyboard.dll ddeml.dll display.dll mouse.dll
 LDIMPORTS = gdi32.dll kernel32.dll ntdll.dll
 
@@ -32,8 +32,7 @@ C_SRCS = \
 	wnd16.c \
 	wsprintf.c
 
-RC_SRCS = \
-	resources/user32.rc
+RC_SRCS = resources/user32.rc
 
 RC_SRCS16 = \
 	resources/display.rc \
diff --git a/dlls/user/tests/user32_test.spec b/dlls/user/tests/user32_test.spec
deleted file mode 100644
index 9afd03f1770..00000000000
--- a/dlls/user/tests/user32_test.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name    user32_test
-type    win32
-mode    cuiexe
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index 3f1dab1f87f..8cc1fa2c577 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -1,7 +1,6 @@
 name	user32
 type	win32
 init	UserClientDllInitialize
-rsrc	resources/user32.res
 
 debug_channels (accel caret class clipboard combo comm cursor dc ddeml dialog
                 driver edit event graphics hook icon key keyboard listbox local
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index 37eda9e63e8..010611b867a 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version.dll
-IMPORTS   = lz32.dll kernel32.dll ntdll.dll
+IMPORTS   = lz32 kernel32 ntdll
 ALTNAMES  = ver.dll
 EXTRALIBS = $(LIBUNICODE)
 
diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in
index aab0abb737c..d9f29ee576a 100644
--- a/dlls/win32s/Makefile.in
+++ b/dlls/win32s/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = w32skrnl.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 ALTNAMES  = w32sys.dll win32s16.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/winaspi/Makefile.in b/dlls/winaspi/Makefile.in
index 31d3f701975..69c3c87bcb4 100644
--- a/dlls/winaspi/Makefile.in
+++ b/dlls/winaspi/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wnaspi32.dll
-IMPORTS   = advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = advapi32 kernel32 ntdll
 ALTNAMES  = winaspi.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in
index 04e3959b9ea..bfaa285451e 100644
--- a/dlls/winedos/Makefile.in
+++ b/dlls/winedos/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedos.dll
-IMPORTS   = user32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 kernel32 ntdll
 LDIMPORTS = user32.dll kernel32.dll ntdll.dll
 
 C_SRCS = \
diff --git a/dlls/wineps/Makefile.in b/dlls/wineps/Makefile.in
index ddbdb2ee0be..4455bc2f01e 100644
--- a/dlls/wineps/Makefile.in
+++ b/dlls/wineps/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineps.dll
-IMPORTS   = user32.dll gdi32.dll winspool.drv advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 gdi32 winspool.drv advapi32 kernel32 ntdll
 ALTNAMES  = wineps16.dll
 EXTRALIBS = @CUPSLIBS@
 EXTRAINCL = @FREETYPEINCL@
@@ -74,8 +74,7 @@ C_SRCS = \
 	type1afm.c \
 	$(DATA_C_SRCS)
 
-RC_SRCS= \
-	rsrc.rc
+RC_SRCS= rsrc.rc
 
 EXTRASUBDIRS = data
 
diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.spec
index 38715310e56..c11f7ef138e 100644
--- a/dlls/wineps/wineps.spec
+++ b/dlls/wineps/wineps.spec
@@ -1,7 +1,6 @@
 name	wineps
 type	win32
 init	PSDRV_Init
-rsrc	rsrc.res
 
 debug_channels (psdrv)
 
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 7105c08131e..0153bece930 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet.dll
-IMPORTS   = shlwapi.dll user32.dll kernel32.dll ntdll.dll
+IMPORTS   = shlwapi user32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index e51ba7024f1..808060d9482 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winmm.dll
-IMPORTS   = user32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 advapi32 kernel32 ntdll
 ALTNAMES  = mmsystem.dll sound.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
@@ -25,8 +25,7 @@ GLUE = \
 	mmsystem.c \
 	time.c
 
-RC_SRCS = \
-	winmm_res.rc
+RC_SRCS = winmm_res.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in
index d1b7107370f..f34b6a98a73 100644
--- a/dlls/winmm/joystick/Makefile.in
+++ b/dlls/winmm/joystick/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = joystick.drv
-IMPORTS   = winmm.dll user32.dll ntdll.dll
+IMPORTS   = winmm user32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in
index a1e8e39ff6d..49676b6b27f 100644
--- a/dlls/winmm/mcianim/Makefile.in
+++ b/dlls/winmm/mcianim/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcianim.drv
-IMPORTS   = winmm.dll user32.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm user32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/winmm/mciavi/Makefile.in
index e5c49f4069c..bfc1d5d5aa3 100644
--- a/dlls/winmm/mciavi/Makefile.in
+++ b/dlls/winmm/mciavi/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi.drv
-IMPORTS   = msvfw32.dll winmm.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+IMPORTS   = msvfw32 winmm user32 gdi32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
@@ -14,8 +14,7 @@ C_SRCS = \
 	mmoutput.c \
 	wnd.c
 
-RC_SRCS = \
-	mciavi_res.rc
+RC_SRCS = mciavi_res.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/winmm/mciavi/mciavi.drv.spec b/dlls/winmm/mciavi/mciavi.drv.spec
index 2f35fe356ec..8e40607665d 100644
--- a/dlls/winmm/mciavi/mciavi.drv.spec
+++ b/dlls/winmm/mciavi/mciavi.drv.spec
@@ -2,7 +2,6 @@ name mciavi
 file mciavi.drv
 type win32
 init MCIAVI_LibMain
-rsrc mciavi_res.res
 
 debug_channels (mciavi)
 
diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in
index 2a38a5dc5de..c9a0c6dc97e 100644
--- a/dlls/winmm/mcicda/Makefile.in
+++ b/dlls/winmm/mcicda/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.drv
-IMPORTS   = winmm.dll kernel32.dll ntdll.dll
-DELAYIMPORTS = user32.dll
+IMPORTS   = winmm kernel32 ntdll
+DELAYIMPORTS = user32
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in
index f5cb6e4bb64..0a136f921ed 100644
--- a/dlls/winmm/mciseq/Makefile.in
+++ b/dlls/winmm/mciseq/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
-IMPORTS   = winmm.dll kernel32.dll ntdll.dll
-DELAYIMPORTS = user32.dll
+IMPORTS   = winmm kernel32 ntdll
+DELAYIMPORTS = user32
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in
index fd09d6e590e..44cbb1d2a97 100644
--- a/dlls/winmm/mciwave/Makefile.in
+++ b/dlls/winmm/mciwave/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.drv
-IMPORTS   = winmm.dll kernel32.dll ntdll.dll
-DELAYIMPORTS = user32.dll
+IMPORTS   = winmm kernel32 ntdll
+DELAYIMPORTS = user32
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/midimap/Makefile.in b/dlls/winmm/midimap/Makefile.in
index 301d73023b7..be9d9377bdd 100644
--- a/dlls/winmm/midimap/Makefile.in
+++ b/dlls/winmm/midimap/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.drv
-IMPORTS   = winmm.dll user32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm user32 advapi32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/wavemap/Makefile.in b/dlls/winmm/wavemap/Makefile.in
index 8511dbb29ba..25eb44002b9 100644
--- a/dlls/winmm/wavemap/Makefile.in
+++ b/dlls/winmm/wavemap/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.drv
-IMPORTS   = msacm32.dll winmm.dll user32.dll kernel32.dll ntdll.dll
+IMPORTS   = msacm32 winmm user32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/winearts/Makefile.in b/dlls/winmm/winearts/Makefile.in
index c6650411ab8..61c5d589367 100644
--- a/dlls/winmm/winearts/Makefile.in
+++ b/dlls/winmm/winearts/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winearts.drv
-IMPORTS   = winmm.dll user32.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm user32 kernel32 ntdll
 EXTRADEFS = @ARTSINCL@
 EXTRALIBS = @ARTSLIBS@
 
diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in
index c501135532b..b24abf9a9b5 100644
--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
-IMPORTS   = winmm.dll user32.dll kernel32.dll ntdll.dll
+IMPORTS   = winmm user32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec
index 8771ac6bfae..4c494c5bacb 100644
--- a/dlls/winmm/winmm.spec
+++ b/dlls/winmm/winmm.spec
@@ -1,7 +1,6 @@
 name winmm
 type win32
 init WINMM_LibMain
-rsrc winmm_res.res
 
 debug_channels (driver mci mmio mmsys mmtime sound)
 
diff --git a/dlls/winnls/Makefile.in b/dlls/winnls/Makefile.in
index be6ff09a913..b7e18f07c7d 100644
--- a/dlls/winnls/Makefile.in
+++ b/dlls/winnls/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winnls32.dll
-IMPORTS   = kernel32.dll ntdll.dll
+IMPORTS   = kernel32 ntdll
 ALTNAMES  = winnls.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/winsock/Makefile.in b/dlls/winsock/Makefile.in
index 5017d89e517..bda70f6eff6 100644
--- a/dlls/winsock/Makefile.in
+++ b/dlls/winsock/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ws2_32.dll
-IMPORTS   = user32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 kernel32 ntdll
 ALTNAMES  = winsock.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/winsock/tests/ws2_32_test.spec b/dlls/winsock/tests/ws2_32_test.spec
deleted file mode 100644
index 91051180fb2..00000000000
--- a/dlls/winsock/tests/ws2_32_test.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	ws2_32_test
-type	win32
-mode	cuiexe
diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in
index c0448f45b51..e13aa2cb6bf 100644
--- a/dlls/winspool/Makefile.in
+++ b/dlls/winspool/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
-IMPORTS   = advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = advapi32 kernel32 ntdll
 EXTRALIBS = @CUPSLIBS@
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in
index 7bf48d7e1c9..e8f03622e41 100644
--- a/dlls/wintrust/Makefile.in
+++ b/dlls/wintrust/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintrust.dll
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in
index 1347ec96ba1..7b7dcf50a23 100644
--- a/dlls/wow32/Makefile.in
+++ b/dlls/wow32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wow32.dll
-IMPORTS   = kernel32.dll
+IMPORTS   = kernel32
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in
index 60874df2da2..e63ddb8324b 100644
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wsock32.dll
-IMPORTS   = ws2_32.dll kernel32.dll ntdll.dll
+IMPORTS   = ws2_32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in
index b646704a137..df0460d32d6 100644
--- a/dlls/x11drv/Makefile.in
+++ b/dlls/x11drv/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = x11drv.dll
-IMPORTS   = user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB)
 LDIMPORTS = user32.dll gdi32.dll kernel32.dll
 
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 2a41a255b93..7917eeef7da 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -37,48 +37,48 @@ all: $(PROGRAMS) $(PROGRAMS:%=%.so)
 
 @MAKE_RULES@
 
-expand.spec.c: expand.spec expand.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym expand.o -o expand.spec.c -spec expand.spec -L$(DLLDIR) -llz32.dll -lkernel32.dll -lntdll.dll
+expand.spec.c: expand.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym expand.o -o expand.spec.c -exe expand -mgui -L$(DLLDIR) -llz32 -lkernel32 -lntdll
 expand.so: expand.o expand.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o expand.so $+ $(ALL_LIBS)
 
-hello.spec.c: hello.spec hello.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello.o -o hello.spec.c -spec hello.spec -L$(DLLDIR) -luser32.dll -lgdi32.dll -lkernel32.dll -lntdll.dll
+hello.spec.c: hello.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello.o -o hello.spec.c -exe hello -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
 hello.so: hello.o hello.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello.so $+ $(ALL_LIBS)
 
-hello2.spec.c: hello2.spec hello2.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello2.o -o hello2.spec.c -spec hello2.spec -L$(DLLDIR) -luser32.dll -lkernel32.dll -lntdll.dll
+hello2.spec.c: hello2.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello2.o -o hello2.spec.c -exe hello2 -mgui -L$(DLLDIR) -luser32 -lkernel32 -lntdll
 hello2.so: hello2.o hello2.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello2.so $+ $(ALL_LIBS)
 
-hello3.spec.c: hello3.spec hello3.o hello3res.res $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello3.o -o hello3.spec.c -spec hello3.spec -L$(DLLDIR) -lcomdlg32.dll -luser32.dll -lgdi32.dll -lkernel32.dll -lntdll.dll
+hello3.spec.c: hello3.o hello3res.res $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello3.o -res hello3res.res -o hello3.spec.c -exe hello3 -mgui -L$(DLLDIR) -lcomdlg32 -luser32 -lgdi32 -lkernel32 -lntdll
 hello3.so: hello3.o hello3.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello3.so $+ $(ALL_LIBS)
 
-hello4.spec.c: hello4.spec hello4.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello4.o -o hello4.spec.c -spec hello4.spec -L$(DLLDIR) -luser32.dll -lgdi32.dll -lkernel32.dll -lntdll.dll
+hello4.spec.c: hello4.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello4.o -o hello4.spec.c -exe hello4 -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
 hello4.so: hello4.o hello4.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello4.so $+ $(ALL_LIBS)
 
-hello5.spec.c: hello5.spec hello5.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello5.o -o hello5.spec.c -spec hello5.spec -L$(DLLDIR) -lkernel32.dll -lntdll.dll
+hello5.spec.c: hello5.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello5.o -o hello5.spec.c -exe hello5 -mgui -L$(DLLDIR) -lkernel32 -lntdll
 hello5.so: hello5.o hello5.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello5.so $+ $(ALL_LIBS)
 
-new.spec.c: new.spec new.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym new.o -o new.spec.c -spec new.spec -L$(DLLDIR) -luser32.dll -lgdi32.dll -lkernel32.dll -lntdll.dll
+new.spec.c: new.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym new.o -o new.spec.c -exe new -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
 new.so: new.o new.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o new.so $+ $(ALL_LIBS)
 
-rolex.spec.c: rolex.spec rolex.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym rolex.o -o rolex.spec.c -spec rolex.spec -L$(DLLDIR) -luser32.dll -lgdi32.dll -lkernel32.dll -lntdll.dll
+rolex.spec.c: rolex.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym rolex.o -o rolex.spec.c -exe rolex -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
 rolex.so: rolex.o rolex.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o rolex.so $+ $(ALL_LIBS)
 
-volinfo.spec.c: volinfo.spec volinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym volinfo.o -o volinfo.spec.c -spec volinfo.spec -L$(DLLDIR) -lkernel32.dll -lntdll.dll
+volinfo.spec.c: volinfo.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym volinfo.o -o volinfo.spec.c -exe volinfo -mgui -L$(DLLDIR) -lkernel32 -lntdll
 volinfo.so: volinfo.o volinfo.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o volinfo.so $+ $(ALL_LIBS)
 
diff --git a/libtest/expand.spec b/libtest/expand.spec
deleted file mode 100644
index a0c73c0094d..00000000000
--- a/libtest/expand.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	expand
-mode	guiexe
-type	win32
diff --git a/libtest/hello.spec b/libtest/hello.spec
deleted file mode 100644
index fcda0d7a4e7..00000000000
--- a/libtest/hello.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	hello
-mode	guiexe
-type	win32
diff --git a/libtest/hello2.spec b/libtest/hello2.spec
deleted file mode 100644
index aaecc3ede37..00000000000
--- a/libtest/hello2.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	hello2
-mode	guiexe
-type	win32
diff --git a/libtest/hello3.spec b/libtest/hello3.spec
deleted file mode 100644
index 272ba4f1093..00000000000
--- a/libtest/hello3.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	hello3
-mode	guiexe
-type	win32
-rsrc	hello3res.res
diff --git a/libtest/hello4.spec b/libtest/hello4.spec
deleted file mode 100644
index b19a9be117e..00000000000
--- a/libtest/hello4.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	hello4
-mode	guiexe
-type	win32
diff --git a/libtest/hello5.spec b/libtest/hello5.spec
deleted file mode 100644
index 04c83790e90..00000000000
--- a/libtest/hello5.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	hello5
-mode	guiexe
-type	win32
diff --git a/libtest/new.spec b/libtest/new.spec
deleted file mode 100644
index 36e492c7dd7..00000000000
--- a/libtest/new.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	new
-mode	guiexe
-type	win32
diff --git a/libtest/rolex.spec b/libtest/rolex.spec
deleted file mode 100644
index 85adaefc5ea..00000000000
--- a/libtest/rolex.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	rolex
-mode	guiexe
-type	win32
diff --git a/libtest/volinfo.spec b/libtest/volinfo.spec
deleted file mode 100644
index 50c1d631e95..00000000000
--- a/libtest/volinfo.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	volinfo
-mode	guiexe
-type	win32
diff --git a/miscemu/Makefile.in b/miscemu/Makefile.in
index 0afb8f397bf..ca523c4290c 100644
--- a/miscemu/Makefile.in
+++ b/miscemu/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = miscemu
-IMPORTS   = ntdll.dll
+IMPORTS   = ntdll
 
 SPEC_SRCS = wine.spec
 
@@ -15,7 +15,7 @@ all: $(MODULE).o
 
 @MAKE_RULES@
 
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
-	$(LDCOMBINE) $(OBJS) -o $@
+$(MODULE).o: $(SPEC_SRCS:.spec=.spec.o) $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
+	$(LDCOMBINE) $(SPEC_SRCS:.spec=.spec.o) $(OBJS) -o $@
 
 ### Dependencies:
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 9825532ebfe..d3b78f98d41 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -2,6 +2,7 @@
 #
 # Each individual makefile should define the following variables:
 # MODULE       : name of the main module being built
+# APPMODE      : program mode (cui,gui,cuiw,guiw)
 # EXTRALIBS    : extra libraries to link in (optional)
 # EXTRADEFS    : extra symbol definitions, like -DWINELIB (optional)
 #
@@ -19,10 +20,15 @@ all: $(MODULE)
 
 @MAKE_RULES@
 
+# Rule for main module spec file
+
+$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ $(SYMBOLFILE:%=-sym %) -o $@ -exe $(MODULE) $(APPMODE:%=-m%) $(RC_SRCS:%.rc=-res %.res) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
+
 # Rules for main module
 
-$(MODULE).so: $(ALL_OBJS) Makefile.in
-	$(LDSHARED) $(LDDLLFLAGS) $(ALL_OBJS) -o $@ $(ALL_LIBS)
+$(MODULE).so: $(MODULE).spec.o $(OBJS) Makefile.in
+	$(LDSHARED) $(LDDLLFLAGS) $(MODULE).spec.o $(OBJS) -o $@ $(ALL_LIBS)
 
 $(MODULE): $(MODULE).so
 	$(RM) $(MODULE) && $(LN_S) $(TOPOBJDIR)/wine $(MODULE)
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index f1734d28397..00886f6eb86 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -8,23 +8,18 @@ MODULE     = none
 PROGRAMS   = icinfo aviinfo aviplay
 ALL_LIBS   = $(LIBWINE) $(LIBS)
 
-SPEC_SRCS = \
-	icinfo.spec \
-	aviinfo.spec \
-	aviplay.spec
-
 all: $(PROGRAMS)
 
 @MAKE_RULES@
 
-aviinfo.spec.c: aviinfo.spec aviinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym aviinfo.o -o aviinfo.spec.c -spec $(SRCDIR)/aviinfo.spec -L$(DLLDIR) -lkernel32.dll -lntdll.dll
+aviinfo.spec.c: aviinfo.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym aviinfo.o -o aviinfo.spec.c -exe aviinfo -mgui -L$(DLLDIR) -lkernel32 -lntdll
 
-aviplay.spec.c: aviplay.spec aviplay.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym aviplay.o -o aviplay.spec.c -spec $(SRCDIR)/aviplay.spec -L$(DLLDIR) -lddraw.dll -lkernel32.dll -lntdll.dll
+aviplay.spec.c: aviplay.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym aviplay.o -o aviplay.spec.c -exe aviplay -mgui -L$(DLLDIR) -lddraw -lkernel32 -lntdll
 
-icinfo.spec.c: icinfo.spec icinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym icinfo.o -o icinfo.spec.c -spec $(SRCDIR)/icinfo.spec -L$(DLLDIR) -lmsvfw32.dll -lkernel32.dll -lntdll.dll
+icinfo.spec.c: icinfo.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym icinfo.o -o icinfo.spec.c -exe icinfo -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32 -lntdll
 
 aviinfo.so: aviinfo.o aviinfo.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o aviinfo.so aviinfo.o aviinfo.spec.o $(ALL_LIBS)
diff --git a/programs/avitools/aviinfo.spec b/programs/avitools/aviinfo.spec
deleted file mode 100644
index 1730af69fc9..00000000000
--- a/programs/avitools/aviinfo.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	aviinfo
-mode	guiexe
-type	win32
diff --git a/programs/avitools/aviplay.spec b/programs/avitools/aviplay.spec
deleted file mode 100644
index 9a1a3e1e59d..00000000000
--- a/programs/avitools/aviplay.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	aviplay
-mode	guiexe
-type	win32
diff --git a/programs/avitools/icinfo.spec b/programs/avitools/icinfo.spec
deleted file mode 100644
index ffe307c99f5..00000000000
--- a/programs/avitools/icinfo.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-name	icinfo
-mode	guiexe
-type	win32
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 915835e14d5..ed7d3fba4a1 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clock
-IMPORTS   = comdlg32.dll shell32.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/clock/clock.spec b/programs/clock/clock.spec
deleted file mode 100644
index f5e1a38ab79..00000000000
--- a/programs/clock/clock.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	clock
-mode	guiexe
-type	win32
-rsrc	rsrc.res
-
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index 589771d1a51..e026fab4738 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -3,13 +3,13 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmdlgtst
-IMPORTS   = comdlg32.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = comdlg32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	cmdlgtst.c
 
-RC_SRCS = \
-	cmdlgr.rc
+RC_SRCS = cmdlgr.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/cmdlgtst/cmdlgtst.spec b/programs/cmdlgtst/cmdlgtst.spec
deleted file mode 100644
index e100d40d4f8..00000000000
--- a/programs/cmdlgtst/cmdlgtst.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	cmdlgtst
-mode	guiexe
-type	win32
-rsrc	cmdlgr.res
-
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 68d78dcfde3..895340610ec 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = control
-IMPORTS   = shell32.dll user32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = shell32 user32 kernel32 ntdll
 
 C_SRCS = control.c
 
diff --git a/programs/control/control.spec b/programs/control/control.spec
deleted file mode 100644
index c902d8ba43b..00000000000
--- a/programs/control/control.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	control
-mode	guiexe
-type	win32
-
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 2a31a44e15b..009a3e0b15e 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad
-IMPORTS   = comdlg32.dll shell32.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/notepad/notepad.spec b/programs/notepad/notepad.spec
deleted file mode 100644
index 1d647ba5608..00000000000
--- a/programs/notepad/notepad.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	notepad
-mode	guiexe
-type	win32
-rsrc	rsrc.res
-
diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in
index 8016fc958ba..c452c61c55d 100644
--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = osversioncheck
-IMPORTS   = kernel32.dll ntdll.dll
+APPMODE   = cui
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = osversioncheck.c
 
diff --git a/programs/osversioncheck/osversioncheck.spec b/programs/osversioncheck/osversioncheck.spec
deleted file mode 100644
index a59ffeed222..00000000000
--- a/programs/osversioncheck/osversioncheck.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	osversioncheck
-mode    cuiexe
-type	win32
-init	main
-
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index ba09ea82c42..325b392ec22 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = progman
-IMPORTS   = shell32.dll comdlg32.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = shell32 comdlg32 user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 
diff --git a/programs/progman/progman.spec b/programs/progman/progman.spec
deleted file mode 100644
index f33dfa88f52..00000000000
--- a/programs/progman/progman.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	progman
-mode	guiexe
-type	win32
-rsrc	rsrc.res
-
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index 3eb8a66784f..492a4be3326 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regapi
-IMPORTS   = advapi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = \
 	regapi.c
diff --git a/programs/regapi/regapi.spec b/programs/regapi/regapi.spec
deleted file mode 100644
index 0d1754693b4..00000000000
--- a/programs/regapi/regapi.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	regapi
-mode	guiexe
-type	win32
-
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index c44a3386a38..7a3d80cae9d 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regedit
-IMPORTS   = msvcrt.dll advapi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = msvcrt advapi32 kernel32 ntdll
 
 C_SRCS = \
 	regedit.c \
diff --git a/programs/regedit/regedit.spec b/programs/regedit/regedit.spec
deleted file mode 100644
index 5b1fcc68110..00000000000
--- a/programs/regedit/regedit.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name    regedit
-type    win32
-mode    guiexe
-init    WinMain
-
diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in
index f8792eb605e..797a036be07 100644
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@@ -4,7 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regsvr32
-IMPORTS   = msvcrt.dll kernel32.dll ntdll.dll
+APPMODE   = cui
+IMPORTS   = msvcrt kernel32 ntdll
 
 C_SRCS = \
 	regsvr32.c
diff --git a/programs/regsvr32/regsvr32.spec b/programs/regsvr32/regsvr32.spec
deleted file mode 100644
index d0f75c17a86..00000000000
--- a/programs/regsvr32/regsvr32.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name    regsvr32
-type    win32
-mode    cuiexe
-init    main
-
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index 5a739b9a435..2f1ada8b9d1 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regtest
-IMPORTS   = advapi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = regtest.c
 
diff --git a/programs/regtest/regtest.spec b/programs/regtest/regtest.spec
deleted file mode 100644
index 13047360ff5..00000000000
--- a/programs/regtest/regtest.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	regtest
-mode	guiexe
-type	win32
-
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index 433cd268109..c68705aafba 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uninstaller
-IMPORTS   = user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	main.c
diff --git a/programs/uninstaller/uninstaller.spec b/programs/uninstaller/uninstaller.spec
deleted file mode 100644
index 6496a262dfc..00000000000
--- a/programs/uninstaller/uninstaller.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	uninstaller
-mode	guiexe
-type	win32
-rsrc	rsrc.res
-
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index 39db49a29d1..68d5f7e05cf 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -3,15 +3,15 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = view
-IMPORTS   = comdlg32.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = comdlg32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	init.c \
 	view.c \
 	winmain.c
 
-RC_SRCS = \
-	viewrc.rc
+RC_SRCS = viewrc.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/view/view.spec b/programs/view/view.spec
deleted file mode 100644
index 8c0b03ca10b..00000000000
--- a/programs/view/view.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	view
-mode	guiexe
-type	win32
-rsrc	viewrc.res
-
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index ae267f960ab..c2b7ba8ed85 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wcmd
-IMPORTS   = shell32.dll user32.dll kernel32.dll ntdll.dll
+APPMODE   = cui
+IMPORTS   = shell32 user32 kernel32 ntdll
 
 C_SRCS = \
 	batch.c \
@@ -11,8 +12,7 @@ C_SRCS = \
 	directory.c \
 	wcmdmain.c
 
-RC_SRCS = \
-	wcmdrc.rc
+RC_SRCS = wcmdrc.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/wcmd/wcmd.spec b/programs/wcmd/wcmd.spec
deleted file mode 100644
index 2b657c3746e..00000000000
--- a/programs/wcmd/wcmd.spec
+++ /dev/null
@@ -1,6 +0,0 @@
-name	wcmd
-mode    cuiexe
-type	win32
-init	main
-rsrc	wcmdrc.res
-
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index 1fce2099348..b9916f449bf 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -4,7 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineconsole
-IMPORTS   = gdi32.dll user32.dll advapi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = gdi32 user32 advapi32 kernel32 ntdll
 DELAYIMPORTS = comctl32
 
 C_SRCS = \
@@ -13,8 +14,7 @@ C_SRCS = \
 	user.c \
 	wineconsole.c
 
-RC_SRCS = \
-        wineconsole_res.rc
+RC_SRCS = wineconsole_res.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index 8acc77ae66c..b276b47df90 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -489,14 +489,14 @@ static BOOL WINECON_HasEvent(LPCSTR ptr, unsigned *evt)
 }
 
 /******************************************************************
- *		WINECON_WinMain
+ *		WinMain
  *
  * wineconsole can either be started as:
  *	wineconsole --use-event=<int>	used when a new console is created (AllocConsole)
  *	wineconsole <pgm> <arguments>	used to start the program <pgm> from the command line in
  *					a freshly created console
  */
-int PASCAL WINECON_WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPCSTR lpCmdLine, UINT nCmdShow)
+int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdShow)
 {
     struct inner_data*	data;
     int			ret = 1;
diff --git a/programs/wineconsole/wineconsole.spec b/programs/wineconsole/wineconsole.spec
deleted file mode 100644
index 804fce9dfc0..00000000000
--- a/programs/wineconsole/wineconsole.spec
+++ /dev/null
@@ -1,6 +0,0 @@
-name	wineconsole
-mode	guiexe
-type	win32
-init	WINECON_WinMain
-rsrc    wineconsole_res.res                                                                                                                                                                  
-
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index 5fe2854440f..b52bc14ff0f 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemine
-IMPORTS   = user32.dll gdi32.dll advapi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
         dialog.c \
diff --git a/programs/winemine/winemine.spec b/programs/winemine/winemine.spec
deleted file mode 100644
index 85c29061fda..00000000000
--- a/programs/winemine/winemine.spec
+++ /dev/null
@@ -1,5 +0,0 @@
-name	winemine
-mode	guiexe
-type	win32
-rsrc	rsrc.res
-
diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in
index 7d9d30d3b2f..8b226612d6f 100644
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winepath
-IMPORTS   = kernel32.dll ntdll.dll
+APPMODE   = cui
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = winepath.c
 
diff --git a/programs/winepath/winepath.spec b/programs/winepath/winepath.spec
deleted file mode 100644
index b73bfd35e68..00000000000
--- a/programs/winepath/winepath.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	winepath
-mode	cuiexe
-type	win32
-
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 2c295b7f06a..fd03347081e 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -7,7 +7,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winetest
-IMPORTS   = kernel32.dll ntdll.dll
+APPMODE   = cui
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = winetest.c
 
diff --git a/programs/winetest/winetest.spec b/programs/winetest/winetest.spec
deleted file mode 100644
index fa8f8e3e66b..00000000000
--- a/programs/winetest/winetest.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	winetest
-mode	cuiexe
-type	win32
-
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index d7cf6c7880c..6529234426e 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhelp
-IMPORTS   = comdlg32.dll shell32.dll user32.dll gdi32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32 ntdll
 PROGRAMS  = hlp2sgml
 
 C_SRCS = \
diff --git a/programs/winhelp/winhelp.spec b/programs/winhelp/winhelp.spec
deleted file mode 100644
index 2d819da5c24..00000000000
--- a/programs/winhelp/winhelp.spec
+++ /dev/null
@@ -1,6 +0,0 @@
-name	winhelp
-mode	guiexe
-type	win32
-init	WinMain
-rsrc	rsrc.res
-
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index b8e18354ab3..ef0deef57b3 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winver
-IMPORTS   = shell32.dll kernel32.dll ntdll.dll
+APPMODE   = gui
+IMPORTS   = shell32 kernel32 ntdll
 
 C_SRCS = winver.c
 
diff --git a/programs/winver/winver.spec b/programs/winver/winver.spec
deleted file mode 100644
index c7c18bd1294..00000000000
--- a/programs/winver/winver.spec
+++ /dev/null
@@ -1,4 +0,0 @@
-name	winver
-mode	guiexe
-type	win32
-
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 686f93136f2..843fd7133fe 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -86,7 +86,6 @@ static char *try_library_path( const char *path, const char *name )
 
     buffer = xmalloc( strlen(path) + strlen(name) + 9 );
     sprintf( buffer, "%s/%s", path, name );
-    if (!strchr( name, '.' )) strcat( buffer, ".dll" );
     strcat( buffer, ".so" );
     /* check if the file exists */
     if ((fd = open( buffer, O_RDONLY )) != -1)
@@ -162,14 +161,25 @@ static void read_exported_symbols( const char *name, struct import *imp )
 void add_import_dll( const char *name, int delay )
 {
     struct import *imp;
+    char *fullname;
     int i;
 
+    fullname = xmalloc( strlen(name) + 5 );
+    strcpy( fullname, name );
+    if (!strchr( fullname, '.' )) strcat( fullname, ".dll" );
+
     /* check if we already imported it */
     for (i = 0; i < nb_imports; i++)
-        if (!strcmp( dll_imports[i]->dll, name )) return;
+    {
+        if (!strcmp( dll_imports[i]->dll, fullname ))
+        {
+            free( fullname );
+            return;
+        }
+    }
 
     imp = xmalloc( sizeof(*imp) );
-    imp->dll        = xstrdup( name );
+    imp->dll        = fullname;
     imp->delay      = delay;
     imp->imports    = NULL;
     imp->nb_imports = 0;
@@ -177,7 +187,7 @@ void add_import_dll( const char *name, int delay )
     imp->lineno = current_line - 1;
 
     if (delay) nb_delayed++;
-    read_exported_symbols( name, imp );
+    read_exported_symbols( fullname, imp );
 
     dll_imports = xrealloc( dll_imports, (nb_imports+1) * sizeof(*dll_imports) );
     dll_imports[nb_imports++] = imp;
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 13c27d92bb7..81a78e9ca8b 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -73,6 +73,7 @@ static enum
 {
     MODE_NONE,
     MODE_SPEC,
+    MODE_EXE,
     MODE_GLUE,
     MODE_DEF,
     MODE_RELAY16,
@@ -113,8 +114,10 @@ static void do_pic(void);
 static void do_output( const char *arg );
 static void do_usage(void);
 static void do_warnings(void);
+static void do_exe_mode( const char *arg );
 static void do_spec( const char *arg );
 static void do_def( const char *arg );
+static void do_exe( const char *arg );
 static void do_glue( const char *arg );
 static void do_relay16(void);
 static void do_relay32(void);
@@ -122,19 +125,23 @@ static void do_sym( const char *arg );
 static void do_lib( const char *arg );
 static void do_import( const char *arg );
 static void do_dimport( const char *arg );
+static void do_rsrc( const char *arg );
 
 static const struct option_descr option_table[] =
 {
     { "-fPIC",    0, do_pic,     "-fPIC            Generate PIC code" },
     { "-h",       0, do_usage,   "-h               Display this help message" },
     { "-w",       0, do_warnings,"-w               Turn on warnings" },
+    { "-m",       1, do_exe_mode,"-m mode          Set the executable mode (cui|gui|cuiw|guiw)" },
     { "-L",       1, do_lib,     "-L directory     Look for imports libraries in 'directory'" },
     { "-l",       1, do_import,  "-l lib.dll       Import the specified library" },
     { "-dl",      1, do_dimport, "-dl lib.dll      Delay-import the specified library" },
+    { "-res",     1, do_rsrc,    "-res rsrc.res    Load resources from rsrc.res" },
     { "-o",       1, do_output,  "-o name          Set the output file name (default: stdout)" },
     { "-sym",     1, do_sym,     "-sym file.o      Read the list of undefined symbols from 'file.o'" },
     { "-spec",    1, do_spec,    "-spec file.spec  Build a .c file from a spec file" },
     { "-def",     1, do_def,     "-def file.spec   Build a .def file from a spec file" },
+    { "-exe",     1, do_exe,     "-exe name        Build a .c file from the named executable" },
     { "-glue",    1, do_glue,    "-glue file.c     Build the 16-bit glue for a .c file" },
     { "-relay16", 0, do_relay16, "-relay16         Build the 16-bit relay assembly routines" },
     { "-relay32", 0, do_relay32, "-relay32         Build the 32-bit relay assembly routines" },
@@ -191,6 +198,29 @@ static void do_def( const char *arg )
     open_input( arg );
 }
 
+static void do_exe( const char *arg )
+{
+    const char *p;
+
+    if (exec_mode != MODE_NONE || !arg[0]) do_usage();
+    exec_mode = MODE_EXE;
+    if ((p = strrchr( arg, '/' ))) p++;
+    else p = arg;
+    strcpy( DLLName, p );
+    strcpy( DLLFileName, p );
+    if (!strchr( DLLFileName, '.' )) strcat( DLLFileName, ".exe" );
+    if (SpecMode == SPEC_MODE_DLL) SpecMode = SPEC_MODE_GUIEXE;
+}
+
+static void do_exe_mode( const char *arg )
+{
+    if (!strcmp( arg, "gui" )) SpecMode = SPEC_MODE_GUIEXE;
+    else if (!strcmp( arg, "cui" )) SpecMode = SPEC_MODE_CUIEXE;
+    else if (!strcmp( arg, "guiw" )) SpecMode = SPEC_MODE_GUIEXE_UNICODE;
+    else if (!strcmp( arg, "cuiw" )) SpecMode = SPEC_MODE_CUIEXE_UNICODE;
+    else do_usage();
+}
+
 static void do_glue( const char *arg )
 {
     if (exec_mode != MODE_NONE || !arg[0]) do_usage();
@@ -232,6 +262,11 @@ static void do_dimport( const char *arg )
     add_import_dll( arg, 1 );
 }
 
+static void do_rsrc( const char *arg )
+{
+    load_res32_file( arg );
+}
+
 /* parse options from the argv array and remove all the recognized ones */
 static void parse_options( char *argv[] )
 {
@@ -296,6 +331,9 @@ int main(int argc, char **argv)
             default: assert(0);
         }
         break;
+    case MODE_EXE:
+        BuildSpec32File( output_file );
+        break;
     case MODE_DEF:
         switch (ParseTopLevel( input_file, 1 ))
         {
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index 0f9811dce42..784106b04c0 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -560,31 +560,6 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
                 fatal_error( "init cannot be used for Win16 spec files\n" );
             init_func = xstrdup( GetToken(0) );
         }
-        else if (strcmp(token, "import") == 0)
-        {
-            const char* name;
-            int delay = 0;
-
-            if (SpecType != SPEC_WIN32)
-                fatal_error( "Imports not supported for Win16\n" );
-            name = GetToken(0);
-            if (*name == '-')
-            {
-                name = GetToken(0);
-                if (!strcmp(name, "delay"))
-                {
-
-                    name = GetToken(0);
-#ifndef __PPC__
-                    delay = 1;
-#else
-		    warning( "The 'delay' option is not yet supported on the PPC. 'delay' will be ignored.\n");
-#endif /* __PPC__ */
-                }
-                else fatal_error( "Unknown option '%s' for import directive\n", name );
-            }
-            if (!def_only) add_import_dll( name, delay );
-        }
         else if (strcmp(token, "rsrc") == 0)
         {
             if (!def_only)
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 0d9b6aae3fb..0bba03cb4b5 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -125,8 +125,11 @@ void warning( const char *msg, ... )
 /* output a standard header for generated files */
 void output_standard_file_header( FILE *outfile )
 {
-    fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n",
-             input_file_name );
+    if (input_file_name)
+        fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n",
+                 input_file_name );
+    else
+        fprintf( outfile, "/* File generated automatically; do not edit! */\n" );
     fprintf( outfile,
              "/* This file can be copied, modified and distributed without restriction. */\n\n" );
 }