diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog
index cb9a05e8f6..9766f304bb 100644
--- a/c/src/lib/libbsp/sh/gensh2/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* include/bsp.h, startup/bspstart.c, startup/hw_init.c: Convert to
+	using c99 fixed size types.
+
 2004-02-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reflect changes to bsp.am. 
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
index 056239ddb9..c5c4d0054b 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
@@ -115,10 +115,10 @@ extern "C" {
  * Defined in the linker script 'linkcmds'
  */
 
-extern unsigned32       HeapStart ;
-extern unsigned32       HeapEnd ;
-extern unsigned32       WorkSpaceStart ;
-extern unsigned32       WorkSpaceEnd ;
+extern uint32_t         HeapStart ;
+extern uint32_t         HeapEnd ;
+extern uint32_t         WorkSpaceStart ;
+extern uint32_t         WorkSpaceEnd ;
 
 extern void *CPU_Interrupt_stack_low ;
 extern void *CPU_Interrupt_stack_high ;
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c
index 57b79152ee..3bddc4fd8a 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c
+++ b/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c
@@ -50,7 +50,7 @@ char *rtems_progname;
  */
  
 void bsp_postdriver_hook(void);
-void bsp_libc_init( void *, unsigned32, int );
+void bsp_libc_init( void *, uint32_t, int );
 
 /*
  *  Function:   bsp_pretasking_hook
@@ -111,8 +111,7 @@ void bsp_start(void)
 
   BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ;
   BSP_Configuration.work_space_size  = 
-    (unsigned32) &WorkSpaceEnd - 
-    (unsigned32) &WorkSpaceStart ;
+    &WorkSpaceEnd - &WorkSpaceStart ;
   
   /*
    *  initialize the CPU table for this BSP
@@ -124,8 +123,7 @@ void bsp_start(void)
 
   /* This isn't used anywhere */
   Cpu_table.interrupt_stack_size = 
-    (unsigned32) (&CPU_Interrupt_stack_high) -
-    (unsigned32) (&CPU_Interrupt_stack_low) ;
+    &CPU_Interrupt_stack_high - &CPU_Interrupt_stack_low ;
 #endif
 
 
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/hw_init.c b/c/src/lib/libbsp/sh/gensh2/startup/hw_init.c
index 15c8e66f2c..78d4031b5f 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/hw_init.c
+++ b/c/src/lib/libbsp/sh/gensh2/startup/hw_init.c
@@ -76,7 +76,7 @@ void early_hw_init (void)
 /*  to be called from 'bspstart.c' */
 void bsp_hw_init (void) 
 {
-  unsigned16 temp16;
+  uint16_t   temp16;
 
 #ifdef STANDALONE_EVB
   /* STANDALONE_EVB: sets up PFC */