diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog
index b27ebcdc14..c5452b867a 100644
--- a/c/src/lib/libbsp/sparc/leon3/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h, startup/bspstart.c, startup/spurious.c: hello and
+	ticker now run using runtest.
+
 2007-05-11	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/spurious.c: Fix typo from previous commit.
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
index 39fe3e2f69..22ab0b1355 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
@@ -42,11 +42,6 @@ extern "C" {
 #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
 #define CONFIGURE_INTERRUPT_STACK_MEMORY  (16 * 1024)
 
-/* add a entry to the device driver table so that I can call rtems_io_register_driver */ 
-#define CONFIGURE_NUMBER_OF_DRIVERS_LEON3 \
-  (((sizeof(Device_drivers) / sizeof(rtems_driver_address_table))) + 1)
-#define CONFIGURE_MAXIMUM_DRIVERS CONFIGURE_NUMBER_OF_DRIVERS_LEON3
-  
 /*
  * Network driver configuration
  */
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
index 438eb87935..e863250614 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
@@ -4,7 +4,7 @@
  *  The generic CPU dependent initialization has been performed
  *  before any of these are invoked.
  *
- *  COPYRIGHT (c) 1989-2006.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  Modified for LEON3 BSP.
@@ -24,8 +24,7 @@
 #include <string.h>
 
 #include <bsp.h>
-#include <rtems/libio.h>
-#include <rtems/libcsupport.h>
+#include <rtems/bspIo.h>
 
 /*
  *  The original table from the application and our copy of it with
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c b/c/src/lib/libbsp/sparc/leon3/startup/spurious.c
index 7ef243849b..bd31f04899 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/spurious.c
@@ -70,7 +70,7 @@ rtems_isr bsp_spurious_handler(
     case 0x09: 
       printk( "Unexpected trap (0x%2d) at address XXX\n",
         real_trap
-        XXX FIXME isf->tpc */
+        /* XXX FIXME isf->tpc */
       );
       break;
     case 0x0A: