diff --git a/src/keyboard/controller.h b/src/keyboard/controller.h
index 4dbd6ae..8e3b55c 100644
--- a/src/keyboard/controller.h
+++ b/src/keyboard/controller.h
@@ -8,11 +8,10 @@
 
 #pragma once
 
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <avr/pgmspace.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
 #include <util/delay.h>
 #include <util/twi.h>
 
diff --git a/src/main.c b/src/main.c
index 796ae92..1fc0e13 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,18 +6,11 @@
  * Project located at <https://github.com/benblazak/ergodox-firmware>
  * ------------------------------------------------------------------------- */
 
-#include <avr/interrupt.h>
-#include <avr/pgmspace.h>
-#include <stdbool.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdint.h>
-#include <util/delay.h>
-#include <util/delay.h>
 #include "./keyboard/controller.c"
 #include "./keyboard/keyboard.h"
 
-
 // --------------------------------------------------------------------
 // types and forward declarations
 // --------------------------------------------------------------------