diff --git a/src/Code_LEDLock.h b/src/Code_LEDLock.h
index d1462b5..f962b5e 100644
--- a/src/Code_LEDLock.h
+++ b/src/Code_LEDLock.h
@@ -2,8 +2,8 @@
 #define CODE_LEDLOCK_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <Code.h>
-#include <LEDInterface.h>
+#include "Code.h"
+#include "LEDInterface.h"
 
 extern volatile uint8_t keyboard_leds;
 
diff --git a/src/Code_LayerHold.h b/src/Code_LayerHold.h
index a591489..ce5da83 100644
--- a/src/Code_LayerHold.h
+++ b/src/Code_LayerHold.h
@@ -2,8 +2,8 @@
 #define CODE_LAYERHOLD_H
 
 #include <inttypes.h>
-#include <Code.h>
-#include <LayerState.h>
+#include "Code.h"
+#include "LayerState.h"
 
 /* Code_LayerHold calls LayerState when pressed to change activeLayer.
 */
diff --git a/src/Code_LayerHoldShift.h b/src/Code_LayerHoldShift.h
index 962ef9a..bcb4d61 100644
--- a/src/Code_LayerHoldShift.h
+++ b/src/Code_LayerHoldShift.h
@@ -2,9 +2,9 @@
 #define CODE_LAYERHOLDSHIFT_H
 
 #include <inttypes.h>
-#include <Code.h>
-#include <LayerState.h>
-#include <Code_Shift.h>
+#include "Code.h"
+#include "LayerState.h"
+#include "Code_Shift.h"
 
 /* Code_LayerHoldShift calls LayerState when pressed to change activeLayer.
 When a Code_LayerHoldShift object is pressed or released, it:
diff --git a/src/Code_LayerLock.h b/src/Code_LayerLock.h
index 356d5c4..0675b1b 100644
--- a/src/Code_LayerLock.h
+++ b/src/Code_LayerLock.h
@@ -2,7 +2,7 @@
 #define CODE_LAYERLOCK_H
 
 #include <inttypes.h>
-#include <Code.h>
+#include "Code.h"
 #include "LayerState.h"
 
 /* Code_LayerLock calls LayerState when pressed to change activeLayer.
diff --git a/src/Code_Null.h b/src/Code_Null.h
index 5ab74b1..67fe605 100644
--- a/src/Code_Null.h
+++ b/src/Code_Null.h
@@ -1,7 +1,7 @@
 #ifndef CODE_NULL_H
 #define CODE_NULL_H
 #include <Arduino.h>
-#include <Code.h>
+#include "Code.h"
 
 /* Class Code_Null doesn't do anything.  It is useful for blank codes.
 */
diff --git a/src/Code_Sc.h b/src/Code_Sc.h
index 598654e..1d3e375 100644
--- a/src/Code_Sc.h
+++ b/src/Code_Sc.h
@@ -2,7 +2,7 @@
 #define CODE_SC_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <Code.h>
+#include "Code.h"
 
 /* Class Code_Sc_LED sends a scancode when press() or release() is called.
 "S" stands for Scancode.
diff --git a/src/Code_ScNS.h b/src/Code_ScNS.h
index 3162ae5..c6fb485 100644
--- a/src/Code_ScNS.h
+++ b/src/Code_ScNS.h
@@ -2,7 +2,7 @@
 #define CODE_SCNS_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <Code_AutoShift.h>
+#include "Code_AutoShift.h"
 
 /* Class Code_ScNS is composed of one scancode, which it sends when press() or release() is called.
 autoShift insures that all MODIFIERKEY_SHIFTs are released.
diff --git a/src/Code_ScS.h b/src/Code_ScS.h
index 52ba356..493bea6 100644
--- a/src/Code_ScS.h
+++ b/src/Code_ScS.h
@@ -2,7 +2,7 @@
 #define CODE_ScS_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <Code_AutoShift.h>
+#include "Code_AutoShift.h"
 
 /* Class Code_ScS contains one scancode, which it sends when press() or release() is called.
 autoShift insures that MODIFIERKEY_LEFT_SHIFT is pressed.
diff --git a/src/Code_Shift.h b/src/Code_Shift.h
index 6280169..68f3287 100644
--- a/src/Code_Shift.h
+++ b/src/Code_Shift.h
@@ -2,7 +2,7 @@
 #define CODE_SHIFT_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <Code.h>
+#include "Code.h"
 
 /* Class Code_Shift sends shift scancode for multi-layered keybrds.
 Explanation in Code_AutoShift.h
diff --git a/src/DebouncerInterface.h b/src/DebouncerInterface.h
index 764fc61..787ab11 100644
--- a/src/DebouncerInterface.h
+++ b/src/DebouncerInterface.h
@@ -1,7 +1,7 @@
 #ifndef DEBOUNCERINTERFACE_H
 #define DEBOUNCERINTERFACE_H
 
-#include <config_keybrd.h>
+#include "config_keybrd.h"
 
 /*
 debounce() takes rawSignal and returns debounced signal.  Signals are bit paterns.
diff --git a/src/Debouncer_Not.h b/src/Debouncer_Not.h
index c8e9a0c..c438c5b 100644
--- a/src/Debouncer_Not.h
+++ b/src/Debouncer_Not.h
@@ -2,8 +2,8 @@
 #define DEBOUNCER_NOT_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <config_keybrd.h>
-#include <DebouncerInterface.h>
+#include "config_keybrd.h"
+#include "DebouncerInterface.h"
 
 /* Debouncer_Not does not debounce.
 debounce() returns raw signal, no debouncing is performed.
diff --git a/src/Debug.h b/src/Debug.h
index 07dcf2b..61e381d 100644
--- a/src/Debug.h
+++ b/src/Debug.h
@@ -1,7 +1,7 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 #include <Arduino.h>
-#include <LEDInterface.h>
+#include "LEDInterface.h"
 
 class Debug
 {
diff --git a/src/Key_LayeredCodeSc.h b/src/Key_LayeredCodeSc.h
index 88516e7..1991375 100644
--- a/src/Key_LayeredCodeSc.h
+++ b/src/Key_LayeredCodeSc.h
@@ -2,8 +2,8 @@
 #define KEY_LAYEREDCODESC_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <Key_LayeredCodeScBase.h>
-#include <LayerStateInterface.h>
+#include "Key_LayeredCodeScBase.h"
+#include "LayerStateInterface.h"
 
 /* Class Key_LayeredCodeSc is a 2-layer code, one object for each layer e.g.
     layer0: ms_up    //mouse up
diff --git a/src/Key_LayeredKeys.h b/src/Key_LayeredKeys.h
index 588445c..a2b27f0 100644
--- a/src/Key_LayeredKeys.h
+++ b/src/Key_LayeredKeys.h
@@ -2,9 +2,9 @@
 #define KEY_LAYEREDKEYS_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LayerStateInterface.h>
-#include <Key.h>
-#include <Key_LayeredKeysBase.h>
+#include "LayerStateInterface.h"
+#include "Key.h"
+#include "Key_LayeredKeysBase.h"
 
 /* Most of the Key_LayeredKeys functionality is in Key_LayeredKeysBase.
 */
diff --git a/src/Key_LayeredKeys1.h b/src/Key_LayeredKeys1.h
index dfa6fe3..8f59ec1 100644
--- a/src/Key_LayeredKeys1.h
+++ b/src/Key_LayeredKeys1.h
@@ -2,9 +2,9 @@
 #define KEY_LAYEREDKEYS1_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LayerStateInterface.h>
-#include <Key.h>
-#include <Key_LayeredKeysBase.h>
+#include "LayerStateInterface.h"
+#include "Key.h"
+#include "Key_LayeredKeysBase.h"
 
 /* Most of the Key_LayeredKeys1 functionality is in Key_LayeredKeysBase.
 Key_LayeredKeys1 is just like Key_LayeredKeys, but with a distinct refLayerState.
diff --git a/src/Key_LayeredKeysBase.h b/src/Key_LayeredKeysBase.h
index 822d05b..009b8cd 100644
--- a/src/Key_LayeredKeysBase.h
+++ b/src/Key_LayeredKeysBase.h
@@ -2,8 +2,8 @@
 #define KEY_LAYEREDKEYSBASE_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LayerStateInterface.h>
-#include <Key.h>
+#include "LayerStateInterface.h"
+#include "Key.h"
 
 /* Class Key_LayeredKeysBase contains an array of Key pointers, one pointer per layer.
 Codes are a kind of Key, so the Key pointers can point to Codes or Keys.
diff --git a/src/Key_LayeredScSc.h b/src/Key_LayeredScSc.h
index 87fad4d..8f25999 100644
--- a/src/Key_LayeredScSc.h
+++ b/src/Key_LayeredScSc.h
@@ -2,8 +2,8 @@
 #define KEY_LAYEREDSCSC_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LayerStateInterface.h>
-#include <Key_LayeredScScBase.h>
+#include "LayerStateInterface.h"
+#include "Key_LayeredScScBase.h"
 
 /* Class Key_LayeredScSc is composed of two scancodes; "S" stands for Scancode.
 layerId is retreived from refLayerState.
diff --git a/src/LED_Port.h b/src/LED_Port.h
index a6210cf..947b911 100644
--- a/src/LED_Port.h
+++ b/src/LED_Port.h
@@ -2,8 +2,8 @@
 #define LED_PORT_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LEDInterface.h>
-#include <PortWriteInterface.h>
+#include "LEDInterface.h"
+#include "PortWriteInterface.h"
 
 /* An LED_Port object is an I/O expander output pin that is connected to an LED indicator light.
 LED_Port functions turn LED on and off.
diff --git a/src/LED_PortOpenDrain.h b/src/LED_PortOpenDrain.h
index bcb6214..8f2baed 100644
--- a/src/LED_PortOpenDrain.h
+++ b/src/LED_PortOpenDrain.h
@@ -2,8 +2,8 @@
 #define LED_PORT_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LEDInterface.h>
-#include <PortWriteInterface.h>
+#include "LEDInterface.h"
+#include "PortWriteInterface.h"
 
 /* An LED_PortOpenDrain object is an I/O expander ouput pin that is connected to an LED.
 LED_PortOpenDrain functions turn LED on and off.
diff --git a/src/LED_uC.h b/src/LED_uC.h
index de37da9..e0703e0 100644
--- a/src/LED_uC.h
+++ b/src/LED_uC.h
@@ -2,7 +2,7 @@
 #define LED_UC_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LEDInterface.h>
+#include "LEDInterface.h"
 
 /* A LED_uC turns LED on and off.
 */
diff --git a/src/LayerState.h b/src/LayerState.h
index 46a1810..a15dd01 100644
--- a/src/LayerState.h
+++ b/src/LayerState.h
@@ -2,7 +2,7 @@
 #define LAYERSTATE_H
 
 #include <inttypes.h>
-#include <LayerStateInterface.h>
+#include "LayerStateInterface.h"
 
 /* Basic LayerState for keyboard.
 When pressed, Code_Layer objects call LayerState functions lock() or hold().
diff --git a/src/LayerState_LED.h b/src/LayerState_LED.h
index 97d60d7..6e77ac8 100644
--- a/src/LayerState_LED.h
+++ b/src/LayerState_LED.h
@@ -3,8 +3,8 @@
 
 #include <Arduino.h>
 #include <inttypes.h>
-#include <LayerState.h>
-#include <LEDInterface.h>
+#include "LayerState.h"
+#include "LEDInterface.h"
 
 /* Basic LayerState with layer LED indictor lights.
 begin() should be called once to turn on LED for initial active layer.
diff --git a/src/PortInterface.h b/src/PortInterface.h
index fdf6cf7..8e8a00c 100644
--- a/src/PortInterface.h
+++ b/src/PortInterface.h
@@ -2,7 +2,7 @@
 #define PORTINTERFACE_H
 #include <Arduino.h>
 #include <inttypes.h>
-#include <PortWriteInterface.h>
+#include "PortWriteInterface.h"
 
 /*
 Port classes are the keybrd library's interface to microcontroller ports or I/O expander ports.
diff --git a/src/Port_MCP23017.h b/src/Port_MCP23017.h
index f7c199d..c7c493d 100644
--- a/src/Port_MCP23017.h
+++ b/src/Port_MCP23017.h
@@ -3,7 +3,7 @@
 #include <Arduino.h>
 #include <inttypes.h>
 #include <Wire.h>
-#include <PortInterface.h>
+#include "PortInterface.h"
 
 /* Port_MCP23017
 write pins are connected to matrix Row (strobe pin) or LED.
diff --git a/src/Port_MCP23S17.h b/src/Port_MCP23S17.h
index aa9ee50..859142f 100644
--- a/src/Port_MCP23S17.h
+++ b/src/Port_MCP23S17.h
@@ -3,7 +3,7 @@
 #include <Arduino.h>
 #include <inttypes.h>
 #include <SPI.h>
-#include <PortInterface.h>
+#include "PortInterface.h"
 
 /* Port_MCP23S17
 write pins are connected to matrix Row (strobe pin) or LED.
diff --git a/src/Port_PCA9655E.h b/src/Port_PCA9655E.h
index ede1a9d..acabeba 100644
--- a/src/Port_PCA9655E.h
+++ b/src/Port_PCA9655E.h
@@ -3,7 +3,7 @@
 #include <Arduino.h>
 #include <inttypes.h>
 #include <Wire.h>
-#include <PortInterface.h>
+#include "PortInterface.h"
 
 /* Port_PCA9655E
 write pins are connected to matrix Row (strobe pin) or LED.
diff --git a/src/Port_ShiftRegs.h b/src/Port_ShiftRegs.h
index 56167d2..29bd492 100644
--- a/src/Port_ShiftRegs.h
+++ b/src/Port_ShiftRegs.h
@@ -3,7 +3,7 @@
 #include <Arduino.h>
 #include <inttypes.h>
 #include <SPI.h>
-#include <PortWriteInterface.h>
+#include "PortWriteInterface.h"
 
 /* Port_ShiftRegs 
 slaveSelect is Arduino-pin number connected to shift register RCLK pin a.k.a. SS or ST
diff --git a/src/Row.h b/src/Row.h
index a0af168..5d4c8d5 100644
--- a/src/Row.h
+++ b/src/Row.h
@@ -3,11 +3,11 @@
 
 #include <Arduino.h>
 #include <inttypes.h>
-#include <config_keybrd.h>
-#include <Key.h>
-#include <ScannerInterface.h>
-#include <Debouncer_Samples.h>
-#include <Debouncer_Not.h>
+#include "config_keybrd.h"
+#include "Key.h"
+#include "ScannerInterface.h"
+#include "Debouncer_Samples.h"
+#include "Debouncer_Not.h"
 
 /*
 strobePin has one of two formats:
diff --git a/src/ScannerInterface.h b/src/ScannerInterface.h
index eef077b..e7280bb 100644
--- a/src/ScannerInterface.h
+++ b/src/ScannerInterface.h
@@ -1,7 +1,7 @@
 #ifndef SCANNERINTERFACE_H
 #define SCANNERINTERFACE_H
 
-#include <config_keybrd.h>
+#include "config_keybrd.h"
 
 /* scan() retuns state of readPins.
 */
diff --git a/src/Scanner_IOE.h b/src/Scanner_IOE.h
index 710bda0..cf3904f 100644
--- a/src/Scanner_IOE.h
+++ b/src/Scanner_IOE.h
@@ -3,8 +3,8 @@
 
 #include <Arduino.h>
 #include <inttypes.h>
-#include <ScannerInterface.h>
-#include <PortInterface.h>
+#include "ScannerInterface.h"
+#include "PortInterface.h"
 
 /* Scanner_IOE uses bit manipulation to read all pins of one port.
 The maximum keys per row is 8, because ports have a maximum of 8 pins each.
diff --git a/src/Scanner_ShiftRegsRead.h b/src/Scanner_ShiftRegsRead.h
index 34c95c9..e56dfd2 100644
--- a/src/Scanner_ShiftRegsRead.h
+++ b/src/Scanner_ShiftRegsRead.h
@@ -3,9 +3,9 @@
 
 #include <Arduino.h>
 #include <inttypes.h>
-#include <config_keybrd.h>
 #include <SPI.h>
-#include <ScannerInterface.h>
+#include "config_keybrd.h"
+#include "ScannerInterface.h"
 
 /* Scanner_ShiftRegsRead reads shift registers.
 Upto 4 shift registers can be in a daisy chained for a total of 32 read pins.
diff --git a/src/Scanner_ShiftRegsReadStrobed.h b/src/Scanner_ShiftRegsReadStrobed.h
index 05f502f..93199a0 100644
--- a/src/Scanner_ShiftRegsReadStrobed.h
+++ b/src/Scanner_ShiftRegsReadStrobed.h
@@ -3,9 +3,9 @@
 
 #include <Arduino.h>
 #include <inttypes.h>
-#include <config_keybrd.h>
 #include <SPI.h>
-#include <ScannerInterface.h>
+#include "config_keybrd.h"
+#include "ScannerInterface.h"
 
 /* Scanner_ShiftRegsReadStrobed reads shift registers.
 Shift registers can be daisy chained for a total of 32 read pins.
diff --git a/src/Scanner_uC.h b/src/Scanner_uC.h
index 9c14ac3..8477c4b 100644
--- a/src/Scanner_uC.h
+++ b/src/Scanner_uC.h
@@ -3,8 +3,8 @@
 
 #include <Arduino.h>
 #include <inttypes.h>
-#include <config_keybrd.h>
-#include <ScannerInterface.h>
+#include "config_keybrd.h"
+#include "ScannerInterface.h"
 
 /* Scanner_uC class uses Arduino pin numbers (not port pin numbers).
 Limit number of readPins to size of read_pins_t, which is defined in config_keybrd.h
diff --git a/src/instantiations_scancode.h b/src/instantiations_scancode.h
index 14e722a..87c1f46 100644
--- a/src/instantiations_scancode.h
+++ b/src/instantiations_scancode.h
@@ -8,10 +8,10 @@ The scancode macros are defined in the top part of
 Arduino\hardware\teensy\cores\teensy\keylayouts.h which is intended for use in "normal" programs.
 This has been tested on teensy2.0.
 */
-#include <Code_Null.h>
-#include <Code_Sc.h>
-#include <Code_ScS.h>
-#include <Code_Shift.h>
+#include "Code_Null.h"
+#include "Code_Sc.h"
+#include "Code_ScS.h"
+#include "Code_Shift.h"
 
 // ********** SCANCODES *********
 Code_Shift s_shift(MODIFIERKEY_LEFT_SHIFT);
diff --git a/src/instantiations_scancodeNotShifted.h b/src/instantiations_scancodeNotShifted.h
index d15ea56..0aaeafb 100644
--- a/src/instantiations_scancodeNotShifted.h
+++ b/src/instantiations_scancodeNotShifted.h
@@ -12,8 +12,8 @@ The scancode macros are defined in the top part of
 Arduino\hardware\teensy\cores\teensy\keylayouts.h which is intended for use in "normal" programs.
 This has been tested on teensy2.0.
 */
-#include <Code_ScNS.h>
-#include <Code_ScNS_00.h>
+#include "Code_ScNS.h"
+#include "Code_ScNS_00.h"
 
 // ********** SCANCODES NOT SHIFTED *********
 Code_ScNS_00 ns_00;                             //double zero