--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-03-30  Bruno Haible  <bruno@clisp.org>
+
+	* lib/alloca_.h: Change prefix of double-inclusion guard macro to _GL_.
+	* lib/poll_.h: Likewise.
+	* lib/stat_.h: Likewise.
+	* lib/sys_time_.h: Likewise.
+	* lib/sysexit_.h: Likewise.
+	* lib/glob_.h: Prefix double-inclusion guard macro with _GL_.
+	* lib/stdbool_.h: Likewise.
+	* lib/byteswap_.h: Add double-inclusion guard.
+
+2007-03-30  Sergey Poznyakoff  <gray@mirddin.farlep.net>
+
+	* lib/sysexit_.h: Prefix double-inclusion guard macro with _GNULIB.
+
 2007-03-30  Karl Berry  <karl@gnu.org>
 
 	* config/srclist-update: double space after USA in the license

--- a/lib/alloca_.h
+++ b/lib/alloca_.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001, 2002, 2003, 2004, 2006 Free Software
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2007 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
@@ -20,8 +20,8 @@
 
 /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
    means there is a real alloca function.  */
-#ifndef _GNULIB_ALLOCA_H
-# define _GNULIB_ALLOCA_H
+#ifndef _GL_ALLOCA_H
+#define _GL_ALLOCA_H
 
 /* alloca (N) returns a pointer to N bytes of memory
    allocated on the stack, which will last until the function returns.
@@ -51,4 +51,4 @@
 # endif
 #endif
 
-#endif /* _GNULIB_ALLOCA_H */
+#endif /* _GL_ALLOCA_H */

--- a/lib/byteswap_.h
+++ b/lib/byteswap_.h
@@ -16,7 +16,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _BYTESWAP_H
+#ifndef _GL_BYTESWAP_H
+#define _GL_BYTESWAP_H
 
 /* Given an unsigned 16-bit argument X, return the value corresponding to
    X with reversed byte order.  */
@@ -41,4 +42,4 @@
 		     (((x) & 0x00FF000000000000ULL) >> 40) | \
 		     (((x) & 0xFF00000000000000ULL) >> 56))
 
-#endif
+#endif /* _GL_BYTESWAP_H */

--- a/lib/glob_.h
+++ b/lib/glob_.h
@@ -18,8 +18,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef GLOB_H
-#define GLOB_H 1
+#ifndef _GL_GLOB_H
+#define _GL_GLOB_H
 
 #ifdef HAVE_SYS_CDEFS_H
 # include <sys/cdefs.h>
@@ -57,4 +57,4 @@
 /* Now the standard GNU C Library header should work.  */
 #include "glob-libc.h"
 
-#endif /* GLOB_H */
+#endif /* _GL_GLOB_H */

--- a/lib/poll_.h
+++ b/lib/poll_.h
@@ -1,7 +1,7 @@
 /* Header for poll(2) emulation
    Contributed by Paolo Bonzini.
 
-   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
 
    This file is part of gnulib.
 
@@ -19,8 +19,8 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef GNULIB_POLL_H
-#define GNULIB_POLL_H
+#ifndef _GL_POLL_H
+#define _GL_POLL_H
 
 /* fake a poll(2) environment */
 #define POLLIN      0x0001	/* any readable data available   */
@@ -50,4 +50,4 @@
 #define INFTIM (-1)
 #endif
 
-#endif
+#endif /* _GL_POLL_H */

--- a/lib/stat_.h
+++ b/lib/stat_.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 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
@@ -17,8 +17,8 @@
 
 /* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
 
-#ifndef _gl_SYS_STAT_H
-#define _gl_SYS_STAT_H
+#ifndef _GL_SYS_STAT_H
+#define _GL_SYS_STAT_H
 
 /* This file is supposed to be used on platforms where <sys/stat.h> is
    incomplete.  It is intended to provide definitions and prototypes
@@ -272,4 +272,4 @@
 # define mkdir rpl_mkdir
 #endif
 
-#endif /* _gl_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */

--- a/lib/stdbool_.h
+++ b/lib/stdbool_.h
@@ -15,8 +15,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _STDBOOL_H
-#define _STDBOOL_H
+#ifndef _GL_STDBOOL_H
+#define _GL_STDBOOL_H
 
 /* ISO C 99 <stdbool.h> for platforms that lack it.  */
 
@@ -115,4 +115,4 @@
 #define true 1
 #define __bool_true_false_are_defined 1
 
-#endif /* _STDBOOL_H */
+#endif /* _GL_STDBOOL_H */

--- a/lib/sys_time_.h
+++ b/lib/sys_time_.h
@@ -18,8 +18,8 @@
 
 /* Written by Paul Eggert.  */
 
-#ifndef _gl_SYS_TIME_H
-#define _gl_SYS_TIME_H
+#ifndef _GL_SYS_TIME_H
+#define _GL_SYS_TIME_H
 
 #if @HAVE_SYS_TIME_H@
 # include @ABSOLUTE_SYS_TIME_H@
@@ -41,4 +41,4 @@
 int gettimeofday (struct timeval *restrict, void *restrict);
 #endif
 
-#endif /* _gl_SYS_TIME_H */
+#endif /* _GL_SYS_TIME_H */

--- a/lib/sysexit_.h
+++ b/lib/sysexit_.h
@@ -17,8 +17,8 @@
 
 /* Written by Simon Josefsson based on sysexits(3) man page */
 
-#ifndef _SYSEXITS_H
-#define _SYSEXITS_H
+#ifndef _GL_SYSEXITS_H
+#define _GL_SYSEXITS_H
 
 #if @HAVE_SYSEXITS_H@
 
@@ -51,4 +51,4 @@
 
 #endif
 
-#endif /* _SYSEXITS_H */
+#endif /* _GL_SYSEXITS_H */