--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,8 @@
 	* lib/wctype.in.h: Renamed from lib/wctype_.h.
 	* modules/wctype (Files, Makefile.am): Use wctype.in.h instead of
 	wctype_.h.
+	* build-aux/bootstrap (slurp): Update.
+	* lib/.cppi-disable: Update.
 
 2007-09-30  Bruno Haible  <bruno@clisp.org>
 

--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -470,14 +470,14 @@
 	insert_sorted_if_absent $ig "$copied"
 	# If an ignored file name ends with _.h, then also add
 	# the name with just ".h".  Many gnulib headers are generated,
-	# e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc.
+	# e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
 	# Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-	f=`echo "$copied"|sed 's/_\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+	f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
 	insert_sorted_if_absent $ig "$f"
 
-	# For files like sys_stat_.h and sys_time_.h, record as
+	# For files like sys_stat.in.h and sys_time.in.h, record as
 	# ignorable the directory we might eventually create: sys/.
-	f=`echo "$copied"|sed 's/sys_.*_\.h$/sys/'`
+	f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
 	insert_sorted_if_absent $ig "$f"
       fi
     done

--- a/lib/.cppi-disable
+++ b/lib/.cppi-disable
@@ -1,7 +1,7 @@
-alloca_.h
+alloca.in.h
 error.h
 exit.h
-fnmatch_.h
+fnmatch.in.h
 fts.c
 fts_.h
 getaddrinfo.h
@@ -11,7 +11,7 @@
 getopt.c
 getopt.h
 getopt1.c
-getopt_.h
+getopt.in.h
 getopt_int.h
 getpagesize.h
 getpass.c
@@ -30,11 +30,11 @@
 regex_internal.c
 regex_internal.h
 stat-time.h
-stdbool_.h
-stdint_.h
+stdbool.in.h
+stdint.in.h
 strnlen1.h
 strtoul.c
-sys_socket_.h
+sys_socket.in.h
 time_r.h
 utimecmp.h
 vasnprintf.h