diff --git a/configs/lincoln60/src/up_boot.c b/configs/lincoln60/src/up_boot.c
index 42b01a3ea3a..6e67f777b4b 100644
--- a/configs/lincoln60/src/up_boot.c
+++ b/configs/lincoln60/src/up_boot.c
@@ -47,7 +47,6 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
 #include "lincoln60_internal.h"
 
 /************************************************************************************
diff --git a/configs/lincoln60/src/up_buttons.c b/configs/lincoln60/src/up_buttons.c
index 55781846d54..76cb1f2d9e0 100644
--- a/configs/lincoln60/src/up_buttons.c
+++ b/configs/lincoln60/src/up_buttons.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/lincoln60/src/up_buttons.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 
 #include <arch/board/board.h>
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 #include "lincoln60_internal.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
diff --git a/configs/lincoln60/src/up_leds.c b/configs/lincoln60/src/up_leds.c
index fe00895b161..3b8692d9393 100644
--- a/configs/lincoln60/src/up_leds.c
+++ b/configs/lincoln60/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/lincoln60/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 
 #include "lincoln60_internal.h"
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h b/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h
index 41ec1ce111b..3e7dfa4e5ec 100644
--- a/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h
+++ b/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h
@@ -141,8 +141,8 @@
  * SD   Signal      Pin   Pin
  * ---  ----------- ----- --------
  * CS   PIO1_11*     55   P2.2        (See LPCXPRESSO_SD_CS)
- * DIN  PIO0_9-MOSI   5   P0.9 MOSI1  (See GPIO_SSP1_MOSI in lpc17_internal.h)
- * DOUT PIO0_8-MISO   6   P0.8 MISO1  (See GPIO_SSP1_MISO in lpc17_internal.h)
+ * DIN  PIO0_9-MOSI   5   P0.9 MOSI1  (See GPIO_SSP1_MOSI in chip/lpc17_ssp.h)
+ * DOUT PIO0_8-MISO   6   P0.8 MISO1  (See GPIO_SSP1_MISO in chip/lpc17_ssp.h)
  * CLK  PIO2_11-SCK   7   P0.9 SCK1   (See GPIO_SSP1_SCK in board.h)
  * CD   PIO2_10      52   P2.11       (See LPCXPRESSO_SD_CD)
  */
diff --git a/configs/lpcxpresso-lpc1768/src/up_boot.c b/configs/lpcxpresso-lpc1768/src/up_boot.c
index f672c4517d9..9766569a953 100644
--- a/configs/lpcxpresso-lpc1768/src/up_boot.c
+++ b/configs/lpcxpresso-lpc1768/src/up_boot.c
@@ -47,7 +47,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_ssp.h"
 #include "lpcxpresso_internal.h"
 
 /************************************************************************************
diff --git a/configs/lpcxpresso-lpc1768/src/up_leds.c b/configs/lpcxpresso-lpc1768/src/up_leds.c
index cebf3a143dd..85539b3787d 100644
--- a/configs/lpcxpresso-lpc1768/src/up_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/lpcxpresso-lpc1768/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 #include "lpcxpresso_internal.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/configs/lpcxpresso-lpc1768/src/up_oled.c b/configs/lpcxpresso-lpc1768/src/up_oled.c
index f3ecde90955..c22b09ceb34 100644
--- a/configs/lpcxpresso-lpc1768/src/up_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/up_oled.c
@@ -2,7 +2,7 @@
  * config/lpcxpresso-lpc1768/src/up_oled.c
  * arch/arm/src/board/up_oled.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,8 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ug-9664hswag01.h>
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
+#include "lpc17_ssp.h"
 #include "lpcxpresso_internal.h"
 
 /****************************************************************************
diff --git a/configs/lpcxpresso-lpc1768/src/up_ssp.c b/configs/lpcxpresso-lpc1768/src/up_ssp.c
index 7b5f02e31c8..3504d78c792 100644
--- a/configs/lpcxpresso-lpc1768/src/up_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/up_ssp.c
@@ -2,7 +2,7 @@
  * configs/lpcxpresso-lpc1768/src/up_ssp.c
  * arch/arm/src/board/up_ssp.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,8 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
+#include "lpc17_ssp.h"
 #include "lpcxpresso_internal.h"
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
@@ -155,11 +156,11 @@ void weak_function lpc17_sspinitialize(void)
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  ssp_dumpgpio("lpc17_spi0select() Entry");
+  ssp_dumpgpio("lpc17_ssp0select() Entry");
 
 #warning "Assert CS here (false)"
 
-  ssp_dumpgpio("lpc17_spi0select() Exit");
+  ssp_dumpgpio("lpc17_ssp0select() Exit");
 }
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -173,7 +174,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  ssp_dumpgpio("lpc17_spi1select() Entry");
+  ssp_dumpgpio("lpc17_ssp1select() Entry");
 
   if (devid == SPIDEV_MMCSD)
     {
@@ -189,7 +190,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
       (void)lpc17_gpiowrite(LPCXPRESSO_OLED_CS, !selected);
     }
 #endif
-  ssp_dumpgpio("lpc17_spi1select() Exit");
+  ssp_dumpgpio("lpc17_ssp1select() Exit");
 }
 
 uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/mbed/src/up_boot.c b/configs/mbed/src/up_boot.c
index 42dd54bf56b..489c0a58cee 100644
--- a/configs/mbed/src/up_boot.c
+++ b/configs/mbed/src/up_boot.c
@@ -47,7 +47,6 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
 #include "mbed_internal.h"
 
 /************************************************************************************
@@ -80,3 +79,4 @@ void lpc17_boardinitialize(void)
   up_ledinit();
 #endif
 }
+
diff --git a/configs/mbed/src/up_leds.c b/configs/mbed/src/up_leds.c
index bc8a8704522..c8c78e3add5 100644
--- a/configs/mbed/src/up_leds.c
+++ b/configs/mbed/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/mbed/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 
 #include "mbed_internal.h"
 
diff --git a/configs/nucleus2g/src/up_boot.c b/configs/nucleus2g/src/up_boot.c
index d4c44a45566..4718e9f8235 100644
--- a/configs/nucleus2g/src/up_boot.c
+++ b/configs/nucleus2g/src/up_boot.c
@@ -47,7 +47,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_ssp.h"
 #include "nucleus2g_internal.h"
 
 /************************************************************************************
diff --git a/configs/nucleus2g/src/up_leds.c b/configs/nucleus2g/src/up_leds.c
index 41f955af481..e1c39f5155f 100644
--- a/configs/nucleus2g/src/up_leds.c
+++ b/configs/nucleus2g/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/nucleus2g/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 
 #include "nucleus2g_internal.h"
 
diff --git a/configs/nucleus2g/src/up_outputs.c b/configs/nucleus2g/src/up_outputs.c
index 749f331eb4d..beb979ae00b 100644
--- a/configs/nucleus2g/src/up_outputs.c
+++ b/configs/nucleus2g/src/up_outputs.c
@@ -7,7 +7,7 @@
  *
  * This file is part of NuttX:
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -54,7 +54,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 
 #include "nucleus2g_internal.h"
 
diff --git a/configs/nucleus2g/src/up_ssp.c b/configs/nucleus2g/src/up_ssp.c
index 13a76813011..77c07f3ebc4 100644
--- a/configs/nucleus2g/src/up_ssp.c
+++ b/configs/nucleus2g/src/up_ssp.c
@@ -2,7 +2,7 @@
  * configs/nucleus2g/src/up_ssp.c
  * arch/arm/src/board/up_ssp.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,8 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
+#include "lpc17_ssp.h"
 #include "nucleus2g_internal.h"
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
@@ -158,7 +159,7 @@ void weak_function lpc17_sspinitialize(void)
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  ssp_dumpgpio("lpc17_spiselect() Entry");
+  ssp_dumpgpio("lpc17_ssp0select() Entry");
 
   if (devid == SPIDEV_MMCSD)
     {
@@ -166,7 +167,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
       lpc17_gpiowrite(NUCLEUS2G_MMCSD_CS, !selected);
     }
-  ssp_dumpgpio("lpc17_spiselect() Exit");
+  ssp_dumpgpio("lpc17_ssp0select() Exit");
 }
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/olimex-lpc1766stk/src/up_boot.c b/configs/olimex-lpc1766stk/src/up_boot.c
index 9d4c3ad3bae..9f420000467 100644
--- a/configs/olimex-lpc1766stk/src/up_boot.c
+++ b/configs/olimex-lpc1766stk/src/up_boot.c
@@ -47,7 +47,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_ssp.h"
 #include "lpc1766stk_internal.h"
 
 /************************************************************************************
diff --git a/configs/olimex-lpc1766stk/src/up_buttons.c b/configs/olimex-lpc1766stk/src/up_buttons.c
index bcafc733707..6d47d2890eb 100644
--- a/configs/olimex-lpc1766stk/src/up_buttons.c
+++ b/configs/olimex-lpc1766stk/src/up_buttons.c
@@ -47,7 +47,7 @@
 
 #include <arch/board/board.h>
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 #include "lpc1766stk_internal.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
diff --git a/configs/olimex-lpc1766stk/src/up_can.c b/configs/olimex-lpc1766stk/src/up_can.c
index f947c827e1b..51d8423e3f5 100644
--- a/configs/olimex-lpc1766stk/src/up_can.c
+++ b/configs/olimex-lpc1766stk/src/up_can.c
@@ -49,7 +49,6 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "lpc17_internal.h"
 #include "lpc17_can.h"
 #include "lpc1766stk_internal.h"
 
diff --git a/configs/olimex-lpc1766stk/src/up_lcd.c b/configs/olimex-lpc1766stk/src/up_lcd.c
index 93923b91a31..4e4c9485648 100644
--- a/configs/olimex-lpc1766stk/src/up_lcd.c
+++ b/configs/olimex-lpc1766stk/src/up_lcd.c
@@ -52,7 +52,7 @@
 #include "up_arch.h"
 #include "lpc17_syscon.h"
 #include "lpc17_pwm.h"
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 #include "lpc1766stk_internal.h"
 
 #if defined(CONFIG_NX_LCDDRIVER) && defined(CONFIG_LCD_NOKIA6100) && defined(CONFIG_LPC17_SSP0)
diff --git a/configs/olimex-lpc1766stk/src/up_leds.c b/configs/olimex-lpc1766stk/src/up_leds.c
index 75c6a8ce0aa..e590be39f46 100644
--- a/configs/olimex-lpc1766stk/src/up_leds.c
+++ b/configs/olimex-lpc1766stk/src/up_leds.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 
 #include "lpc1766stk_internal.h"
 
diff --git a/configs/olimex-lpc1766stk/src/up_nsh.c b/configs/olimex-lpc1766stk/src/up_nsh.c
index 036350dede1..99e9c4d9c23 100644
--- a/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -2,7 +2,7 @@
  * config/olimex-lpc1766stk/src/up_nsh.c
  * arch/arm/src/board/up_nsh.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 #include "lpc1766stk_internal.h"
 
 /****************************************************************************
diff --git a/configs/olimex-lpc1766stk/src/up_ssp.c b/configs/olimex-lpc1766stk/src/up_ssp.c
index 272a1706503..2c6c613c797 100644
--- a/configs/olimex-lpc1766stk/src/up_ssp.c
+++ b/configs/olimex-lpc1766stk/src/up_ssp.c
@@ -53,7 +53,8 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
+#include "lpc17_ssp.h"
 #include "lpc1766stk_internal.h"
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
diff --git a/configs/olimex-lpc1766stk/src/up_usbmsc.c b/configs/olimex-lpc1766stk/src/up_usbmsc.c
index 08c5fb88741..ce7c7577180 100644
--- a/configs/olimex-lpc1766stk/src/up_usbmsc.c
+++ b/configs/olimex-lpc1766stk/src/up_usbmsc.c
@@ -48,7 +48,7 @@
 #include <nuttx/spi.h>
 #include <nuttx/mmcsd.h>
 
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
 #include "lpc1766stk_internal.h"
 
 /****************************************************************************