diff --git a/configure.in b/configure.in
index fdbc6dac3..4381e03ce 100644
--- a/configure.in
+++ b/configure.in
@@ -247,7 +247,7 @@ AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
 AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
 
 # Check for some functions
-AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
+AC_CHECK_FUNCS(localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
 
 # Check for sys_errlist
 AC_MSG_CHECKING(for sys_errlist)
@@ -706,8 +706,6 @@ AC_SUBST(G_THREAD_LIBS)
 
 CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
 
-AC_CHECK_FUNCS(localtime_r rand_r)
-
 dnl **********************************************
 dnl *** GDefaultMutex setup and initialization ***
 dnl **********************************************
diff --git a/gdate.c b/gdate.c
index f44d70b73..44a6bad67 100644
--- a/gdate.c
+++ b/gdate.c
@@ -21,6 +21,10 @@
  * MT safe
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "glib.h"
 
 #include <time.h>
diff --git a/glib/gdate.c b/glib/gdate.c
index f44d70b73..44a6bad67 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -21,6 +21,10 @@
  * MT safe
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "glib.h"
 
 #include <time.h>