--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,8 @@
 	* lib/netinet_in.in.h: Renamed from lib/netinet_in_.h.
 	* modules/netinet_in (Files, Makefile.am): Use netinet_in.in.h instead
 	of netinet_in_.h. Add dependency.
+	* lib/poll.in.h: Renamed from lib/poll_.h.
+	* modules/poll (Files, Makefile.am): Use poll.in.h instead of poll_.h.
 
 2007-09-30  Bruno Haible  <bruno@clisp.org>
 

new file mode 100644
--- /dev/null
+++ b/lib/poll.in.h
@@ -0,0 +1,53 @@
+/* Header for poll(2) emulation
+   Contributed by Paolo Bonzini.
+
+   Copyright 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
+
+   This file is part of gnulib.
+
+   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.  */
+
+#ifndef _GL_POLL_H
+#define _GL_POLL_H
+
+/* fake a poll(2) environment */
+#define POLLIN      0x0001	/* any readable data available   */
+#define POLLPRI     0x0002	/* OOB/Urgent readable data      */
+#define POLLOUT     0x0004	/* file descriptor is writeable  */
+#define POLLERR     0x0008	/* some poll error occurred      */
+#define POLLHUP     0x0010	/* file descriptor was "hung up" */
+#define POLLNVAL    0x0020	/* requested events "invalid"    */
+#define POLLRDNORM  0x0040
+#define POLLRDBAND  0x0080
+#define POLLWRNORM  0x0100
+#define POLLWRBAND  0x0200
+
+struct pollfd
+{
+  int fd;			/* which file descriptor to poll */
+  short events;			/* events we are interested in   */
+  short revents;		/* events found on return        */
+};
+
+typedef unsigned long nfds_t;
+
+extern int poll (struct pollfd *pfd, nfds_t nfd, int timeout);
+
+/* Define INFTIM only if doing so conforms to POSIX.  */
+#if !defined (_POSIX_C_SOURCE) && !defined (_XOPEN_SOURCE)
+#define INFTIM (-1)
+#endif
+
+#endif /* _GL_POLL_H */

deleted file mode 100644
--- a/lib/poll_.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Header for poll(2) emulation
-   Contributed by Paolo Bonzini.
-
-   Copyright 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
-
-   This file is part of gnulib.
-
-   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.  */
-
-#ifndef _GL_POLL_H
-#define _GL_POLL_H
-
-/* fake a poll(2) environment */
-#define POLLIN      0x0001	/* any readable data available   */
-#define POLLPRI     0x0002	/* OOB/Urgent readable data      */
-#define POLLOUT     0x0004	/* file descriptor is writeable  */
-#define POLLERR     0x0008	/* some poll error occurred      */
-#define POLLHUP     0x0010	/* file descriptor was "hung up" */
-#define POLLNVAL    0x0020	/* requested events "invalid"    */
-#define POLLRDNORM  0x0040
-#define POLLRDBAND  0x0080
-#define POLLWRNORM  0x0100
-#define POLLWRBAND  0x0200
-
-struct pollfd
-{
-  int fd;			/* which file descriptor to poll */
-  short events;			/* events we are interested in   */
-  short revents;		/* events found on return        */
-};
-
-typedef unsigned long nfds_t;
-
-extern int poll (struct pollfd *pfd, nfds_t nfd, int timeout);
-
-/* Define INFTIM only if doing so conforms to POSIX.  */
-#if !defined (_POSIX_C_SOURCE) && !defined (_XOPEN_SOURCE)
-#define INFTIM (-1)
-#endif
-
-#endif /* _GL_POLL_H */

--- a/modules/poll
+++ b/modules/poll
@@ -3,7 +3,7 @@
 
 Files:
 lib/poll.c
-lib/poll_.h
+lib/poll.in.h
 m4/poll.m4
 
 Depends-on:
@@ -18,9 +18,9 @@
 
 # We need the following in order to create <poll.h> when the system
 # doesn't have one.
-poll.h: poll_.h
+poll.h: poll.in.h
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/poll_.h; \
+	  cat $(srcdir)/poll.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 MOSTLYCLEANFILES += poll.h poll.h-t