diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 74f4cf56abd..e76a792c162 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -15,21 +15,16 @@ ALL_OBJS    = $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
 BASEMODULE  = $(MODULE:.exe=)
 TESTIMPORTS = $(DELAYIMPORTS) $(IMPORTS)
-RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) $(PLTESTPROGRAM:%=-p %)
+RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR)
 
 @MAKE_RULES@
 
 all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT)
 
-# Rule for main module spec file
-
-$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe $(MODULE) $(APPMODE:%=--mode %) $(RC_SRCS:.rc=.res) $(ALL_OBJS) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%)
-
 # Rules for .so main module
 
-$(MODULE).so: $(MODULE).spec.o $(ALL_OBJS) Makefile.in
-	$(LDDLL) $(MODULE).spec.o $(ALL_OBJS) -o $@ -L$(DLLDIR) $(ALL_LIBS) -lc
+$(MODULE).so: $(ALL_OBJS) $(RC_SRCS:.rc=.res) Makefile.in
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) $(APPMODE) $(ALL_OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(IMPORTS:%=-l%) $(ALL_LIBS) -lc
 
 $(BASEMODULE): $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
@@ -37,7 +32,7 @@ $(BASEMODULE): $(WINEWRAPPER)
 # Rules for .exe main module
 
 $(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in
-	$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
+	$(CC) $(APPMODE) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
 
 # Rules for testing
 
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 636f442d297..696c9d3c851 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -17,32 +17,23 @@ C_SRCS = \
 
 all: $(PROGRAMS:%=%$(DLLEXT)) $(PROGRAMS:.exe=$(EXEEXT))
 
-aviinfo.exe.spec.c: aviinfo.o $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviinfo.exe --mode gui aviinfo.o -L$(DLLDIR) -lavifil32 -lkernel32
+aviinfo.exe.so: aviinfo.o
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ aviinfo.o -L$(DLLDIR) -lavifil32 $(ALL_LIBS) -lc
 
-aviplay.exe.spec.c: aviplay.o $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviplay.exe --mode gui aviplay.o -L$(DLLDIR) -lavifil32 -lddraw -lkernel32
+aviplay.exe.so: aviplay.o
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ aviplay.o -L$(DLLDIR) -lavifil32 -lddraw $(ALL_LIBS) -lc
 
-icinfo.exe.spec.c: icinfo.o $(WINEBUILD)
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe icinfo.exe --mode gui icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32
-
-aviinfo.exe.so: aviinfo.o aviinfo.exe.spec.o
-	$(LDDLL) -o $@ aviinfo.o aviinfo.exe.spec.o $(ALL_LIBS) -lc
-
-aviplay.exe.so: aviplay.o aviplay.exe.spec.o
-	$(LDDLL) -o $@ aviplay.o aviplay.exe.spec.o $(ALL_LIBS) -lc
-
-icinfo.exe.so: icinfo.o icinfo.exe.spec.o
-	$(LDDLL) -o $@ icinfo.o icinfo.exe.spec.o $(ALL_LIBS) -lc
+icinfo.exe.so: icinfo.o
+	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 $(ALL_LIBS) -lc
 
 aviinfo.exe: aviinfo.o
-	$(CC) -o $@ aviinfo.o -lavifil32 -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ aviinfo.o -lavifil32 $(ALL_LIBS)
 
 aviplay.exe: aviplay.o
-	$(CC) -o $@ aviplay.o -lavifil32 -lddraw -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ aviplay.o -lavifil32 -lddraw $(ALL_LIBS)
 
 icinfo.exe: icinfo.o
-	$(CC) -o $@ icinfo.o -lmsvfw32 -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ icinfo.o -lmsvfw32 $(ALL_LIBS)
 
 $(PROGRAMS:.exe=): $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index ed3f7eecf01..c4918232cb9 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clock.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 LICENSELANG = En
 
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index 55cfc0767d8..c661dcd15fa 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmdlgtst.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = \
 	cmdlgtst.c
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 93de5db1c73..8fe15221818 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = control.exe
-APPMODE   = gui
-IMPORTS   = shell32 user32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = control.c
 
diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in
index b7f47e5bb48..acce36fd069 100644
--- a/programs/expand/Makefile.in
+++ b/programs/expand/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = expand.exe
-APPMODE   = cui
-IMPORTS   = lz32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = lz32
 
 C_SRCS = expand.c
 
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 61b2432821e..2d3a79a2c1d 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 msvcrt advapi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = msvcrt
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
 
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index c358d7b70a5..ddc73f53ce7 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = progman.exe
-APPMODE   = gui
-IMPORTS   = shell32 comdlg32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 LICENSELANG = En
 
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index d16f11068ee..d5edae9131c 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regedit.exe
-APPMODE   = gui
-IMPORTS   = msvcrt advapi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = msvcrt
 DELAYIMPORTS = shell32 comdlg32 comctl32 user32 gdi32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in
index aaaefc0ae34..09bcdeaeb10 100644
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regsvr32.exe
-APPMODE   = cui
-IMPORTS   = kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
 	regsvr32.c
diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in
index e630e449f62..9c63c9b3300 100644
--- a/programs/rpcss/Makefile.in
+++ b/programs/rpcss/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcss.exe
-APPMODE   = cui
-IMPORTS   = kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
        epmap_server.c \
diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in
index 6b06679cae9..9e3ec1d73c1 100644
--- a/programs/rundll32/Makefile.in
+++ b/programs/rundll32/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rundll32.exe
-APPMODE   = cui
-IMPORTS   = user32 kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
 	rundll32.c
diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in
index 2a9291d0019..3b769601f6b 100644
--- a/programs/start/Makefile.in
+++ b/programs/start/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = start.exe
-APPMODE   = cui
-IMPORTS   = shell32 user32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = shell32
 
 C_SRCS = start.c
 
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index bc6b84963b6..b9e0dff45eb 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uninstaller.exe
-APPMODE   = cui
-IMPORTS   = user32 gdi32 advapi32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = gdi32
 
 C_SRCS = \
 	main.c
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index 5ef4ee1f638..cb364eacd39 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = view.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = \
 	init.c \
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 714c68f0a50..d1ec2f98914 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wcmd.exe
-APPMODE   = cui
-IMPORTS   = shell32 user32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = shell32
 
 C_SRCS = \
 	batch.c \
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index 9473580dc31..acd171b53d8 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineboot.exe
-APPMODE   = cui
-IMPORTS   = advapi32 kernel32
+APPMODE   = -mconsole
 
 C_SRCS = \
 	wineboot.c
diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in
index 88f60616eb2..96fd24032a8 100644
--- a/programs/winebrowser/Makefile.in
+++ b/programs/winebrowser/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winebrowser.exe
-APPMODE   = cui
-IMPORTS   = shell32 user32 advapi32 kernel32
+APPMODE   = -mconsole
+IMPORTS   = shell32
 
 C_SRCS = \
 	main.c
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index b62b0c9f673..cfadd1c7c85 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecfg.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 comctl32 user32 advapi32
+APPMODE   = -mwindows
+IMPORTS   = comctl32
 
 C_SRCS = \
 	appdefaults.c \
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index f03b71870d3..2b59e9ad18d 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineconsole.exe
-APPMODE   = gui
-IMPORTS   = advapi32 kernel32 ntdll
+APPMODE   = -mwindows
+IMPORTS   = ntdll
 DELAYIMPORTS = comctl32 user32 gdi32
 
 C_SRCS = \
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 91d03ece3d9..59f3ef9b04c 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedbg.exe
-APPMODE   = cui
-IMPORTS   = advapi32 kernel32 ntdll
+APPMODE   = -mconsole
+IMPORTS   = ntdll
 DELAYIMPORTS = user32
 
 C_SRCS = \
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index 9b1596a1358..b178415b17f 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
-APPMODE   = gui
-IMPORTS   = shell32 comctl32 ole32 user32 gdi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = comctl32 ole32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index 017d0fce743..90f4911b8e5 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
-APPMODE   = gui
-IMPORTS   = shell32 ole32 user32 advapi32 kernel32
+APPMODE   = -mwindows
+IMPORTS   = ole32
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index 3725b74daa3..1392d60a8b2 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemine.exe
-APPMODE   = gui
-IMPORTS   = user32 gdi32 advapi32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = \
         dialog.c \
diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in
index e2286ee4166..f648894d49d 100644
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winepath.exe
-APPMODE   = cui
-IMPORTS   = kernel32
+APPMODE   = -mconsole
 
 C_SRCS = winepath.c
 
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index b956660be31..3b2f0973ac4 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winetest.exe
-APPMODE   = gui
-IMPORTS   = comctl32 user32 wsock32
+APPMODE   = -mwindows
+IMPORTS   = comctl32 wsock32
 
 C_SRCS = \
 	gui.c \
diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in
index 61b1db0c9f5..b7b948d8dc7 100644
--- a/programs/winevdm/Makefile.in
+++ b/programs/winevdm/Makefile.in
@@ -3,8 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winevdm.exe
-APPMODE   = cui
-IMPORTS   = winedos kernel32
+APPMODE   = -mconsole
+IMPORTS   = winedos
 
 C_SRCS = \
 	winevdm.c
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index 5db18de3a69..c4b1f61ed46 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhelp.exe
-APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
+APPMODE   = -mwindows
 PROGRAMS  = hlp2sgml
 
 C_SRCS = \
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index 651a5284c97..617ed74cdc8 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winver.exe
-APPMODE   = gui
-IMPORTS   = shell32 kernel32
+APPMODE   = -mwindows
 
 C_SRCS = winver.c