diff --git a/Makefile b/Makefile
index 17a8420..83d2b15 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 PROCESSOR_FAMILY := lm4f
 BOARD := lplm4f120h5qr
-# watch the CPU execute
-#CPPFLAGS := -DCPU_DEBUG
-CPPFLAGS := -DHARDWARE_H=\"hw/lm4f-utft-sd.h\"
+CPPFLAGS := -DDEBUGGING -DHARDWARE_H=\"hw/lm4f-utft-sd.h\"
+LIBRARIES := UTFT SD
 
 include energia10.mk
diff --git a/apple1.ino b/apple1.ino
index 8c4d777..c38c448 100644
--- a/apple1.ino
+++ b/apple1.ino
@@ -2,20 +2,6 @@
 #include <r65emu.h>
 
 #include <SPI.h>
-#if defined(USE_UTFT)
-//#include <UTFT.h>
-#elif defined(USE_ESPI)
-#include <TFT_eSPI.h>
-#endif
-
-#if defined(USE_SD)
-#include <SD.h>
-#elif defined(USE_SPIFFS)
-#include <FS.h>
-#include <SPIFFS.h>
-#elif defined(ESP8266)
-#include <FS.h>
-#endif
 
 #if defined(SPIRAM_CS)
 #include <SpiRAM.h>
diff --git a/io.cpp b/io.cpp
index cc524d6..a85f29a 100644
--- a/io.cpp
+++ b/io.cpp
@@ -17,7 +17,7 @@ static unsigned r, c;
 static char screen[ROWS][COLS];
 
 void io::reset() {
-	TFTDisplay::begin(TFT_BG, TFT_FG, reverse_landscape);
+	TFTDisplay::begin(TFT_BG, TFT_FG, landscape);
 	clear();
 	_cy += 2;
 
diff --git a/pia.cpp b/pia.cpp
index c0154dd..a5e06fb 100644
--- a/pia.cpp
+++ b/pia.cpp
@@ -1,5 +1,4 @@
-#include <Stream.h>
-#include <stdint.h>
+#include <Arduino.h>
 #include <memory.h>
 #include "pia.h"