diff --git a/Makefile b/Makefile
index 68a80fc1..2ae61724 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,10 @@ $(BUILD)/$(BIN).html: $(OBJS)
 		--shell-file=$(TOP)/watch-library/simulator/shell.html
 endif
 
+# Add your include directories here.
+INCLUDES += \
+  -I./watch-library/shared/watch \
+
 # Add your source files here.
 SRCS += \
   ./app.c \
diff --git a/app.c b/app.c
index 231dccbe..a8655b1a 100644
--- a/app.c
+++ b/app.c
@@ -1,4 +1,5 @@
 #include "app.h"
+#include "watch.h"
 #include "delay.h"
 
 void app_init(void) {
diff --git a/watch-library/shared/watch/watch.h b/watch-library/shared/watch/watch.h
index c1838b44..516f08e6 100644
--- a/watch-library/shared/watch/watch.h
+++ b/watch-library/shared/watch/watch.h
@@ -27,7 +27,6 @@
 #define WATCH_H_
 #include <stdint.h>
 #include <stdbool.h>
-#include "driver_init.h"
 #include "pins.h"
 
 #define SWCLK GPIO(GPIO_PORTA, 30)
@@ -58,20 +57,20 @@
                                deepest sleep mode available on the SAM L22.
  */
 
-#include "watch_rtc.h"
-#include "watch_slcd.h"
-#include "watch_extint.h"
-#include "watch_led.h"
-#include "watch_buzzer.h"
-#include "watch_adc.h"
-#include "watch_gpio.h"
-#include "watch_i2c.h"
-#include "watch_spi.h"
-#include "watch_uart.h"
-#include "watch_storage.h"
-#include "watch_deepsleep.h"
+// #include "watch_rtc.h"
+// #include "watch_slcd.h"
+// #include "watch_extint.h"
+// #include "watch_led.h"
+// #include "watch_buzzer.h"
+// #include "watch_adc.h"
+// #include "watch_gpio.h"
+// #include "watch_i2c.h"
+// #include "watch_spi.h"
+// #include "watch_uart.h"
+// #include "watch_storage.h"
+// #include "watch_deepsleep.h"
 
-#include "watch_private.h"
+// #include "watch_private.h"
 
 /** @brief Returns true if either the buzzer or the LED driver is enabled.
   * @details Both the buzzer and the LED use the TCC peripheral to drive their behavior. This function returns true if that