5 files changed, 11 insertions, 7 deletions
diff --git a/wirish/boards.h b/wirish/boards.h
index cec844f..8df7028 100644
--- a/wirish/boards.h
+++ b/wirish/boards.h
@@ -119,19 +119,22 @@ bool boardUsesPin(uint8 pin);
 
 /* Include the appropriate private header from boards/: */
 
+/* FIXME put boards/ before these paths once you stick make into the
+ * IDE; current situation is a hack. */
+
 #ifdef BOARD_maple
-#include "boards/maple.h"
+#include "maple.h"
 #elif defined(BOARD_maple_native)
-#include "boards/maple_native.h"
+#include "maple_native.h"
 #elif defined(BOARD_maple_mini)
-#include "boards/maple_mini.h"
+#include "maple_mini.h"
 #elif defined(BOARD_maple_RET6)
 /*
  * **NOT** MAPLE REV6.  This the **Maple RET6 EDITION**, which is a
  * Maple with an STM32F103RET6 (...RET6) instead of an STM32F103RBT6
  * (...RBT6) on it.  Maple Rev6 (as of March 2011) DOES NOT EXIST.
  */
-#include "boards/maple_RET6.h"
+#include "maple_RET6.h"
 #else
 #error "Board type has not been selected correctly."
 #endif
diff --git a/wirish/io.h b/wirish/io.h
index 4e415b5..137377d 100644
--- a/wirish/io.h
+++ b/wirish/io.h
@@ -33,7 +33,8 @@
 
 #include "gpio.h"
 #include "adc.h"
-#include "time.h"
+
+#include "wirish_time.h"
 
 /**
  * Specifies a GPIO pin behavior.
diff --git a/wirish/wirish.h b/wirish/wirish.h
index 880157d..4cc142d 100644
--- a/wirish/wirish.h
+++ b/wirish/wirish.h
@@ -40,7 +40,7 @@
 #include "pwm.h"
 #include "ext_interrupts.h"
 #include "wirish_math.h"
-#include "time.h"
+#include "wirish_time.h"
 #include "HardwareSPI.h"
 #include "HardwareSerial.h"
 #include "usb_serial.h"
diff --git a/wirish/time.cpp b/wirish/wirish_time.cpp
index b5663b0..2771e95 100644
--- a/wirish/time.cpp
+++ b/wirish/wirish_time.cpp
@@ -28,7 +28,7 @@
 
 #include "libmaple.h"
 #include "systick.h"
-#include "time.h"
+#include "wirish_time.h"
 #include "delay.h"
 
 void delay(unsigned long ms) {
diff --git a/wirish/time.h b/wirish/wirish_time.h
index a0c0c82..a0c0c82 100644
--- a/wirish/time.h
+++ b/wirish/wirish_time.h