--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-03-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* modules/c-stack (Depends-on): Add unistd.
+	* modules/getlogin_r: Likewise.
+	* modules/glob: Likewise.
+	* modules/pagealign_alloc: Likewise.
+	* modules/unistd (Files): Remove lib/unistd_.h.
+	(EXTRA_DIST): Remove.
+	(unistd.h): Create using 'echo' rather than 'cp', so that we don't
+	need unistd_.h.
+	(MOSTLYCLEANFILES): Remove unistd.h-t.
+
 2006-03-07  Simon Josefsson  <jas@extundo.com>
 
 	* modules/getopt (Depends-on): Add unistd.

--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* c-stack.c: Include unistd.h unconditionally, since we now assume
+	the unistd module.
+	* getlogin_r.c: Likewise.
+	* getlogin_r.h: Likewise.
+	* glob.c: Likewise.
+	* pagealign_alloc.c: Likewise.
+	* unistd_.h: Remove; no longer needed.
+
 2006-03-07  Simon Josefsson  <jas@extundo.com>
 
 	* unistd_.h: New file.

--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -1,6 +1,6 @@
 /* Stack overflow handling.
 
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -77,9 +77,7 @@
 # include <ucontext.h>
 #endif
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #ifndef STDERR_FILENO
 # define STDERR_FILENO 2
 #endif

--- a/lib/getlogin_r.c
+++ b/lib/getlogin_r.c
@@ -26,10 +26,7 @@
 
 #include <errno.h>
 #include <string.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if !HAVE_DECL_GETLOGIN
 char *getlogin (void);

--- a/lib/getlogin_r.h
+++ b/lib/getlogin_r.h
@@ -19,10 +19,7 @@
 /* Written by Paul Eggert and Derek Price.  */
 
 #include <stddef.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 /* Copies the user's login name to NAME.
    The array pointed to by NAME has room for SIZE bytes.

--- a/lib/glob.c
+++ b/lib/glob.c
@@ -34,13 +34,10 @@
 #include <stdio.h>		/* Needed on stupid SunOS for assert.  */
 
 #if !defined _LIBC || !defined GLOB_ONLY_P
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-# ifndef POSIX
-#  ifdef _POSIX_VERSION
-#   define POSIX
-#  endif
-# endif
+
+#include <unistd.h>
+#if !defined POSIX && defined _POSIX_VERSION
+# define POSIX
 #endif
 
 #include <pwd.h>

--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -29,10 +29,7 @@
 #include <stdlib.h>
 
 #include <fcntl.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if HAVE_MMAP
 # include <sys/mman.h>

deleted file mode 100644
--- a/lib/unistd_.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* A unistd.h replacement for systems lacking it.
-   Copyright (C) 2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-/* Put any statements that are necessary to get a working unistd.h in
-   this file. */
-
-/* MS Visual Studio doesn't have unistd.h, but it doesn't seem to need
-   any particular statements in this file.  So this file is here to
-   avoid breaking '#include <unistd.h>' in other files. */

--- a/modules/c-stack
+++ b/modules/c-stack
@@ -9,6 +9,7 @@
 Depends-on:
 gettext-h
 exitfail
+unistd
 
 configure.ac:
 gl_C_STACK

--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -7,6 +7,7 @@
 m4/getlogin_r.m4
 
 Depends-on:
+unistd
 
 configure.ac:
 gl_GETLOGIN_R

--- a/modules/glob
+++ b/modules/glob
@@ -19,6 +19,7 @@
 stat-macros
 stdbool
 strdup
+unistd
 
 configure.ac:
 gl_GLOB

--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -13,6 +13,7 @@
 getpagesize
 gettext-h
 xalloc
+unistd
 
 configure.ac:
 gl_PAGEALIGN_ALLOC

--- a/modules/unistd
+++ b/modules/unistd
@@ -2,7 +2,6 @@
 A <unistd.h> for systems lacking it.
 
 Files:
-lib/unistd_.h
 m4/unistd_h.m4
 
 Depends-on:
@@ -12,14 +11,12 @@
 
 Makefile.am:
 BUILT_SOURCES += $(UNISTD_H)
-EXTRA_DIST += unistd_.h
 
-# We need the following in order to create <unistd.h> when the system
-# doesn't have one.
-unistd.h: unistd_.h
-	cp $(srcdir)/unistd_.h $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += unistd.h unistd.h-t
+# We need the following in order to create an empty placeholder for
+# <unistd.h> when the system doesn't have one.
+unistd.h:
+	echo '/* Empty placeholder for $@.  */' >$@
+MOSTLYCLEANFILES += unistd.h
 
 Include:
 #include <unistd.h>