diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 3cd3c19d6b31a95b626b42ce13b3f22b8630a2df..7dab0b6e8aad923e22e115ffa3be733c94d57734 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -44,6 +44,11 @@ $(ALTNAMES:%=lib%.a): lib$(MODULE).a
 checklink:: lib$(MODULE).$(LIBEXT)
 	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(TOPOBJDIR) -lwine -lwine_unicode $(EXTRALIBS) $(LIBS) && $(RM) checklink
 
+# Rules for debug channels
+
+debug_channels: dummy
+	$(TOPSRCDIR)/tools/make_debug $(MODULE).spec $(C_SRCS) $(SUBDIRS:%=%/*.c)
+
 # Rules for installation
 
 .PHONY: install_so install_a
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index f1b7c8efd82f842b7bfaf5b687fac407b53f07c5..28d7b1c128b053a286822f2867b00a81e5a6f1d5 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -378,66 +378,66 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 # Inter-dll dependencies (only necessary for .so)
 
 advapi32/libadvapi32.so: libkernel32.so libntdll.so
-avifil32/libavifil32.so: libmsvfw32.so libkernel32.so
-comctl32/libcomctl32.so: libuser32.so libgdi32.so libadvapi32.so libkernel32.so
+avifil32/libavifil32.so: libmsvfw32.so libkernel32.so libntdll.so
+comctl32/libcomctl32.so: libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so
 commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libuser32.so libwinspool.drv.so libgdi32.so libkernel32.so libntdll.so
 crtdll/libcrtdll.so: libkernel32.so libntdll.so
 dciman32/libdciman32.so: libntdll.so
 ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so
-dinput/libdinput.so: libuser32.so libkernel32.so
+dinput/libdinput.so: libuser32.so libkernel32.so libntdll.so
 dplay/libdplay.so: libdplayx.so
-dplayx/libdplayx.so: libwinmm.so libole32.so libuser32.so libadvapi32.so libkernel32.so
-dsound/libdsound.so: libwinmm.so libkernel32.so
-gdi/libgdi32.so: libadvapi32.so libkernel32.so
-icmp/libicmp.so: libkernel32.so
-imagehlp/libimagehlp.so: libkernel32.so
-imm32/libimm32.so: libkernel32.so
+dplayx/libdplayx.so: libwinmm.so libole32.so libuser32.so libadvapi32.so libkernel32.so libntdll.so
+dsound/libdsound.so: libwinmm.so libkernel32.so libntdll.so
+gdi/libgdi32.so: libadvapi32.so libkernel32.so libntdll.so
+icmp/libicmp.so: libkernel32.so libntdll.so
+imagehlp/libimagehlp.so: libkernel32.so libntdll.so
+imm32/libimm32.so: libkernel32.so libntdll.so
 kernel/libkernel32.so: libntdll.so
-lzexpand/liblz32.so: libkernel32.so
-mpr/libmpr.so: libkernel32.so
-msacm/libmsacm32.so: libwinmm.so libuser32.so libkernel32.so
+lzexpand/liblz32.so: libkernel32.so libntdll.so
+mpr/libmpr.so: libkernel32.so libntdll.so
+msacm/libmsacm32.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
 msnet32/libmsnet32.so: libntdll.so
-msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so
+msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so libntdll.so
 odbc32/libodbc32.so: libntdll.so
 ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so libntdll.so
-oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libkernel32.so
-olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so
+oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
+olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so libntdll.so
 oledlg/liboledlg.so: libntdll.so
-olepro32/libolepro32.so: liboleaut32.so
+olepro32/libolepro32.so: liboleaut32.so libntdll.so
 olesvr/libolesvr32.so: libntdll.so
 opengl32/libopengl32.so: libx11drv.so libkernel32.so
-psapi/libpsapi.so: libkernel32.so
+psapi/libpsapi.so: libkernel32.so libntdll.so
 rasapi32/librasapi32.so: libntdll.so
-richedit/libriched32.so: libuser32.so libkernel32.so
+richedit/libriched32.so: libuser32.so libkernel32.so libntdll.so
 rpcrt4/librpcrt4.so: libntdll.so
-serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so
-setupapi/libsetupapi.so: libadvapi32.so libkernel32.so
-shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so
-shfolder/libshfolder.so: libshell32.so
-shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so
+serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so libntdll.so
+setupapi/libsetupapi.so: libadvapi32.so libkernel32.so libntdll.so
+shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
+shfolder/libshfolder.so: libshell32.so libntdll.so
+shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
 tapi32/libtapi32.so: libkernel32.so
-ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so
-urlmon/liburlmon.so: libole32.so
+ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so libntdll.so
+urlmon/liburlmon.so: libole32.so libntdll.so
 user/libuser32.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
-version/libversion.so: liblz32.so libkernel32.so
-win32s/libw32skrnl.so: libkernel32.so
-winaspi/libwnaspi32.so: libadvapi32.so libkernel32.so
-wineps/libwineps.so: libuser32.so libgdi32.so libkernel32.so
-wininet/libwininet.so: libuser32.so libkernel32.so
-winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so
-winmm/libwinmm.so: libuser32.so libkernel32.so
-winmm/mcianim/libmcianim.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mciavi/libmciavi.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mcicda/libmcicda.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mciseq/libmciseq.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mciwave/libmciwave.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/midimap/libmidimap.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so
+version/libversion.so: liblz32.so libkernel32.so libntdll.so
+win32s/libw32skrnl.so: libkernel32.so libntdll.so
+winaspi/libwnaspi32.so: libadvapi32.so libkernel32.so libntdll.so
+wineps/libwineps.so: libuser32.so libgdi32.so libkernel32.so libntdll.so
+wininet/libwininet.so: libuser32.so libkernel32.so libntdll.so
+winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/libwinmm.so: libuser32.so libkernel32.so libntdll.so
+winmm/mcianim/libmcianim.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mciavi/libmciavi.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mcicda/libmcicda.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mciseq/libmciseq.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mciwave/libmciwave.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/midimap/libmidimap.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
 winsock/libws2_32.so: libuser32.so libkernel32.so libntdll.so
-winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so
-wow32/libwow32.so: libkernel32.so
-wsock32/libwsock32.so: libws2_32.so
+winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
+wow32/libwow32.so: libkernel32.so libntdll.so
+wsock32/libwsock32.so: libws2_32.so libkernel32.so libntdll.so
 x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so
 
 $(DLLFILES): dummy
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index 713435a3243d24972f4c2c1a6fc10a9426351d0f..25fdf1e70e8c0b54cfe6f327044771f37e24c450 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -4,6 +4,8 @@ type	win32
 import	kernel32.dll
 import	ntdll.dll
 
+debug_channels (advapi)
+
 @ stub AbortSystemShutdownA
 @ stub AbortSystemShutdownW
 @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 70c7fd7090fd56847a5a4371bb8296b16d7f60af..4a14a7ffefe5fadcea5cb3a0c5fa4dab87331bd2 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = avifil32
 SOVERSION = 1.0
 ALTNAMES  = avifile
-IMPORTS   = msvfw32 kernel32
+IMPORTS   = msvfw32 kernel32 ntdll
 
 C_SRCS = \
 	avifile.c
diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec
index 0c03f528ee42bd2ed5b253d0b1f6b0845c899d1f..d19a396242252347e647950494d1f10d7cb7c49c 100644
--- a/dlls/avifil32/avifil32.spec
+++ b/dlls/avifil32/avifil32.spec
@@ -3,6 +3,9 @@ type	win32
 
 import msvfw32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (avifile)
 
 @ stub    AVIBuildFilter
 @ stub    AVIBuildFilterA
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index 19490e138f35930895ba5230c498a9a5c1ede663..d0a6f60d0959f4ffcc8e4959cd95b92991500e01 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32
 SOVERSION = 1.0
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	animate.c \
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index 2cd1bbef364cdfd9bdafb6a2027c8b0199e9b8c6..6b3e16b93cc55345530bb91921ef065123cfe999 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -7,6 +7,11 @@ import	user32.dll
 import	gdi32.dll
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+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 
diff --git a/dlls/commdlg/comdlg32.spec b/dlls/commdlg/comdlg32.spec
index e63af388b756ccf35ee36fa236d9744911195e28..066c9ae787eca4f91b6ecda3e9d7432dd1010b7c 100644
--- a/dlls/commdlg/comdlg32.spec
+++ b/dlls/commdlg/comdlg32.spec
@@ -12,6 +12,8 @@ import gdi32.dll
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (commdlg)
+
  0 stub ArrowBtnWndProc
  1 stdcall ChooseColorA(ptr) ChooseColorA
  2 stdcall ChooseColorW(ptr) ChooseColorW
diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index 12b0c5ddee61f08a6c2c92178f6f54278218226c..c29c1868b20ae420ead8fc016db5c7e5809f689f 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -6,6 +6,8 @@ init    CRTDLL_Init
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (crtdll)
+
 @ cdecl ??2@YAPAXI@Z(long) CRTDLL_new
 @ cdecl ??3@YAXPAX@Z(long) CRTDLL_delete
 @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) CRTDLL_set_new_handler
diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec
index 871a7718548ef756269916d6316e759c74622c8e..098822de90e3ff96b7f7f94867d07997a39d3115 100644
--- a/dlls/ddraw/ddraw.spec
+++ b/dlls/ddraw/ddraw.spec
@@ -7,6 +7,8 @@ import x11drv.dll
 import gdi32.dll
 import kernel32.dll
 
+debug_channels (ddraw)
+
 @ stub DDHAL32_VidMemAlloc
 @ stub DDHAL32_VidMemFree
 @ stub DDInternalLock
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index f5bdf81f13f45b19626d8252976e2f9adf86ef0d..7a69fa4f25284638a22ad6daecf26de26d3390ca 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput
 SOVERSION = 1.0
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	dinput_main.c
diff --git a/dlls/dinput/dinput.spec b/dlls/dinput/dinput.spec
index 47c8c06bbf5c038e5fc309de35ded4a1c5317568..628bfae95e3325a8137291144a78f92e75f09163 100644
--- a/dlls/dinput/dinput.spec
+++ b/dlls/dinput/dinput.spec
@@ -3,6 +3,9 @@ type win32
 
 import user32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (dinput)
 
 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
 @ stub DirectInputCreateW
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 84e7b7ac74550b6299a2d1c5ff817faf6517230e..d9f7f0dfc7bb6b69529bb8e3e86afc4b502e805b 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx
 SOVERSION = 1.0
-IMPORTS   = winmm ole32 user32 advapi32 kernel32
+IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	dpclassfactory.c \
diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec
index fd165650afaa0ac426be2b40f0cc722a275dcc70..eba9d9c05e2850af9a8b6aac344d0997f83cb362 100644
--- a/dlls/dplayx/dplayx.spec
+++ b/dlls/dplayx/dplayx.spec
@@ -7,6 +7,9 @@ import ole32.dll
 import user32.dll
 import advapi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (dplay)
 
   1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
   2 stdcall DirectPlayEnumerateA(ptr ptr) DirectPlayEnumerateA
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index efb8b1f4f28a9e8d44ba82acd7afbe832884aa5c..c9fa8beee87e8cd6509d2f007ea316228d2dc386 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound
 SOVERSION = 1.0
-IMPORTS   = winmm kernel32
+IMPORTS   = winmm kernel32 ntdll
 
 C_SRCS = \
 	dsound_main.c
diff --git a/dlls/dsound/dsound.spec b/dlls/dsound/dsound.spec
index 5fadf30e6828c3c75e7bc07c7f90fa15f4e1d429..4594181693d33c65198e8f45b94c39bba764b082 100644
--- a/dlls/dsound/dsound.spec
+++ b/dlls/dsound/dsound.spec
@@ -1,7 +1,11 @@
 name dsound
 type win32
-import winmm
-import kernel32
+
+import winmm.dll
+import kernel32.dll
+import ntdll.dll
+
+debug_channels (dsound)
 
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index b5584cb8a9bc46ebcd31795e765c0b6273a7685b..55c95d2854fb86cdeb0f0fdfd5a21b65aedc682e 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = gdi32
 SOVERSION = 1.0
 ALTNAMES  = gdi dispdib wing
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = \
 	bidi16.c \
diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec
index be9d5e2c39d4f5df416917513070cb66b218e04d..38a2125c3211f38c5cdff31d72439978f5f7978c 100644
--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
@@ -4,6 +4,10 @@ init    MAIN_GdiInit
 
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+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
diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in
index f77e49cb20c59bab290aded050834e0c6a538f77..df1688bf5d4d14745e7d26b350e4a9b8b699c738 100644
--- a/dlls/icmp/Makefile.in
+++ b/dlls/icmp/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = icmp_main.c 
 
diff --git a/dlls/icmp/icmp.spec b/dlls/icmp/icmp.spec
index 0e30d90286682ad1640a274b5006952eab455e0a..2ecf2189d5554fd77fb6c4fc640c2c32423d9941 100644
--- a/dlls/icmp/icmp.spec
+++ b/dlls/icmp/icmp.spec
@@ -2,6 +2,9 @@ name icmp
 type win32
 
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (icmp)
 
 @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
 @ stdcall IcmpCreateFile() IcmpCreateFile
diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index b0c2befccb8853eedf73a53fad68c57d5c9f9134..66a83401ab72e4b575362ce43494d86c18fc50a6 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	access.c \
diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec
index d403ff657c4577088f619a36748054e4d9b94bf4..ee9d35ab3ec31df58e40a990e4f3bea6ef0356a6 100644
--- a/dlls/imagehlp/imagehlp.spec
+++ b/dlls/imagehlp/imagehlp.spec
@@ -3,6 +3,9 @@ type	win32
 init	IMAGEHLP_LibMain
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (imagehlp)
 
 @ stdcall BindImage(str str str) BindImage
 @ stdcall BindImageEx(long str str str ptr) BindImageEx
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index 65028e6ce60786a0e31b2eb80e8eeaeed4bab685..215f0fbd01f26e516d24b485f3038cd3db6807d8 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	imm.c
diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec
index f008bfe6b2c2f382c25f0b259ada1446bf692df6..a87e52689a3f80edee81b1fed068f847ba7790e4 100644
--- a/dlls/imm32/imm32.spec
+++ b/dlls/imm32/imm32.spec
@@ -2,6 +2,9 @@ name	imm32
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (imm)
 
 @ stdcall ImmAssociateContext(long long) ImmAssociateContext
 @ stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA
diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec
index 9d1df99954d0695c3c279c67dc2741ef718c603f..0ea5407a2db4f7e0dd22d5e56721cdaec1846d4a 100644
--- a/dlls/kernel/kernel32.spec
+++ b/dlls/kernel/kernel32.spec
@@ -5,6 +5,8 @@ rsrc	kernel.res
 
 import  ntdll.dll
 
+debug_channels (comm 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/Makefile.in b/dlls/lzexpand/Makefile.in
index d5ef1ca23513b985a0da575d40194f645de78863..ac80c860ba60348ca6fe522023c7df1fde5ebd72 100644
--- a/dlls/lzexpand/Makefile.in
+++ b/dlls/lzexpand/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = lz32
 SOVERSION = 1.0
 ALTNAMES  = lzexpand
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	lzexpand_main.c
diff --git a/dlls/lzexpand/lz32.spec b/dlls/lzexpand/lz32.spec
index 828d18f0540e3473d235a8f5b635778feec879aa..172079dce2e3a3462e399c9c680cd11b88bbb461 100644
--- a/dlls/lzexpand/lz32.spec
+++ b/dlls/lzexpand/lz32.spec
@@ -2,6 +2,9 @@ name	lz32
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (file)
 
 @ stdcall CopyLZFile(long long) CopyLZFile
 @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in
index b6e312e0926bad93728af49825dabe3de9fc3020..88e8f2c4fa12f4a7bec166967dd1164845862f13 100644
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	auth.c \
diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec
index efe28d039428c24c68ba72f754241f7ed2c9e91a..e2ea0ce6418909e1c585376e92df8898b3779f61 100644
--- a/dlls/mpr/mpr.spec
+++ b/dlls/mpr/mpr.spec
@@ -2,6 +2,9 @@ name mpr
 type win32
 
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (mpr)
 
 # ordinal exports
  1 stub @
diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in
index 06eca803f317360e754cab33615fe39be9c79bea..f73bc2b815354b4bd85721c2e7cfc92fbcfc134f 100644
--- a/dlls/msacm/Makefile.in
+++ b/dlls/msacm/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msacm32
 SOVERSION = 1.0
 ALTNAMES  = msacm
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	driver.c \
diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec
index 6c2b78204986be3cef46244fa501da0781c44469..51184d504eefa47d0a4fdfd4caaec30fd95a5f48 100644
--- a/dlls/msacm/msacm32.spec
+++ b/dlls/msacm/msacm32.spec
@@ -6,6 +6,9 @@ rsrc msacm.res
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (msacm)
 
  1 stub XRegThunkEntry
  2 stdcall acmDriverAddA(ptr long long long long) acmDriverAddA
diff --git a/dlls/msvideo/Makefile.in b/dlls/msvideo/Makefile.in
index 3e03b06a3fcf0841919b7057e32b80fdfd36d25b..67b7a4e1077ba108f73f1e0c877986d43911078c 100644
--- a/dlls/msvideo/Makefile.in
+++ b/dlls/msvideo/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msvfw32
 SOVERSION = 1.0
 ALTNAMES  = msvideo
-IMPORTS   = winmm user32 gdi32 kernel32
+IMPORTS   = winmm user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	msvideo_main.c \
diff --git a/dlls/msvideo/msvfw32.spec b/dlls/msvideo/msvfw32.spec
index d8351f14a0f96da3e849bf00e2e020d8058e274a..321d9dbde9be821c6e5b78f5326cb0f2b7677d79 100644
--- a/dlls/msvideo/msvfw32.spec
+++ b/dlls/msvideo/msvfw32.spec
@@ -5,6 +5,9 @@ import winmm.dll
 import user32.dll
 import gdi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (msvideo)
 
 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124
diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec
index 07a293f985cee5df04c4564fa9e1ba835992799d..02503340b2e5d7e6675b982ab6b926e0716cb4dc 100644
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@@ -4,6 +4,8 @@ init    MAIN_OdbcInit
 
 import	ntdll.dll
 
+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/ole32.spec b/dlls/ole32/ole32.spec
index b4a9bb9842b98324f9cc55bad549465741440ece..8dfd17b83736e47a42874ad3f6afb8aa251b2669 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -8,6 +8,8 @@ import rpcrt4.dll
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (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/Makefile.in b/dlls/oleaut32/Makefile.in
index fd4721474a80614091400c913f22bb9b4754e3ff..41289940a7b59a906d33c4dd30319319af2feb59 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = oleaut32
 SOVERSION = 1.0
 ALTNAMES  = ole2disp typelib
-IMPORTS   = ole32 user32 gdi32 kernel32
+IMPORTS   = ole32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	connpt.c \
diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec
index e07df28165800ce461ea4504046de375c0442aa0..a99c9325a55fb7491609df1c23b345ac945f30f7 100644
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@@ -5,6 +5,9 @@ import ole32.dll
 import user32.dll
 import gdi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (ole typelib)
 
 1 stub DllGetClassObject
 2 stdcall SysAllocString(wstr) SysAllocString
diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in
index a8ddcd79370e469a62d7bda0a4678801f7c5fc33..bbbadac349cc23482ff18693e4feab30b993c3af 100644
--- a/dlls/olecli/Makefile.in
+++ b/dlls/olecli/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = olecli32
 SOVERSION = 1.0
 ALTNAMES  = olecli
-IMPORTS   = ole32 olesvr32 gdi32
+IMPORTS   = ole32 olesvr32 gdi32 ntdll
 
 C_SRCS = \
 	olecli_main.c
diff --git a/dlls/olecli/olecli32.spec b/dlls/olecli/olecli32.spec
index 4c1d16b293d60c3d6a6af5f1d3f14451b54edf8b..40985a8b17561500532629c58e34ddf43bf78ad9 100644
--- a/dlls/olecli/olecli32.spec
+++ b/dlls/olecli/olecli32.spec
@@ -4,6 +4,9 @@ type win32
 import ole32.dll
 import olesvr32.dll
 import gdi32.dll
+import ntdll.dll
+
+debug_channels (ole)
 
    1 stub WEP
    2 stub OleDelete
diff --git a/dlls/oledlg/oledlg.spec b/dlls/oledlg/oledlg.spec
index 594a10fe4babc25d3af299865cdfb914f4a8e522..2195dfa5ee30e3813c64694027eda667dedda79f 100644
--- a/dlls/oledlg/oledlg.spec
+++ b/dlls/oledlg/oledlg.spec
@@ -3,6 +3,8 @@ type	win32
 
 import	ntdll.dll
 
+debug_channels (ole)
+
   1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
   2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
   3 stdcall OleUIInsertObjectA(ptr) OleUIInsertObjectA
diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in
index 534a94b01f527b12d9c7369aa50b205380a11cbc..d8f5f0db956b99d2a299838a3be61ae98d4a5d04 100644
--- a/dlls/olepro32/Makefile.in
+++ b/dlls/olepro32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32
 SOVERSION = 1.0
-IMPORTS   = oleaut32
+IMPORTS   = oleaut32 ntdll
 
 C_SRCS = olepro32stubs.c
 
diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec
index be39dece2992aa0011f5d9bf8cb6c869b921c0e8..52f6e80ebfb4aea82d4aca54b08f3a5a8deecaa0 100644
--- a/dlls/olepro32/olepro32.spec
+++ b/dlls/olepro32/olepro32.spec
@@ -2,6 +2,9 @@ name olepro32
 type win32
 
 import oleaut32.dll
+import ntdll.dll
+
+debug_channels (ole)
 
 248 forward OleIconToCursor OLEAUT32.OleIconToCursor
 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
diff --git a/dlls/olesvr/olesvr32.spec b/dlls/olesvr/olesvr32.spec
index 41892c3f3182de02e06cf45f7002597d79511683..aca7656f43c86f62d8b791e3e0692572df83e6f2 100644
--- a/dlls/olesvr/olesvr32.spec
+++ b/dlls/olesvr/olesvr32.spec
@@ -3,6 +3,8 @@ type	win32
 
 import	ntdll.dll
 
+debug_channels (ole)
+
  1 stub WEP
  2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
  3 stub OleRevokeServer
diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec
index 3ec44fe3e07ea395ac93959fae39dac9a28f5a01..ac7588fcbfe53aab0f7606de543d55866a19870b 100644
--- a/dlls/opengl32/opengl32.spec
+++ b/dlls/opengl32/opengl32.spec
@@ -5,6 +5,8 @@ init OpenGL32_Init
 import x11drv
 import kernel32
 
+debug_channels (opengl)
+
 @  stdcall wglCreateContext(long) wglCreateContext
 @  stdcall wglCreateLayerContext(long long) wglCreateLayerContext
 @  stdcall wglCopyContext(long long long) wglCopyContext
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index 35b8544324e3460941b8f72c96acc6c75f52c692..834a4f27188202da8be9cdf3be7ae8a3ef8e4d28 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = psapi
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	psapi_main.c
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index 6bfd9f78e1acbb2472f00693d18b73889505e43e..7d01cba3598faee4e24cfa9e6580a220061a2479 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -2,6 +2,9 @@ name    psapi
 type    win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (psapi)
 
 @ stdcall EmptyWorkingSet(long) EmptyWorkingSet
 @ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec
index 920903df97a21a36b56ce72334219166caf4d04b..eb402d7dc4c0cb48ef195fa65b88e053a31f315b 100644
--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
@@ -3,6 +3,8 @@ type	win32
 
 import	ntdll.dll
 
+debug_channels (ras)
+
 500 stub	RnaEngineRequest
 501 stub	DialEngineRequest
 502 stub	SuprvRequest
diff --git a/dlls/richedit/Makefile.in b/dlls/richedit/Makefile.in
index d4a8c6ea6ea07d00ef64c5ad772f91dada5ab1fa..93e6a09bcbb9cce36080d4950692443100d92ff9 100644
--- a/dlls/richedit/Makefile.in
+++ b/dlls/richedit/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
 SOVERSION = 1.0
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	charlist.c \
diff --git a/dlls/richedit/riched32.spec b/dlls/richedit/riched32.spec
index b0c06fbd8591935d6d6a646c13c614832119f924..98532608c9c856552c60ca62d97c5ec848345943 100644
--- a/dlls/richedit/riched32.spec
+++ b/dlls/richedit/riched32.spec
@@ -4,5 +4,8 @@ init	RICHED32_LibMain
 
 import	user32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (richedit)
 
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index 8d9b149a8b833f157cfb6ba57f06711a028fd036..0c33ce999da1ae70eee70db66c4f3e224124e28a 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -4,6 +4,8 @@ init	RPCRT4_LibMain
 
 import	ntdll.dll
 
+debug_channels (ole)
+
 @ stdcall UuidCreate(ptr) UuidCreate
 @ stdcall RpcStringFreeA(ptr) RpcStringFreeA
 @ stdcall UuidToStringA(ptr ptr) UuidToStringA
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 5ae497df19d4374a2c5c9a4d00cd0c9222505e5f..8565bdf7713b1b1b00abdfea31ed0a47a1838b34 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui
 SOVERSION = 1.0
-IMPORTS   = user32 advapi32 kernel32
+IMPORTS   = user32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	confdlg.c
diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec
index 65014da67f550731940fd0ef97a16236c23fb1c8..60d20a8b4827e76de2c4dbef2e83a18f9330de04 100644
--- a/dlls/serialui/serialui.spec
+++ b/dlls/serialui/serialui.spec
@@ -6,6 +6,9 @@ rsrc	serialui_rc.res
 import	user32.dll
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (comm)
 
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages
 3 stdcall drvCommConfigDialog(ptr long ptr) SERIALUI_CommConfigDialog
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 6b4ee79f32d48ec4dcb09d111bf525f0e887909b..c7dda9de54e2f36f1f32123db0d50830924e25ba 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = setupapi
 SOVERSION = 1.0
 ALTNAMES  = setupx
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = \
 	infparse.c \
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index c38a8358c4293d99e7d7c6c81ee96f7496031e55..a43a4f695cfcf5933efe90504facc6ef86f9c93c 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -3,6 +3,9 @@ type win32
 
 import advapi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (setupapi setupx)
 
 # almost all functions are commented out for now. Ordinals are from setupapi.dll 4.0
 
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index abe912809cbc5dab3138535ad3ad7cb2300fdb95..90c0d3c9c0b800e28ad4937eb6c082cafaae31e3 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = shell32
 SOVERSION = 1.0
 ALTNAMES  = shell
-IMPORTS   = ole32 shlwapi comctl32 advapi32 user32 gdi32 kernel32
+IMPORTS   = ole32 shlwapi comctl32 advapi32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	brsfolder.c \
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 7859acff146f99834e54aae76228cc2a2cf65add..7fbc84796ba97f1362f5be42706929855c08941b 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -36,8 +36,8 @@ void pdump (LPCITEMIDLIST pidl)
 
 	/* silence the sub-functions */
 	bIsShellDebug = TRACE_ON(shell);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_shell, FALSE);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, FALSE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_shell, FALSE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, FALSE);
 
 	if (! pidltemp)
 	{
@@ -77,8 +77,8 @@ void pdump (LPCITEMIDLIST pidl)
 	  pcheck(pidl);
 	}
 
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_shell, bIsShellDebug);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, TRUE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_shell, bIsShellDebug);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, TRUE);
 
 }
 #define BYTES_PRINTED 32
@@ -89,7 +89,7 @@ BOOL pcheck (LPCITEMIDLIST pidl)
         LPITEMIDLIST pidltemp = pidl;
 
 	bIsPidlDebug = TRACE_ON(shell);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, FALSE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, FALSE);
 
         if (pidltemp && pidltemp->mkid.cb)
         { do
@@ -135,7 +135,7 @@ BOOL pcheck (LPCITEMIDLIST pidl)
 	    pidltemp = ILGetNext(pidltemp);
 	  } while (pidltemp->mkid.cb);
 	}
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, bIsPidlDebug);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, bIsPidlDebug);
 	return ret;
 }
 
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 490a5c57d69d8e08ca44876916e786b7355c6f44..4d3a864c8c06bd9a9d476cf411670918294962fd 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -12,6 +12,9 @@ import advapi32.dll
 import user32.dll
 import gdi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (exec pidl shell)
 
 # Functions exported by the Win95 shell32.dll 
 # (these need to have these exact ordinals, for some 
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 8978b8fc22affb92256794455e00a7c95443fa9d..30d9327db08cf6b59d16c2bb181649042bbf2f57 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi
 SOVERSION = 1.0
-IMPORTS   = advapi32 user32 gdi32 kernel32
+IMPORTS   = advapi32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	ordinal.c \
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index d4d31b685543320c1a5b22cdd40f08c1bdc925fb..19f3787eb7a60c503fdd88491c6fc36a29bab668 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -2,10 +2,13 @@ name shlwapi
 type win32
 init SHLWAPI_LibMain
 
-import advapi32
-import user32
-import gdi32
-import kernel32
+import advapi32.dll
+import user32.dll
+import gdi32.dll
+import kernel32.dll
+import ntdll.dll
+
+debug_channels (shell)
 
 1   stdcall @(ptr ptr) SHLWAPI_1
 2   stub @
diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec
index 44a16cb172c7509a3d5dfacf02442dcafac553ae..c4b1cd88cfda236d12ecee7ef0211caf71a48f35 100644
--- a/dlls/tapi32/tapi32.spec
+++ b/dlls/tapi32/tapi32.spec
@@ -3,6 +3,8 @@ type	win32
 
 import	kernel32.dll
 
+debug_channels (tapi)
+
 @ stdcall lineAccept(long str long) lineAccept
 @ stdcall lineAddProvider(str long ptr) lineAddProvider
 @ stdcall lineAddToConference(long long) lineAddToConference
diff --git a/dlls/ttydrv/Makefile.in b/dlls/ttydrv/Makefile.in
index c2a88df94be5931111c1de115c6417d2062031f0..1c5548be6cc87bbac9e5d5d2ac16bd09c299a68c 100644
--- a/dlls/ttydrv/Makefile.in
+++ b/dlls/ttydrv/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ttydrv
 SOVERSION = 1.0
 EXTRALIBS = $(LIBS)
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	bitmap.c \
diff --git a/dlls/ttydrv/ttydrv.spec b/dlls/ttydrv/ttydrv.spec
index bb423dcb19de31f3b710b77b1fefbab4b03e701d..aef0ce97adf472fcabb85a50b7cc11d9802f56e5 100644
--- a/dlls/ttydrv/ttydrv.spec
+++ b/dlls/ttydrv/ttydrv.spec
@@ -5,6 +5,9 @@ init	TTYDRV_Init
 import	user32.dll
 import	gdi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (ttydrv)
 
 # USER driver
 
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index 7547fcdfb71e0cb93dc269c44d1d818e2ad3f264..b4497226c4974ee3cd1f036d3aadd4e7588069cb 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon
 SOVERSION = 1.0
-IMPORTS   = ole32
+IMPORTS   = ole32 ntdll
 
 C_SRCS = \
 	umon.c \
diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec
index 0a86c52ddc04d92de7d94967addbdad675003132..967246e3757e1b3d8029f463189348dd0effbc21 100644
--- a/dlls/urlmon/urlmon.spec
+++ b/dlls/urlmon/urlmon.spec
@@ -2,6 +2,9 @@ name    urlmon
 type    win32
 
 import	ole32.dll
+import	ntdll.dll
+
+debug_channels (win32)
 
 1 stub CDLGetLongPathNameA
 2 stub CDLGetLongPathNameW
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index cc5a252faab9fd08fcd74eed89abcdfe591d6fac..e1b441c8376551d14601f6f49fc270966aace321 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -8,6 +8,11 @@ import	advapi32.dll
 import	kernel32.dll
 import	ntdll.dll
 
+debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver
+                edit event graphics hook icon key keyboard listbox local mdi
+                menu message msg nonclient prop relay resource scroll sendmsg
+                shell static 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/Makefile.in b/dlls/version/Makefile.in
index 3447096d22f94c55cfe4886290fc30ce907c6b56..5bd76a9afeda39c541f2a81f831d437b90480f1b 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = version
 SOVERSION = 1.0
 ALTNAMES  = ver
-IMPORTS   = lz32 kernel32
+IMPORTS   = lz32 kernel32 ntdll
 
 C_SRCS = \
 	info.c \
diff --git a/dlls/version/version.spec b/dlls/version/version.spec
index cf06fad869aa446294b01257e1a1c8c5e3719e50..7c4ab7959752b8da86ef02686320d76d91af1289 100644
--- a/dlls/version/version.spec
+++ b/dlls/version/version.spec
@@ -3,6 +3,9 @@ type win32
 
 import lz32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (ver)
 
 @ stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfoA
 @ stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSizeA
diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in
index 7539534dd30a2f12d2515b35b7b6ae43cc1caff1..f64f781aa134d221be7a3944d68060e40d9d6aad 100644
--- a/dlls/win32s/Makefile.in
+++ b/dlls/win32s/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = w32skrnl
 SOVERSION = 1.0
 ALTNAMES  = w32sys win32s16
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	w32skernel.c \
diff --git a/dlls/win32s/w32skrnl.spec b/dlls/win32s/w32skrnl.spec
index 1109d7eb96df63393bb450bcb8713ce0cfd32df5..be8e6c0db5161346b0d9a7156b170723802ade7d 100644
--- a/dlls/win32s/w32skrnl.spec
+++ b/dlls/win32s/w32skrnl.spec
@@ -2,6 +2,9 @@ name	w32skrnl
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (dll)
 
 1 stub _kSetEnvironmentVariable@8
 2 stub _SzFromImte@4
diff --git a/dlls/winaspi/Makefile.in b/dlls/winaspi/Makefile.in
index 2538efe3b00918d98a24ed94e590759edf7c962f..ea756b816b4e99624999147689247ba16dc95a1c 100644
--- a/dlls/winaspi/Makefile.in
+++ b/dlls/winaspi/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wnaspi32
 SOVERSION = 1.0
 ALTNAMES  = winaspi
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = \
 	aspi.c \
diff --git a/dlls/winaspi/wnaspi32.spec b/dlls/winaspi/wnaspi32.spec
index 1ed92f0fc6c1c9d8d39e3f7dd3376698ea771010..289e1554f65570c24efcfa41faabb8cd1058608c 100644
--- a/dlls/winaspi/wnaspi32.spec
+++ b/dlls/winaspi/wnaspi32.spec
@@ -4,6 +4,9 @@ init	WNASPI32_LibMain
 
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (aspi)
 
 # we have several ordinal clashes here, it seems...
 
diff --git a/dlls/wineps/Makefile.in b/dlls/wineps/Makefile.in
index 3437aebc181acfed58c47a5fd7e2711152530de3..e8764301e1430249d429230216d3564e60a7236f 100644
--- a/dlls/wineps/Makefile.in
+++ b/dlls/wineps/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wineps
 SOVERSION = 1.0
 ALTNAMES  = wineps16
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	afm.c \
diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.spec
index 17053e3b0c4dabc21ce76302aacbd93e2f7f00d4..d96efc5efad89ab61d6c55813fa08c45e0daa295 100644
--- a/dlls/wineps/wineps.spec
+++ b/dlls/wineps/wineps.spec
@@ -6,3 +6,6 @@ rsrc	rsrc.res
 import	user32.dll
 import	gdi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (psdrv)
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 8832c27d49efd6d5247601eb53fa106b185a268d..8c7532f0c298936f0f4b08e434054792e1deabc6 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet
 SOVERSION = 1.0
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	ftp.c \
diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec
index 064620b2358f6df9f99010e618b55db7731d0362..0525db170adf2e533029444a5c2795b02d2ba1de 100644
--- a/dlls/wininet/wininet.spec
+++ b/dlls/wininet/wininet.spec
@@ -4,6 +4,9 @@ init    WININET_LibMain
 
 import	user32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (wininet)
 
 @ stub InternetInitializeAutoProxyDll
 @ stub ShowCertificate
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 5448f6357e9c379846eac1d025d31f33d349c014..96ca8fd7ff8888e927c5a07de8d3b33ab388a277 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winmm
 SOVERSION = 1.0
 ALTNAMES  = mmsystem sound
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	joystick.c \
diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in
index 7de7caf7b5b1b236670442840626a805ed99b139..dd48054bc249acabeadec56088d4c6bd3b118c91 100644
--- a/dlls/winmm/joystick/Makefile.in
+++ b/dlls/winmm/joystick/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = joystick.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	joystick.c
diff --git a/dlls/winmm/joystick/joystick.drv.spec b/dlls/winmm/joystick/joystick.drv.spec
index 9b0cd2b3bb81303cd7877f1b2336363df816ca69..9a7417c6f9d72361575cc8a4f718a4a4f1367e6a 100644
--- a/dlls/winmm/joystick/joystick.drv.spec
+++ b/dlls/winmm/joystick/joystick.drv.spec
@@ -4,5 +4,9 @@ type win32
 
 import winmm.dll
 import user32.dll
+import kernel32.dll
+import ntdll.dll
+
+debug_channels (joystick)
 
 @ stdcall DriverProc(long long long long long) JSTCK_DriverProc
diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in
index 3bc74c96b97e041f79dcd26cc47ebed65d742c32..e124a8c41950235c321b2339621920e679750313 100644
--- a/dlls/winmm/mcianim/Makefile.in
+++ b/dlls/winmm/mcianim/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcianim.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mcianim.c
diff --git a/dlls/winmm/mcianim/mcianim.drv.spec b/dlls/winmm/mcianim/mcianim.drv.spec
index b9522c0dbf2c341f7f96388337f17fb54986528f..902d935b2dea7c24dc152d48a0a5c4e03252819b 100644
--- a/dlls/winmm/mcianim/mcianim.drv.spec
+++ b/dlls/winmm/mcianim/mcianim.drv.spec
@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mcianim)
 
 @ stdcall DriverProc(long long long long long) MCIANIM_DriverProc
diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/winmm/mciavi/Makefile.in
index 6f52614692427bd1e7996789191b34599ebffdca..4baf9014c2962dce87ecfa285e792b1e6f0aafe6 100644
--- a/dlls/winmm/mciavi/Makefile.in
+++ b/dlls/winmm/mciavi/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mciavi.c
diff --git a/dlls/winmm/mciavi/mciavi.drv.spec b/dlls/winmm/mciavi/mciavi.drv.spec
index 09547c71351327976d191a08e9660d2a978bcd9e..623f9f9a68cbdddbb44d2914df9eef4083b09b24 100644
--- a/dlls/winmm/mciavi/mciavi.drv.spec
+++ b/dlls/winmm/mciavi/mciavi.drv.spec
@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mciavi)
 
 @ stdcall DriverProc(long long long long long) MCIAVI_DriverProc
diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in
index a204a4d19eec5d992e070aa37a3759e69a4838e8..83256f524c1ea26c3ea1ad2e5e59ebbca28c1132 100644
--- a/dlls/winmm/mcicda/Makefile.in
+++ b/dlls/winmm/mcicda/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mcicda.c
diff --git a/dlls/winmm/mcicda/mcicda.drv.spec b/dlls/winmm/mcicda/mcicda.drv.spec
index f82ae87bca83d2e3345768f3417042f9ec2d6ce4..45d5e35da27f2eb6f9f4d03a33fa3683d966d177 100644
--- a/dlls/winmm/mcicda/mcicda.drv.spec
+++ b/dlls/winmm/mcicda/mcicda.drv.spec
@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mcicda)
 
 @ stdcall DriverProc(long long long long long) MCICDA_DriverProc
diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in
index 1bad2cd52a7084938bdaddee2c6ca0992633c0c4..732bac84aed1ef1a2dfaab17e4fc4721e0c7f70b 100644
--- a/dlls/winmm/mciseq/Makefile.in
+++ b/dlls/winmm/mciseq/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mcimidi.c
diff --git a/dlls/winmm/mciseq/mciseq.drv.spec b/dlls/winmm/mciseq/mciseq.drv.spec
index 2ac882d3cb746fa9f36d834abca9e7cf7f04347b..8c2318040d5abbbe00f3bf594564ae2828a3350a 100644
--- a/dlls/winmm/mciseq/mciseq.drv.spec
+++ b/dlls/winmm/mciseq/mciseq.drv.spec
@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mcimidi)
 
 @ stdcall DriverProc(long long long long long) MCIMIDI_DriverProc
diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in
index 79343ea3ce5fe38db50b0de7d97d671ef00178d3..9b4f4338be87a3cfec72b8fed8d4072b276f7309 100644
--- a/dlls/winmm/mciwave/Makefile.in
+++ b/dlls/winmm/mciwave/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mciwave.c
diff --git a/dlls/winmm/mciwave/mciwave.drv.spec b/dlls/winmm/mciwave/mciwave.drv.spec
index 860b9c4b164b3260ed4fd433c28d29cb4324abd5..a2d22143395ff21e643d8bbf0fc8d089b331bf1d 100644
--- a/dlls/winmm/mciwave/mciwave.drv.spec
+++ b/dlls/winmm/mciwave/mciwave.drv.spec
@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mciwave)
 
 @ stdcall DriverProc(long long long long long) MCIWAVE_DriverProc
diff --git a/dlls/winmm/midimap/Makefile.in b/dlls/winmm/midimap/Makefile.in
index 136efe274ec3b5007567c4b3c2bf6693e5467ec1..e28d024b290932e0fb3695eb1be3c06425ccae92 100644
--- a/dlls/winmm/midimap/Makefile.in
+++ b/dlls/winmm/midimap/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	midimap.c
diff --git a/dlls/winmm/midimap/midimap.drv.spec b/dlls/winmm/midimap/midimap.drv.spec
index a899bcc332ade88aa20f992dcccedcc2c00e505f..bbc87d6e2c904daed061e6cae57ba7c016eb5cd3 100644
--- a/dlls/winmm/midimap/midimap.drv.spec
+++ b/dlls/winmm/midimap/midimap.drv.spec
@@ -5,6 +5,9 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (msacm)
 
 @ stdcall DriverProc(long long long long long) MIDIMAP_DriverProc
 @ stdcall midMessage(long long long long long) MIDIMAP_midMessage
diff --git a/dlls/winmm/wavemap/Makefile.in b/dlls/winmm/wavemap/Makefile.in
index d7d69e7f64ba40558e612f32f3ce174ad812b690..77736d6c9b05562e23e4eca304cffb7ae44a34f3 100644
--- a/dlls/winmm/wavemap/Makefile.in
+++ b/dlls/winmm/wavemap/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	wavemap.c
diff --git a/dlls/winmm/wavemap/msacm.drv.spec b/dlls/winmm/wavemap/msacm.drv.spec
index e235d062ac1df9d315e0f3c4ed39195a5885555c..6b37d52d4120aaf8567455498b65112d16bad186 100644
--- a/dlls/winmm/wavemap/msacm.drv.spec
+++ b/dlls/winmm/wavemap/msacm.drv.spec
@@ -5,6 +5,9 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+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/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in
index 41d68ff27adb7cad4009fd5b778a26954e44e100..a8123c4e7db3d57b8568ceefc5ccf6154a002467 100644
--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winmm/wineoss/wineoss.drv.spec b/dlls/winmm/wineoss/wineoss.drv.spec
index fd8b9e37316e22c9be05c3f5989417a83ae236d9..935f55298d9401a85445b782d48ebdff6bb4653d 100644
--- a/dlls/winmm/wineoss/wineoss.drv.spec
+++ b/dlls/winmm/wineoss/wineoss.drv.spec
@@ -5,6 +5,9 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+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 08bf8660a80e5c7db0361767a6d817e86560955d..d5bf906074c827fbfd74746f13316de133460091 100644
--- a/dlls/winmm/winmm.spec
+++ b/dlls/winmm/winmm.spec
@@ -5,6 +5,10 @@ rsrc winmm_res.res
 
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (joystick mci mcianim mciavi mcicda mcimidi mciwave midi mmaux
+                mmio mmsys mmtime msacm sound wave)
 
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA
diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec
index be3c6854e452ff2716f5fdbcdedceca9d08bfb91..7c7ee6a6a436a451d0200decfcd97e6dc04990ab 100644
--- a/dlls/winsock/ws2_32.spec
+++ b/dlls/winsock/ws2_32.spec
@@ -10,6 +10,8 @@ import user32.dll
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (winsock)
+
 #  EXPORTS ***********
 1   stdcall  accept(long ptr ptr) WSOCK32_accept
 2   stdcall  bind(long ptr long) WSOCK32_bind
diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in
index 2525288a3f8630d8fb9dada44eb80a5080662eaa..b12f65375335b4f8f22b1da4f8142b74fb6e79d3 100644
--- a/dlls/winspool/Makefile.in
+++ b/dlls/winspool/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
 SOVERSION = 1.0
-IMPORTS   = gdi32 advapi32 kernel32
+IMPORTS   = gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	info.c \
diff --git a/dlls/winspool/winspool.drv.spec b/dlls/winspool/winspool.drv.spec
index 10f8f7470c1f322df29ab73bf4b5e981c0daf2e9..d4fd54425b14278dc8754cecb573b2ee223685dc 100644
--- a/dlls/winspool/winspool.drv.spec
+++ b/dlls/winspool/winspool.drv.spec
@@ -6,6 +6,9 @@ init	WINSPOOL_EntryPoint
 import	gdi32.dll
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (winspool)
 
 101 stub ADVANCEDSETUPDIALOG
 102 stub AbortPrinter
diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in
index e2e9d12e11ec9af55f55bf174da8c3f829cb9f38..84c4a0b7518c7dbd9dc90c5db953800fd84a613e 100644
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wsock32
 SOVERSION = 1.0
-IMPORTS   = ws2_32
+IMPORTS   = ws2_32 kernel32 ntdll
 
 C_SRCS = socket.c
 
diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec
index f579d9c415fbffc38cc74cbda496f10bfa43b995..154c780e18c413adf7f1ed394f035133320e8470 100644
--- a/dlls/wsock32/wsock32.spec
+++ b/dlls/wsock32/wsock32.spec
@@ -2,6 +2,10 @@ name	wsock32
 type	win32
 
 import	ws2_32.dll
+import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (winsock)
 
   1 forward accept ws2_32.accept
   2 forward bind ws2_32.bind
diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec
index 4d635882c93e5d4bce8bf282315f0afda6738de5..e8f1f6c749720991c0d84ac65394473da46705bf 100644
--- a/dlls/x11drv/x11drv.spec
+++ b/dlls/x11drv/x11drv.spec
@@ -6,6 +6,9 @@ import	user32.dll
 import	gdi32.dll
 import	kernel32.dll
 
+debug_channels (bitblt bitmap clipboard cursor dinput event font gdi graphics
+                key keyboard opengl palette text win x11 x11drv)
+
 # USER driver
 
 @ cdecl Synchronize() X11DRV_Synchronize