diff --git a/ChangeLog b/ChangeLog
index 1aa02174a2..4942e44b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-14  Christian Stimming <stimming@tuhh.de>
+
+	* src/gnome-utils/gnc-druid-provider-multifile-gnome.h: Improve
+	include order so that building without <glob.h> is possible.
+
 2006-03-14  David Hampton  <hampton@employees.org>
 
 	* src/gnome-utils/gnc-tree-view-account.c:
diff --git a/src/gnome-utils/gnc-druid-provider-file-gnome.h b/src/gnome-utils/gnc-druid-provider-file-gnome.h
index 325ac6d413..ccacfe4a7b 100644
--- a/src/gnome-utils/gnc-druid-provider-file-gnome.h
+++ b/src/gnome-utils/gnc-druid-provider-file-gnome.h
@@ -10,6 +10,7 @@
 #ifdef HAVE_GLOB_H
 # include <glob.h>
 #else
+# include <stddef.h> /* for size_t */
 typedef struct
 {
   size_t gl_pathc;    /* Count of paths matched so far  */
diff --git a/src/gnome-utils/gnc-druid-provider-multifile-gnome.c b/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
index 662212d623..5591e040d7 100644
--- a/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
+++ b/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
@@ -2,9 +2,9 @@
 
 #include "config.h"
 #include "gnc-druid-gnome-ui.h"
+#include "gnc-druid-provider-file-gnome.h"
 #include "gnc-druid-provider-multifile-gnome.h"
 #include "gnc-druid-provider-desc-multifile.h"
-#include "gnc-druid-provider-file-gnome.h"
 
 #include "gnc-basic-gobject.h"
 #include "dialog-utils.h"
diff --git a/src/gnome-utils/gnc-druid-provider-multifile-gnome.h b/src/gnome-utils/gnc-druid-provider-multifile-gnome.h
index 0e9db67bda..f2ee537357 100644
--- a/src/gnome-utils/gnc-druid-provider-multifile-gnome.h
+++ b/src/gnome-utils/gnc-druid-provider-multifile-gnome.h
@@ -10,12 +10,15 @@
 #ifdef HAVE_GLOB_H
 # include <glob.h>
 #else
+# ifndef GNC_DRUID_PROVIDER_FILE_GNOME_H
+#  include <stddef.h> /* for size_t */
 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
 #endif
 
 #include <glib.h>