diff --git a/cores/arduino/board.h b/cores/arduino/board.h
index 5a394e03fc..55ae8c1f62 100644
--- a/cores/arduino/board.h
+++ b/cores/arduino/board.h
@@ -12,7 +12,6 @@
 #include "digital_io.h"
 #include "dwt.h"
 #include "hw_config.h"
-#include "stm32_eeprom.h"
 #include "timer.h"
 #include "uart.h"
 
diff --git a/libraries/EEPROM/src/EEPROM.h b/libraries/EEPROM/src/EEPROM.h
index ab5c742b14..57271f4241 100644
--- a/libraries/EEPROM/src/EEPROM.h
+++ b/libraries/EEPROM/src/EEPROM.h
@@ -22,6 +22,9 @@
 #define EEPROM_h
 
 #include "Arduino.h"
+extern "C" {
+#include "utility/stm32_eeprom.h"
+}
 
 /***
     EERef class.
diff --git a/libraries/SrcWrapper/src/stm32/stm32_eeprom.c b/libraries/EEPROM/src/utility/stm32_eeprom.c
similarity index 100%
rename from libraries/SrcWrapper/src/stm32/stm32_eeprom.c
rename to libraries/EEPROM/src/utility/stm32_eeprom.c
diff --git a/cores/arduino/stm32/stm32_eeprom.h b/libraries/EEPROM/src/utility/stm32_eeprom.h
similarity index 100%
rename from cores/arduino/stm32/stm32_eeprom.h
rename to libraries/EEPROM/src/utility/stm32_eeprom.h