2005-05-26 Ralf Corsepius <ralf.corsepius@rtems.org>

	* include/bsp.h: New header guard.

96 files changed, 293 insertions, 101 deletions

diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index 267f3c571e..2fc5d63397 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/arm/armulator/include/bsp.h b/c/src/lib/libbsp/arm/armulator/include/bsp.h
index 2c313c90e4..e2fb57af47 100644
--- a/c/src/lib/libbsp/arm/armulator/include/bsp.h
+++ b/c/src/lib/libbsp/arm/armulator/include/bsp.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __ARMULATOR_h
-#define __ARMULATOR_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog
index b70fe4253b..c9bc4d89dc 100644
--- a/c/src/lib/libbsp/arm/csb336/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb336/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-04-26	Joel Sherrill <joel@OARcorp.com>
 
 	* network/network.c: Add include rtems/bspIo.h to eliminate warning.
diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp.h b/c/src/lib/libbsp/arm/csb336/include/bsp.h
index 460456e225..e7c3ec9e47 100644
--- a/c/src/lib/libbsp/arm/csb336/include/bsp.h
+++ b/c/src/lib/libbsp/arm/csb336/include/bsp.h
@@ -12,8 +12,8 @@
  *
  *  $Id$
 */
-#ifndef __BSP_H__
-#define __BSP_H__
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,5 +57,5 @@ int rtems_mc9328mxl_enet_attach(struct rtems_bsdnet_ifconfig *config,
 }
 #endif
 
-#endif /* __BSP_H__ */
+#endif /* _BSP_H */
 
diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index 8b2a819d0b..d5223d55d0 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-04-26	Joel Sherrill <joel@OARcorp.com>
 
 	* network/network.c: Eliminate warnings.
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/c/src/lib/libbsp/arm/csb337/include/bsp.h
index 579f69f295..3a3c8c1c31 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bsp.h
+++ b/c/src/lib/libbsp/arm/csb337/include/bsp.h
@@ -12,8 +12,8 @@
  *
  *  $Id$
  */
-#ifndef __BSP_H__
-#define __BSP_H__
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,5 +61,5 @@ int rtems_at91rm9200_emac_attach(struct rtems_bsdnet_ifconfig *config, int attac
 }
 #endif
 
-#endif /* __BSP_H__ */
+#endif /* _BSP_H */
 
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index cf8e5d4298..b44db45792 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * irq/irq.h: Modified names and types to match rtems/irq.h. 
diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h
index e6f09ebc07..4b3540e01c 100644
--- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h
+++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h
@@ -11,8 +11,8 @@
  *
  *  $Id$
 */
-#ifndef __BSP_H__
-#define __BSP_H__
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,4 +50,4 @@ extern rtems_configuration_table BSP_Configuration;
 }
 #endif
 
-#endif /* __BSP_H__ */
+#endif /* _BSP_H */
diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog
index 4fb3186c4b..8cfe15fd15 100644
--- a/c/src/lib/libbsp/arm/gp32/ChangeLog
+++ b/c/src/lib/libbsp/arm/gp32/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-04-26	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/bspstart.c: Add include rtems/bspIo.h to eliminate warning.
diff --git a/c/src/lib/libbsp/arm/gp32/include/bsp.h b/c/src/lib/libbsp/arm/gp32/include/bsp.h
index 3b5b57ce55..c5dd530b49 100644
--- a/c/src/lib/libbsp/arm/gp32/include/bsp.h
+++ b/c/src/lib/libbsp/arm/gp32/include/bsp.h
@@ -15,8 +15,8 @@
 +--------------------------------------------------------------------------*/
 
 
-#ifndef __BSP_H_
-#define __BSP_H_
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,6 +50,6 @@ void LCD_BREAK();
 }
 #endif
 
-#endif /* __BSP_H_ */
+#endif /* _BSP_H */
 /* end of include file */
 
diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
index 57260b59c4..94cb71eb38 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
+++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-02-02	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* include/tm27.h, timer/timer.c: #include <rtems/tic4x/c4xio.h>
diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h
index 5b7f92834d..4819cb2296 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h
+++ b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h
@@ -12,8 +12,8 @@
  *  $Id$
  */
 
-#ifndef __C4XSIM_h
-#define __C4XSIM_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/h8300/h8sim/ChangeLog b/c/src/lib/libbsp/h8300/h8sim/ChangeLog
index 61dbc1dab6..4dc484d177 100644
--- a/c/src/lib/libbsp/h8300/h8sim/ChangeLog
+++ b/c/src/lib/libbsp/h8300/h8sim/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-11	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Add .rodata.* sections.
diff --git a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
index 9c910071e4..37b2da2972 100644
--- a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
+++ b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __H8SIM_h
-#define __H8SIM_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index f4a151600e..b3e0f8dbb7 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-06      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * clock/ckinit.c, console/console.c, include/bsp.h, startup/bspstart.c:
diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
index 829b3fc2f5..fc4b08dda8 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
@@ -11,8 +11,8 @@
  *  $Id$
  */
 
-#ifndef __I386EX_BSP_h
-#define __I386EX_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index a954ddb67f..12118275e0 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-06      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * 3c509/3c509.c, clock/ckinit.c, console/console.c, console/fb_vga.c,
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h
index be92a6c70b..aa7ecbe390 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h
@@ -38,8 +38,8 @@
 |  $Id$
 +--------------------------------------------------------------------------*/
 
-#ifndef __BSP_H_
-#define __BSP_H_
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -208,5 +208,5 @@ void breakpoint(void);
 }
 #endif
 
-#endif /* __BSP_H_ */
+#endif /* _BSP_H */
 /* end of include file */
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 66c9f15930..d7b7b6c17c 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-06      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * clock/ckinit.c, console/console.c, include/bsp.h, network/ne2000.c:
diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
index 990072d49d..ffa5cbae7f 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
@@ -11,8 +11,8 @@
  *  $Id$
  */
 
-#ifndef __TS386_h
-#define __TS386_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog
index c23ee77662..9eaca989c4 100644
--- a/c/src/lib/libbsp/m68k/csb360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-02-11	Joel Sherrill <joel@OARcorp.com>
 
 	* include/bsp.h: Correct type of symbols from linkcmds to compile with
diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
index 447fee5ea7..cebd467402 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
@@ -17,8 +17,8 @@
  *  bsp.h,v 1.1 2001/10/26 19:30:10 joel Exp
  */
 
-#ifndef __CSB360_BSP_H__
-#define __CSB360_BSP_H__
+#ifndef _BSP_H
+#define _BSP_H
 
 #include <mcf5272/mcf5272.h>
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
index 4991b6cfdc..d10332e510 100644
--- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog
+++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
index 3b1c759e63..648c2c2686 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
@@ -12,8 +12,8 @@
  *  $Id$
  */
 
-#ifndef __DMV152_h
-#define __DMV152_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index 842be691ad..d8fbcaaa25 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
index 7a040a8be1..017a5ecaa4 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
@@ -14,8 +14,8 @@
  *  $Id$
  */
 
-#ifndef __GEN68302_BSP_h
-#define __GEN68302_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index 1ad9bd1dac..9e7f63b409 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-02-11	Joel Sherrill <joel@OARcorp.com>
 
 	* include/bsp.h: Correct type of symbols from linkcmds to compile with
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index 4c41744150..b648682785 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
@@ -17,8 +17,8 @@
  *  http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef __GEN68340_BSP_h
-#define __GEN68340_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index ace204815d..d9847c1829 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-04-26	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/alloc360.c: Eliminate warnings.
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
index b44321a8cb..216d1b6ad8 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
@@ -23,8 +23,8 @@
  *  http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef __GEN68360_BSP_h
-#define __GEN68360_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog
index ed1d7d2399..f630666142 100644
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-20	Joel Sherrill <joel@OARcorp.com>
 
 	* console/duart.c: Remove warning.
diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h
index c4165e0383..d2599379a1 100644
--- a/c/src/lib/libbsp/m68k/idp/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h
@@ -5,8 +5,8 @@
  *  $Id$
  */
 
-#ifndef __IDP_BSP_H
-#define __IDP_BSP_H
+#ifndef _BSP_H
+#define _BSP_H
 
 #include <bspopts.h>
 
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
index c9c1e0a484..63eb01a3ab 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-02-11	Joel Sherrill <joel@OARcorp.com>
 
 	* include/bsp.h: Correct type of symbols from linkcmds to compile with
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
index 2b7dfc65bb..b6833813e9 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __mcf5206elite_BSP_h
-#define __mcf5206elite_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #include "mcf5206/mcf5206e.h"
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index ac2a31869c..0509e34962 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index 8538230680..33aba4050f 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -12,8 +12,8 @@
  *  $Id$
  */
 
-#ifndef __MRM332_BSP_h
-#define __MRM332_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index e342e32e9e..8d4a49f542 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
index c3476cd159..389ab0ee9f 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
@@ -12,8 +12,8 @@
  *  $Id$
  */
 
-#ifndef __MVME136_h
-#define __MVME136_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
index 4b58fd6fb1..2386f0fcbf 100644
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
index 0e2f315da4..261f595698 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __MVME147_h
-#define __MVME147_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
index 898243b141..52297ac2ff 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
index 22d43070e7..9f2331e865 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __MVME147_h
-#define __MVME147_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index cab093e8aa..8eb6cb0330 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-18	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Use ../../shared/tod.h instead of include/tod.h.
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
index 20203796f1..63f77b6394 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#ifndef __MVME162_h
-#define __MVME162_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
index b2c0e463b1..4ba30fcfc5 100644
--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-04-26	Joel Sherrill <joel@OARcorp.com>
 
 	* network/network.c: Change int to rtems_id to eliminate warning.
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
index d68650d2dc..902c4f453d 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __MVME167_H
-#define __MVME167_H
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index b00540698b..d162e3daa9 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-09	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Add rom section to remove warning.
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
index e6b99e8a5a..b3e42bb988 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
@@ -14,8 +14,8 @@
  *  $Id$
  */
 
-#ifndef __GEN68302_BSP_h
-#define __GEN68302_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
index d2e74c1c3b..7f9efd1552 100644
--- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-23  Eric Norum <norume@aps.anl.gov>
 
 	* startup/linkcmds
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
index 7cff0ba590..e17055c474 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
@@ -2,8 +2,8 @@
  *  uC5282 BSP header file
  */
  
-#ifndef __SBC5282_BSP_H
-#define __SBC5282_BSP_H
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog
index 87b69124ee..407dc22169 100644
--- a/c/src/lib/libbsp/mips/csb350/ChangeLog
+++ b/c/src/lib/libbsp/mips/csb350/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-10	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* clock/clockdrv.c, include/bsp.h, network/network.c,
diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/c/src/lib/libbsp/mips/csb350/include/bsp.h
index bd7d4b5c5c..715f5cb477 100644
--- a/c/src/lib/libbsp/mips/csb350/include/bsp.h
+++ b/c/src/lib/libbsp/mips/csb350/include/bsp.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __BSP_H__
-#define __BSP_H__
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog
index ed9f919e28..30a12a8a10 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog
+++ b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h
index fb6f421389..eba3c3b466 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h
+++ b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __GENERIC_MONGOOSE_V_h
-#define __GENERIC_MONGOOSE_V_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
index c4e64b95cd..a0076a26e0 100644
--- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog
+++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h
index ce7f4a78af..47bccae86d 100644
--- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h
+++ b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __JMR3904_h
-#define __JMR3904_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog
index b182d88016..2f0865e164 100644
--- a/c/src/lib/libbsp/mips/p4000/ChangeLog
+++ b/c/src/lib/libbsp/mips/p4000/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-04-26	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/idtmem.S: Eliminate warnings and be more consistent with
diff --git a/c/src/lib/libbsp/mips/p4000/include/bsp.h b/c/src/lib/libbsp/mips/p4000/include/bsp.h
index 4f195fd0a9..2bcb9eb50d 100644
--- a/c/src/lib/libbsp/mips/p4000/include/bsp.h
+++ b/c/src/lib/libbsp/mips/p4000/include/bsp.h
@@ -15,8 +15,8 @@
  */
 /* @(#)bsp.h       03/15/96     1.1 */
 
-#ifndef __P4000_BSP_h
-#define __P4000_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
index c4c4803f1d..7db54eba11 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h
index f617130088..efa3b3ef3a 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h
@@ -14,8 +14,8 @@
  *  $Id$
  */
 
-#ifndef __NO_BSP_h
-#define __NO_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
index 56620de190..a22247fbd1 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * console/rsPMCQ1.c, irq/irq.c: Modified to use rtems/irq.h.
diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
index fa48060c55..8b6c72db33 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
@@ -10,8 +10,8 @@
  *  $Id$
  */
 
-#ifndef EP1A_BSP_H
-#define EP1A_BSP_H
+#ifndef _BSP_H
+#define _BSP_H
 
 #include <bspopts.h>
 
diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog
index 824b24695c..d2f8ee2fb2 100644
--- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-02-16	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove argument from RTEMS_PPC_EXCEPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h
index 6f21df01c8..ee474543f0 100644
--- a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h
@@ -40,8 +40,8 @@
  *
  */
 
-#ifndef __GEN405_h
-#define __GEN405_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog
index 806c598969..5bfbe67653 100644
--- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-02-16	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove argument from RTEMS_PPC_EXCEPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h
index 96e5b747b8..df5e3e4f6e 100644
--- a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h
@@ -37,8 +37,8 @@
  *  $Id$
  */
 
-#ifndef __HELAS403_h
-#define __HELAS403_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 93012bbe1d..79541a2195 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * irq/irq.c, irq/irq.h, network/network.c: Modified to use rtems/irq.h.
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
index f5d4345f69..f8e19a7cba 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
@@ -14,8 +14,8 @@
  *  $Id$
  */
 
-#ifndef __MBX8xx_h
-#define __MBX8xx_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index e4ac9a7e01..39307ce2aa 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-02-16	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove argument from RTEMS_PPC_EXCEPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
index 4d88ce7ca7..6e189f08be 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
@@ -9,8 +9,8 @@
  *
  * $Id$
  */
-#ifndef LIBBSP_POWERPC_MOTOROLA_SHARED_BSP_H
-#define LIBBSP_POWERPC_MOTOROLA_SHARED_BSP_H
+#ifndef _BSP_H
+#define _BSP_H
 
 #include <bspopts.h>
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index c976cbe774..13263d4a25 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * irq/irq.c, irq/irq.h: Modified to use rtems/irq.h.
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
index 7b17c9b047..24af398909 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
@@ -14,8 +14,8 @@
  *  $Id$
  */
 
-#ifndef __NO_BSP_h
-#define __NO_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index 743e0379c6..a38c2b6c32 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-20	Jennifer Averett <jennifer@OARcorp.com>
 
 	PR 702/bsps
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
index 2c799557d9..f83c5f5a23 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef LIBBSP_POWERPC_MVME5500_BSP_H
-#define LIBBSP_POWERPC_MVME5500_BSP_H
+#ifndef _BSP_H
+#define _BSP_H
 
 #include <bspopts.h>
 
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index da4589ac01..8997a4ef58 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * irq/irq.c, irq/irq.h: Modified to use rtems/irq.h.
diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/c/src/lib/libbsp/powerpc/psim/include/bsp.h
index 0d4001b689..fd0e8f8d2f 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/psim/include/bsp.h
@@ -29,8 +29,8 @@
  *  $Id$
  */
 
-#ifndef __PAPYRUS_h
-#define __PAPYRUS_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index ee1279519a..d30689a868 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * irq/irq.c, irq/irq.h: Modified to use rtems/irq.h.
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index 5ae21308e6..8ba7686646 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -12,8 +12,8 @@
  *  $Id$
  */
 
-#ifndef __BSP_h
-#define __BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog
index a7f268b2db..f57dfb91d7 100644
--- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-10	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* console/console.c: Eliminate unsigned8.
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
index 21f66d2b86..260e736fc9 100644
--- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
@@ -20,8 +20,8 @@
  *  $Id$
  */
 
-#ifndef __SS555_h
-#define __SS555_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog
index 279b789e4d..7b6ab854ca 100644
--- a/c/src/lib/libbsp/sh/gensh1/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-11	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Add .rodata.* sections.
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index 8a49df2eef..04f5488091 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -22,8 +22,8 @@
  *  $Id$
  */
 
-#ifndef __gensh1_h
-#define __gensh1_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog
index 2c87bac748..d4dcaebdcf 100644
--- a/c/src/lib/libbsp/sh/gensh2/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-11	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Add .rodata.* sections.
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
index 4e158ec4f8..6556d429c5 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
@@ -33,8 +33,8 @@
  *  $Id$
  */
 
-#ifndef __gensh2_h
-#define __gensh2_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog
index 0a255d8422..91735ae2de 100644
--- a/c/src/lib/libbsp/sh/gensh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
index 29c54f80e6..8ced2a9fb8 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
@@ -37,8 +37,8 @@
  *  $Id$
  */
 
-#ifndef __gensh4_h
-#define __gensh4_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog
index 1fe69c72f2..fc352bcd8b 100644
--- a/c/src/lib/libbsp/sh/shsim/ChangeLog
+++ b/c/src/lib/libbsp/sh/shsim/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-05-20	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Add SHGEN.
diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h
index 58cf0418a9..74f024f0ea 100644
--- a/c/src/lib/libbsp/sh/shsim/include/bsp.h
+++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h
@@ -21,8 +21,8 @@
  * $Id$
  */
 
-#ifndef __bsp_h
-#define __bsp_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index e825aa2f85..ff4c0f807d 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/sh/simsh4/include/bsp.h b/c/src/lib/libbsp/sh/simsh4/include/bsp.h
index a3ddac38b0..9b11de964a 100644
--- a/c/src/lib/libbsp/sh/simsh4/include/bsp.h
+++ b/c/src/lib/libbsp/sh/simsh4/include/bsp.h
@@ -38,8 +38,8 @@
  *  $Id$
  */
 
-#ifndef __simsh4_h
-#define __simsh4_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog
index 9b428b3189..d2c0a331ae 100644
--- a/c/src/lib/libbsp/sparc/erc32/ChangeLog
+++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-20	Joel Sherrill <joel@OARcorp.com>
 
 	* bsp_specs: Conditionalize inclusion of crtend/crtn.
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
index 81bb4b779d..b05a6788f0 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#ifndef __ERC32_BSP_h
-#define __ERC32_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog
index c056c41363..bbb1147b86 100644
--- a/c/src/lib/libbsp/sparc/leon/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-20	Joel Sherrill <joel@OARcorp.com>
 
 	* Makefile.am: Fix typo.
diff --git a/c/src/lib/libbsp/sparc/leon/include/bsp.h b/c/src/lib/libbsp/sparc/leon/include/bsp.h
index ee63921dea..f1d9469144 100644
--- a/c/src/lib/libbsp/sparc/leon/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon/include/bsp.h
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#ifndef __SIS_h
-#define __SIS_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog
index 456c7cce1e..0b1f53b601 100644
--- a/c/src/lib/libbsp/unix/posix/ChangeLog
+++ b/c/src/lib/libbsp/unix/posix/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-26	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h: New header guard.
+
 2005-01-22	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Merge rtems-ctor.o into libbsp.a.
diff --git a/c/src/lib/libbsp/unix/posix/include/bsp.h b/c/src/lib/libbsp/unix/posix/include/bsp.h
index 388d3eef3e..ef17db16ad 100644
--- a/c/src/lib/libbsp/unix/posix/include/bsp.h
+++ b/c/src/lib/libbsp/unix/posix/include/bsp.h
@@ -12,8 +12,8 @@
  *  $Id$
  */
 
-#ifndef __POSIX_BSP_h
-#define __POSIX_BSP_h
+#ifndef _BSP_H
+#define _BSP_H
 
 #ifdef __cplusplus
 extern "C" {