diff --git a/Make.rules.in b/Make.rules.in
index 7497a82ce18..1e66fdfdaff 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -107,7 +107,7 @@ dlldir          = @libdir@/wine
 prog_manext     = 1
 conf_manext     = 5
 CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                  *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
+                  *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
 
 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)
@@ -137,13 +137,13 @@ LINTS = $(C_SRCS:.c=.ln)
 	$(WINDRES) -i $< -o $@
 
 .spec.spec.c:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -spec $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -spec $<
 
 .spec.spec.def:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -def $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -def $<
 
 .c.glue.c:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -glue $<
 
 .c.ln:
 	$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
@@ -169,6 +169,11 @@ $(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 debug channels
+
+$(MODULE).dbg.c: $(C_SRCS) $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -debug -C$(SRCDIR) $(C_SRCS)
+
 # Rule to rebuild the resource compiler
 
 $(WRC):
@@ -232,8 +237,8 @@ winapi_check::
 $(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
 	cd `dirname $@` && $(MAKE) depend
 
-depend: $(MAKEDEP) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__)
-	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(EXTRA_SRCS) $(CTESTS) -C. $(GEN_C_SRCS)
+depend: $(MAKEDEP) $(SUBDIRS:%=%/__depend__)
+	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(EXTRA_SRCS) $(CTESTS)
 
 # Rules for cleaning
 
@@ -290,7 +295,7 @@ $(TESTPROGRAM).tmp.o: $(TESTOBJS)
 	-$(STRIP) --strip-unneeded $@
 
 $(TESTPROGRAM).spec.c: $(TESTPROGRAM).tmp.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym $(TESTPROGRAM).tmp.o -o $@ -exe $(TESTPROGRAM) -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%)
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym $(TESTPROGRAM).tmp.o -o $@ -exe $(TESTPROGRAM) -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%)
 
 $(TESTPROGRAM).exe: $(TESTOBJS)
 	$(CC) $(TESTOBJS) -o $@ $(TESTIMPORTS:%=-l%) $(LIBWINE) $(LIBS)
diff --git a/debugger/.cvsignore b/debugger/.cvsignore
index 7f47d23c1dd..b8154348e83 100644
--- a/debugger/.cvsignore
+++ b/debugger/.cvsignore
@@ -1,6 +1,7 @@
 Makefile
 lex.yy.c
 winedbg
+winedbg.dbg.c
 winedbg.spec.c
 y.tab.c
 y.tab.h
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index a999792e3af..86702460c9e 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -14,7 +14,7 @@ ALTSPECS    = $(ALTNAMES:%.dll=%)
 SPEC_SRCS   = $(ALTSPECS:%=%.spec)
 MAINSPEC    = $(MODULE:%.dll=%).spec
 SPEC_DEF    = $(MAINSPEC).def
-ALL_OBJS    = $(MAINSPEC).o $(SPEC_SRCS:.spec=.spec.o) $(OBJS)
+ALL_OBJS    = $(MAINSPEC).o $(SPEC_SRCS:.spec=.spec.o) $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBS)
 TESTIMPORTS = $(MODULE) $(DELAYIMPORTS) $(IMPORTS)
 
@@ -25,7 +25,7 @@ all: $(MODULE)$(DLLEXT)
 # 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%)
+	$(LDPATH) $(WINEBUILD) $(DEFS) $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:%.rc=-res %.res) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
 
 # Rules for .so files
 
@@ -34,8 +34,8 @@ $(MODULE).so: $(ALL_OBJS) Makefile.in
 
 # Rules for .dll files
 
-$(MODULE): $(OBJS) $(SPEC_DEF) Makefile.in
-	$(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS)
+$(MODULE): $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) Makefile.in
+	$(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS)
 
 $(SPEC_DEF): $(WINEBUILD)
 
@@ -48,11 +48,6 @@ checklink:: $(MODULE)$(DLLEXT)
 
 $(TESTRESULTS): $(MODULE)$(DLLEXT)
 
-# Rules for debug channels
-
-debug_channels: dummy
-	$(TOPSRCDIR)/tools/make_debug $(MAINSPEC) $(C_SRCS) $(SUBDIRS:%=%/*.c)
-
 # Sanity check
 
 Makedll.rules: $(TOPSRCDIR)/Makedll.rules.in $(TOPSRCDIR)/configure
diff --git a/dlls/advapi32/.cvsignore b/dlls/advapi32/.cvsignore
index c4669ab2afb..1b89f21570e 100644
--- a/dlls/advapi32/.cvsignore
+++ b/dlls/advapi32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+advapi32.dll.dbg.c
 advapi32.spec.c
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index f7327cfdfec..1c2c8fc4187 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -1,7 +1,4 @@
 name	advapi32
-type	win32
-
-debug_channels (advapi crypt reg)
 
 @ stdcall AbortSystemShutdownA(ptr) AbortSystemShutdownA
 @ stdcall AbortSystemShutdownW(ptr) AbortSystemShutdownW
diff --git a/dlls/avicap32/.cvsignore b/dlls/avicap32/.cvsignore
index 103d1dde90f..6d99ff32b5a 100644
--- a/dlls/avicap32/.cvsignore
+++ b/dlls/avicap32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+avicap32.dll.dbg.c
 avicap32.spec.c
diff --git a/dlls/avicap32/avicap32.spec b/dlls/avicap32/avicap32.spec
index 7145dbb8518..64eebc840af 100644
--- a/dlls/avicap32/avicap32.spec
+++ b/dlls/avicap32/avicap32.spec
@@ -1,4 +1,2 @@
 name avicap32
-type win32
 
-debug_channels ()
diff --git a/dlls/avifil32/.cvsignore b/dlls/avifil32/.cvsignore
index 614b8200c20..fbab5a7cefa 100644
--- a/dlls/avifil32/.cvsignore
+++ b/dlls/avifil32/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+avifil32.dll.dbg.c
 avifil32.spec.c
 avifile.spec.c
diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec
index 4d74ecfb701..abfd32e4b02 100644
--- a/dlls/avifil32/avifil32.spec
+++ b/dlls/avifil32/avifil32.spec
@@ -1,7 +1,4 @@
 name	avifil32
-type	win32
-
-debug_channels (avifile)
 
 @ stub    AVIBuildFilter
 @ stub    AVIBuildFilterA
diff --git a/dlls/comctl32/.cvsignore b/dlls/comctl32/.cvsignore
index e75122ba62f..03f439dcb3b 100644
--- a/dlls/comctl32/.cvsignore
+++ b/dlls/comctl32/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+comctl32.dll.dbg.c
 comctl32.spec.c
 rsrc.res
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index 8921e74f3a5..68da71c5959 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -1,11 +1,6 @@
 name	comctl32
-type	win32
 init	COMCTL32_LibMain
 
-debug_channels (animate comboex commctrl datetime header hotkey imagelist ipaddress
-                listview message monthcal nativefont pager progress propsheet
-                rebar statusbar tab toolbar tooltips trackbar treeview updown)
-
 # Functions exported by the Win95 comctl32.dll 
 # (these need to have these exact ordinals, because some win95 dlls 
 #  import comctl32.dll by ordinal)
diff --git a/dlls/commdlg/.cvsignore b/dlls/commdlg/.cvsignore
index 7de11cce5d5..58b02337f49 100644
--- a/dlls/commdlg/.cvsignore
+++ b/dlls/commdlg/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+comdlg32.dll.dbg.c
 comdlg32.spec.c
 commdlg.spec.c
 rsrc.res
diff --git a/dlls/commdlg/comdlg32.spec b/dlls/commdlg/comdlg32.spec
index d5693a45750..6d927e6c4a8 100644
--- a/dlls/commdlg/comdlg32.spec
+++ b/dlls/commdlg/comdlg32.spec
@@ -1,9 +1,6 @@
 name	comdlg32
-type	win32
 init	COMDLG32_DllEntryPoint
 
-debug_channels (commdlg)
-
 @ stdcall ChooseColorA(ptr) ChooseColorA
 @ stdcall ChooseColorW(ptr) ChooseColorW
 @ stdcall ChooseFontA(ptr) ChooseFontA
diff --git a/dlls/crtdll/.cvsignore b/dlls/crtdll/.cvsignore
index 2ca972c0de5..214507d4524 100644
--- a/dlls/crtdll/.cvsignore
+++ b/dlls/crtdll/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+crtdll.dll.dbg.c
 crtdll.spec.c
diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index ff5c6c2a753..590e61c239a 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -1,10 +1,7 @@
 # Old C runtime library. All functions provided by msvcrt
 name    crtdll
-type    win32
 init    CRTDLL_Init
 
-debug_channels (crtdll)
-
 @ forward ??2@YAPAXI@Z msvcrt.??2@YAPAXI@Z
 @ forward ??3@YAXPAX@Z msvcrt.??3@YAXPAX@Z
 @ forward ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z
diff --git a/dlls/crypt32/.cvsignore b/dlls/crypt32/.cvsignore
index 80173339f58..ef778ed409b 100644
--- a/dlls/crypt32/.cvsignore
+++ b/dlls/crypt32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+crypt32.dll.dbg.c
 crypt32.spec.c
diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec
index 469c1214dc1..5a54d685fb7 100644
--- a/dlls/crypt32/crypt32.spec
+++ b/dlls/crypt32/crypt32.spec
@@ -1,7 +1,4 @@
 name crypt32
-type win32
-
-debug_channels ()
 
 @ stub CertAddCRLContextToStore
 @ stub CertAddCTLContextToStore
diff --git a/dlls/dciman32/.cvsignore b/dlls/dciman32/.cvsignore
index 6757d1d1146..a13bb4226f5 100644
--- a/dlls/dciman32/.cvsignore
+++ b/dlls/dciman32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+dciman32.dll.dbg.c
 dciman32.spec.c
diff --git a/dlls/dciman32/dciman32.spec b/dlls/dciman32/dciman32.spec
index b19b9026fe7..762852da093 100644
--- a/dlls/dciman32/dciman32.spec
+++ b/dlls/dciman32/dciman32.spec
@@ -1,5 +1,4 @@
 name	dciman32
-type	win32
 
 @ stub    DCIBeginAccess
 @ stdcall DCICloseProvider(long) DCICloseProvider
diff --git a/dlls/ddraw/.cvsignore b/dlls/ddraw/.cvsignore
index 568a5facf9b..ef8425d7b13 100644
--- a/dlls/ddraw/.cvsignore
+++ b/dlls/ddraw/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+ddraw.dll.dbg.c
 ddraw.spec.c
 version.res
diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec
index a4c4f90d902..0f98a073014 100644
--- a/dlls/ddraw/ddraw.spec
+++ b/dlls/ddraw/ddraw.spec
@@ -1,9 +1,6 @@
 name ddraw
-type win32
 init DDRAW_DllMain
 
-debug_channels (ddraw)
-
 @ stub DDHAL32_VidMemAlloc
 @ stub DDHAL32_VidMemFree
 @ stub DDInternalLock
diff --git a/dlls/devenum/.cvsignore b/dlls/devenum/.cvsignore
index 1c6fa2057c5..aed793e19c5 100644
--- a/dlls/devenum/.cvsignore
+++ b/dlls/devenum/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+devenum.dll.dbg.c
 devenum.spec.c
diff --git a/dlls/devenum/devenum.spec b/dlls/devenum/devenum.spec
index d0b3e7dbcc3..1e9263583a7 100644
--- a/dlls/devenum/devenum.spec
+++ b/dlls/devenum/devenum.spec
@@ -1,7 +1,4 @@
 name devenum
-type win32
-
-debug_channels()
 
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
diff --git a/dlls/dinput/.cvsignore b/dlls/dinput/.cvsignore
index f6b621fd80d..8c7d70ae7d9 100644
--- a/dlls/dinput/.cvsignore
+++ b/dlls/dinput/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+dinput.dll.dbg.c
 dinput.spec.c
diff --git a/dlls/dinput/dinput.spec b/dlls/dinput/dinput.spec
index 74288c648af..d0478a1ed77 100644
--- a/dlls/dinput/dinput.spec
+++ b/dlls/dinput/dinput.spec
@@ -1,7 +1,4 @@
 name dinput
-type win32
-
-debug_channels (dinput)
 
 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
 @ stub DirectInputCreateW
diff --git a/dlls/dplay/.cvsignore b/dlls/dplay/.cvsignore
index fe9258123d2..1aac9b3290e 100644
--- a/dlls/dplay/.cvsignore
+++ b/dlls/dplay/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+dplay.dll.dbg.c
 dplay.spec.c
diff --git a/dlls/dplay/dplay.spec b/dlls/dplay/dplay.spec
index 1979d4c8c76..4a00bb65eaf 100644
--- a/dlls/dplay/dplay.spec
+++ b/dlls/dplay/dplay.spec
@@ -1,6 +1,5 @@
 # First DirectPlay dll. Replaced by dplayx.dll.
 name dplay
-type win32
 
 @ forward DirectPlayCreate dplayx.DirectPlayCreate
 @ forward DirectPlayEnumerate dplayx.DirectPlayEnumerate
diff --git a/dlls/dplayx/.cvsignore b/dlls/dplayx/.cvsignore
index dbf73608560..297580e839f 100644
--- a/dlls/dplayx/.cvsignore
+++ b/dlls/dplayx/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+dplayx.dll.dbg.c
 dplayx.spec.c
 version.res
diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec
index 7391aaebd17..674f00aba3d 100644
--- a/dlls/dplayx/dplayx.spec
+++ b/dlls/dplayx/dplayx.spec
@@ -1,9 +1,6 @@
 name dplayx
-type win32
 init DPLAYX_LibMain
 
-debug_channels (dplay)
-
   1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
   2 stdcall DirectPlayEnumerateA(ptr ptr) DirectPlayEnumerateA
   3 stdcall DirectPlayEnumerateW(ptr ptr) DirectPlayEnumerateW
diff --git a/dlls/dsound/.cvsignore b/dlls/dsound/.cvsignore
index c88b549003a..ec799350653 100644
--- a/dlls/dsound/.cvsignore
+++ b/dlls/dsound/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+dsound.dll.dbg.c
 dsound.spec.c
diff --git a/dlls/dsound/dsound.spec b/dlls/dsound/dsound.spec
index 8cb2f9c3d9f..34534f57b4c 100644
--- a/dlls/dsound/dsound.spec
+++ b/dlls/dsound/dsound.spec
@@ -1,7 +1,4 @@
 name dsound
-type win32
-
-debug_channels (dsound)
 
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate
diff --git a/dlls/gdi/.cvsignore b/dlls/gdi/.cvsignore
index 557fa039dec..39e0a712b7d 100644
--- a/dlls/gdi/.cvsignore
+++ b/dlls/gdi/.cvsignore
@@ -1,6 +1,7 @@
 Makefile
 dispdib.spec.c
 gdi.exe.spec.c
+gdi32.dll.dbg.c
 gdi32.spec.c
 printdrv.glue.c
 version.res
diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec
index 31b90ed0ad7..6741a4766bf 100644
--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
@@ -1,10 +1,6 @@
 name    gdi32
-type    win32
 init    MAIN_GdiInit
 
-debug_channels (bitblt bitmap clipping dc ddraw driver enhmetafile font gdi
-                metafile palette print region text win16drv wing)
-
 # ordinal exports
 100 stdcall @(long long str str str) GDI_CallDevInstall16
 101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16
diff --git a/dlls/glu32/.cvsignore b/dlls/glu32/.cvsignore
index 5aa5a5f2d8e..5125d009f63 100644
--- a/dlls/glu32/.cvsignore
+++ b/dlls/glu32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+glu32.dll.dbg.c
 glu32.spec.c
diff --git a/dlls/glu32/glu32.spec b/dlls/glu32/glu32.spec
index 772e11db4e1..fd5054621da 100644
--- a/dlls/glu32/glu32.spec
+++ b/dlls/glu32/glu32.spec
@@ -1,5 +1,4 @@
 name glu32
-type win32
 
 @ stdcall gluLookAt(double double double double double double double double double) wine_gluLookAt
 @ stdcall gluOrtho2D(double double double double) wine_gluOrtho2D
diff --git a/dlls/icmp/.cvsignore b/dlls/icmp/.cvsignore
index f540160d1d7..d046dd8c499 100644
--- a/dlls/icmp/.cvsignore
+++ b/dlls/icmp/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+icmp.dll.dbg.c
 icmp.spec.c
diff --git a/dlls/icmp/icmp.spec b/dlls/icmp/icmp.spec
index 731c1fc36c5..9cb088e82ac 100644
--- a/dlls/icmp/icmp.spec
+++ b/dlls/icmp/icmp.spec
@@ -1,7 +1,4 @@
 name icmp
-type win32
-
-debug_channels (icmp)
 
 @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
 @ stdcall IcmpCreateFile() IcmpCreateFile
diff --git a/dlls/imagehlp/.cvsignore b/dlls/imagehlp/.cvsignore
index 6eaf6d023d6..0a109cb87f5 100644
--- a/dlls/imagehlp/.cvsignore
+++ b/dlls/imagehlp/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+imagehlp.dll.dbg.c
 imagehlp.spec.c
diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec
index b9531d295ca..af5bd8dab1f 100644
--- a/dlls/imagehlp/imagehlp.spec
+++ b/dlls/imagehlp/imagehlp.spec
@@ -1,9 +1,6 @@
 name	imagehlp
-type	win32
 init	IMAGEHLP_LibMain
 
-debug_channels (imagehlp)
-
 @ stdcall BindImage(str str str) BindImage
 @ stdcall BindImageEx(long str str str ptr) BindImageEx
 @ stdcall CheckSumMappedFile(ptr long ptr ptr) CheckSumMappedFile
diff --git a/dlls/imm32/.cvsignore b/dlls/imm32/.cvsignore
index 423ab3cc8a7..e0933051e16 100644
--- a/dlls/imm32/.cvsignore
+++ b/dlls/imm32/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 imm.spec.c
+imm32.dll.dbg.c
 imm32.spec.c
diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec
index 3347812b613..94a1d99acbb 100644
--- a/dlls/imm32/imm32.spec
+++ b/dlls/imm32/imm32.spec
@@ -1,7 +1,4 @@
 name	imm32
-type	win32
-
-debug_channels (imm)
 
 @ stdcall ImmAssociateContext(long long) ImmAssociateContext
 @ stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA
diff --git a/dlls/kernel/.cvsignore b/dlls/kernel/.cvsignore
index 8be1c157476..67ea13ab721 100644
--- a/dlls/kernel/.cvsignore
+++ b/dlls/kernel/.cvsignore
@@ -1,6 +1,7 @@
 Makefile
 comm.spec.c
 kernel.res
+kernel32.dll.dbg.c
 kernel32.spec.c
 krnl386.exe.spec.c
 stress.spec.c
diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec
index 3e99c79395d..0d7b406f1ef 100644
--- a/dlls/kernel/kernel32.spec
+++ b/dlls/kernel/kernel32.spec
@@ -1,10 +1,6 @@
 name	kernel32
-type	win32
 init	MAIN_KernelInit
 
-debug_channels (comm console debugstr dll int resource stress thunk toolhelp
-                win32)
-
 # Functions exported by the Win95 kernel32.dll 
 # (these need to have these exact ordinals, for some win95 dlls 
 #  import kernel32.dll by ordinal)
diff --git a/dlls/lzexpand/.cvsignore b/dlls/lzexpand/.cvsignore
index 2bfb03c3d72..62d856390e7 100644
--- a/dlls/lzexpand/.cvsignore
+++ b/dlls/lzexpand/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+lz32.dll.dbg.c
 lz32.spec.c
 lzexpand.spec.c
diff --git a/dlls/lzexpand/lz32.spec b/dlls/lzexpand/lz32.spec
index 7b158b2f5cc..503dce18068 100644
--- a/dlls/lzexpand/lz32.spec
+++ b/dlls/lzexpand/lz32.spec
@@ -1,7 +1,4 @@
 name	lz32
-type	win32
-
-debug_channels (file)
 
 @ stdcall CopyLZFile(long long) CopyLZFile
 @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
diff --git a/dlls/mapi32/.cvsignore b/dlls/mapi32/.cvsignore
index aac714589ce..261a6c241af 100644
--- a/dlls/mapi32/.cvsignore
+++ b/dlls/mapi32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+mapi32.dll.dbg.c
 mapi32.spec.c
diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec
index d682641ce40..be82299aba0 100644
--- a/dlls/mapi32/mapi32.spec
+++ b/dlls/mapi32/mapi32.spec
@@ -1,7 +1,4 @@
 name mapi32
-type win32
-
-debug_channels (mapi)
 
 @ stub BMAPIAddress
 @ stub BMAPIDetails
diff --git a/dlls/mpr/.cvsignore b/dlls/mpr/.cvsignore
index 7d7523f38da..e30b9ef5e95 100644
--- a/dlls/mpr/.cvsignore
+++ b/dlls/mpr/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+mpr.dll.dbg.c
 mpr.spec.c
diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec
index e20e614a22b..5f9068f9bbf 100644
--- a/dlls/mpr/mpr.spec
+++ b/dlls/mpr/mpr.spec
@@ -1,7 +1,4 @@
 name mpr
-type win32
-
-debug_channels (mpr)
 
 # ordinal exports
  1 stub @
diff --git a/dlls/msacm/.cvsignore b/dlls/msacm/.cvsignore
index 3a11a6fd00b..bf498071bff 100644
--- a/dlls/msacm/.cvsignore
+++ b/dlls/msacm/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 msacm.res
 msacm.spec.c
+msacm32.dll.dbg.c
 msacm32.spec.c
diff --git a/dlls/msacm/imaadp32/.cvsignore b/dlls/msacm/imaadp32/.cvsignore
index 7901fe27ac3..525c7a499a9 100644
--- a/dlls/msacm/imaadp32/.cvsignore
+++ b/dlls/msacm/imaadp32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+imaadp32.acm.dbg.c
 imaadp32.acm.spec.c
diff --git a/dlls/msacm/imaadp32/imaadp32.acm.spec b/dlls/msacm/imaadp32/imaadp32.acm.spec
index 64cf04a4728..53b1f7947a5 100644
--- a/dlls/msacm/imaadp32/imaadp32.acm.spec
+++ b/dlls/msacm/imaadp32/imaadp32.acm.spec
@@ -1,7 +1,4 @@
 name imaadp32
 file imaadp32.acm
-type win32
-
-debug_channels (adpcm)
 
 @ stdcall DriverProc (long long long long long) ADPCM_DriverProc
diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec
index b8900fba74a..07f92811069 100644
--- a/dlls/msacm/msacm32.spec
+++ b/dlls/msacm/msacm32.spec
@@ -1,9 +1,6 @@
 name msacm32
-type win32
 init MSACM32_LibMain
 
-debug_channels (msacm)
-
 @ stdcall acmDriverAddA(ptr long long long long) acmDriverAddA
 @ stdcall acmDriverAddW(ptr long long long long) acmDriverAddW
 @ stdcall acmDriverClose(long long) acmDriverClose
diff --git a/dlls/msacm/msg711/.cvsignore b/dlls/msacm/msg711/.cvsignore
index 91522089423..b75bb72c1f6 100644
--- a/dlls/msacm/msg711/.cvsignore
+++ b/dlls/msacm/msg711/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msg711.drv.dbg.c
 msg711.drv.spec.c
diff --git a/dlls/msacm/msg711/msg711.drv.spec b/dlls/msacm/msg711/msg711.drv.spec
index 3df1a287119..d03bb631e4a 100644
--- a/dlls/msacm/msg711/msg711.drv.spec
+++ b/dlls/msacm/msg711/msg711.drv.spec
@@ -1,7 +1,4 @@
 name msg711
 file msg711.drv
-type win32
-
-debug_channels ()
 
 @ stub DriverProc #(long long long long long)
diff --git a/dlls/msdmo/.cvsignore b/dlls/msdmo/.cvsignore
index 06694f4beca..6fb9add57ae 100644
--- a/dlls/msdmo/.cvsignore
+++ b/dlls/msdmo/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msdmo.dll.dbg.c
 msdmo.spec.c
diff --git a/dlls/msdmo/msdmo.spec b/dlls/msdmo/msdmo.spec
index 9e962d3b0b6..0915fa5696c 100644
--- a/dlls/msdmo/msdmo.spec
+++ b/dlls/msdmo/msdmo.spec
@@ -1,7 +1,4 @@
 name msdmo
-type win32
-
-debug_channels ()
 
 @ stub DMOEnum
 @ stub DMOGetName
diff --git a/dlls/msimg32/.cvsignore b/dlls/msimg32/.cvsignore
index 7ef3314829f..274f1f4010b 100644
--- a/dlls/msimg32/.cvsignore
+++ b/dlls/msimg32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msimg32.dll.dbg.c
 msimg32.spec.c
diff --git a/dlls/msimg32/msimg32.spec b/dlls/msimg32/msimg32.spec
index 748c8c99a42..dd4af755143 100644
--- a/dlls/msimg32/msimg32.spec
+++ b/dlls/msimg32/msimg32.spec
@@ -1,7 +1,4 @@
 name msimg32
-type win32
-
-debug_channels (msimg32)
 
 @ stdcall AlphaBlend(long long long long long long long long long long long) AlphaBlend
 @ stub DllInitialize
diff --git a/dlls/msisys/.cvsignore b/dlls/msisys/.cvsignore
index 2cbfe04eef4..9c0c08065ad 100644
--- a/dlls/msisys/.cvsignore
+++ b/dlls/msisys/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msisys.ocx.dbg.c
 msisys.ocx.spec.c
diff --git a/dlls/msisys/msisys.ocx.spec b/dlls/msisys/msisys.ocx.spec
index 6c6ae61967d..904ea070f1f 100644
--- a/dlls/msisys/msisys.ocx.spec
+++ b/dlls/msisys/msisys.ocx.spec
@@ -1,10 +1,7 @@
 name	msisys
 file	msisys.ocx
-type	win32
 init	MSISYS_DllMain
 
-debug_channels (msisys)
-
 @ stdcall DllCanUnloadNow() MSISYS_DllCanUnloadNow
 @ stdcall DllGetClassObject(ptr ptr ptr) MSISYS_DllGetClassObject
 @ stdcall DllRegisterServer() MSISYS_DllRegisterServer
diff --git a/dlls/msnet32/.cvsignore b/dlls/msnet32/.cvsignore
index a5862c10c4a..2eb8e46e2a1 100644
--- a/dlls/msnet32/.cvsignore
+++ b/dlls/msnet32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msnet32.dll.dbg.c
 msnet32.spec.c
diff --git a/dlls/msnet32/msnet32.spec b/dlls/msnet32/msnet32.spec
index 07dbe95c82e..04003532db8 100644
--- a/dlls/msnet32/msnet32.spec
+++ b/dlls/msnet32/msnet32.spec
@@ -1,5 +1,4 @@
 name msnet32
-type win32
 
   1 stub @
   2 stub @
diff --git a/dlls/msrle32/.cvsignore b/dlls/msrle32/.cvsignore
index 2a842f8b0c0..7ee5ee5cb8b 100644
--- a/dlls/msrle32/.cvsignore
+++ b/dlls/msrle32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msrle32.dll.dbg.c
 msrle32.spec.c
diff --git a/dlls/msrle32/msrle32.spec b/dlls/msrle32/msrle32.spec
index f64d3df90fd..62e3ca8d3b9 100644
--- a/dlls/msrle32/msrle32.spec
+++ b/dlls/msrle32/msrle32.spec
@@ -1,7 +1,4 @@
 name msrle32
-type win32
-
-debug_channels()
 
 @ stub DriverProc #(long long long long long)
 
diff --git a/dlls/msvcrt/.cvsignore b/dlls/msvcrt/.cvsignore
index ac6bca3055c..97af32c99c2 100644
--- a/dlls/msvcrt/.cvsignore
+++ b/dlls/msvcrt/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msvcrt.dll.dbg.c
 msvcrt.spec.c
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 2f3475d8dfe..70145ed5550 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1,10 +1,7 @@
 # msvcrt.dll - MS VC++ Run Time Library
 name    msvcrt
-type    win32
 init    MSVCRT_Init
 
-debug_channels (msvcrt)
-
 @ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT
 @ cdecl ??0__non_rtti_object@@QAE@ABV0@@Z(ptr ptr) MSVCRT___non_rtti_object_copy_ctor
 @ cdecl ??0__non_rtti_object@@QAE@PBD@Z(ptr ptr) MSVCRT___non_rtti_object_ctor
diff --git a/dlls/msvcrt20/.cvsignore b/dlls/msvcrt20/.cvsignore
index 32f19cb4916..87d921377b7 100644
--- a/dlls/msvcrt20/.cvsignore
+++ b/dlls/msvcrt20/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msvcrt20.dll.dbg.c
 msvcrt20.spec.c
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index f22911cdc5a..7e88159a950 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -1,8 +1,5 @@
 # msvcrt20.dll - MS VC++ Run Time Library
 name    msvcrt20
-type    win32
-
-debug_channels (msvcrt) 
 
 @ stub ??0Iostream_init@@QAE@AAVios@@H@Z  #
 @ stub ??0Iostream_init@@QAE@XZ #
diff --git a/dlls/msvideo/.cvsignore b/dlls/msvideo/.cvsignore
index 27896d4569b..369c6923780 100644
--- a/dlls/msvideo/.cvsignore
+++ b/dlls/msvideo/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+msvfw32.dll.dbg.c
 msvfw32.spec.c
 msvideo.spec.c
 msvideo_main.glue.c
diff --git a/dlls/msvideo/msvfw32.spec b/dlls/msvideo/msvfw32.spec
index 501c064208d..3892934845c 100644
--- a/dlls/msvideo/msvfw32.spec
+++ b/dlls/msvideo/msvfw32.spec
@@ -1,7 +1,4 @@
 name	msvfw32
-type	win32
-
-debug_channels (mci msvideo)
 
 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124
diff --git a/dlls/netapi32/.cvsignore b/dlls/netapi32/.cvsignore
index 199fc7cb4e1..7e2a48f632e 100644
--- a/dlls/netapi32/.cvsignore
+++ b/dlls/netapi32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+netapi32.dll.dbg.c
 netapi32.spec.c
diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec
index a321c858f6a..b476aa4b587 100644
--- a/dlls/netapi32/netapi32.spec
+++ b/dlls/netapi32/netapi32.spec
@@ -1,8 +1,5 @@
 name	netapi32
-type    win32
 init	NETAPI32_LibMain
 
-debug_channels (netbios)
-
 1 stdcall Netbios(ptr) Netbios
 
diff --git a/dlls/ntdll/.cvsignore b/dlls/ntdll/.cvsignore
index 628b5f6db06..8573fd7953f 100644
--- a/dlls/ntdll/.cvsignore
+++ b/dlls/ntdll/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+ntdll.dll.dbg.c
 ntdll.spec.c
 relay16.s
 relay32.s
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index f5bc369365d..4abbfdb6d3d 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -142,10 +142,10 @@ EXTRASUBDIRS = \
 @MAKE_DLL_RULES@
 
 relay16.s: $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay16
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -relay16
 
 relay32.s: $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay32
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -relay32
 
 install:: install_libdir
 uninstall:: uninstall_libdir
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 77b509f16b4..687d1ef083d 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1,11 +1,4 @@
 name	ntdll
-type	win32
-
-debug_channels (atom cdrom console debug delayhlp dll dosfs dosmem file fixup
-                global heap int int21 int31 io loaddll local module ntdll process
-                profile reg relay resource segment seh selector server snoop
-                string system tape task thread tid timer toolhelp ver virtual
-                vxd win32)
 
 #note that the Zw... functions are alternate names for the 
 #Nt... functions.  (see www.sysinternals.com for details)
diff --git a/dlls/odbc32/.cvsignore b/dlls/odbc32/.cvsignore
index 4d7688f24aa..3462f114261 100644
--- a/dlls/odbc32/.cvsignore
+++ b/dlls/odbc32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+odbc32.dll.dbg.c
 odbc32.spec.c
diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec
index bfa1c9ce575..1d46d8c1087 100644
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@@ -1,9 +1,6 @@
 name	odbc32
-type	win32
 init    MAIN_OdbcInit
 
-debug_channels (odbc)
-
 001 stdcall SQLAllocConnect(long ptr) SQLAllocConnect
 002 stdcall SQLAllocEnv(ptr)  SQLAllocEnv
 003 stdcall SQLAllocStmt(long ptr) SQLAllocStmt
diff --git a/dlls/ole32/.cvsignore b/dlls/ole32/.cvsignore
index 01418cb7f99..596bc230a02 100644
--- a/dlls/ole32/.cvsignore
+++ b/dlls/ole32/.cvsignore
@@ -5,6 +5,7 @@ ole2conv.spec.c
 ole2nls.spec.c
 ole2prox.spec.c
 ole2thk.spec.c
+ole32.dll.dbg.c
 ole32.spec.c
 ole32res.res
 storage.spec.c
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 8cfb6f891b0..4639af7bc78 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -1,9 +1,6 @@
 name	ole32
-type	win32
 init	OLE32_DllEntryPoint
 
-debug_channels (accel ole relay storage)
-
   1 stub BindMoniker                # stdcall (ptr long ptr ptr) return 0,ERR_NOTIMPLEMENTED
   2 stdcall CLSIDFromProgID(wstr ptr) CLSIDFromProgID
   3 stdcall CLSIDFromString(wstr ptr) CLSIDFromString
diff --git a/dlls/oleaut32/.cvsignore b/dlls/oleaut32/.cvsignore
index cf245a0cfc6..eca8239ce56 100644
--- a/dlls/oleaut32/.cvsignore
+++ b/dlls/oleaut32/.cvsignore
@@ -1,5 +1,6 @@
 Makefile
 ole2disp.spec.c
+oleaut32.dll.dbg.c
 oleaut32.spec.c
 typelib.spec.c
 version.res
diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec
index 3e62b9ed829..369722d2898 100644
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@@ -1,7 +1,4 @@
 name oleaut32
-type win32
-
-debug_channels (ole olerelay typelib)
 
 1 stdcall DllGetClassObject(ptr ptr ptr) OLEAUT32_DllGetClassObject
 2 stdcall SysAllocString(wstr) SysAllocString
diff --git a/dlls/olecli/.cvsignore b/dlls/olecli/.cvsignore
index f45948f92ad..f4ef9df0445 100644
--- a/dlls/olecli/.cvsignore
+++ b/dlls/olecli/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 olecli.spec.c
+olecli32.dll.dbg.c
 olecli32.spec.c
diff --git a/dlls/olecli/olecli32.spec b/dlls/olecli/olecli32.spec
index e50bcf5b52c..a26d10194c9 100644
--- a/dlls/olecli/olecli32.spec
+++ b/dlls/olecli/olecli32.spec
@@ -1,7 +1,4 @@
 name olecli32
-type win32
-
-debug_channels (ole)
 
    1 stub WEP
    2 stub OleDelete
diff --git a/dlls/oledlg/.cvsignore b/dlls/oledlg/.cvsignore
index 704ceaa2923..75b71549269 100644
--- a/dlls/oledlg/.cvsignore
+++ b/dlls/oledlg/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+oledlg.dll.dbg.c
 oledlg.spec.c
diff --git a/dlls/oledlg/oledlg.spec b/dlls/oledlg/oledlg.spec
index 207bf0ae28b..722bf5b4a38 100644
--- a/dlls/oledlg/oledlg.spec
+++ b/dlls/oledlg/oledlg.spec
@@ -1,7 +1,4 @@
 name	oledlg
-type	win32
-
-debug_channels (ole)
 
   1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
   2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
diff --git a/dlls/olepro32/.cvsignore b/dlls/olepro32/.cvsignore
index f59f0563855..9f8beb92726 100644
--- a/dlls/olepro32/.cvsignore
+++ b/dlls/olepro32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+olepro32.dll.dbg.c
 olepro32.spec.c
diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec
index fd434dda2c0..39878067768 100644
--- a/dlls/olepro32/olepro32.spec
+++ b/dlls/olepro32/olepro32.spec
@@ -1,7 +1,4 @@
 name olepro32
-type win32
-
-debug_channels (ole)
 
 248 forward OleIconToCursor OLEAUT32.OleIconToCursor
 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
diff --git a/dlls/olesvr/.cvsignore b/dlls/olesvr/.cvsignore
index 7bfe5af66a8..e31360201e7 100644
--- a/dlls/olesvr/.cvsignore
+++ b/dlls/olesvr/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 olesvr.spec.c
+olesvr32.dll.dbg.c
 olesvr32.spec.c
diff --git a/dlls/olesvr/olesvr32.spec b/dlls/olesvr/olesvr32.spec
index bfce0af77b8..371b523702b 100644
--- a/dlls/olesvr/olesvr32.spec
+++ b/dlls/olesvr/olesvr32.spec
@@ -1,7 +1,4 @@
 name	olesvr32
-type	win32
-
-debug_channels (ole)
 
  1 stub WEP
  2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
diff --git a/dlls/opengl32/.cvsignore b/dlls/opengl32/.cvsignore
index a064ed4701d..65eb8283d88 100644
--- a/dlls/opengl32/.cvsignore
+++ b/dlls/opengl32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+opengl32.dll.dbg.c
 opengl32.spec.c
diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec
index 35c03bff704..3c06c97a33c 100644
--- a/dlls/opengl32/opengl32.spec
+++ b/dlls/opengl32/opengl32.spec
@@ -1,9 +1,6 @@
 name opengl32
-type win32
 init OpenGL32_Init
 
-debug_channels (opengl)
-
 @  stdcall wglCreateContext(long) wglCreateContext
 @  stdcall wglCreateLayerContext(long long) wglCreateLayerContext
 @  stdcall wglCopyContext(long long long) wglCopyContext
diff --git a/dlls/psapi/.cvsignore b/dlls/psapi/.cvsignore
index dfa50006edf..955eba30763 100644
--- a/dlls/psapi/.cvsignore
+++ b/dlls/psapi/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+psapi.dll.dbg.c
 psapi.spec.c
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index d0acd048e2c..d6f02759d24 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -1,7 +1,4 @@
 name    psapi
-type    win32
-
-debug_channels (psapi)
 
 @ stdcall EmptyWorkingSet(long) EmptyWorkingSet
 @ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
diff --git a/dlls/qcap/.cvsignore b/dlls/qcap/.cvsignore
index 4baa8b62f4c..aefad9fcd17 100644
--- a/dlls/qcap/.cvsignore
+++ b/dlls/qcap/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+qcap.dll.dbg.c
 qcap.spec.c
diff --git a/dlls/qcap/qcap.spec b/dlls/qcap/qcap.spec
index 2ef3d9fad15..18321af6945 100644
--- a/dlls/qcap/qcap.spec
+++ b/dlls/qcap/qcap.spec
@@ -1,7 +1,4 @@
 name qcap
-type win32
-
-debug_channels()
 
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
diff --git a/dlls/quartz/.cvsignore b/dlls/quartz/.cvsignore
index 70e5165c221..85e92426225 100644
--- a/dlls/quartz/.cvsignore
+++ b/dlls/quartz/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+quartz.dll.dbg.c
 quartz.spec.c
diff --git a/dlls/quartz/quartz.spec b/dlls/quartz/quartz.spec
index 375ea8d04c3..1b363ec7608 100644
--- a/dlls/quartz/quartz.spec
+++ b/dlls/quartz/quartz.spec
@@ -1,7 +1,4 @@
 name	quartz
-type	win32
-
-debug_channels (quartz)
 
 @ stub AMGetErrorTextA
 @ stub AMGetErrorTextW
diff --git a/dlls/rasapi32/.cvsignore b/dlls/rasapi32/.cvsignore
index ecf5e142097..7176938555c 100644
--- a/dlls/rasapi32/.cvsignore
+++ b/dlls/rasapi32/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 rasapi16.spec.c
+rasapi32.dll.dbg.c
 rasapi32.spec.c
diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec
index fb8501ceb73..94507e5f020 100644
--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
@@ -1,7 +1,4 @@
 name	rasapi32
-type	win32
-
-debug_channels (ras)
 
  1  stub RasAutodialAddressToNetwork
  2  stub RasAutodialEntryToNetwork
diff --git a/dlls/richedit/.cvsignore b/dlls/richedit/.cvsignore
index c5dbbfe8dfb..27323c9b02d 100644
--- a/dlls/richedit/.cvsignore
+++ b/dlls/richedit/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+riched32.dll.dbg.c
 riched32.spec.c
diff --git a/dlls/richedit/riched32.spec b/dlls/richedit/riched32.spec
index 8010c665173..1f0e28bb41d 100644
--- a/dlls/richedit/riched32.spec
+++ b/dlls/richedit/riched32.spec
@@ -1,7 +1,4 @@
 name	riched32
-type	win32
 init	RICHED32_LibMain
 
-debug_channels (richedit)
-
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion
diff --git a/dlls/rpcrt4/.cvsignore b/dlls/rpcrt4/.cvsignore
index dba83f678ed..fe5dc76692f 100644
--- a/dlls/rpcrt4/.cvsignore
+++ b/dlls/rpcrt4/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+rpcrt4.dll.dbg.c
 rpcrt4.spec.c
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index 8f3857c7fe7..305bf5db00d 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -1,9 +1,6 @@
 name	rpcrt4
-type	win32
 init	RPCRT4_LibMain
 
-debug_channels (ole)
-
 @ stub DceErrorInqTextA
 @ stub DceErrorInqTextW
 
diff --git a/dlls/serialui/.cvsignore b/dlls/serialui/.cvsignore
index 9d1d4664576..a926717bcd4 100644
--- a/dlls/serialui/.cvsignore
+++ b/dlls/serialui/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+serialui.dll.dbg.c
 serialui.spec.c
 serialui_rc.res
diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec
index 665d5536bec..7b286862ed7 100644
--- a/dlls/serialui/serialui.spec
+++ b/dlls/serialui/serialui.spec
@@ -1,9 +1,6 @@
 name	serialui
-type	win32
 init	SERIALUI_LibMain
 
-debug_channels (comm)
-
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages
 3 stdcall drvCommConfigDialog(ptr long ptr) SERIALUI_CommConfigDialog
 4 stdcall drvSetDefaultCommConfig(str ptr long) SERIALUI_SetDefaultCommConfig
diff --git a/dlls/setupapi/.cvsignore b/dlls/setupapi/.cvsignore
index 8df8ae4642b..72b2f699659 100644
--- a/dlls/setupapi/.cvsignore
+++ b/dlls/setupapi/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+setupapi.dll.dbg.c
 setupapi.res
 setupapi.spec.c
 setupx.spec.c
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index e6af34df93b..f332050cfb0 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -1,7 +1,4 @@
 name setupapi
-type win32
-
-debug_channels (setupapi)
 
 @ stub AddMiniIconToList
 @ stub AddTagToGroupOrderListEntry
diff --git a/dlls/shdocvw/.cvsignore b/dlls/shdocvw/.cvsignore
index d74a544c134..d7d33031cab 100644
--- a/dlls/shdocvw/.cvsignore
+++ b/dlls/shdocvw/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+shdocvw.dll.dbg.c
 shdocvw.spec.c
diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec
index 47eb9f43e81..c0f683cdd46 100644
--- a/dlls/shdocvw/shdocvw.spec
+++ b/dlls/shdocvw/shdocvw.spec
@@ -1,7 +1,4 @@
 name	shdocvw
-type	win32
-
-debug_channels (comimpl shdocvw)
 
 # ordinal exports
 101 stub @
diff --git a/dlls/shell32/.cvsignore b/dlls/shell32/.cvsignore
index ce0caa61a02..6c848d4bcbe 100644
--- a/dlls/shell32/.cvsignore
+++ b/dlls/shell32/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 shell.spec.c
+shell32.dll.dbg.c
 shell32.spec.c
 shres.res
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index bf358748cd3..d22eec4c062 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -1,9 +1,6 @@
 name	shell32
-type	win32
 init	Shell32LibMain
 
-debug_channels (exec pidl shell shlctrl)
-
 # Functions exported by the Win95 shell32.dll 
 # (these need to have these exact ordinals, for some 
 #  win95 and winNT dlls import shell32.dll by ordinal)
diff --git a/dlls/shfolder/.cvsignore b/dlls/shfolder/.cvsignore
index 36465b548cc..9a9af27e40a 100644
--- a/dlls/shfolder/.cvsignore
+++ b/dlls/shfolder/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+shfolder.dll.dbg.c
 shfolder.spec.c
diff --git a/dlls/shfolder/shfolder.spec b/dlls/shfolder/shfolder.spec
index 0d97004456c..65ca40db63d 100644
--- a/dlls/shfolder/shfolder.spec
+++ b/dlls/shfolder/shfolder.spec
@@ -1,5 +1,4 @@
 name shfolder
-type win32
 
 @ forward SHGetFolderPathA shell32.SHGetFolderPathA
 @ forward SHGetFolderPathW shell32.SHGetFolderPathW
diff --git a/dlls/shlwapi/.cvsignore b/dlls/shlwapi/.cvsignore
index 1fd3a31c5ba..9568f968a7b 100644
--- a/dlls/shlwapi/.cvsignore
+++ b/dlls/shlwapi/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+shlwapi.dll.dbg.c
 shlwapi.spec.c
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index f933f6624c3..30a3659e5c9 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -1,9 +1,6 @@
 name shlwapi
-type win32
 init SHLWAPI_LibMain
 
-debug_channels (shell)
-
 1   stdcall @(str ptr) SHLWAPI_1
 2   stdcall @(wstr ptr) SHLWAPI_2
 3   stdcall @(str long) SHLWAPI_3
diff --git a/dlls/snmpapi/.cvsignore b/dlls/snmpapi/.cvsignore
index 779a18113e4..c2f5b71c214 100644
--- a/dlls/snmpapi/.cvsignore
+++ b/dlls/snmpapi/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+snmpapi.dll.dbg.c
 snmpapi.spec.c
diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec
index 6c86eb4b02e..a1d8a9a23bc 100644
--- a/dlls/snmpapi/snmpapi.spec
+++ b/dlls/snmpapi/snmpapi.spec
@@ -1,9 +1,6 @@
 name    snmpapi
-type    win32
 init    SNMPAPI_DllMain
 
-debug_channels (snmpapi)
-
 @ stub SnmpSvcAddrIsIpx
 @ stub SnmpSvcAddrToSocket
 @ stub SnmpSvcBufRevAndCpy
diff --git a/dlls/sti/.cvsignore b/dlls/sti/.cvsignore
index b194d264fb1..c93235f3c69 100644
--- a/dlls/sti/.cvsignore
+++ b/dlls/sti/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+sti.dll.dbg.c
 sti.spec.c
diff --git a/dlls/sti/sti.spec b/dlls/sti/sti.spec
index f4716d47465..4848784c046 100644
--- a/dlls/sti/sti.spec
+++ b/dlls/sti/sti.spec
@@ -1,7 +1,4 @@
 name sti
-type win32
-
-debug_channels()
 
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
diff --git a/dlls/tapi32/.cvsignore b/dlls/tapi32/.cvsignore
index f1566dac650..65d7929a690 100644
--- a/dlls/tapi32/.cvsignore
+++ b/dlls/tapi32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+tapi32.dll.dbg.c
 tapi32.spec.c
diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec
index 32402ee2341..d4afab2053e 100644
--- a/dlls/tapi32/tapi32.spec
+++ b/dlls/tapi32/tapi32.spec
@@ -1,7 +1,4 @@
 name	tapi32
-type	win32
-
-debug_channels (tapi)
 
 @ stdcall lineAccept(long str long) lineAccept
 @ stdcall lineAddProvider(str long ptr) lineAddProvider
diff --git a/dlls/ttydrv/.cvsignore b/dlls/ttydrv/.cvsignore
index 2736f1fa23a..e177b59ec28 100644
--- a/dlls/ttydrv/.cvsignore
+++ b/dlls/ttydrv/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+ttydrv.dll.dbg.c
 ttydrv.spec.c
diff --git a/dlls/ttydrv/ttydrv.spec b/dlls/ttydrv/ttydrv.spec
index b8d5aa3e9a3..5d379cbe48f 100644
--- a/dlls/ttydrv/ttydrv.spec
+++ b/dlls/ttydrv/ttydrv.spec
@@ -1,9 +1,6 @@
 name	ttydrv
-type	win32
 init	TTYDRV_Init
 
-debug_channels (ttydrv)
-
 # GDI driver
 
 @ cdecl Arc(ptr long long long long long long long long) TTYDRV_DC_Arc
diff --git a/dlls/twain/.cvsignore b/dlls/twain/.cvsignore
index 6fbf05bf74d..f93dc009dcc 100644
--- a/dlls/twain/.cvsignore
+++ b/dlls/twain/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+twain_32.dll.dbg.c
 twain_32.spec.c
diff --git a/dlls/twain/twain_32.spec b/dlls/twain/twain_32.spec
index d337782ed06..cde68f24904 100644
--- a/dlls/twain/twain_32.spec
+++ b/dlls/twain/twain_32.spec
@@ -1,7 +1,4 @@
 name	twain_32
-type	win32
 init	TWAIN_LibMain
 
-debug_channels (twain)
-
 @ stdcall DSM_Entry(ptr ptr long long long ptr) DSM_Entry
diff --git a/dlls/url/.cvsignore b/dlls/url/.cvsignore
index 9b4dc6b137c..af36c61bf8a 100644
--- a/dlls/url/.cvsignore
+++ b/dlls/url/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+url.dll.dbg.c
 url.spec.c
diff --git a/dlls/url/url.spec b/dlls/url/url.spec
index d9805c0d412..91a444ce19f 100644
--- a/dlls/url/url.spec
+++ b/dlls/url/url.spec
@@ -1,7 +1,4 @@
 name url
-type win32
-
-debug_channels()
 
 @ stub AddMIMEFileTypesPS
 @ stub AutodialHookCallback
diff --git a/dlls/urlmon/.cvsignore b/dlls/urlmon/.cvsignore
index 16ad9005918..4364e74c9c6 100644
--- a/dlls/urlmon/.cvsignore
+++ b/dlls/urlmon/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+urlmon.dll.dbg.c
 urlmon.spec.c
diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec
index 9f05a76a8b1..24034bc11a7 100644
--- a/dlls/urlmon/urlmon.spec
+++ b/dlls/urlmon/urlmon.spec
@@ -1,7 +1,4 @@
 name    urlmon
-type    win32
-
-debug_channels (urlmon win32)
 
 1 stub CDLGetLongPathNameA
 2 stub CDLGetLongPathNameW
diff --git a/dlls/user/.cvsignore b/dlls/user/.cvsignore
index 49c2c5b63ff..05b10951b27 100644
--- a/dlls/user/.cvsignore
+++ b/dlls/user/.cvsignore
@@ -6,5 +6,6 @@ mouse.spec.c
 property.glue.c
 text.glue.c
 user.exe.spec.c
+user32.dll.dbg.c
 user32.spec.c
 wnd16.glue.c
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index 8cc1fa2c577..c941cfca5a2 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -1,12 +1,6 @@
 name	user32
-type	win32
 init	UserClientDllInitialize
 
-debug_channels (accel caret class clipboard combo comm cursor dc ddeml dialog
-                driver edit event graphics hook icon key keyboard listbox local
-                mdi menu message msg nonclient relay resource scroll shell static
-                string syscolor system text timer win win32 wnet)
-
 @ stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout
 @ stdcall AdjustWindowRect(ptr long long) AdjustWindowRect
 @ stdcall AdjustWindowRectEx(ptr long long long) AdjustWindowRectEx
diff --git a/dlls/version/.cvsignore b/dlls/version/.cvsignore
index 0b26930e66a..e377992678f 100644
--- a/dlls/version/.cvsignore
+++ b/dlls/version/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 ver.spec.c
+version.dll.dbg.c
 version.spec.c
diff --git a/dlls/version/version.spec b/dlls/version/version.spec
index 0853d9cacfc..82ed1cdfce4 100644
--- a/dlls/version/version.spec
+++ b/dlls/version/version.spec
@@ -1,7 +1,4 @@
 name version
-type win32
-
-debug_channels (ver)
 
 @ stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfoA
 @ stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSizeA
diff --git a/dlls/win32s/.cvsignore b/dlls/win32s/.cvsignore
index e76201f0ec3..8ccefa33450 100644
--- a/dlls/win32s/.cvsignore
+++ b/dlls/win32s/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+w32skrnl.dll.dbg.c
 w32skrnl.spec.c
 w32sys.spec.c
 win32s16.spec.c
diff --git a/dlls/win32s/w32skrnl.spec b/dlls/win32s/w32skrnl.spec
index 7fa7897f5d7..fd97de84c5c 100644
--- a/dlls/win32s/w32skrnl.spec
+++ b/dlls/win32s/w32skrnl.spec
@@ -1,7 +1,4 @@
 name	w32skrnl
-type	win32
-
-debug_channels (dll)
 
 1 stub _kSetEnvironmentVariable@8
 2 stub _SzFromImte@4
diff --git a/dlls/winaspi/.cvsignore b/dlls/winaspi/.cvsignore
index 1df4934a7ec..003be60fee6 100644
--- a/dlls/winaspi/.cvsignore
+++ b/dlls/winaspi/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 winaspi.spec.c
 winaspi16.glue.c
+wnaspi32.dll.dbg.c
 wnaspi32.spec.c
diff --git a/dlls/winaspi/wnaspi32.spec b/dlls/winaspi/wnaspi32.spec
index 8c9303ba11f..a0c4998cbcd 100644
--- a/dlls/winaspi/wnaspi32.spec
+++ b/dlls/winaspi/wnaspi32.spec
@@ -1,9 +1,6 @@
 name	wnaspi32
-type	win32
 init	WNASPI32_LibMain
 
-debug_channels (aspi)
-
 # we have several ordinal clashes here, it seems...
 
 1 cdecl GetASPI32SupportInfo() GetASPI32SupportInfo
diff --git a/dlls/winedos/.cvsignore b/dlls/winedos/.cvsignore
index 3670d73fe38..88f6c2dc2a2 100644
--- a/dlls/winedos/.cvsignore
+++ b/dlls/winedos/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+winedos.dll.dbg.c
 winedos.spec.c
diff --git a/dlls/winedos/winedos.spec b/dlls/winedos/winedos.spec
index 10dd26621c9..1e50d4ff495 100644
--- a/dlls/winedos/winedos.spec
+++ b/dlls/winedos/winedos.spec
@@ -1,9 +1,6 @@
 name winedos
-type win32
 init DOSVM_Init
 
-debug_channels (aspi console ddraw int int21 int31 module relay)
-
 @ stdcall LoadDosExe(str long) MZ_LoadImage
 
 # DPMI functions
diff --git a/dlls/wineps/.cvsignore b/dlls/wineps/.cvsignore
index 9b34e2b2c2c..7daf02aab42 100644
--- a/dlls/wineps/.cvsignore
+++ b/dlls/wineps/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 rsrc.res
+wineps.dll.dbg.c
 wineps.spec.c
 wineps16.spec.c
diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.spec
index c11f7ef138e..4b2fbfeb21a 100644
--- a/dlls/wineps/wineps.spec
+++ b/dlls/wineps/wineps.spec
@@ -1,9 +1,6 @@
 name	wineps
-type	win32
 init	PSDRV_Init
 
-debug_channels (psdrv)
-
 # GDI driver
 
 @ cdecl Arc(ptr long long long long long long long long) PSDRV_Arc
diff --git a/dlls/wininet/.cvsignore b/dlls/wininet/.cvsignore
index 02f7ace90e7..aaa584ef236 100644
--- a/dlls/wininet/.cvsignore
+++ b/dlls/wininet/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+wininet.dll.dbg.c
 wininet.spec.c
diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec
index 87faaacb237..96b138fd484 100644
--- a/dlls/wininet/wininet.spec
+++ b/dlls/wininet/wininet.spec
@@ -1,9 +1,6 @@
 name    wininet
-type    win32
 init    WININET_LibMain
 
-debug_channels (wininet)
-
 @ stub InternetInitializeAutoProxyDll
 @ stub ShowCertificate
 @ stdcall CommitUrlCacheEntryA(str str long long long str long str str) CommitUrlCacheEntryA
diff --git a/dlls/winmm/.cvsignore b/dlls/winmm/.cvsignore
index 0811ae98a92..49b85c0065c 100644
--- a/dlls/winmm/.cvsignore
+++ b/dlls/winmm/.cvsignore
@@ -4,5 +4,6 @@ mmsystem.glue.c
 mmsystem.spec.c
 sound.spec.c
 time.glue.c
+winmm.dll.dbg.c
 winmm.spec.c
 winmm_res.res
diff --git a/dlls/winmm/joystick/.cvsignore b/dlls/winmm/joystick/.cvsignore
index 3e41704814b..aa7a0b1f198 100644
--- a/dlls/winmm/joystick/.cvsignore
+++ b/dlls/winmm/joystick/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+joystick.drv.dbg.c
 joystick.drv.spec.c
diff --git a/dlls/winmm/joystick/joystick.drv.spec b/dlls/winmm/joystick/joystick.drv.spec
index 655886a6473..54e9c34c77a 100644
--- a/dlls/winmm/joystick/joystick.drv.spec
+++ b/dlls/winmm/joystick/joystick.drv.spec
@@ -1,7 +1,4 @@
 name joystick
 file joystick.drv
-type win32
-
-debug_channels (joystick)
 
 @ stdcall DriverProc(long long long long long) JSTCK_DriverProc
diff --git a/dlls/winmm/mcianim/.cvsignore b/dlls/winmm/mcianim/.cvsignore
index 66b554dbca0..2f9b1b1d952 100644
--- a/dlls/winmm/mcianim/.cvsignore
+++ b/dlls/winmm/mcianim/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+mcianim.drv.dbg.c
 mcianim.drv.spec.c
diff --git a/dlls/winmm/mcianim/mcianim.drv.spec b/dlls/winmm/mcianim/mcianim.drv.spec
index 9d28dab7ee7..2e34ad0276a 100644
--- a/dlls/winmm/mcianim/mcianim.drv.spec
+++ b/dlls/winmm/mcianim/mcianim.drv.spec
@@ -1,7 +1,4 @@
 name mcianim
 file mcianim.drv
-type win32
-
-debug_channels (mcianim)
 
 @ stdcall DriverProc(long long long long long) MCIANIM_DriverProc
diff --git a/dlls/winmm/mciavi/.cvsignore b/dlls/winmm/mciavi/.cvsignore
index 9e25e5cd5c8..ec8f910cfe0 100644
--- a/dlls/winmm/mciavi/.cvsignore
+++ b/dlls/winmm/mciavi/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+mciavi.drv.dbg.c
 mciavi.drv.spec.c
 mciavi_res.res
diff --git a/dlls/winmm/mciavi/mciavi.drv.spec b/dlls/winmm/mciavi/mciavi.drv.spec
index 8e40607665d..bba843cf95d 100644
--- a/dlls/winmm/mciavi/mciavi.drv.spec
+++ b/dlls/winmm/mciavi/mciavi.drv.spec
@@ -1,8 +1,5 @@
 name mciavi
 file mciavi.drv
-type win32
 init MCIAVI_LibMain
 
-debug_channels (mciavi)
-
 @ stdcall DriverProc(long long long long long) MCIAVI_DriverProc
diff --git a/dlls/winmm/mcicda/.cvsignore b/dlls/winmm/mcicda/.cvsignore
index 31a6d4b493e..698fb76fc55 100644
--- a/dlls/winmm/mcicda/.cvsignore
+++ b/dlls/winmm/mcicda/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+mcicda.drv.dbg.c
 mcicda.drv.spec.c
diff --git a/dlls/winmm/mcicda/mcicda.drv.spec b/dlls/winmm/mcicda/mcicda.drv.spec
index 529453719d8..c6d6716f04b 100644
--- a/dlls/winmm/mcicda/mcicda.drv.spec
+++ b/dlls/winmm/mcicda/mcicda.drv.spec
@@ -1,7 +1,4 @@
 name mcicda
 file mcicda.drv
-type win32
-
-debug_channels (mcicda)
 
 @ stdcall DriverProc(long long long long long) MCICDA_DriverProc
diff --git a/dlls/winmm/mciseq/.cvsignore b/dlls/winmm/mciseq/.cvsignore
index 4b25329e230..6903122d9f1 100644
--- a/dlls/winmm/mciseq/.cvsignore
+++ b/dlls/winmm/mciseq/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+mciseq.drv.dbg.c
 mciseq.drv.spec.c
diff --git a/dlls/winmm/mciseq/mciseq.drv.spec b/dlls/winmm/mciseq/mciseq.drv.spec
index 3377010b2db..46ae86bf66c 100644
--- a/dlls/winmm/mciseq/mciseq.drv.spec
+++ b/dlls/winmm/mciseq/mciseq.drv.spec
@@ -1,7 +1,4 @@
 name mciseq
 file mciseq.drv
-type win32
-
-debug_channels (mcimidi)
 
 @ stdcall DriverProc(long long long long long) MCIMIDI_DriverProc
diff --git a/dlls/winmm/mciwave/.cvsignore b/dlls/winmm/mciwave/.cvsignore
index 670a6ab1a60..df055867c2a 100644
--- a/dlls/winmm/mciwave/.cvsignore
+++ b/dlls/winmm/mciwave/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+mciwave.drv.dbg.c
 mciwave.drv.spec.c
diff --git a/dlls/winmm/mciwave/mciwave.drv.spec b/dlls/winmm/mciwave/mciwave.drv.spec
index 7b3147d21c1..23e6f731f62 100644
--- a/dlls/winmm/mciwave/mciwave.drv.spec
+++ b/dlls/winmm/mciwave/mciwave.drv.spec
@@ -1,7 +1,4 @@
 name mciwave
 file mciwave.drv
-type win32
-
-debug_channels (mciwave)
 
 @ stdcall DriverProc(long long long long long) MCIWAVE_DriverProc
diff --git a/dlls/winmm/midimap/.cvsignore b/dlls/winmm/midimap/.cvsignore
index 9ae44ca8e31..bdf88dd1c46 100644
--- a/dlls/winmm/midimap/.cvsignore
+++ b/dlls/winmm/midimap/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+midimap.drv.dbg.c
 midimap.drv.spec.c
diff --git a/dlls/winmm/midimap/midimap.drv.spec b/dlls/winmm/midimap/midimap.drv.spec
index 454e032b80d..6c1d24626b0 100644
--- a/dlls/winmm/midimap/midimap.drv.spec
+++ b/dlls/winmm/midimap/midimap.drv.spec
@@ -1,8 +1,5 @@
 name midimap
 file midimap.drv
-type win32
-
-debug_channels (msacm)
 
 @ stdcall DriverProc(long long long long long) MIDIMAP_DriverProc
 @ stdcall modMessage(long long long long long) MIDIMAP_modMessage
diff --git a/dlls/winmm/wavemap/.cvsignore b/dlls/winmm/wavemap/.cvsignore
index ea6af380ad9..77f70097a2c 100644
--- a/dlls/winmm/wavemap/.cvsignore
+++ b/dlls/winmm/wavemap/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+msacm.drv.dbg.c
 msacm.drv.spec.c
diff --git a/dlls/winmm/wavemap/msacm.drv.spec b/dlls/winmm/wavemap/msacm.drv.spec
index c573e40313d..892c37994be 100644
--- a/dlls/winmm/wavemap/msacm.drv.spec
+++ b/dlls/winmm/wavemap/msacm.drv.spec
@@ -1,8 +1,5 @@
 name msacmmap
 file msacm.drv
-type win32
-
-debug_channels (msacm)
 
 @ stdcall DriverProc(long long long long long) WAVEMAP_DriverProc
 @ stdcall widMessage(long long long long long) WAVEMAP_widMessage
diff --git a/dlls/winmm/winearts/.cvsignore b/dlls/winmm/winearts/.cvsignore
index 3a5385a2791..cfeff5803aa 100644
--- a/dlls/winmm/winearts/.cvsignore
+++ b/dlls/winmm/winearts/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+winearts.drv.dbg.c
 winearts.drv.spec.c
diff --git a/dlls/winmm/winearts/Makefile.in b/dlls/winmm/winearts/Makefile.in
index 61c5d589367..577bea7296b 100644
--- a/dlls/winmm/winearts/Makefile.in
+++ b/dlls/winmm/winearts/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winearts.drv
 IMPORTS   = winmm user32 kernel32 ntdll
-EXTRADEFS = @ARTSINCL@
+EXTRAINCL = @ARTSINCL@
 EXTRALIBS = @ARTSLIBS@
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff --git a/dlls/winmm/winearts/winearts.drv.spec b/dlls/winmm/winearts/winearts.drv.spec
index b89c8fad36d..c410623fea6 100644
--- a/dlls/winmm/winearts/winearts.drv.spec
+++ b/dlls/winmm/winearts/winearts.drv.spec
@@ -1,8 +1,5 @@
 name winearts
 file winearts.drv
-type win32
-
-debug_channels (wave)
 
 @ stdcall DriverProc(long long long long long) ARTS_DriverProc
 @ stdcall wodMessage(long long long long long) ARTS_wodMessage
diff --git a/dlls/winmm/wineoss/.cvsignore b/dlls/winmm/wineoss/.cvsignore
index b480bb3ba10..186250c2b89 100644
--- a/dlls/winmm/wineoss/.cvsignore
+++ b/dlls/winmm/wineoss/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+wineoss.drv.dbg.c
 wineoss.drv.spec.c
diff --git a/dlls/winmm/wineoss/wineoss.drv.spec b/dlls/winmm/wineoss/wineoss.drv.spec
index 2171e02f88c..7b259a9229a 100644
--- a/dlls/winmm/wineoss/wineoss.drv.spec
+++ b/dlls/winmm/wineoss/wineoss.drv.spec
@@ -1,8 +1,5 @@
 name wineoss
 file wineoss.drv
-type win32
-
-debug_channels (midi mmaux wave)
 
   1 stdcall DriverProc(long long long long long) OSS_DriverProc
   2 stdcall auxMessage(long long long long long) OSS_auxMessage
diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec
index 4c494c5bacb..e7068549cbd 100644
--- a/dlls/winmm/winmm.spec
+++ b/dlls/winmm/winmm.spec
@@ -1,9 +1,6 @@
 name winmm
-type win32
 init WINMM_LibMain
 
-debug_channels (driver mci mmio mmsys mmtime sound)
-
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA
 3 stub @
diff --git a/dlls/winnls/.cvsignore b/dlls/winnls/.cvsignore
index 5459b374696..3ea5b4cc4e7 100644
--- a/dlls/winnls/.cvsignore
+++ b/dlls/winnls/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 winnls.spec.c
+winnls32.dll.dbg.c
 winnls32.spec.c
diff --git a/dlls/winnls/winnls32.spec b/dlls/winnls/winnls32.spec
index b452a054fc5..ea4353d23ee 100644
--- a/dlls/winnls/winnls32.spec
+++ b/dlls/winnls/winnls32.spec
@@ -1,5 +1,4 @@
 name	winnls32
-type	win32
 
 1  stub WINNLS32EnableIME
 2  stub WINNLS32GetEnableStatus
diff --git a/dlls/winsock/.cvsignore b/dlls/winsock/.cvsignore
index f51c97575b0..cf6c740ae2b 100644
--- a/dlls/winsock/.cvsignore
+++ b/dlls/winsock/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 winsock.spec.c
+ws2_32.dll.dbg.c
 ws2_32.spec.c
diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec
index ca2713701d8..ec45f3f3b5a 100644
--- a/dlls/winsock/ws2_32.spec
+++ b/dlls/winsock/ws2_32.spec
@@ -3,11 +3,8 @@
 #  Export table information obtained from Windows 2000 ws2_32.dll
 
 name ws2_32
-type win32
 init WS_LibMain
 
-debug_channels (winsock)
-
 #  EXPORTS ***********
 1   stdcall  accept(long ptr ptr) WS_accept
 2   stdcall  bind(long ptr long) WS_bind
diff --git a/dlls/winspool/.cvsignore b/dlls/winspool/.cvsignore
index af5cd83fa6e..5f979ba71eb 100644
--- a/dlls/winspool/.cvsignore
+++ b/dlls/winspool/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+winspool.drv.dbg.c
 winspool.drv.spec.c
diff --git a/dlls/winspool/winspool.drv.spec b/dlls/winspool/winspool.drv.spec
index e20f8b9df7f..0932b0b386a 100644
--- a/dlls/winspool/winspool.drv.spec
+++ b/dlls/winspool/winspool.drv.spec
@@ -1,10 +1,7 @@
 name	winspool
-type	win32
 file	winspool.drv
 init	WINSPOOL_EntryPoint
 
-debug_channels (winspool)
-
 100 stub @
 @ stub ADVANCEDSETUPDIALOG
 @ stub AbortPrinter
diff --git a/dlls/wintrust/.cvsignore b/dlls/wintrust/.cvsignore
index 8a9f7bb0435..da89a78db54 100644
--- a/dlls/wintrust/.cvsignore
+++ b/dlls/wintrust/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+wintrust.dll.dbg.c
 wintrust.spec.c
diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec
index cdf11e0cd71..b79316762e7 100644
--- a/dlls/wintrust/wintrust.spec
+++ b/dlls/wintrust/wintrust.spec
@@ -1,6 +1,3 @@
 name	wintrust
-type	win32
-
-debug_channels (win32)
 
 @ stdcall WinVerifyTrust(long ptr ptr) WinVerifyTrust
diff --git a/dlls/wow32/.cvsignore b/dlls/wow32/.cvsignore
index 71fe447c876..a115ddce40d 100644
--- a/dlls/wow32/.cvsignore
+++ b/dlls/wow32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+wow32.dll.dbg.c
 wow32.spec.c
diff --git a/dlls/wow32/wow32.spec b/dlls/wow32/wow32.spec
index e3012665ac8..032bbbb1c03 100644
--- a/dlls/wow32/wow32.spec
+++ b/dlls/wow32/wow32.spec
@@ -1,5 +1,4 @@
 name	wow32
-type	win32
 
 # ordinal exports
 1 forward WOWGetDescriptor kernel32.K32WOWGetDescriptor
diff --git a/dlls/wsock32/.cvsignore b/dlls/wsock32/.cvsignore
index 5e34f92c8f9..251bbc9257a 100644
--- a/dlls/wsock32/.cvsignore
+++ b/dlls/wsock32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+wsock32.dll.dbg.c
 wsock32.spec.c
diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec
index 308c7dfdc4a..7d33f9c0e90 100644
--- a/dlls/wsock32/wsock32.spec
+++ b/dlls/wsock32/wsock32.spec
@@ -1,7 +1,4 @@
 name	wsock32
-type	win32
-
-debug_channels (winsock)
 
   1 forward accept ws2_32.accept
   2 forward bind ws2_32.bind
diff --git a/dlls/x11drv/.cvsignore b/dlls/x11drv/.cvsignore
index 75471af224f..85a80264077 100644
--- a/dlls/x11drv/.cvsignore
+++ b/dlls/x11drv/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 wineclipsrv
+x11drv.dll.dbg.c
 x11drv.spec.c
diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec
index 34a24336a68..c45306cecc0 100644
--- a/dlls/x11drv/x11drv.spec
+++ b/dlls/x11drv/x11drv.spec
@@ -1,10 +1,6 @@
 name	x11drv
-type	win32
 init	X11DRV_Init
 
-debug_channels (bitblt bitmap clipboard cursor dinput event font gdi graphics
-                key keyboard opengl palette text win x11drv xrender)
-
 # GDI driver
 
 @ cdecl Arc(ptr long long long long long long long long) X11DRV_Arc
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 7917eeef7da..2376b9a4b4d 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -1,4 +1,4 @@
-DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT
+DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
 LDDLLFLAGS = @LDDLLFLAGS@
 TOPSRCDIR  = @top_srcdir@
 TOPOBJDIR  = ..
@@ -38,47 +38,47 @@ all: $(PROGRAMS) $(PROGRAMS:%=%.so)
 @MAKE_RULES@
 
 expand.spec.c: expand.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym expand.o -o expand.spec.c -exe expand -mgui -L$(DLLDIR) -llz32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello.o -o hello.spec.c -exe hello -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello2.o -o hello2.spec.c -exe hello2 -mgui -L$(DLLDIR) -luser32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.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
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello4.o -o hello4.spec.c -exe hello4 -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym hello5.o -o hello5.spec.c -exe hello5 -mgui -L$(DLLDIR) -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym new.o -o new.spec.c -exe new -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym rolex.o -o rolex.spec.c -exe rolex -mgui -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym volinfo.o -o volinfo.spec.c -exe volinfo -mgui -L$(DLLDIR) -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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/miscemu/wine.spec b/miscemu/wine.spec
index 52555b7ac85..2923380b87b 100644
--- a/miscemu/wine.spec
+++ b/miscemu/wine.spec
@@ -1,4 +1,3 @@
 name	wine
 mode	guiexe
-type	win32
 init	wine_initial_task
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 3c1b3ee6750..c4a9d90aef0 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -11,6 +11,7 @@
 
 DEFS        = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
 LDDLLFLAGS  = @LDDLLFLAGS@
+ALL_OBJS    = $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBS)
 SYMBOLFILE  = $(MODULE).tmp.o
 TESTIMPORTS = $(DELAYIMPORTS) $(IMPORTS)
@@ -23,20 +24,20 @@ all: $(MODULE)$(EXEEXT)
 # 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%)
+	$(LDPATH) $(WINEBUILD) $(DEFS) $(SYMBOLFILE:%=-sym %) -o $@ -exe $(MODULE) $(APPMODE:%=-m%) $(RC_SRCS:%.rc=-res %.res) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
 
 # Rules for .so main module
 
-$(MODULE).so: $(MODULE).spec.o $(OBJS) Makefile.in
-	$(LDSHARED) $(LDDLLFLAGS) $(MODULE).spec.o $(OBJS) -o $@ $(ALL_LIBS)
+$(MODULE).so: $(MODULE).spec.o $(ALL_OBJS) Makefile.in
+	$(LDSHARED) $(LDDLLFLAGS) $(MODULE).spec.o $(ALL_OBJS) -o $@ $(ALL_LIBS)
 
 $(MODULE): $(MODULE).so
 	$(RM) $(MODULE) && $(LN_S) $(TOPOBJDIR)/wine $(MODULE)
 
 # Rules for .exe main module
 
-$(MODULE).exe: $(OBJS) $(RCOBJS) Makefile.in
-	$(CC) $(OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
+$(MODULE).exe: $(ALL_OBJS) $(RCOBJS) Makefile.in
+	$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
 
 # Rules for checking that no imports are missing
 
@@ -47,11 +48,6 @@ checklink:: $(MODULE).so
 
 $(TESTRESULTS): $(MODULE).so
 
-# Rules for debug channels
-
-debug_channels: dummy
-	$(TOPSRCDIR)/tools/make_debug $(MODULE).spec $(C_SRCS)
-
 # Rules for installation
 
 .PHONY: install_prog$(EXEEXT)
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 00886f6eb86..e4e5e53def3 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -1,4 +1,4 @@
-DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT
+DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
 LDDLLFLAGS = @LDDLLFLAGS@
 TOPSRCDIR  = @top_srcdir@
 TOPOBJDIR  = ../..
@@ -13,13 +13,13 @@ all: $(PROGRAMS)
 @MAKE_RULES@
 
 aviinfo.spec.c: aviinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym aviinfo.o -o aviinfo.spec.c -exe aviinfo -mgui -L$(DLLDIR) -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviinfo.o -o aviinfo.spec.c -exe aviinfo -mgui -L$(DLLDIR) -lkernel32 -lntdll
 
 aviplay.spec.c: aviplay.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym aviplay.o -o aviplay.spec.c -exe aviplay -mgui -L$(DLLDIR) -lddraw -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviplay.o -o aviplay.spec.c -exe aviplay -mgui -L$(DLLDIR) -lddraw -lkernel32 -lntdll
 
 icinfo.spec.c: icinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym icinfo.o -o icinfo.spec.c -exe icinfo -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32 -lntdll
+	$(LDPATH) $(WINEBUILD) $(DEFS) -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/clock/.cvsignore b/programs/clock/.cvsignore
index d5353648642..2f2e0a9c265 100644
--- a/programs/clock/.cvsignore
+++ b/programs/clock/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 clock
+clock.dbg.c
 clock.spec.c
 rsrc.res
diff --git a/programs/cmdlgtst/.cvsignore b/programs/cmdlgtst/.cvsignore
index 29bc66af96f..684099c31b9 100644
--- a/programs/cmdlgtst/.cvsignore
+++ b/programs/cmdlgtst/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 cmdlgr.res
 cmdlgtst
+cmdlgtst.dbg.c
 cmdlgtst.spec.c
diff --git a/programs/control/.cvsignore b/programs/control/.cvsignore
index dafb6940558..9f10f668c44 100644
--- a/programs/control/.cvsignore
+++ b/programs/control/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 control
+control.dbg.c
 control.spec.c
diff --git a/programs/notepad/.cvsignore b/programs/notepad/.cvsignore
index 46fda4aebd3..127bbbf8553 100644
--- a/programs/notepad/.cvsignore
+++ b/programs/notepad/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 notepad
+notepad.dbg.c
 notepad.spec.c
 rsrc.res
diff --git a/programs/osversioncheck/.cvsignore b/programs/osversioncheck/.cvsignore
index 769454b5865..4da03d5725e 100644
--- a/programs/osversioncheck/.cvsignore
+++ b/programs/osversioncheck/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 osversioncheck
+osversioncheck.dbg.c
 osversioncheck.spec.c
diff --git a/programs/progman/.cvsignore b/programs/progman/.cvsignore
index 8716df3e6f7..73bdce5cbab 100644
--- a/programs/progman/.cvsignore
+++ b/programs/progman/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 progman
+progman.dbg.c
 progman.spec.c
 rsrc.res
diff --git a/programs/regapi/.cvsignore b/programs/regapi/.cvsignore
index bb58883f33f..bfb8096bacd 100644
--- a/programs/regapi/.cvsignore
+++ b/programs/regapi/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 regapi
+regapi.dbg.c
 regapi.spec.c
diff --git a/programs/regedit/.cvsignore b/programs/regedit/.cvsignore
index 463823f99a0..dd85b9782a8 100644
--- a/programs/regedit/.cvsignore
+++ b/programs/regedit/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+regedit.dbg.c
 regedit.spec.c
diff --git a/programs/regsvr32/.cvsignore b/programs/regsvr32/.cvsignore
index 07ce01a23dc..8e4e0681f18 100644
--- a/programs/regsvr32/.cvsignore
+++ b/programs/regsvr32/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+regsvr32.dbg.c
 regsvr32.spec.c
diff --git a/programs/regtest/.cvsignore b/programs/regtest/.cvsignore
index 2d18c33dd58..b8a6b35b430 100644
--- a/programs/regtest/.cvsignore
+++ b/programs/regtest/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 regtest
+regtest.dbg.c
 regtest.spec.c
diff --git a/programs/uninstaller/.cvsignore b/programs/uninstaller/.cvsignore
index 43799b4091d..bd469935ed8 100644
--- a/programs/uninstaller/.cvsignore
+++ b/programs/uninstaller/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 rsrc.res
 uninstaller
+uninstaller.dbg.c
 uninstaller.spec.c
diff --git a/programs/view/.cvsignore b/programs/view/.cvsignore
index 7deec698e2b..4543de08810 100644
--- a/programs/view/.cvsignore
+++ b/programs/view/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 view
+view.dbg.c
 view.spec.c
 viewrc.res
diff --git a/programs/wcmd/.cvsignore b/programs/wcmd/.cvsignore
index 06b676630bb..997f434eef8 100644
--- a/programs/wcmd/.cvsignore
+++ b/programs/wcmd/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 wcmd
+wcmd.dbg.c
 wcmd.spec.c
 wcmdrc.res
diff --git a/programs/wineconsole/.cvsignore b/programs/wineconsole/.cvsignore
index 84bd2b5f9de..d20ecf16003 100644
--- a/programs/wineconsole/.cvsignore
+++ b/programs/wineconsole/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 wineconsole
+wineconsole.dbg.c
 wineconsole.spec.c
 wineconsole_res.res
diff --git a/programs/winemine/.cvsignore b/programs/winemine/.cvsignore
index f16473ece95..2e6b0920f41 100644
--- a/programs/winemine/.cvsignore
+++ b/programs/winemine/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 rsrc.res
 winemine
+winemine.dbg.c
 winemine.spec.c
diff --git a/programs/winepath/.cvsignore b/programs/winepath/.cvsignore
index 0966b84e023..24c02ceddc7 100644
--- a/programs/winepath/.cvsignore
+++ b/programs/winepath/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 winepath
+winepath.dbg.c
 winepath.spec.c
diff --git a/programs/winetest/.cvsignore b/programs/winetest/.cvsignore
index b6780d9f1a6..3ebb0b79847 100644
--- a/programs/winetest/.cvsignore
+++ b/programs/winetest/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 wine.c
+winetest.dbg.c
 winetest.spec.c
diff --git a/programs/winhelp/.cvsignore b/programs/winhelp/.cvsignore
index 35d22567c7b..59843857666 100644
--- a/programs/winhelp/.cvsignore
+++ b/programs/winhelp/.cvsignore
@@ -3,6 +3,7 @@ hlp2sgml
 lex.yy.c
 rsrc.res
 winhelp
+winhelp.dbg.c
 winhelp.spec.c
 y.tab.c
 y.tab.h
diff --git a/programs/winver/.cvsignore b/programs/winver/.cvsignore
index e4bc633e244..72f11154ef8 100644
--- a/programs/winver/.cvsignore
+++ b/programs/winver/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 winver
+winver.dbg.c
 winver.spec.c
diff --git a/tools/winebuild/README b/tools/winebuild/README
index cc49bf3ae6b..29e94ef524f 100644
--- a/tools/winebuild/README
+++ b/tools/winebuild/README
@@ -8,9 +8,7 @@ type    win16|win32
 [heap   SIZE]
 [stack  SIZE]
 [init	FUNCTION]
-[import [IMP_FLAGS] DLL]
 [rsrc	RESFILE]
-[debug_channels ([CHANNEL [CHANNEL...]])]
 [ignore ([SYMBOL [SYMBOL...]])]
 
 ORDINAL FUNCTYPE [FLAGS] EXPORTNAME([ARGTYPE [ARGTYPE [...]]]) HANDLERNAME
@@ -51,20 +49,8 @@ for kernel, which lives in the Windows file KRNL386.EXE).
 "init" specifies a function which will be called when this dll
 is loaded. This is only valid for Win32 modules.
 
-"import" names a module that this one depends on (only for Win32
-modules at the present). The import declaration can be present several
-times.
-
-"IMP_FLAGS" is a series of optional flags, preceded by a '-'
-character. The supported flags are:
-"-delay":       the module this module depends upon will be loaded
-	 	when the first API will be called (and not while this
-		module is loaded)
-
 "rsrc" specifies the path of the compiled resource file.
 
-"debug_channels" specifies the list of debug channels used by the dll.
-
 "ignore" specifies a list of symbols that should be ignored when
 resolving undefined symbols against the imported libraries.
 
diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h
index 5cce3c95163..232157db7c4 100644
--- a/tools/winebuild/build.h
+++ b/tools/winebuild/build.h
@@ -60,7 +60,6 @@ typedef enum
 
 typedef enum
 {
-    SPEC_INVALID,
     SPEC_WIN16,
     SPEC_WIN32
 } SPEC_TYPE;
@@ -146,6 +145,7 @@ extern void warning( const char *msg, ... );
 extern void output_standard_file_header( FILE *outfile );
 extern void dump_bytes( FILE *outfile, const unsigned char *data, int len,
                         const char *label, int constant );
+extern const char *make_c_identifier( const char *str );
 extern int get_alignment(int alignBoundary);
 
 extern void add_import_dll( const char *name, int delay );
@@ -157,6 +157,7 @@ extern int output_resources( FILE *outfile );
 extern void load_res16_file( const char *name );
 extern int output_res16_data( FILE *outfile );
 extern int output_res16_directory( unsigned char *buffer );
+extern void parse_debug_channels( const char *srcdir, const char *filename );
 
 extern void BuildGlue( FILE *outfile, FILE *infile );
 extern void BuildRelays16( FILE *outfile );
@@ -164,6 +165,7 @@ extern void BuildRelays32( FILE *outfile );
 extern void BuildSpec16File( FILE *outfile );
 extern void BuildSpec32File( FILE *outfile );
 extern void BuildDef32File( FILE *outfile );
+extern void BuildDebugFile( FILE *outfile );
 extern SPEC_TYPE ParseTopLevel( FILE *file, int def_only );
 
 /* global variables */
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 81a78e9ca8b..802af1f0b1b 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -67,6 +67,7 @@ const char *output_file_name;
 
 static FILE *input_file;
 static FILE *output_file;
+static const char *current_src_dir;
 
 /* execution mode */
 static enum
@@ -76,6 +77,7 @@ static enum
     MODE_EXE,
     MODE_GLUE,
     MODE_DEF,
+    MODE_DEBUG,
     MODE_RELAY16,
     MODE_RELAY32
 } exec_mode = MODE_NONE;
@@ -110,10 +112,12 @@ struct option_descr
     const char *usage;
 };
 
-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_f_flags( const char *arg );
+static void do_define( const char *arg );
+static void do_include( const char *arg );
 static void do_exe_mode( const char *arg );
 static void do_spec( const char *arg );
 static void do_def( const char *arg );
@@ -121,7 +125,9 @@ static void do_exe( const char *arg );
 static void do_glue( const char *arg );
 static void do_relay16(void);
 static void do_relay32(void);
+static void do_debug(void);
 static void do_sym( const char *arg );
+static void do_chdir( const char *arg );
 static void do_lib( const char *arg );
 static void do_import( const char *arg );
 static void do_dimport( const char *arg );
@@ -129,30 +135,29 @@ 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" },
+    { "-C",       1, do_chdir,   "-C dir           Change directory to <dir> before opening source files" },
+    { "-f",       1, do_f_flags, "-f flags         Compiler flags (only -fPIC is supported)" },
+    { "-D",       1, do_define,  "-D sym           Ignored for C flags compatibility" },
+    { "-I",       1, do_include, "-I dir           Ignored for C flags compatibility" },
     { "-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'" },
+    { "-sym",     1, do_sym,     "-sym file.o      Read the list of undefined symbols from 'file.o'\n" },
     { "-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" },
+    { "-debug",   0, do_debug,   "-debug [files]   Build a .c file containing debug channels declarations" },
     { "-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" },
     { NULL,       0, NULL,      NULL }
 };
 
-static void do_pic(void)
-{
-    UsePIC = 1;
-}
-
 static void do_output( const char *arg )
 {
     if ( ( unlink ( arg ) ) == -1 && ( errno != ENOENT ) ) 
@@ -175,7 +180,7 @@ static void do_usage(void)
     fprintf( stderr, "Usage: winebuild [options]\n\n" );
     fprintf( stderr, "Options:\n" );
     for (opt = option_table; opt->name; opt++) fprintf( stderr, "   %s\n", opt->usage );
-    fprintf( stderr, "\nExactly one of -spec, -glue or -relay must be specified.\n\n" );
+    fprintf( stderr, "\nExactly one of -spec, -def, -exe, -debug, -glue, -relay16 or -relay32 must be specified.\n\n" );
     exit(1);
 }
 
@@ -184,6 +189,22 @@ static void do_warnings(void)
     display_warnings = 1;
 }
 
+static void do_f_flags( const char *arg )
+{
+    if (!strcmp( arg, "PIC" )) UsePIC = 1;
+    /* ignore all other flags */
+}
+
+static void do_define( const char *arg )
+{
+    /* nothing */
+}
+
+static void do_include( const char *arg )
+{
+    /* nothing */
+}
+
 static void do_spec( const char *arg )
 {
     if (exec_mode != MODE_NONE || !arg[0]) do_usage();
@@ -228,6 +249,17 @@ static void do_glue( const char *arg )
     open_input( arg );
 }
 
+static void do_debug(void)
+{
+    if (exec_mode != MODE_NONE) do_usage();
+    exec_mode = MODE_DEBUG;
+}
+
+static void do_chdir( const char *arg )
+{
+    current_src_dir = arg;
+}
+
 static void do_relay16(void)
 {
     if (exec_mode != MODE_NONE) do_usage();
@@ -274,8 +306,7 @@ static void parse_options( char *argv[] )
     char * const * ptr;
     const char* arg=NULL;
 
-    ptr=argv+1;
-    while (*ptr != NULL)
+    for (ptr = argv + 1; *ptr; ptr++)
     {
         for (opt = option_table; opt->name; opt++)
         {
@@ -298,13 +329,18 @@ static void parse_options( char *argv[] )
 
         if (!opt->name)
         {
+            if (exec_mode == MODE_DEBUG && **ptr != '-')
+            {
+                /* this a file name to parse for debug channels */
+                parse_debug_channels( current_src_dir, *ptr );
+                continue;
+            }
             fprintf( stderr, "Unrecognized option '%s'\n", *ptr );
             do_usage();
         }
 
         if (opt->has_arg && arg!=NULL) opt->func( arg );
         else opt->func( "" );
-        ptr++;
     }
 }
 
@@ -346,6 +382,9 @@ int main(int argc, char **argv)
             default: assert(0);
         }
         break;
+    case MODE_DEBUG:
+        BuildDebugFile( output_file );
+        break;
     case MODE_GLUE:
         BuildGlue( output_file, input_file );
         break;
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index 784106b04c0..af91c3defdb 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -36,7 +36,7 @@
 
 int current_line = 0;
 
-static SPEC_TYPE SpecType = SPEC_INVALID;
+static SPEC_TYPE SpecType = SPEC_WIN32;
 
 static char ParseBuffer[512];
 static char TokenBuffer[512];
@@ -127,26 +127,6 @@ static const char * GetToken( int allow_eof )
 }
 
 
-/*******************************************************************
- *         ParseDebug
- *
- * Parse a debug channel definition.
- */
-static void ParseDebug(void)
-{
-    const char *token = GetToken(0);
-    if (*token != '(') fatal_error( "Expected '(' got '%s'\n", token );
-    for (;;)
-    {
-        token = GetToken(0);
-        if (*token == ')') break;
-        debug_channels = xrealloc( debug_channels,
-                                   (nb_debug_channels + 1) * sizeof(*debug_channels));
-        debug_channels[nb_debug_channels++] = xstrdup(token);
-    }
-}
-
-
 /*******************************************************************
  *         ParseIgnore
  *
@@ -575,12 +555,6 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
                 fatal_error( "Owner only supported for Win16 spec files\n" );
             strcpy( owner_name, GetToken(0) );
         }
-        else if (strcmp(token, "debug_channels") == 0)
-        {
-            if (SpecType != SPEC_WIN32)
-                fatal_error( "debug channels only supported for Win32 spec files\n" );
-            ParseDebug();
-        }
         else if (strcmp(token, "ignore") == 0)
         {
             if (SpecType != SPEC_WIN32)
@@ -614,7 +588,6 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
             sprintf( DLLFileName, "%s.exe", DLLName );
     }
 
-    if (SpecType == SPEC_INVALID) fatal_error( "Missing 'type' declaration\n" );
     if (SpecType == SPEC_WIN16 && !owner_name[0])
         fatal_error( "'owner' not specified for Win16 dll\n" );
 
@@ -622,3 +595,84 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
     sort_names();
     return SpecType;
 }
+
+
+/*******************************************************************
+ *         add_debug_channel
+ */
+static void add_debug_channel( const char *name )
+{
+    int i;
+
+    for (i = 0; i < nb_debug_channels; i++)
+        if (!strcmp( debug_channels[i], name )) return;
+
+    debug_channels = xrealloc( debug_channels, (nb_debug_channels + 1) * sizeof(*debug_channels));
+    debug_channels[nb_debug_channels++] = xstrdup(name);
+}
+
+
+/*******************************************************************
+ *         parse_debug_channels
+ *
+ * Parse a source file and extract the debug channel definitions.
+ */
+void parse_debug_channels( const char *srcdir, const char *filename )
+{
+    FILE *file;
+    int eol_seen = 1;
+    char *fullname = NULL;
+
+    if (srcdir)
+    {
+        fullname = xmalloc( strlen(srcdir) + strlen(filename) + 2 );
+        strcpy( fullname, srcdir );
+        strcat( fullname, "/" );
+        strcat( fullname, filename );
+    }
+    else fullname = xstrdup( filename );
+
+    if (!(file = fopen( fullname, "r" ))) fatal_error( "Cannot open file '%s'\n", fullname );
+    input_file_name = fullname;
+    current_line = 1;
+    while (fgets( ParseBuffer, sizeof(ParseBuffer), file ))
+    {
+        char *channel, *end, *p = ParseBuffer;
+
+        p = ParseBuffer + strlen(ParseBuffer) - 1;
+        if (!eol_seen)  /* continuation line */
+        {
+            eol_seen = (*p == '\n');
+            continue;
+        }
+        if ((eol_seen = (*p == '\n'))) *p = 0;
+
+        p = ParseBuffer;
+        while (isspace(*p)) p++;
+        if (!memcmp( p, "WINE_DECLARE_DEBUG_CHANNEL", 26 ) ||
+            !memcmp( p, "WINE_DEFAULT_DEBUG_CHANNEL", 26 ))
+        {
+            p += 26;
+            while (isspace(*p)) p++;
+            if (*p != '(')
+                fatal_error( "invalid debug channel specification '%s'\n", ParseBuffer );
+            p++;
+            while (isspace(*p)) p++;
+            if (!isalpha(*p))
+                fatal_error( "invalid debug channel specification '%s'\n", ParseBuffer );
+            channel = p;
+            while (isalnum(*p) || *p == '_') p++;
+            end = p;
+            while (isspace(*p)) p++;
+            if (*p != ')')
+                fatal_error( "invalid debug channel specification '%s'\n", ParseBuffer );
+            *end = 0;
+            add_debug_channel( channel );
+        }
+        current_line++;
+    }
+    fclose( file );
+    input_file_name = NULL;
+    current_line = 0;
+    free( fullname );
+}
diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c
index b30723e21bf..f12de6e267c 100644
--- a/tools/winebuild/spec16.c
+++ b/tools/winebuild/spec16.c
@@ -786,7 +786,7 @@ void BuildSpec16File( FILE *outfile )
 
 #ifdef __i386__
         fprintf( outfile, "    { 0x68, %s_CallFrom16_%s, 0x9a, __wine_call_from_16_%s,\n",
-                 DLLName, profile, 
+                 make_c_identifier(DLLName), profile,
                  (typelist[i]->flags & (FLAG_REGISTER|FLAG_INTERRUPT)) ? "regs":
                  typelist[i]->type == TYPE_PASCAL_16? "word" : "long" );
         if (argsize)
@@ -890,16 +890,19 @@ void BuildSpec16File( FILE *outfile )
 
 #if defined(__i386__)
     fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
-    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n", DLLName );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n",
+             make_c_identifier(DLLName) );
     fprintf( outfile, "    \"\\t.previous\\n\");\n" );
 #elif defined(__sparc__)
     fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
-    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n", DLLName );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n",
+             make_c_identifier(DLLName) );
     fprintf( outfile, "    \"\\tnop\\n\"\n" );
     fprintf( outfile, "    \"\\t.previous\\n\");\n" );
 #elif defined(__PPC__)
     fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
-    fprintf( outfile, "    \"\\tbl " PREFIX "__wine_spec_%s_init\\n\"\n", DLLName );
+    fprintf( outfile, "    \"\\tbl " PREFIX "__wine_spec_%s_init\\n\"\n",
+             make_c_identifier(DLLName) );
     fprintf( outfile, "    \"\\t.previous\\n\");\n" );
 #else
 #error You need to define the DLL constructor for your architecture
@@ -914,7 +917,7 @@ void BuildSpec16File( FILE *outfile )
              "{\n"
              "    extern void __wine_register_dll_16( const struct dll_descriptor *descr );\n"
              "    __wine_register_dll_16( &descriptor );\n"
-             "}\n", DLLName );
+             "}\n", make_c_identifier(DLLName) );
 }
 
 
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 7bfd39d31c7..1e33c0599c2 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -58,7 +58,7 @@ static const char *make_internal_name( const ORDDEF *odp, const char *prefix )
         for (p = buffer; *p; p++) if (!isalnum(*p) && *p != '_') break;
         if (!*p) return buffer;
     }
-    sprintf( buffer, "__wine_%s_%s_%d", prefix, DLLName, odp->ordinal );
+    sprintf( buffer, "__wine_%s_%s_%d", prefix, make_c_identifier(DLLName), odp->ordinal );
     return buffer;
 }
 
@@ -310,9 +310,9 @@ static int output_exports( FILE *outfile, int nr_exports )
             if (!isalnum(*p) && *p != '_' && *p != '.') break;
         if (*p) continue;
         fprintf( outfile, "    \"\\t.globl " PREFIX "__wine_dllexport_%s_%s\\n\"\n",
-                 DLLName, Names[i]->name );
+                 make_c_identifier(DLLName), Names[i]->name );
         fprintf( outfile, "    \"" PREFIX "__wine_dllexport_%s_%s:\\n\"\n",
-                 DLLName, Names[i]->name );
+                 make_c_identifier(DLLName), Names[i]->name );
     }
     fprintf( outfile, "    \"\\t.long 0xffffffff\\n\"\n" );
 
@@ -433,7 +433,7 @@ static void output_register_funcs( FILE *outfile )
 void BuildSpec32File( FILE *outfile )
 {
     int exports_size = 0;
-    int nr_exports, nr_imports, nr_resources, nr_debug;
+    int nr_exports, nr_imports, nr_resources;
     int characteristics, subsystem;
     DWORD page_size;
 
@@ -504,10 +504,6 @@ void BuildSpec32File( FILE *outfile )
 
     nr_resources = output_resources( outfile );
 
-    /* Output the debug channels */
-
-    nr_debug = output_debug( outfile );
-
     /* Output LibMain function */
 
     characteristics = subsystem = 0;
@@ -714,38 +710,20 @@ void BuildSpec32File( FILE *outfile )
 
 #if defined(__i386__)
     fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
-    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n", DLLName );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n",
+             make_c_identifier(DLLName) );
     fprintf( outfile, "    \"\\t.previous\\n\");\n" );
-    if (nr_debug)
-    {
-        fprintf( outfile, "asm(\"\\t.section\t.fini ,\\\"ax\\\"\\n\"\n" );
-        fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_fini\\n\"\n", DLLName );
-        fprintf( outfile, "    \"\\t.previous\\n\");\n" );
-    }
 #elif defined(__sparc__)
     fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
-    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n", DLLName );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_init\\n\"\n",
+             make_c_identifier(DLLName) );
     fprintf( outfile, "    \"\\tnop\\n\"\n" );
     fprintf( outfile, "    \"\\t.previous\\n\");\n" );
-    if (nr_debug)
-    {
-        fprintf( outfile, "asm(\"\\t.section\t.fini ,\\\"ax\\\"\\n\"\n" );
-        fprintf( outfile, "    \"\\tcall " PREFIX "__wine_spec_%s_fini\\n\"\n", DLLName );
-        fprintf( outfile, "    \"\\tnop\\n\"\n" );
-        fprintf( outfile, "    \"\\t.previous\\n\");\n" );
-    }
 #elif defined(__PPC__)
     fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
     fprintf( outfile, "    \"\\tbl " PREFIX "__wine_spec_%s_init\\n\"\n",
-             DLLName );
+             make_c_identifier(DLLName) );
     fprintf( outfile, "    \"\\t.previous\\n\");\n" );
-    if (nr_debug)
-    {
-        fprintf( outfile, "asm(\"\\t.section\t.fini ,\\\"ax\\\"\\n\"\n" );
-        fprintf( outfile, "    \"\\tbl " PREFIX "__wine_spec_%s_fini\\n\"\n",
-                 DLLName );
-        fprintf( outfile, "    \"\\t.previous\\n\");\n" );
-    }
 #else
 #error You need to define the DLL constructor for your architecture
 #endif
@@ -760,20 +738,8 @@ void BuildSpec32File( FILE *outfile )
              "    extern void __wine_dll_register( const struct image_nt_headers *, const char * );\n"
              "    extern void *__wine_dbg_register( char * const *, int );\n"
              "    __wine_dll_register( &nt_header, \"%s\" );\n",
-             DLLName, DLLFileName );
-    if (nr_debug)
-        fprintf( outfile, "    debug_registration = __wine_dbg_register( debug_channels, %d );\n",
-                 nr_debug );
+             make_c_identifier(DLLName), DLLFileName );
     fprintf( outfile, "}\n" );
-    if (nr_debug)
-    {
-        fprintf( outfile,
-                 "\nvoid __wine_spec_%s_fini(void)\n"
-                 "{\n"
-                 "    extern void __wine_dbg_unregister( void* );\n"
-                 "    __wine_dbg_unregister( debug_registration );\n"
-                 "}\n", DLLName );
-    }
 }
 
 
@@ -842,3 +808,91 @@ void BuildDef32File(FILE *outfile)
         fprintf(outfile, " @%d\n", odp->ordinal);
     }
 }
+
+
+/*******************************************************************
+ *         BuildDebugFile
+ *
+ * Build the debugging channels source file.
+ */
+void BuildDebugFile( FILE *outfile )
+{
+    int nr_debug;
+    char *prefix, *p;
+
+    output_standard_file_header( outfile );
+    nr_debug = output_debug( outfile );
+    if (!nr_debug)
+    {
+        fprintf( outfile, "/* no debug channels found for this module */\n" );
+        return;
+    }
+
+    if (output_file_name)
+    {
+        if ((p = strrchr( output_file_name, '/' ))) p++;
+        prefix = xstrdup( p ? p : output_file_name );
+        if ((p = strchr( prefix, '.' ))) *p = 0;
+        strcpy( p, make_c_identifier(p) );
+    }
+    else prefix = xstrdup( "_" );
+
+    /* Output the DLL constructor */
+
+    fprintf( outfile,
+             "#ifdef __GNUC__\n"
+             "static void __wine_dbg_%s_init(void) __attribute__((constructor));\n"
+             "static void __wine_dbg_%s_fini(void) __attribute__((destructor));\n"
+             "#else\n"
+             "static void __asm__dummy_dll_init(void) {\n",
+             prefix, prefix );
+
+#if defined(__i386__)
+    fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_dbg_%s_init\\n\"\n", prefix );
+    fprintf( outfile, "    \"\\t.previous\\n\");\n" );
+    fprintf( outfile, "asm(\"\\t.section\t.fini ,\\\"ax\\\"\\n\"\n" );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_dbg_%s_fini\\n\"\n", prefix );
+    fprintf( outfile, "    \"\\t.previous\\n\");\n" );
+#elif defined(__sparc__)
+    fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_dbg_%s_init\\n\"\n", prefix );
+    fprintf( outfile, "    \"\\tnop\\n\"\n" );
+    fprintf( outfile, "    \"\\t.previous\\n\");\n" );
+    fprintf( outfile, "asm(\"\\t.section\t.fini ,\\\"ax\\\"\\n\"\n" );
+    fprintf( outfile, "    \"\\tcall " PREFIX "__wine_dbg_%s_fini\\n\"\n", prefix );
+    fprintf( outfile, "    \"\\tnop\\n\"\n" );
+    fprintf( outfile, "    \"\\t.previous\\n\");\n" );
+#elif defined(__PPC__)
+    fprintf( outfile, "asm(\"\\t.section\t.init ,\\\"ax\\\"\\n\"\n" );
+    fprintf( outfile, "    \"\\tbl " PREFIX "__wine_dbg_%s_init\\n\"\n", prefix );
+    fprintf( outfile, "    \"\\t.previous\\n\");\n" );
+    fprintf( outfile, "asm(\"\\t.section\t.fini ,\\\"ax\\\"\\n\"\n" );
+    fprintf( outfile, "    \"\\tbl " PREFIX "__wine_dbg_%s_fini\\n\"\n", prefix );
+    fprintf( outfile, "    \"\\t.previous\\n\");\n" );
+#else
+#error You need to define the DLL constructor for your architecture
+#endif
+    fprintf( outfile, "}\n#endif /* defined(__GNUC__) */\n" );
+
+    fprintf( outfile,
+             "\n#ifdef __GNUC__\n"
+             "static\n"
+             "#endif\n"
+             "void __wine_dbg_%s_init(void)\n"
+             "{\n"
+             "    extern void *__wine_dbg_register( char * const *, int );\n"
+             "    debug_registration = __wine_dbg_register( debug_channels, %d );\n"
+             "}\n", prefix, nr_debug );
+    fprintf( outfile,
+             "\n#ifdef __GNUC__\n"
+             "static\n"
+             "#endif\n"
+             "void __wine_dbg_%s_fini(void)\n"
+             "{\n"
+             "    extern void __wine_dbg_unregister( void* );\n"
+             "    __wine_dbg_unregister( debug_registration );\n"
+             "}\n", prefix );
+
+    free( prefix );
+}
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 0bba03cb4b5..7e4bb4f5148 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -151,6 +151,27 @@ void dump_bytes( FILE *outfile, const unsigned char *data, int len,
     fprintf( outfile, "\n};\n" );
 }
 
+
+/*******************************************************************
+ *         make_c_identifier
+ *
+ * Map a string to a valid C identifier.
+ */
+const char *make_c_identifier( const char *str )
+{
+    static char buffer[256];
+    char *p;
+
+    for (p = buffer; *str && p < buffer+sizeof(buffer)-1; p++, str++)
+    {
+        if (isalnum(*str)) *p = *str;
+        else *p = '_';
+    }
+    *p = 0;
+    return buffer;
+}
+
+
 /*****************************************************************
  *  Function:    get_alignment
  *