diff --git a/ChangeLog b/ChangeLog
index c1af0879eb..7463167b3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-03-09  Christian Stimming <stimming@tuhh.de>
 
+	* configure.in, src/gnome-utils/gnc-druid-provider-file-gnome.h:
+	Check for <glob.h> and provide own typedef if header unavailable.
+
+	* configure.in, src/gnome-utils/gnc-gnome-utils.c: Check for
+	<X11/Xlib.h> and ignore code section if header unavailable.
+
 	* po/glossary/vi.po: Updated vietnamese glossary by Clytie Siddall
 	<clytie@riverland.net.au>
 
diff --git a/src/gnome-utils/gnc-druid-provider-file-gnome.h b/src/gnome-utils/gnc-druid-provider-file-gnome.h
index a2f953c52a..325ac6d413 100644
--- a/src/gnome-utils/gnc-druid-provider-file-gnome.h
+++ b/src/gnome-utils/gnc-druid-provider-file-gnome.h
@@ -7,7 +7,17 @@
 //extern "C" {
 #endif
 
-#include <glob.h>
+#ifdef HAVE_GLOB_H
+# include <glob.h>
+#else
+typedef struct
+{
+  size_t gl_pathc;    /* Count of paths matched so far  */
+  char **gl_pathv;    /* List of matched pathnames.  */
+  size_t gl_offs;     /* Slots to reserve in `gl_pathv'.  */
+} glob_t;
+#endif
+
 #include <glib.h>
 #include <glib-object.h>
 #include <libgnomeui/libgnomeui.h>