diff --git a/meson.build b/meson.build
index b52ae16f..50d5d4b0 100644
--- a/meson.build
+++ b/meson.build
@@ -275,7 +275,6 @@ linux_platform_src = ['platform/targets/linux/emulator/emulator.c',
                       'platform/drivers/keyboard/keyboard_linux.c',
                       'platform/drivers/NVM/nvmem_linux.c',
                       'platform/drivers/GPS/GPS_linux.c',
-                      'platform/mcu/x86_64/drivers/gpio.c',
                       'platform/mcu/x86_64/drivers/delays.c',
                       'platform/drivers/baseband/radio_linux.cpp',
                       'platform/drivers/audio/audio_linux.c',
diff --git a/openrtx/include/interfaces/gpio.h b/openrtx/include/peripherals/gpio.h
similarity index 100%
rename from openrtx/include/interfaces/gpio.h
rename to openrtx/include/peripherals/gpio.h
diff --git a/platform/drivers/ADC/ADC1_MDx.c b/platform/drivers/ADC/ADC1_MDx.c
index f6c3bff8..6ff35c36 100644
--- a/platform/drivers/ADC/ADC1_MDx.c
+++ b/platform/drivers/ADC/ADC1_MDx.c
@@ -16,7 +16,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <pthread.h>
 #include <stdlib.h>
diff --git a/platform/drivers/ADC/ADC1_Mod17.c b/platform/drivers/ADC/ADC1_Mod17.c
index 59cce6a9..6f843af4 100644
--- a/platform/drivers/ADC/ADC1_Mod17.c
+++ b/platform/drivers/ADC/ADC1_Mod17.c
@@ -16,7 +16,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <pthread.h>
 #include <stdlib.h>
diff --git a/platform/drivers/GPS/GPS_MDx.cpp b/platform/drivers/GPS/GPS_MDx.cpp
index 290e7d9c..89dc077f 100644
--- a/platform/drivers/GPS/GPS_MDx.cpp
+++ b/platform/drivers/GPS/GPS_MDx.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/delays.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <peripherals/gps.h>
 #include <hwconfig.h>
 #include <string.h>
diff --git a/platform/drivers/NVM/AT24Cx_GDx.c b/platform/drivers/NVM/AT24Cx_GDx.c
index 25260d9e..21220975 100644
--- a/platform/drivers/NVM/AT24Cx_GDx.c
+++ b/platform/drivers/NVM/AT24Cx_GDx.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "AT24Cx.h"
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
 #include <stdint.h>
diff --git a/platform/drivers/NVM/W25Qx.c b/platform/drivers/NVM/W25Qx.c
index fbb0a0c7..635df974 100644
--- a/platform/drivers/NVM/W25Qx.c
+++ b/platform/drivers/NVM/W25Qx.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <hwconfig.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 
 #define CMD_WRITE 0x02   /* Read data              */
diff --git a/platform/drivers/NVM/spiFlash_GDx.c b/platform/drivers/NVM/spiFlash_GDx.c
index d5a0c161..fbf9accc 100644
--- a/platform/drivers/NVM/spiFlash_GDx.c
+++ b/platform/drivers/NVM/spiFlash_GDx.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
 #include <stdint.h>
diff --git a/platform/drivers/NVM/spiFlash_MD3x.c b/platform/drivers/NVM/spiFlash_MD3x.c
index 44732a64..13a23b6a 100644
--- a/platform/drivers/NVM/spiFlash_MD3x.c
+++ b/platform/drivers/NVM/spiFlash_MD3x.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <stdint.h>
 
diff --git a/platform/drivers/NVM/spiFlash_MD9600.c b/platform/drivers/NVM/spiFlash_MD9600.c
index e41df902..ed90dd72 100644
--- a/platform/drivers/NVM/spiFlash_MD9600.c
+++ b/platform/drivers/NVM/spiFlash_MD9600.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <stdint.h>
 #include <SPI2.h>
diff --git a/platform/drivers/USB/usb_MDx.cpp b/platform/drivers/USB/usb_MDx.cpp
index 682cea05..ef0aad43 100644
--- a/platform/drivers/USB/usb_MDx.cpp
+++ b/platform/drivers/USB/usb_MDx.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/platform.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include "usb.h"
 
diff --git a/platform/drivers/audio/MAX9814_Mod17.cpp b/platform/drivers/audio/MAX9814_Mod17.cpp
index df48ca15..f3801548 100644
--- a/platform/drivers/audio/MAX9814_Mod17.cpp
+++ b/platform/drivers/audio/MAX9814_Mod17.cpp
@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include "MAX9814.h"
 
diff --git a/platform/drivers/audio/audio_GDx.c b/platform/drivers/audio/audio_GDx.c
index ff2278e6..40857c82 100644
--- a/platform/drivers/audio/audio_GDx.c
+++ b/platform/drivers/audio/audio_GDx.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/audio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 
 
diff --git a/platform/drivers/audio/audio_MDx.c b/platform/drivers/audio/audio_MDx.c
index 5df201f7..ab4f9e6a 100644
--- a/platform/drivers/audio/audio_MDx.c
+++ b/platform/drivers/audio/audio_MDx.c
@@ -21,7 +21,7 @@
 #include <interfaces/delays.h>
 #include <interfaces/audio.h>
 #include <interfaces/radio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 
 #define PATH(x,y) ((x << 4) | y)
diff --git a/platform/drivers/audio/audio_Mod17.c b/platform/drivers/audio/audio_Mod17.c
index 867dddf3..e9d3fd96 100644
--- a/platform/drivers/audio/audio_Mod17.c
+++ b/platform/drivers/audio/audio_Mod17.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/audio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include "MAX9814.h"
 
diff --git a/platform/drivers/audio/audio_linux.c b/platform/drivers/audio/audio_linux.c
index aeae664c..2f24895e 100644
--- a/platform/drivers/audio/audio_linux.c
+++ b/platform/drivers/audio/audio_linux.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/audio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 
 
diff --git a/platform/drivers/audio/inputStream_MDx.cpp b/platform/drivers/audio/inputStream_MDx.cpp
index aeef5698..af0e490e 100644
--- a/platform/drivers/audio/inputStream_MDx.cpp
+++ b/platform/drivers/audio/inputStream_MDx.cpp
@@ -21,7 +21,7 @@
 #include <kernel/scheduler/scheduler.h>
 #include <interfaces/audio_stream.h>
 #include <toneGenerator_MDx.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <stdbool.h>
 #include <miosix.h>
diff --git a/platform/drivers/audio/inputStream_Mod17.cpp b/platform/drivers/audio/inputStream_Mod17.cpp
index d2f7d0cb..4ec2057a 100644
--- a/platform/drivers/audio/inputStream_Mod17.cpp
+++ b/platform/drivers/audio/inputStream_Mod17.cpp
@@ -21,7 +21,7 @@
 #include <kernel/scheduler/scheduler.h>
 #include <interfaces/audio_stream.h>
 #include <toneGenerator_MDx.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <stdbool.h>
 #include <miosix.h>
diff --git a/platform/drivers/audio/outputStream_Mod17.cpp b/platform/drivers/audio/outputStream_Mod17.cpp
index 6f62b0cc..f9b85a64 100644
--- a/platform/drivers/audio/outputStream_Mod17.cpp
+++ b/platform/drivers/audio/outputStream_Mod17.cpp
@@ -20,7 +20,7 @@
 
 #include <kernel/scheduler/scheduler.h>
 #include <interfaces/audio_stream.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <data_conversion.h>
 #include <hwconfig.h>
 #include <timers.h>
diff --git a/platform/drivers/backlight/backlight_GDx.c b/platform/drivers/backlight/backlight_GDx.c
index 2963aff8..4004f554 100644
--- a/platform/drivers/backlight/backlight_GDx.c
+++ b/platform/drivers/backlight/backlight_GDx.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/platform.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include "backlight.h"
 
diff --git a/platform/drivers/backlight/backlight_MDx.c b/platform/drivers/backlight/backlight_MDx.c
index 43cf7b0e..f977f55f 100644
--- a/platform/drivers/backlight/backlight_MDx.c
+++ b/platform/drivers/backlight/backlight_MDx.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/platform.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include "backlight.h"
 
diff --git a/platform/drivers/baseband/AT1846S_UV3x0.cpp b/platform/drivers/baseband/AT1846S_UV3x0.cpp
index a10fbf27..b8966f67 100644
--- a/platform/drivers/baseband/AT1846S_UV3x0.cpp
+++ b/platform/drivers/baseband/AT1846S_UV3x0.cpp
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
 #include "AT1846S.h"
diff --git a/platform/drivers/baseband/HR_C5000_MDx.cpp b/platform/drivers/baseband/HR_C5000_MDx.cpp
index 019f1b64..7f22f514 100644
--- a/platform/drivers/baseband/HR_C5000_MDx.cpp
+++ b/platform/drivers/baseband/HR_C5000_MDx.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/delays.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include "HR_C5000.h"
 
diff --git a/platform/drivers/baseband/HR_C6000_GDx.cpp b/platform/drivers/baseband/HR_C6000_GDx.cpp
index 7efa83a6..4788b2bb 100644
--- a/platform/drivers/baseband/HR_C6000_GDx.cpp
+++ b/platform/drivers/baseband/HR_C6000_GDx.cpp
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
 #include "HR_C6000.h"
diff --git a/platform/drivers/baseband/HR_C6000_UV3x0.cpp b/platform/drivers/baseband/HR_C6000_UV3x0.cpp
index 366d1ca1..a510cc4b 100644
--- a/platform/drivers/baseband/HR_C6000_UV3x0.cpp
+++ b/platform/drivers/baseband/HR_C6000_UV3x0.cpp
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
 #include "HR_C6000.h"
diff --git a/platform/drivers/baseband/HR_Cx000.cpp b/platform/drivers/baseband/HR_Cx000.cpp
index cf5f58c7..32c1c54a 100644
--- a/platform/drivers/baseband/HR_Cx000.cpp
+++ b/platform/drivers/baseband/HR_Cx000.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/delays.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <type_traits>
 #include <hwconfig.h>
 #include "HR_Cx000.h"
diff --git a/platform/drivers/baseband/MCP4551_Mod17.cpp b/platform/drivers/baseband/MCP4551_Mod17.cpp
index a6f7307c..f906327f 100644
--- a/platform/drivers/baseband/MCP4551_Mod17.cpp
+++ b/platform/drivers/baseband/MCP4551_Mod17.cpp
@@ -19,7 +19,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
 #include "MCP4551.h"
diff --git a/platform/drivers/baseband/SKY72310.c b/platform/drivers/baseband/SKY72310.c
index bb8e5568..13bc3d18 100644
--- a/platform/drivers/baseband/SKY72310.c
+++ b/platform/drivers/baseband/SKY72310.c
@@ -16,7 +16,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
 #include <math.h>
diff --git a/platform/drivers/baseband/radio_GDx.cpp b/platform/drivers/baseband/radio_GDx.cpp
index a92c335f..1dcff312 100644
--- a/platform/drivers/baseband/radio_GDx.cpp
+++ b/platform/drivers/baseband/radio_GDx.cpp
@@ -20,7 +20,7 @@
 
 #include <interfaces/radio.h>
 #include <interfaces/nvmem.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <calibInfo_GDx.h>
 #include <hwconfig.h>
 #include <algorithm>
diff --git a/platform/drivers/baseband/radio_MD3x0.cpp b/platform/drivers/baseband/radio_MD3x0.cpp
index 9993c6a6..54df3e5d 100644
--- a/platform/drivers/baseband/radio_MD3x0.cpp
+++ b/platform/drivers/baseband/radio_MD3x0.cpp
@@ -21,7 +21,7 @@
 #include <toneGenerator_MDx.h>
 #include <interfaces/nvmem.h>
 #include <interfaces/radio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <calibInfo_MDx.h>
 #include <hwconfig.h>
 #include <ADC1_MDx.h>
diff --git a/platform/drivers/baseband/radio_Mod17.cpp b/platform/drivers/baseband/radio_Mod17.cpp
index 9581752d..f51b0cee 100644
--- a/platform/drivers/baseband/radio_Mod17.cpp
+++ b/platform/drivers/baseband/radio_Mod17.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/radio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <calibInfo_Mod17.h>
 #include <hwconfig.h>
 #include <MCP4551.h>
diff --git a/platform/drivers/baseband/radio_UV3x0.cpp b/platform/drivers/baseband/radio_UV3x0.cpp
index 96f98dbb..0d580ac6 100644
--- a/platform/drivers/baseband/radio_UV3x0.cpp
+++ b/platform/drivers/baseband/radio_UV3x0.cpp
@@ -21,7 +21,7 @@
 #include <interfaces/delays.h>
 #include <interfaces/nvmem.h>
 #include <interfaces/radio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <calibInfo_MDx.h>
 #include <hwconfig.h>
 #include <algorithm>
diff --git a/platform/drivers/chSelector/chSelector_MD9600.c b/platform/drivers/chSelector/chSelector_MD9600.c
index 4338613d..5049eebb 100644
--- a/platform/drivers/chSelector/chSelector_MD9600.c
+++ b/platform/drivers/chSelector/chSelector_MD9600.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/platform.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <qdec.h>
 #include "chSelector.h"
diff --git a/platform/drivers/chSelector/chSelector_UV3x0.c b/platform/drivers/chSelector/chSelector_UV3x0.c
index 7879bdd9..a687daa5 100644
--- a/platform/drivers/chSelector/chSelector_UV3x0.c
+++ b/platform/drivers/chSelector/chSelector_UV3x0.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <interfaces/platform.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <qdec.h>
 #include "chSelector.h"
diff --git a/platform/drivers/display/HX8353_MD3x.cpp b/platform/drivers/display/HX8353_MD3x.cpp
index 13484a48..fe30ef40 100644
--- a/platform/drivers/display/HX8353_MD3x.cpp
+++ b/platform/drivers/display/HX8353_MD3x.cpp
@@ -16,7 +16,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/display.h>
 #include <interfaces/delays.h>
 #include <interfaces/platform.h>
diff --git a/platform/drivers/display/SH110x_Mod17.c b/platform/drivers/display/SH110x_Mod17.c
index 3f38bfd8..5405b719 100644
--- a/platform/drivers/display/SH110x_Mod17.c
+++ b/platform/drivers/display/SH110x_Mod17.c
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/display.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
diff --git a/platform/drivers/display/SSD1306_Mod17.c b/platform/drivers/display/SSD1306_Mod17.c
index 31c92188..ea1720b8 100644
--- a/platform/drivers/display/SSD1306_Mod17.c
+++ b/platform/drivers/display/SSD1306_Mod17.c
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/display.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
diff --git a/platform/drivers/display/ST7567_MD9600.c b/platform/drivers/display/ST7567_MD9600.c
index 59c31491..2d211577 100644
--- a/platform/drivers/display/ST7567_MD9600.c
+++ b/platform/drivers/display/ST7567_MD9600.c
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/display.h>
 #include <interfaces/delays.h>
 #include "hwconfig.h"
diff --git a/platform/drivers/display/UC1701_GDx.c b/platform/drivers/display/UC1701_GDx.c
index 85138838..e8fef3e8 100644
--- a/platform/drivers/display/UC1701_GDx.c
+++ b/platform/drivers/display/UC1701_GDx.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <backlight.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/display.h>
 #include <interfaces/delays.h>
 #include <hwconfig.h>
diff --git a/platform/drivers/keyboard/keyboard_GDx.c b/platform/drivers/keyboard/keyboard_GDx.c
index 348a56dd..e6080beb 100644
--- a/platform/drivers/keyboard/keyboard_GDx.c
+++ b/platform/drivers/keyboard/keyboard_GDx.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <interfaces/keyboard.h>
 #include "hwconfig.h"
diff --git a/platform/drivers/keyboard/keyboard_MD3x.c b/platform/drivers/keyboard/keyboard_MD3x.c
index eb349af2..3df7183e 100644
--- a/platform/drivers/keyboard/keyboard_MD3x.c
+++ b/platform/drivers/keyboard/keyboard_MD3x.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <interfaces/keyboard.h>
 #include <interfaces/platform.h>
diff --git a/platform/drivers/keyboard/keyboard_MD9600.c b/platform/drivers/keyboard/keyboard_MD9600.c
index cd3bf3ce..409d3f0c 100644
--- a/platform/drivers/keyboard/keyboard_MD9600.c
+++ b/platform/drivers/keyboard/keyboard_MD9600.c
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <interfaces/keyboard.h>
 #include <interfaces/platform.h>
diff --git a/platform/drivers/keyboard/keyboard_Mod17.c b/platform/drivers/keyboard/keyboard_Mod17.c
index d1158450..2453922e 100644
--- a/platform/drivers/keyboard/keyboard_Mod17.c
+++ b/platform/drivers/keyboard/keyboard_Mod17.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 #include <interfaces/keyboard.h>
 #include <interfaces/platform.h>
diff --git a/platform/drivers/tones/toneGenerator_MDx.cpp b/platform/drivers/tones/toneGenerator_MDx.cpp
index e55a28b8..487eaf6a 100644
--- a/platform/drivers/tones/toneGenerator_MDx.cpp
+++ b/platform/drivers/tones/toneGenerator_MDx.cpp
@@ -21,7 +21,7 @@
 #include "toneGenerator_MDx.h"
 #include <miosix.h>
 #include <hwconfig.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <kernel/scheduler/scheduler.h>
 
 using namespace miosix;
diff --git a/platform/mcu/MK22FN512xxx12/boot/bsp.cpp b/platform/mcu/MK22FN512xxx12/boot/bsp.cpp
index 828302c5..cb7f0b22 100644
--- a/platform/mcu/MK22FN512xxx12/boot/bsp.cpp
+++ b/platform/mcu/MK22FN512xxx12/boot/bsp.cpp
@@ -29,7 +29,7 @@
 #include <kernel/sync.h>
 #include <hwconfig.h>
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 
 namespace miosix
 {
diff --git a/platform/mcu/MK22FN512xxx12/drivers/gpio.c b/platform/mcu/MK22FN512xxx12/drivers/gpio.c
index 07616495..4f8b6b37 100644
--- a/platform/mcu/MK22FN512xxx12/drivers/gpio.c
+++ b/platform/mcu/MK22FN512xxx12/drivers/gpio.c
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "MK22F51212.h"
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 
 /*
  * MK22 GPIO management is a bit convoluted: instead of having all the registers
diff --git a/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c b/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c
index 12411615..8512c61e 100644
--- a/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c
+++ b/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
diff --git a/platform/mcu/STM32F4xx/drivers/USART3.cpp b/platform/mcu/STM32F4xx/drivers/USART3.cpp
index 80bb25bf..b7ffa1f9 100644
--- a/platform/mcu/STM32F4xx/drivers/USART3.cpp
+++ b/platform/mcu/STM32F4xx/drivers/USART3.cpp
@@ -22,7 +22,7 @@
  ***************************************************************************/
 
 #include <kernel/scheduler/scheduler.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <kernel/queue.h>
 #include <miosix.h>
 #include "USART3.h"
diff --git a/platform/mcu/STM32F4xx/drivers/gpio.c b/platform/mcu/STM32F4xx/drivers/gpio.c
index 9381985a..c45d655a 100644
--- a/platform/mcu/STM32F4xx/drivers/gpio.c
+++ b/platform/mcu/STM32F4xx/drivers/gpio.c
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "stm32f4xx.h"
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 
 void gpio_setMode(void *port, uint8_t pin, enum Mode mode)
 {
diff --git a/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c b/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c
index c4b7c9c8..3fb56073 100644
--- a/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c
+++ b/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c
@@ -30,7 +30,7 @@
 #include "usb_bsp.h"
 #include "usbd_conf.h"
 #include "stm32f4xx.h"
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/delays.h>
 
 extern USB_OTG_CORE_HANDLE           USB_OTG_dev;
diff --git a/platform/mcu/x86_64/drivers/gpio.c b/platform/mcu/x86_64/drivers/gpio.c
deleted file mode 100644
index b968b7ab..00000000
--- a/platform/mcu/x86_64/drivers/gpio.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2020 - 2023 by Frederik Saraci IU2NRO                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 3 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
- ***************************************************************************/
-
-#include <interfaces/gpio.h>
-#include <stdio.h>
-
-void gpio_setMode(void *port, uint8_t pin, enum Mode mode)
-{
-    printf("gpio_setMode(%s, %u, %u)\n", (char*) port, pin, mode);
-}
-
-void gpio_setAlternateFunction(void *port, uint8_t pin, uint8_t afNum)
-{
-    printf("gpio_setAlternateFunction(%s, %u, %u)\n", (char*) port, pin, afNum);
-}
-
-void gpio_setOutputSpeed(void *port, uint8_t pin, enum Speed spd)
-{
-    printf("gpio_setOutputSpeed(%s, %u, %u)\n", (char*) port, pin, spd);
-}
-
-void gpio_setPin(void *port, uint8_t pin)
-{
-    printf("gpio_setPin(%s, %u)\n", (char*) port, pin);
-}
-
-void gpio_clearPin(void *port, uint8_t pin)
-{
-    printf("gpio_clearPin(%s, %u)\n", (char*) port, pin);
-}
-
-void gpio_togglePin(void *port, uint8_t pin)
-{
-    printf("gpio_togglePin(%s, %u)\n", (char*) port, pin);
-}
-
-uint8_t gpio_readPin(const void *port, uint8_t pin)
-{
-    printf("gpio_readPin(%s, %u)\n", (char*) port, pin);
-    return 1;
-}
diff --git a/platform/targets/DM-1801/platform.c b/platform/targets/DM-1801/platform.c
index 7faa19d2..dd2b4288 100644
--- a/platform/targets/DM-1801/platform.c
+++ b/platform/targets/DM-1801/platform.c
@@ -21,7 +21,7 @@
 #include <interfaces/platform.h>
 #include <interfaces/nvmem.h>
 #include <interfaces/audio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <calibInfo_GDx.h>
 #include <ADC0_GDx.h>
 #include <string.h>
diff --git a/platform/targets/GD-77/platform.c b/platform/targets/GD-77/platform.c
index 972f591f..4da8f5bc 100644
--- a/platform/targets/GD-77/platform.c
+++ b/platform/targets/GD-77/platform.c
@@ -21,7 +21,7 @@
 #include <interfaces/platform.h>
 #include <interfaces/nvmem.h>
 #include <interfaces/audio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <calibInfo_GDx.h>
 #include <ADC0_GDx.h>
 #include <string.h>
diff --git a/platform/targets/MD-3x0/platform.c b/platform/targets/MD-3x0/platform.c
index 9e0362e2..0f555aa6 100644
--- a/platform/targets/MD-3x0/platform.c
+++ b/platform/targets/MD-3x0/platform.c
@@ -17,7 +17,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/nvmem.h>
 #include <interfaces/platform.h>
 #include <hwconfig.h>
diff --git a/platform/targets/MD-9600/platform.c b/platform/targets/MD-9600/platform.c
index 818946b1..8d65f95a 100644
--- a/platform/targets/MD-9600/platform.c
+++ b/platform/targets/MD-9600/platform.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <interfaces/nvmem.h>
 #include <interfaces/platform.h>
 #include <interfaces/delays.h>
diff --git a/platform/targets/MD-UV3x0/platform.c b/platform/targets/MD-UV3x0/platform.c
index 72f3753c..02fc7913 100644
--- a/platform/targets/MD-UV3x0/platform.c
+++ b/platform/targets/MD-UV3x0/platform.c
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <interfaces/platform.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <hwconfig.h>
 #include <string.h>
 #include <ADC1_MDx.h>
diff --git a/platform/targets/Module17/platform.c b/platform/targets/Module17/platform.c
index f027c17a..5f2c0a3d 100644
--- a/platform/targets/Module17/platform.c
+++ b/platform/targets/Module17/platform.c
@@ -22,7 +22,7 @@
 #include <interfaces/platform.h>
 #include <interfaces/nvmem.h>
 #include <interfaces/audio.h>
-#include <interfaces/gpio.h>
+#include <peripherals/gpio.h>
 #include <calibInfo_Mod17.h>
 #include <ADC1_Mod17.h>
 #include <backlight.h>
diff --git a/platform/targets/linux/platform.c b/platform/targets/linux/platform.c
index d1dc2c2e..f2e346d2 100644
--- a/platform/targets/linux/platform.c
+++ b/platform/targets/linux/platform.c
@@ -16,7 +16,6 @@
  ***************************************************************************/
 
 #include <interfaces/platform.h>
-#include <interfaces/gpio.h>
 #include <interfaces/nvmem.h>
 #include <stdio.h>
 #include "emulator.h"