10 files changed, 46 insertions, 60 deletions
diff --git a/wirish/boards/maple.cpp b/wirish/boards/maple/board.cpp
index 43d4386..256bb90 100644
--- a/wirish/boards/maple.cpp
+++ b/wirish/boards/maple/board.cpp
@@ -25,18 +25,16 @@
  *****************************************************************************/
 
 /**
- * @file   maple.cpp
+ * @file   wirish/boards/maple/board.cpp
  * @author Marti Bolivar <mbolivar@leaflabs.com>
- * @brief  Maple PIN_MAP and boardInit().
+ * @brief  Maple board file.
  */
 
-#ifdef BOARD_maple
+#include <board/board.h>
 
-#include "maple.h"
-
-#include "gpio.h"
-#include "timer.h"
-#include "wirish_types.h"
+#include <libmaple/gpio.h>
+#include <libmaple/timer.h>
+#include <wirish/wirish_types.h>
 
 void boardInit(void) {
 }
@@ -112,5 +110,3 @@ extern const uint8 boardUsedPins[] __FLASH__ = {
     BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
     BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
 };
-
-#endif
diff --git a/wirish/boards/maple.h b/wirish/boards/maple/include/board/board.h
index a986884..49f5b9a 100644
--- a/wirish/boards/maple.h
+++ b/wirish/boards/maple/include/board/board.h
@@ -25,9 +25,9 @@
  *****************************************************************************/
 
 /**
- * @file   maple.h
+ * @file   wirish/boards/maple/include/board/board.h
  * @author Marti Bolivar <mbolivar@leaflabs.com>
- * @brief  Private include file for Maple in boards.h
+ * @brief  Maple board header.
  */
 
 #ifndef _BOARD_MAPLE_H_
diff --git a/wirish/boards/maple_RET6.cpp b/wirish/boards/maple_RET6/board.cpp
index cbd7e25..2ef7de7 100644
--- a/wirish/boards/maple_RET6.cpp
+++ b/wirish/boards/maple_RET6/board.cpp
@@ -25,18 +25,17 @@
  *****************************************************************************/
 
 /**
- * @file   maple_RET6.cpp
+ * @file   wirish/boards/maple_RET6/board.cpp
  * @author Marti Bolivar <mbolivar@leaflabs.com>
  * @brief  Maple RET6 Edition board file
  */
 
-#ifdef BOARD_maple_RET6
+#include <board/board.h>
 
-#include "maple_RET6.h"
+#include <libmaple/gpio.h>
+#include <libmaple/timer.h>
 
-#include "gpio.h"
-#include "timer.h"
-#include "wirish_types.h"
+#include <wirish/wirish_types.h>
 
 void boardInit(void) {
 }
@@ -114,5 +113,3 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
     BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
     BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
 };
-
-#endif
diff --git a/wirish/boards/maple_RET6.h b/wirish/boards/maple_RET6/include/board/board.h
index 9e7ce9d..1a0365a 100644
--- a/wirish/boards/maple_RET6.h
+++ b/wirish/boards/maple_RET6/include/board/board.h
@@ -25,11 +25,12 @@
  *****************************************************************************/
 
 /**
- * @file   maple_RET6.h
+ * @file   wirish/boards/maple_RET6/include/board/board.h
  * @author Marti Bolivar <mbolivar@leaflabs.com>
- * @brief  Private include file for Maple RET6 Edition in boards.h
+ * @brief  Maple RET6 Edition board header.
  *
- * See maple.h for more information on these definitions.
+ * See wirish/boards/maple/include/board/board.h for more information
+ * on these definitions.
  */
 
 #ifndef _BOARDS_MAPLE_RET6_H_
diff --git a/wirish/boards/maple_mini.cpp b/wirish/boards/maple_mini/board.cpp
index f111a14..599cb66 100644
--- a/wirish/boards/maple_mini.cpp
+++ b/wirish/boards/maple_mini/board.cpp
@@ -25,19 +25,18 @@
  *****************************************************************************/
 
 /**
- * @file   maple_mini.cpp
+ * @file   wirish/boards/maple_mini/board.cpp
  * @author Marti Bolivar <mbolivar@leaflabs.com>
  * @brief  Maple Mini board file.
  */
 
-#ifdef BOARD_maple_mini
+#include <board/board.h>
 
-#include "maple_mini.h"
+#include <libmaple/gpio.h>
+#include <libmaple/timer.h>
 
-#include "gpio.h"
-#include "timer.h"
-#include "wirish_debug.h"
-#include "wirish_types.h"
+#include <wirish/wirish_debug.h>
+#include <wirish/wirish_types.h>
 
 /* Since we want the Serial Wire/JTAG pins as GPIOs, disable both SW
  * and JTAG debug support */
@@ -102,5 +101,3 @@ extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
 extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
     BOARD_LED_PIN, BOARD_BUTTON_PIN, USB_DP, USB_DM
 };
-
-#endif
diff --git a/wirish/boards/maple_mini.h b/wirish/boards/maple_mini/include/board/board.h
index 40f507b..bfba46d 100644
--- a/wirish/boards/maple_mini.h
+++ b/wirish/boards/maple_mini/include/board/board.h
@@ -25,11 +25,12 @@
  *****************************************************************************/
 
 /**
- * @file   maple_mini.h
+ * @file   wirish/boards/maple_mini/include/board/board.h
  * @author Marti Bolivar <mbolivar@leaflabs.com>
- * @brief  Private include file for Maple Mini in boards.h
+ * @brief  Maple Mini board header.
  *
- * See maple.h for more information on these definitions.
+ * See wirish/boards/maple/include/board/board.h for more information
+ * on these definitions.
  */
 
 #ifndef _BOARD_MAPLE_MINI_H_
diff --git a/wirish/boards/maple_native.cpp b/wirish/boards/maple_native/board.cpp
index 821be77..515cf5b 100644
--- a/wirish/boards/maple_native.cpp
+++ b/wirish/boards/maple_native/board.cpp
@@ -25,21 +25,19 @@
  *****************************************************************************/
 
 /**
- * @file   maple_native.cpp
+ * @file   wirish/boards/maple_native/board.cpp
  * @author Marti Bolivar <mbolivar@leaflabs.com>
  * @brief  Maple Native board file.
  */
 
-#ifdef BOARD_maple_native
+#include <board/board.h>
 
-#include "maple_native.h"
+#include <libmaple/fsmc.h>
+#include <libmaple/gpio.h>
+#include <libmaple/rcc.h>
+#include <libmaple/timer.h>
 
-#include "fsmc.h"
-#include "gpio.h"
-#include "rcc.h"
-#include "timer.h"
-
-#include "wirish_types.h"
+#include <wirish/wirish_types.h>
 
 static void initSRAMChip(void);
 
@@ -197,5 +195,3 @@ static void initSRAMChip(void) {
     fsmc_nor_psram_set_addset(regs, 0);
     fsmc_nor_psram_set_datast(regs, 3);
 }
-
-#endif
diff --git a/wirish/boards/maple_native.h b/wirish/boards/maple_native/include/board/board.h
index 7c09014..397afaf 100644
--- a/wirish/boards/maple_native.h
+++ b/wirish/boards/maple_native/include/board/board.h
@@ -25,11 +25,12 @@
  *****************************************************************************/
 
 /**
- * @file   maple_native.h
+ * @file   wirish/boards/maple_native/include/board/board.h.
  * @author Marti Bolivar <mbolivar@leaflabs.com>
- * @brief  Private include file for Maple Native in boards.h
+ * @brief  Maple Native board header file.
  *
- * See maple.h for more information on these definitions.
+ * See wirish/boards/maple/include/board/board.h for more information
+ * on these definitions.
  */
 
 #ifndef _BOARD_MAPLE_NATIVE_H_
diff --git a/wirish/boards/olimex_stm32_h103.cpp b/wirish/boards/olimex_stm32_h103/board.cpp
index a9f0936..d9b8033 100644
--- a/wirish/boards/olimex_stm32_h103.cpp
+++ b/wirish/boards/olimex_stm32_h103/board.cpp
@@ -26,18 +26,17 @@
  *****************************************************************************/
 
 /**
- * @file   olimex_stm32_h103.cpp
+ * @file   wirish/boards/olimex_stm32_h103/board.cpp
  * @author David Kiliani <mail@davidkiliani.de>
- * @brief  Olimex STM32_H103 PIN_MAP and boardInit().
+ * @brief  Olimex STM32_H103 board file.
  */
 
-#ifdef BOARD_olimex_stm32_h103
+#include <board/board.h>
 
-#include "olimex_stm32_h103.h"
+#include <libmaple/gpio.h>
+#include <libmaple/timer.h>
 
-#include "gpio.h"
-#include "timer.h"
-#include "wirish_types.h"
+#include <wirish/wirish_types.h>
 
 void boardInit(void) {
 }
@@ -118,5 +117,3 @@ extern const uint8 boardUsedPins[] __FLASH__ = {
     BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
     BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
 };
-
-#endif
diff --git a/wirish/boards/olimex_stm32_h103.h b/wirish/boards/olimex_stm32_h103/include/board/board.h
index d2b5fcc..b312e26 100644
--- a/wirish/boards/olimex_stm32_h103.h
+++ b/wirish/boards/olimex_stm32_h103/include/board/board.h
@@ -26,9 +26,9 @@
  *****************************************************************************/
 
 /**
- * @file   olimex_stm32_h103.h
+ * @file   wirish/boards/olimex_stm32_h103/include/board/board.h
  * @author David Kiliani <mail@davidkiliani.de>
- * @brief  Private include file for Olimex STM32_H103 in boards.h
+ * @brief  Olimex STM32_H103 board header.
  */
 
 #ifndef _BOARD_OLIMEX_STM32_H103_H_