diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c
index 02f7689570c5..1b70f345ecc9 100644
--- a/keyboards/crkbd/keymaps/default/keymap.c
+++ b/keyboards/crkbd/keymaps/default/keymap.c
@@ -1,11 +1,12 @@
 #include QMK_KEYBOARD_H
 
-extern keymap_config_t keymap_config;
-
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
 extern rgblight_config_t rgblight_config;
 #endif
+#ifdef SSD1306OLED
+#    include "ssd1306.h"
+#endif
 
 extern uint8_t is_master;
 
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h
index ee8774de361a..2717bc4bb92d 100644
--- a/keyboards/crkbd/rev1/rev1.h
+++ b/keyboards/crkbd/rev1/rev1.h
@@ -13,13 +13,6 @@
     #include "ssd1306.h"
 #endif
 
-#ifdef USE_I2C
-    #include <stddef.h>
-    #ifdef __AVR__
-        #include <avr/interrupt.h>
-        #include <avr/io.h>
-    #endif
-#endif
 
 #define has_usb() is_keyboard_master()
 uint8_t is_master;
diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
index 588ed689945c..317601974611 100644
--- a/keyboards/crkbd/rules.mk
+++ b/keyboards/crkbd/rules.mk
@@ -32,8 +32,7 @@ RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
-LIB_SRC += ssd1306.c \
-        i2c_master.c
+LIB_SRC += ssd1306.c 
 
 # if firmware size over limit, try this option