--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -39,7 +39,6 @@
 #include "fatal-signal.h"
 #include "pathmax.h"
 #include "tmpdir.h"
-#include "mkdtemp.h"
 #include "xalloc.h"
 #include "xallocsa.h"
 #include "gl_linkedhash_list.h"

--- a/lib/mkdtemp.c
+++ b/lib/mkdtemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001-2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001-2003, 2006-2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,9 @@
 #include <config.h>
 
 /* Specification.  */
-#include "mkdtemp.h"
+#include <stdlib.h>
 
 #include "tempname.h"
-#include <stdlib.h>
 
 /* Generate a unique temporary directory from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";

--- a/m4/mkdtemp.m4
+++ b/m4/mkdtemp.m4
@@ -1,13 +1,15 @@
-# mkdtemp.m4 serial 4
-dnl Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+# mkdtemp.m4 serial 5
+dnl Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gt_FUNC_MKDTEMP],
 [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REPLACE_FUNCS(mkdtemp)
   if test $ac_cv_func_mkdtemp = no; then
+    HAVE_MKDTEMP=0
     gl_PREREQ_MKDTEMP
   fi
 ])

--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -2,21 +2,22 @@
 mkdtemp() function: create a private temporary directory.
 
 Files:
-lib/mkdtemp.h
 lib/mkdtemp.c
 m4/mkdtemp.m4
 
 Depends-on:
 stdint
+stdlib
 tempname
 
 configure.ac:
 gt_FUNC_MKDTEMP
+gl_STDLIB_MODULE_INDICATOR([mkdtemp])
 
 Makefile.am:
 
 Include:
-"mkdtemp.h"
+<stdlib.h>
 
 License:
 LGPL