--- ./src/bug-buddy.c	Fri Jun 15 10:07:12 2001
+++ ../bug-buddy-2.0.8/./src/bug-buddy.c	Sat Sep 22 11:03:33 2001
@@ -34,8 +34,8 @@
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
 #include <libgnomevfs/gnome-vfs.h>
 
-#include <libxml/tree.h>
-#include <libxml/parser.h>
+#include <gnome-xml/tree.h>
+#include <gnome-xml/parser.h>
 
 #include <sys/types.h>
 #include <signal.h>
--- ./src/bugzilla.h	Thu Jun 21 12:47:26 2001
+++ ../bug-buddy-2.0.8/./src/bugzilla.h	Sat Sep 22 11:03:03 2001
@@ -24,7 +24,7 @@
 #define __BUGZILLA_H__
 
 #include <libgnomevfs/gnome-vfs-types.h>
-#include <libxml/parser.h>
+#include <gnome-xml/parser.h>
 
 typedef struct _BugzillaBTS BugzillaBTS;
 
--- ./src/bugzilla.c	Mon Aug  6 15:30:14 2001
+++ ../bug-buddy-2.0.8/./src/bugzilla.c	Sat Sep 22 11:02:50 2001
@@ -36,9 +36,9 @@
 #include "util.h"
 #include <dirent.h>
 
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
+#include <gnome-xml/tree.h>
+#include <gnome-xml/parser.h>
+#include <gnome-xml/xmlmemory.h>
 
 /* define to x for some debugging output */
 #define d(x)
--- ./xml-i18n-merge.in	Mon Aug  6 21:28:37 2001
+++ ../bug-buddy-2.0.8/./xml-i18n-merge.in	Sat Sep 22 10:42:55 2001
@@ -51,7 +51,7 @@
 
 ## Handle options
 GetOptions (
-	    "help|h|?" => \$HELP_ARG,
+	    "help|h" => \$HELP_ARG,
 	    "version|v" => \$VERSION_ARG,
             "quiet|q" => \$QUIET_ARG,
 	    "oaf-style|o" => \$OAF_STYLE_ARG,
--- ./xml-i18n-extract.in	Mon Aug  6 21:28:37 2001
+++ ../bug-buddy-2.0.8/./xml-i18n-extract.in	Sat Sep 22 10:42:52 2001
@@ -62,7 +62,7 @@
 GetOptions (
 	    "type=s"     => \$TYPE_ARG,
             "local|l"    => \$LOCAL_ARG,
-            "help|h|?"   => \$HELP_ARG,
+            "help|h"     => \$HELP_ARG,
             "version|v"  => \$VERSION_ARG,
             "update"     => \$UPDATE_ARG,
 	    "quiet|q"    => \$QUIET_ARG,
--- ./xml-i18n-update.in	Mon Aug  6 21:28:37 2001
+++ ../bug-buddy-2.0.8/./xml-i18n-update.in	Sat Sep 22 10:43:00 2001
@@ -72,7 +72,7 @@
 
 ## Handle options
 GetOptions (
-	    "help|h|?"  	=> \$HELP_ARG,
+	    "help|h"    	=> \$HELP_ARG,
 	    "version|v" 	=> \$VERSION_ARG,
 	    "dist|d"		=> \$DIST_ARG,
 	    "pot|p"		=> \$POT_ARG,