Index: exp-omega/o_main.c
===================================================================
--- exp-omega/o_main.c	(revision 7545)
+++ exp-omega/o_main.c	(working copy)
@@ -58,9 +58,6 @@
 #include "pub_tool_options.h"
 #include "pub_tool_clreq.h"
 
-#include "coregrind/pub_core_options.h"
-#include "coregrind/pub_core_debugger.h"
-
 #include "libvex_guest_offsets.h"
 
 #include "exp-omega.h"
Index: include/pub_tool_options.h
===================================================================
--- include/pub_tool_options.h	(revision 7545)
+++ include/pub_tool_options.h	(working copy)
@@ -141,6 +141,14 @@
 */
 extern Char* VG_(expand_file_name)(Char* option_name, Char* format);
 
+/* Enquire about whether to attach to a debugger at errors?   default: NO */
+extern Bool  VG_(clo_db_attach);
+
+extern void VG_(start_debugger) ( ThreadId tid );
+
+
 #endif   // __PUB_TOOL_OPTIONS_H
 
 /*--------------------------------------------------------------------*/
Index: coregrind/pub_core_options.h
===================================================================
--- coregrind/pub_core_options.h	(revision 7545)
+++ coregrind/pub_core_options.h	(working copy)
@@ -48,8 +48,6 @@
    default: 0 (no, return the application's exit code in the normal
    way. */
 extern Int   VG_(clo_error_exitcode);
-/* Enquire about whether to attach to a debugger at errors?   default: NO */
-extern Bool  VG_(clo_db_attach);
 /* The debugger command?  default: whatever gdb ./configure found */
 extern Char* VG_(clo_db_command);
 /* Generating a suppression for each error?   default: 0 (NO)
