Converted to the new debug interface, using script written by Patrik
Stridvall.

relay32/snoop.c

diff --git a/relay32/snoop.c b/relay32/snoop.c
index afc7392..6879009 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -17,7 +17,7 @@
 #include "selectors.h"
 #include "stackframe.h"
 #include "debugstr.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(snoop)
 
@@ -141,7 +141,7 @@
 	memset((*dll)->funs,0,nrofordinals*sizeof(SNOOP_FUN));
 	if (!(*dll)->funs) {
 		HeapFree(SystemHeap,0,*dll);
-		FIXME(snoop,"out of memory\n");
+		FIXME("out of memory\n");
 		return;
 	}
 }
@@ -270,7 +270,7 @@
 		dll=dll->next;
 	}
 	if (!dll) {
-		FIXME(snoop,"entrypoint 0x%08lx not found\n",entry);
+		FIXME("entrypoint 0x%08lx not found\n",entry);
 		return; /* oops */
 	}
 	/* guess cdecl ... */
@@ -365,7 +365,7 @@
 }
 #else	/* !__i386__ */
 void SNOOP_RegisterDLL(HMODULE hmod,LPCSTR name,DWORD nrofordinals) {
-	FIXME(snoop,"snooping works only on i386 for now.\n");
+	FIXME("snooping works only on i386 for now.\n");
 	return;
 }
 

relay32/utthunk.c

diff --git a/relay32/utthunk.c b/relay32/utthunk.c
index 90faa15..4a94ce5 100644
--- a/relay32/utthunk.c
+++ b/relay32/utthunk.c
@@ -10,7 +10,7 @@
 #include "selectors.h"
 #include "callback.h"
 #include "process.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "debugstr.h"
 
 DEFAULT_DEBUG_CHANNEL(thunk)
@@ -103,7 +103,7 @@
         segptrList = HeapAlloc( GetProcessHeap(), 0, sizeof(SEGPTR)*nList );
         if ( !segptrList )
         {
-            FIXME( thunk, "Unable to allocate segptrList!" );
+            FIXME("Unable to allocate segptrList!" );
             return 0;
         }
 
@@ -280,7 +280,7 @@
  */
 WORD WINAPI UTInit16( DWORD x1, DWORD x2, DWORD x3, DWORD x4 )
 {
-    FIXME( thunk, "(%08lx, %08lx, %08lx, %08lx): stub\n", x1, x2, x3, x4 );
+    FIXME("(%08lx, %08lx, %08lx, %08lx): stub\n", x1, x2, x3, x4 );
     return 0;
 }