--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+2009-09-17  Eric Blake  <ebb9@byu.net>
+
+	maint: make Include sections of modules consistent
+	* modules/alloca: Use only header name; no need to list #include.
+	* modules/alloca-opt: Likewise.
+	* modules/arpa_inet: Likewise.
+	* modules/canon-host: Likewise.
+	* modules/configmake: Likewise.
+	* modules/dirent: Likewise.
+	* modules/eealloc: Likewise.
+	* modules/environ: Likewise.
+	* modules/fchdir: Likewise.
+	* modules/fcntl: Likewise.
+	* modules/fcntl-h: Likewise.
+	* modules/gethrxtime: Likewise.
+	* modules/gettime: Likewise.
+	* modules/ignore-value: Likewise.
+	* modules/inet_ntop: Likewise.
+	* modules/inet_pton: Likewise.
+	* modules/inttypes: Likewise.
+	* modules/isnand-nolibm: Likewise.
+	* modules/isnanf-nolibm: Likewise.
+	* modules/mbchar: Likewise.
+	* modules/mbfile: Likewise.
+	* modules/mbiter: Likewise.
+	* modules/mbuiter: Likewise.
+	* modules/netdb: Likewise.
+	* modules/netinet_in: Likewise.
+	* modules/nproc: Likewise.
+	* modules/pagealign_alloc: Likewise.
+	* modules/poll: Likewise.
+	* modules/printf-frexp: Likewise.
+	* modules/pthread: Likewise.
+	* modules/putenv: Likewise.
+	* modules/random_r: Likewise.
+	* modules/relocatable-prog: Likewise.
+	* modules/search: Likewise.
+	* modules/select: Likewise.
+	* modules/selinux-h: Likewise.
+	* modules/settime: Likewise.
+	* modules/signal: Likewise.
+	* modules/size_max: Likewise.
+	* modules/socklen: Likewise.
+	* modules/ssize_t: Likewise.
+	* modules/stdarg: Likewise.
+	* modules/stdbool: Likewise.
+	* modules/stddef: Likewise.
+	* modules/stdint: Likewise.
+	* modules/stdio: Likewise.
+	* modules/stdlib: Likewise.
+	* modules/string: Likewise.
+	* modules/strings: Likewise.
+	* modules/sys_file: Likewise.
+	* modules/sys_ioctl: Likewise.
+	* modules/sys_select: Likewise.
+	* modules/sys_socket: Likewise.
+	* modules/sys_stat: Likewise.
+	* modules/sys_time: Likewise.
+	* modules/sys_times: Likewise.
+	* modules/sys_utsname: Likewise.
+	* modules/sys_wait: Likewise.
+	* modules/sysexits: Likewise.
+	* modules/time: Likewise.
+	* modules/times: Likewise.
+	* modules/tmpfile: Likewise.
+	* modules/trim: Likewise.
+	* modules/unistd: Likewise.
+	* modules/wchar: Likewise.
+	* modules/wctype: Likewise.
+
 2009-09-17  Bruno Haible  <bruno@clisp.org>
 
 	Make getdate.y compile on QNX and NetBSD 5 / i386.

--- a/modules/alloca
+++ b/modules/alloca
@@ -12,7 +12,7 @@
 Makefile.am:
 
 Include:
-#include <alloca.h>
+<alloca.h>
 
 License:
 public domain

--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -26,7 +26,7 @@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 Include:
-#include <alloca.h>
+<alloca.h>
 
 License:
 LGPLv2+

--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -39,7 +39,7 @@
 MOSTLYCLEANDIRS += arpa
 
 Include:
-#include <arpa/inet.h>
+<arpa/inet.h>
 
 License:
 LGPLv2+

--- a/modules/canon-host
+++ b/modules/canon-host
@@ -17,7 +17,7 @@
 Makefile.am:
 
 Include:
-#include "canon-host.h"
+"canon-host.h"
 
 Link:
 $(GETADDRINFO_LIB)

--- a/modules/configmake
+++ b/modules/configmake
@@ -67,7 +67,7 @@
 
 Include:
 /* Include only after all system include files.  */
-#include "configmake.h"
+"configmake.h"
 
 License:
 LGPLv2+

--- a/modules/dirent
+++ b/modules/dirent
@@ -41,7 +41,7 @@
 MOSTLYCLEANFILES += dirent.h dirent.h-t
 
 Include:
-#include <dirent.h>
+<dirent.h>
 
 License:
 LGPLv2+

--- a/modules/eealloc
+++ b/modules/eealloc
@@ -13,7 +13,7 @@
 Makefile.am:
 
 Include:
-#include <eealloc.h>
+<eealloc.h>
 
 License:
 GPL

--- a/modules/environ
+++ b/modules/environ
@@ -15,7 +15,7 @@
 Makefile.am:
 
 Include:
-#include <unistd.h>
+<unistd.h>
 
 License:
 LGPLv2+

--- a/modules/fchdir
+++ b/modules/fchdir
@@ -28,7 +28,7 @@
 Makefile.am:
 
 Include:
-#include <unistd.h>
+<unistd.h>
 
 License:
 LGPL

--- a/modules/fcntl
+++ b/modules/fcntl
@@ -11,7 +11,7 @@
 Makefile.am:
 
 Include:
-#include <fcntl.h>
+<fcntl.h>
 
 License:
 LGPL

--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -36,7 +36,7 @@
 MOSTLYCLEANFILES += fcntl.h fcntl.h-t
 
 Include:
-#include <fcntl.h>
+<fcntl.h>
 
 License:
 LGPL

--- a/modules/gethrxtime
+++ b/modules/gethrxtime
@@ -20,7 +20,7 @@
 Makefile.am:
 
 Include:
-#include "xtime.h"
+"xtime.h"
 
 License:
 GPL

--- a/modules/gettime
+++ b/modules/gettime
@@ -18,7 +18,7 @@
 Makefile.am:
 
 Include:
-#include "timespec.h"
+"timespec.h"
 
 License:
 GPL

--- a/modules/ignore-value
+++ b/modules/ignore-value
@@ -13,7 +13,7 @@
 lib_SOURCES += ignore-value.h
 
 Include:
-#include <ignore-value.h>
+<ignore-value.h>
 
 License:
 LGPL

--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -23,7 +23,7 @@
 LGPLv2+
 
 Include:
-#include <arpa/inet.h>
+<arpa/inet.h>
 
 Maintainer:
 Yoann Vandoorselaere, glibc

--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -24,7 +24,7 @@
 LGPLv2+
 
 Include:
-#include <arpa/inet.h>
+<arpa/inet.h>
 
 Maintainer:
 Simon Josefsson, glibc

--- a/modules/inttypes
+++ b/modules/inttypes
@@ -51,7 +51,7 @@
 MOSTLYCLEANFILES += inttypes.h inttypes.h-t
 
 Include:
-#include <inttypes.h>
+<inttypes.h>
 
 License:
 LGPL

--- a/modules/isnand-nolibm
+++ b/modules/isnand-nolibm
@@ -19,7 +19,7 @@
 Makefile.am:
 
 Include:
-#include "isnand-nolibm.h"
+"isnand-nolibm.h"
 
 License:
 LGPL

--- a/modules/isnanf-nolibm
+++ b/modules/isnanf-nolibm
@@ -19,7 +19,7 @@
 Makefile.am:
 
 Include:
-#include "isnanf-nolibm.h"
+"isnanf-nolibm.h"
 
 License:
 LGPL

--- a/modules/mbchar
+++ b/modules/mbchar
@@ -21,7 +21,7 @@
 lib_SOURCES += mbchar.c
 
 Include:
-#include "mbchar.h"
+"mbchar.h"
 
 License:
 LGPL

--- a/modules/mbfile
+++ b/modules/mbfile
@@ -20,7 +20,7 @@
 lib_SOURCES += mbfile.h
 
 Include:
-#include "mbfile.h"
+"mbfile.h"
 
 License:
 LGPL

--- a/modules/mbiter
+++ b/modules/mbiter
@@ -20,7 +20,7 @@
 lib_SOURCES += mbiter.h
 
 Include:
-#include "mbiter.h"
+"mbiter.h"
 
 License:
 LGPL

--- a/modules/mbuiter
+++ b/modules/mbuiter
@@ -21,7 +21,7 @@
 lib_SOURCES += mbuiter.h
 
 Include:
-#include "mbuiter.h"
+"mbuiter.h"
 
 License:
 LGPL

--- a/modules/netdb
+++ b/modules/netdb
@@ -36,7 +36,7 @@
 MOSTLYCLEANFILES += netdb.h netdb.h-t
 
 Include:
-#include <netdb.h>
+<netdb.h>
 
 License:
 LGPLv2+

--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -33,7 +33,7 @@
 MOSTLYCLEANDIRS += netinet
 
 Include:
-#include <netinet/in.h>
+<netinet/in.h>
 
 License:
 LGPLv2+

--- a/modules/nproc
+++ b/modules/nproc
@@ -14,7 +14,7 @@
 Makefile.am:
 
 Include:
-#include "nproc.h"
+"nproc.h"
 
 License:
 GPL

--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -22,7 +22,7 @@
 Makefile.am:
 
 Include:
-#include "pagealign_alloc.h"
+"pagealign_alloc.h"
 
 License:
 GPL

--- a/modules/poll
+++ b/modules/poll
@@ -30,7 +30,7 @@
 MOSTLYCLEANFILES += poll.h poll.h-t
 
 Include:
-#include <poll.h>
+<poll.h>
 
 License:
 LGPLv2+

--- a/modules/printf-frexp
+++ b/modules/printf-frexp
@@ -17,7 +17,7 @@
 lib_SOURCES += printf-frexp.c
 
 Include:
-#include "printf-frexp.h"
+"printf-frexp.h"
 
 License:
 LGPL

--- a/modules/pthread
+++ b/modules/pthread
@@ -20,7 +20,7 @@
 MOSTLYCLEANFILES += pthread.h
 
 Include:
-#include <pthread.h>
+<pthread.h>
 
 License:
 LGPLv2+

--- a/modules/putenv
+++ b/modules/putenv
@@ -16,7 +16,7 @@
 Makefile.am:
 
 Include:
-#include <stdlib.h>
+<stdlib.h>
 
 License:
 LGPL

--- a/modules/random_r
+++ b/modules/random_r
@@ -16,7 +16,7 @@
 Makefile.am:
 
 Include:
-#include <stdlib.h>
+<stdlib.h>
 
 License:
 LGPLv2+

--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -31,8 +31,8 @@
 DEFS += -DEXEEXT=\"@EXEEXT@\"
 
 Include:
-#include "relocatable.h"
-#include "progname.h"
+"relocatable.h"
+"progname.h"
 
 License:
 GPL

--- a/modules/search
+++ b/modules/search
@@ -34,7 +34,7 @@
 MOSTLYCLEANFILES += search.h search.h-t
 
 Include:
-#include <search.h>
+<search.h>
 
 License:
 LGPL

--- a/modules/select
+++ b/modules/select
@@ -16,7 +16,7 @@
 Makefile.am:
 
 Include:
-#include <sys/select.h>
+<sys/select.h>
 
 License:
 LGPLv2+

--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -38,8 +38,8 @@
 MOSTLYCLEANDIRS += selinux
 
 Include:
-#include <selinux/selinux.h>
-#include <selinux/context.h>
+<selinux/selinux.h>
+<selinux/context.h>
 
 Link:
 $(LIB_SELINUX)

--- a/modules/settime
+++ b/modules/settime
@@ -18,7 +18,7 @@
 Makefile.am:
 
 Include:
-#include "timespec.h"
+"timespec.h"
 
 License:
 GPL

--- a/modules/signal
+++ b/modules/signal
@@ -39,7 +39,7 @@
 MOSTLYCLEANFILES += signal.h signal.h-t
 
 Include:
-#include <signal.h>
+<signal.h>
 
 License:
 LGPLv2+

--- a/modules/size_max
+++ b/modules/size_max
@@ -14,7 +14,7 @@
 lib_SOURCES += size_max.h
 
 Include:
-#include "size_max.h"
+"size_max.h"
 
 License:
 LGPLv2+

--- a/modules/socklen
+++ b/modules/socklen
@@ -13,8 +13,8 @@
 Makefile.am:
 
 Include:
-#include <sys/types.h>
-#include <sys/socket.h>
+<sys/types.h>
+<sys/socket.h>
 
 License:
 unlimited

--- a/modules/ssize_t
+++ b/modules/ssize_t
@@ -12,7 +12,7 @@
 Makefile.am:
 
 Include:
-#include <sys/types.h>
+<sys/types.h>
 
 License:
 unlimited

--- a/modules/stdarg
+++ b/modules/stdarg
@@ -35,7 +35,7 @@
 MOSTLYCLEANFILES += stdarg.h stdarg.h-t
 
 Include:
-#include <stdarg.h>
+<stdarg.h>
 
 License:
 LGPL

--- a/modules/stdbool
+++ b/modules/stdbool
@@ -25,7 +25,7 @@
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
 Include:
-#include <stdbool.h>
+<stdbool.h>
 
 License:
 LGPLv2+

--- a/modules/stddef
+++ b/modules/stddef
@@ -31,7 +31,7 @@
 MOSTLYCLEANFILES += stddef.h stddef.h-t
 
 Include:
-#include <stddef.h>
+<stddef.h>
 
 License:
 LGPLv2+

--- a/modules/stdint
+++ b/modules/stdint
@@ -57,7 +57,7 @@
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
 Include:
-#include <stdint.h>
+<stdint.h>
 
 License:
 LGPLv2+

--- a/modules/stdio
+++ b/modules/stdio
@@ -106,7 +106,7 @@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
 Include:
-#include <stdio.h>
+<stdio.h>
 
 License:
 LGPLv2+

--- a/modules/stdlib
+++ b/modules/stdlib
@@ -72,7 +72,7 @@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 
 Include:
-#include <stdlib.h>
+<stdlib.h>
 
 License:
 LGPLv2+

--- a/modules/string
+++ b/modules/string
@@ -92,7 +92,7 @@
 MOSTLYCLEANFILES += string.h string.h-t
 
 Include:
-#include <string.h>
+<string.h>
 
 License:
 LGPLv2+

--- a/modules/strings
+++ b/modules/strings
@@ -32,7 +32,7 @@
 MOSTLYCLEANFILES += strings.h strings.h-t
 
 Include:
-#include <strings.h>
+<strings.h>
 
 License:
 LGPLv2+

--- a/modules/sys_file
+++ b/modules/sys_file
@@ -35,7 +35,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/file.h>
+<sys/file.h>
 
 License:
 LGPLv2+

--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -38,7 +38,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/ioctl.h>
+<sys/ioctl.h>
 
 License:
 LGPLv2+

--- a/modules/sys_select
+++ b/modules/sys_select
@@ -39,7 +39,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/select.h>
+<sys/select.h>
 
 License:
 LGPLv2+

--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -58,7 +58,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/socket.h>
+<sys/socket.h>
 
 License:
 LGPLv2+

--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -52,7 +52,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/stat.h>
+<sys/stat.h>
 
 License:
 LGPLv2+

--- a/modules/sys_time
+++ b/modules/sys_time
@@ -33,7 +33,7 @@
 MOSTLYCLEANFILES += sys/time.h sys/time.h-t
 
 Include:
-#include <sys/time.h>
+<sys/time.h>
 
 License:
 LGPLv2+

--- a/modules/sys_times
+++ b/modules/sys_times
@@ -30,7 +30,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/times.h>
+<sys/times.h>
 
 License:
 LGPLv2+

--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -31,7 +31,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/utsname.h>
+<sys/utsname.h>
 
 License:
 LGPLv2+

--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -33,7 +33,7 @@
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/wait.h>
+<sys/wait.h>
 
 License:
 LGPLv2+

--- a/modules/sysexits
+++ b/modules/sysexits
@@ -29,7 +29,7 @@
 MOSTLYCLEANFILES += sysexits.h sysexits.h-t
 
 Include:
-#include <sysexits.h>
+<sysexits.h>
 
 License:
 LGPL

--- a/modules/time
+++ b/modules/time
@@ -37,7 +37,7 @@
 MOSTLYCLEANFILES += time.h time.h-t
 
 Include:
-#include <time.h>
+<time.h>
 
 License:
 LGPLv2+

--- a/modules/times
+++ b/modules/times
@@ -17,7 +17,7 @@
 Makefile.am:
 
 Include:
-#include <sys/times.h>
+<sys/times.h>
 
 License:
 LGPLv2+

--- a/modules/tmpfile
+++ b/modules/tmpfile
@@ -16,7 +16,7 @@
 Makefile.am:
 
 Include:
-#include <stdio.h>
+<stdio.h>
 
 License:
 GPL

--- a/modules/trim
+++ b/modules/trim
@@ -18,7 +18,7 @@
 lib_SOURCES += trim.c
 
 Include:
-#include "trim.h"
+"trim.h"
 
 License:
 GPL

--- a/modules/unistd
+++ b/modules/unistd
@@ -101,7 +101,7 @@
 MOSTLYCLEANFILES += unistd.h unistd.h-t
 
 Include:
-#include <unistd.h>
+<unistd.h>
 
 License:
 LGPLv2+

--- a/modules/wchar
+++ b/modules/wchar
@@ -68,7 +68,7 @@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
 
 Include:
-#include <wchar.h>
+<wchar.h>
 
 License:
 LGPLv2+

--- a/modules/wctype
+++ b/modules/wctype
@@ -33,7 +33,7 @@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
 Include:
-#include <wctype.h>
+<wctype.h>
 
 License:
 LGPLv2+