--- a/src/debug.c	Mon Aug 13 11:25:03 2007 +0200
+++ b/src/debug.c	Mon Aug 13 11:26:11 2007 +0200
@@ -39,8 +39,7 @@
  * 4.  Add a FROB line for it in xemacs_debug_loop.
  */
 
-Lisp_Object Qredisplay, Qbuffers, Qfaces;
-Lisp_Object Qwindows, Qframes, Qdevices;
+static Lisp_Object Qredisplay, Qbuffers, Qfaces, Qwindows, Qframes, Qdevices;
 
 struct debug_classes active_debug_classes;
 
@@ -194,7 +193,6 @@
   defsymbol (&Qwindows, "windows");
   defsymbol (&Qframes, "frames");
   defsymbol (&Qdevices, "devices");
-  /* defsymbol (&Qbyte_code, "byte-code"); in bytecode.c */
 
   DEFSUBR (Fadd_debug_class_to_check);
   DEFSUBR (Fdelete_debug_class_to_check);
@@ -206,7 +204,7 @@
 }
 
 void
-vars_of_debug (void)
+reinit_vars_of_debug (void)
 {
   /* If you need to have any classes active early on in startup, then
      the flags should be set here.
@@ -214,3 +212,9 @@
      to emacs.c. */
   xemacs_debug_loop (INIT, Qnil, Qnil);
 }
+
+void
+vars_of_debug (void)
+{
+  reinit_vars_of_debug ();
+}