diff --git a/meson.build b/meson.build
index 96a388d9..4468bdd7 100644
--- a/meson.build
+++ b/meson.build
@@ -27,9 +27,8 @@ else
   openrtx_src += 'openrtx/src/main.c'
 endif
 
-openrtx_inc = ['openrtx/include/interfaces',
+openrtx_inc = ['openrtx/include',
                'openrtx/include/calibration',
-               'openrtx/include',
                'platform/drivers/ADC',
                'platform/drivers/NVM',
                'platform/drivers/tones',
diff --git a/openrtx/include/cps.h b/openrtx/include/cps.h
index 441b857d..da86eb22 100644
--- a/openrtx/include/cps.h
+++ b/openrtx/include/cps.h
@@ -22,7 +22,7 @@
 #define CPS_H
 
 #include <stdint.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 #include <datatypes.h>
 
 /**
diff --git a/openrtx/include/interfaces/graphics.h b/openrtx/include/interfaces/graphics.h
index 56a1e720..63ac3074 100644
--- a/openrtx/include/interfaces/graphics.h
+++ b/openrtx/include/interfaces/graphics.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <display.h>
+#include <interfaces/display.h>
 #include "gfxfont.h"
 #include "TomThumb.h"
 #include "FreeSans6pt7b.h"
diff --git a/openrtx/include/state.h b/openrtx/include/state.h
index e1dec5f3..55031ea9 100644
--- a/openrtx/include/state.h
+++ b/openrtx/include/state.h
@@ -23,7 +23,7 @@
 
 #include <datatypes.h>
 #include <stdbool.h>
-#include <rtc.h>
+#include <interfaces/rtc.h>
 #include <cps.h>
 
 /**
diff --git a/openrtx/include/ui.h b/openrtx/include/ui.h
index e43081cb..b79d1850 100644
--- a/openrtx/include/ui.h
+++ b/openrtx/include/ui.h
@@ -22,7 +22,7 @@
 
 #include <stdbool.h>
 #include <state.h>
-#include <keyboard.h>
+#include <interfaces/keyboard.h>
 #include <stdint.h>
 #include <event.h>
 
diff --git a/openrtx/src/graphics.c b/openrtx/src/graphics.c
index 22e03299..d4111509 100644
--- a/openrtx/src/graphics.c
+++ b/openrtx/src/graphics.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <hwconfig.h>
-#include <display.h>
-#include <graphics.h>
+#include <interfaces/display.h>
+#include <interfaces/graphics.h>
 
 #ifdef PIX_FMT_RGB565
 /* This specialization is meant for an RGB565 little endian pixel format.
diff --git a/openrtx/src/main.c b/openrtx/src/main.c
index b2c73d6d..65426533 100644
--- a/openrtx/src/main.c
+++ b/openrtx/src/main.c
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <threads.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <battery.h>
-#include <graphics.h>
+#include <interfaces/graphics.h>
 #include <hwconfig.h>
 
 int main(void)
diff --git a/openrtx/src/state.c b/openrtx/src/state.c
index 118e18ae..b23bdef7 100644
--- a/openrtx/src/state.c
+++ b/openrtx/src/state.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <state.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 
 state_t state;
 
diff --git a/openrtx/src/threads.c b/openrtx/src/threads.c
index 6f9f4501..b06d7ce3 100644
--- a/openrtx/src/threads.c
+++ b/openrtx/src/threads.c
@@ -22,12 +22,12 @@
 #include <ui.h>
 #include <state.h>
 #include <threads.h>
-#include <keyboard.h>
-#include <graphics.h>
-#include <platform.h>
+#include <interfaces/keyboard.h>
+#include <interfaces/graphics.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <event.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 
 /* Mutex for concurrent access to state variable */
 static OS_MUTEX state_mutex;
diff --git a/openrtx/src/ui.c b/openrtx/src/ui.c
index 58155910..a1eebf1e 100644
--- a/openrtx/src/ui.c
+++ b/openrtx/src/ui.c
@@ -66,11 +66,11 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <ui.h>
-#include <rtx.h>
-#include <delays.h>
-#include <graphics.h>
-#include <keyboard.h>
-#include <platform.h>
+#include <interfaces/rtx.h>
+#include <interfaces/delays.h>
+#include <interfaces/graphics.h>
+#include <interfaces/keyboard.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <string.h>
 #include <battery.h>
diff --git a/platform/drivers/ADC/ADC1_MDx.c b/platform/drivers/ADC/ADC1_MDx.c
index 050c1c44..d4728133 100644
--- a/platform/drivers/ADC/ADC1_MDx.c
+++ b/platform/drivers/ADC/ADC1_MDx.c
@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include "hwconfig.h"
 #include "ADC1_MDx.h"
 
diff --git a/platform/drivers/NVM/extFlash_MDx.c b/platform/drivers/NVM/extFlash_MDx.c
index 170245a1..31c95717 100644
--- a/platform/drivers/NVM/extFlash_MDx.c
+++ b/platform/drivers/NVM/extFlash_MDx.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "extFlash_MDx.h"
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/platform/drivers/NVM/nvmem_MD3x0.c b/platform/drivers/NVM/nvmem_MD3x0.c
index e5793608..e5fb2b83 100644
--- a/platform/drivers/NVM/nvmem_MD3x0.c
+++ b/platform/drivers/NVM/nvmem_MD3x0.c
@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <nvmem.h>
-#include <delays.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/delays.h>
 #include "extFlash_MDx.h"
 #include "calibInfo_MDx.h"
 
diff --git a/platform/drivers/NVM/nvmem_MDUV3x0.c b/platform/drivers/NVM/nvmem_MDUV3x0.c
index 314c51d3..51da1e3d 100644
--- a/platform/drivers/NVM/nvmem_MDUV3x0.c
+++ b/platform/drivers/NVM/nvmem_MDUV3x0.c
@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <nvmem.h>
-#include <delays.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/delays.h>
 #include "calibInfo_MDx.h"
 #include "extFlash_MDx.h"
 
diff --git a/platform/drivers/baseband/HR-C5000_MD3x0.c b/platform/drivers/baseband/HR-C5000_MD3x0.c
index 5be9e0c3..922ca50f 100644
--- a/platform/drivers/baseband/HR-C5000_MD3x0.c
+++ b/platform/drivers/baseband/HR-C5000_MD3x0.c
@@ -20,8 +20,8 @@
 
 #include "HR-C5000_MD3x0.h"
 #include <hwconfig.h>
-#include <gpio.h>
-#include <delays.h>
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include <hwconfig.h>
 #include <os.h>
 
diff --git a/platform/drivers/baseband/pll_MD3x0.c b/platform/drivers/baseband/pll_MD3x0.c
index 8833c18a..6b284592 100644
--- a/platform/drivers/baseband/pll_MD3x0.c
+++ b/platform/drivers/baseband/pll_MD3x0.c
@@ -17,8 +17,8 @@
 
 #include "pll_MD3x0.h"
 #include <math.h>
-#include "gpio.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include "hwconfig.h"
 
 #define REF_CLK 16800000.0F  /* Reference clock: 16.8MHz                 */
diff --git a/platform/drivers/baseband/rtx_GDx.c b/platform/drivers/baseband/rtx_GDx.c
index 6e2d8a37..1587485d 100644
--- a/platform/drivers/baseband/rtx_GDx.c
+++ b/platform/drivers/baseband/rtx_GDx.c
@@ -20,11 +20,11 @@
 
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 #include <stdio.h>
 
 OS_MUTEX *cfgMutex;               /* Mutex for incoming config messages */
diff --git a/platform/drivers/baseband/rtx_MD3x0.c b/platform/drivers/baseband/rtx_MD3x0.c
index 4cf57ec3..114e7fc2 100644
--- a/platform/drivers/baseband/rtx_MD3x0.c
+++ b/platform/drivers/baseband/rtx_MD3x0.c
@@ -23,13 +23,13 @@
 #include <calibUtils.h>
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <ADC1_MDx.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <gpio.h>
-#include <rtx.h>
+#include <interfaces/gpio.h>
+#include <interfaces/rtx.h>
 #include "HR-C5000_MD3x0.h"
 #include "pll_MD3x0.h"
 
diff --git a/platform/drivers/baseband/rtx_UV3x0.c b/platform/drivers/baseband/rtx_UV3x0.c
index 25d4abd0..63a65a15 100644
--- a/platform/drivers/baseband/rtx_UV3x0.c
+++ b/platform/drivers/baseband/rtx_UV3x0.c
@@ -20,11 +20,11 @@
 
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 
 OS_MUTEX *cfgMutex;               /* Mutex for incoming config messages */
 OS_Q cfgMailbox;                  /* Queue for incoming config messages */
diff --git a/platform/drivers/baseband/rtx_linux.c b/platform/drivers/baseband/rtx_linux.c
index a7aa647d..dc12cea7 100644
--- a/platform/drivers/baseband/rtx_linux.c
+++ b/platform/drivers/baseband/rtx_linux.c
@@ -20,11 +20,11 @@
 
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 #include <stdio.h>
 
 OS_MUTEX *cfgMutex;               /* Mutex for incoming config messages */
diff --git a/platform/drivers/display/HX83XX_MDx.c b/platform/drivers/display/HX83XX_MDx.c
index 28b60454..21eded90 100644
--- a/platform/drivers/display/HX83XX_MDx.c
+++ b/platform/drivers/display/HX83XX_MDx.c
@@ -20,9 +20,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <os.h>
-#include "gpio.h"
-#include "display.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/display.h>
+#include <interfaces/delays.h>
 #include "hwconfig.h"
 #include "stm32f4xx.h"
 
diff --git a/platform/drivers/display/UC1701_GD77.c b/platform/drivers/display/UC1701_GD77.c
index 4292f17a..0fcb15b4 100644
--- a/platform/drivers/display/UC1701_GD77.c
+++ b/platform/drivers/display/UC1701_GD77.c
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <os.h>
-#include "gpio.h"
-#include "display.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/display.h>
+#include <interfaces/delays.h>
 #include "hwconfig.h"
 
 /*
diff --git a/platform/drivers/display/display_libSDL.c b/platform/drivers/display/display_libSDL.c
index 7840b358..1eab38aa 100644
--- a/platform/drivers/display/display_libSDL.c
+++ b/platform/drivers/display/display_libSDL.c
@@ -24,7 +24,7 @@
  * this driver.
  */
 
-#include "display.h"
+#include <interfaces/display.h>
 #include <stdio.h>
 #include <string.h>
 #include <SDL2/SDL.h>
diff --git a/platform/drivers/keyboard/keyboard_GD77.c b/platform/drivers/keyboard/keyboard_GD77.c
index 5eeceb15..16144600 100644
--- a/platform/drivers/keyboard/keyboard_GD77.c
+++ b/platform/drivers/keyboard/keyboard_GD77.c
@@ -18,9 +18,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "gpio.h"
-#include "delays.h"
-#include "keyboard.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/keyboard.h>
 #include "hwconfig.h"
 
 void kbd_init()
diff --git a/platform/drivers/keyboard/keyboard_MDx.c b/platform/drivers/keyboard/keyboard_MDx.c
index 00210780..95522ebc 100644
--- a/platform/drivers/keyboard/keyboard_MDx.c
+++ b/platform/drivers/keyboard/keyboard_MDx.c
@@ -20,9 +20,9 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include "gpio.h"
-#include "delays.h"
-#include "keyboard.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/keyboard.h>
 #include "hwconfig.h"
 
 void kbd_init()
diff --git a/platform/drivers/keyboard/keyboard_linux.c b/platform/drivers/keyboard/keyboard_linux.c
index 711c6a8b..03dd0c82 100644
--- a/platform/drivers/keyboard/keyboard_linux.c
+++ b/platform/drivers/keyboard/keyboard_linux.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include "keyboard.h"
+#include <interfaces/keyboard.h>
 #include <SDL2/SDL.h>
 
 void kbd_init()
diff --git a/platform/drivers/tones/toneGenerator_MDx.c b/platform/drivers/tones/toneGenerator_MDx.c
index 2930b992..1dfa08b4 100644
--- a/platform/drivers/tones/toneGenerator_MDx.c
+++ b/platform/drivers/tones/toneGenerator_MDx.c
@@ -20,7 +20,7 @@
 
 #include "toneGenerator_MDx.h"
 #include <hwconfig.h>
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 
 /*
diff --git a/platform/mcu/MK22FN512xxx12/drivers/delays.c b/platform/mcu/MK22FN512xxx12/drivers/delays.c
index 75c93e70..cb6e1a48 100644
--- a/platform/mcu/MK22FN512xxx12/drivers/delays.c
+++ b/platform/mcu/MK22FN512xxx12/drivers/delays.c
@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "delays.h"
+#include <interfaces/delays.h>
 
 /**
  * Implementation of the delay functions for STM32F405 MCU.
diff --git a/platform/mcu/MK22FN512xxx12/drivers/gpio.c b/platform/mcu/MK22FN512xxx12/drivers/gpio.c
index 08b8beb0..d5f2912a 100644
--- a/platform/mcu/MK22FN512xxx12/drivers/gpio.c
+++ b/platform/mcu/MK22FN512xxx12/drivers/gpio.c
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "MK22F51212.h"
-#include "gpio.h"
+#include <interfaces/gpio.h>
 
 /*
  * MK22 GPIO management is a bit convoluted: instead of having all the registers
diff --git a/platform/mcu/MK22FN512xxx12/drivers/rtc.c b/platform/mcu/MK22FN512xxx12/drivers/rtc.c
index 83a78312..a7a917c8 100644
--- a/platform/mcu/MK22FN512xxx12/drivers/rtc.c
+++ b/platform/mcu/MK22FN512xxx12/drivers/rtc.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <os.h>
-#include "rtc.h"
+#include <interfaces/rtc.h>
 
 /*
  * NOTE: even if the MK22FN512 MCU has an RTC, it is unusable in GDx platforms
diff --git a/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c b/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c
index 125f1ca8..6b0c0ac6 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 <gpio.h>
+#include <interfaces/gpio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
diff --git a/platform/mcu/STM32F4xx/drivers/delays.c b/platform/mcu/STM32F4xx/drivers/delays.c
index 75c93e70..cb6e1a48 100644
--- a/platform/mcu/STM32F4xx/drivers/delays.c
+++ b/platform/mcu/STM32F4xx/drivers/delays.c
@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "delays.h"
+#include <interfaces/delays.h>
 
 /**
  * Implementation of the delay functions for STM32F405 MCU.
diff --git a/platform/mcu/STM32F4xx/drivers/gpio.c b/platform/mcu/STM32F4xx/drivers/gpio.c
index d45b8b41..f9765920 100644
--- a/platform/mcu/STM32F4xx/drivers/gpio.c
+++ b/platform/mcu/STM32F4xx/drivers/gpio.c
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "stm32f4xx.h"
-#include "gpio.h"
+#include <interfaces/gpio.h>
 
 void gpio_setMode(void *port, uint8_t pin, enum Mode mode)
 {
diff --git a/platform/mcu/STM32F4xx/drivers/rtc.c b/platform/mcu/STM32F4xx/drivers/rtc.c
index 0f5234d4..64d45146 100644
--- a/platform/mcu/STM32F4xx/drivers/rtc.c
+++ b/platform/mcu/STM32F4xx/drivers/rtc.c
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <os.h>
-#include "rtc.h"
+#include <interfaces/rtc.h>
 #include "stm32f4xx.h"
 
 void rtc_init()
diff --git a/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c b/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c
index 82141835..a9062094 100644
--- a/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c
+++ b/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c
@@ -30,9 +30,9 @@
 #include "usb_bsp.h"
 #include "usbd_conf.h"
 #include "stm32f4xx.h"
-#include "gpio.h"
+#include <interfaces/gpio.h>
 #include <os.h>
-#include <delays.h>
+#include <interfaces/delays.h>
 
 extern USB_OTG_CORE_HANDLE           USB_OTG_dev;
 extern uint32_t USBD_OTG_ISR_Handler(USB_OTG_CORE_HANDLE *pdev);
diff --git a/platform/mcu/x86_64/drivers/delays.c b/platform/mcu/x86_64/drivers/delays.c
index 2fa636b5..cfb48574 100644
--- a/platform/mcu/x86_64/drivers/delays.c
+++ b/platform/mcu/x86_64/drivers/delays.c
@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "delays.h"
+#include <interfaces/delays.h>
 #include <unistd.h>
 #include <stdio.h>
 
diff --git a/platform/mcu/x86_64/drivers/gpio.c b/platform/mcu/x86_64/drivers/gpio.c
index 95312999..0498783e 100644
--- a/platform/mcu/x86_64/drivers/gpio.c
+++ b/platform/mcu/x86_64/drivers/gpio.c
@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "gpio.h"
+#include <interfaces/gpio.h>
 #include <stdio.h>
 
 void gpio_setMode(void *port, uint8_t pin, enum Mode mode)
diff --git a/platform/mcu/x86_64/drivers/rtc.c b/platform/mcu/x86_64/drivers/rtc.c
index ef1b9e0e..2671af63 100644
--- a/platform/mcu/x86_64/drivers/rtc.c
+++ b/platform/mcu/x86_64/drivers/rtc.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "rtc.h"
+#include <interfaces/rtc.h>
 
 void rtc_init()
 {
diff --git a/platform/targets/DM-1801/platform.c b/platform/targets/DM-1801/platform.c
index 4af913f8..2b4274d2 100644
--- a/platform/targets/DM-1801/platform.c
+++ b/platform/targets/DM-1801/platform.c
@@ -18,9 +18,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <ADC0_GDx.h>
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 #include "hwconfig.h"
 
diff --git a/platform/targets/GD77/platform.c b/platform/targets/GD77/platform.c
index 4af913f8..2b4274d2 100644
--- a/platform/targets/GD77/platform.c
+++ b/platform/targets/GD77/platform.c
@@ -18,9 +18,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <ADC0_GDx.h>
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 #include "hwconfig.h"
 
diff --git a/platform/targets/MD-380/platform.c b/platform/targets/MD-380/platform.c
index 4adc5d9b..dc2f3109 100644
--- a/platform/targets/MD-380/platform.c
+++ b/platform/targets/MD-380/platform.c
@@ -17,9 +17,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
-#include <nvmem.h>
-#include <platform.h>
+#include <interfaces/gpio.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <ADC1_MDx.h>
 #include <calibInfo_MDx.h>
diff --git a/platform/targets/MD-390/platform.c b/platform/targets/MD-390/platform.c
index 4adc5d9b..dc2f3109 100644
--- a/platform/targets/MD-390/platform.c
+++ b/platform/targets/MD-390/platform.c
@@ -17,9 +17,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
-#include <nvmem.h>
-#include <platform.h>
+#include <interfaces/gpio.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <ADC1_MDx.h>
 #include <calibInfo_MDx.h>
diff --git a/platform/targets/MD-UV380/platform.c b/platform/targets/MD-UV380/platform.c
index 3ffebd3e..253f2761 100644
--- a/platform/targets/MD-UV380/platform.c
+++ b/platform/targets/MD-UV380/platform.c
@@ -17,13 +17,13 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <platform.h>
-#include <gpio.h>
+#include <interfaces/platform.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 #include <hwconfig.h>
 #include <ADC1_MDx.h>
 #include <calibInfo_MDx.h>
-#include <nvmem.h>
+#include <interfaces/nvmem.h>
 
 mduv3x0Calib_t calibration;
 
diff --git a/platform/targets/linux/platform.c b/platform/targets/linux/platform.c
index 5efbef68..b6fb845f 100644
--- a/platform/targets/linux/platform.c
+++ b/platform/targets/linux/platform.c
@@ -15,8 +15,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "platform.h"
-#include "gpio.h"
+#include <interfaces/platform.h>
+#include <interfaces/gpio.h>
 #include <stdio.h>
 #include "emulator.h"
 
diff --git a/tests/platform/MD380_FM_simpleRtx.c b/tests/platform/MD380_FM_simpleRtx.c
index 8d4d13ce..fa5c2650 100644
--- a/tests/platform/MD380_FM_simpleRtx.c
+++ b/tests/platform/MD380_FM_simpleRtx.c
@@ -23,10 +23,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "delays.h"
-#include "rtx.h"
-#include "platform.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/rtx.h>
+#include <interfaces/platform.h>
 #include "hwconfig.h"
 #include "toneGenerator_MDx.h"
 
diff --git a/tests/platform/MD380_blink.c b/tests/platform/MD380_blink.c
index fc256239..2976ea43 100644
--- a/tests/platform/MD380_blink.c
+++ b/tests/platform/MD380_blink.c
@@ -23,8 +23,8 @@
 #include <os.h>
 #include <stdio.h>
 #include "stm32f4xx.h"
-#include "gpio.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include <lib_mem.h>
 
 static OS_TCB        t1TCB;
diff --git a/tests/platform/MD380_display.c b/tests/platform/MD380_display.c
index 382223c9..88369111 100644
--- a/tests/platform/MD380_display.c
+++ b/tests/platform/MD380_display.c
@@ -23,11 +23,11 @@
 #include <os.h>
 #include <lib_mem.h>
 #include <stdio.h>
-#include "gpio.h"
-#include "delays.h"
-#include "display.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/display.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 
 static OS_TCB        t1TCB;
 static CPU_STK_SIZE  t1Stk[128];
diff --git a/tests/platform/boot_test.c b/tests/platform/boot_test.c
index 9360645c..6647011c 100644
--- a/tests/platform/boot_test.c
+++ b/tests/platform/boot_test.c
@@ -20,7 +20,7 @@
 
 #include <os.h>
 #include <stdio.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 
 int main()
 {
diff --git a/tests/platform/display_test_SDL.c b/tests/platform/display_test_SDL.c
index 8e10fa16..72ab02c8 100644
--- a/tests/platform/display_test_SDL.c
+++ b/tests/platform/display_test_SDL.c
@@ -25,7 +25,7 @@
  * the driver source file.
  */
 
-#include "display.h"
+#include <interfaces/display.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/tests/platform/gpio_demo.c b/tests/platform/gpio_demo.c
index bbc1759e..b6990f1c 100644
--- a/tests/platform/gpio_demo.c
+++ b/tests/platform/gpio_demo.c
@@ -20,10 +20,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 
 void printBits(uint16_t value, point_t pos)
 {
diff --git a/tests/platform/gui_demo.c b/tests/platform/gui_demo.c
index f27bb550..b0154267 100644
--- a/tests/platform/gui_demo.c
+++ b/tests/platform/gui_demo.c
@@ -20,12 +20,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 #include "state.h"
-#include "keyboard.h"
+#include <interfaces/keyboard.h>
 #include "ui.h"
 
 
diff --git a/tests/platform/kek_demo.c b/tests/platform/kek_demo.c
index b457b9d0..0939838f 100644
--- a/tests/platform/kek_demo.c
+++ b/tests/platform/kek_demo.c
@@ -7,7 +7,7 @@
 #include <SDL2/SDL.h>
 #undef main
 
-#include "graphics.h"
+#include <interfaces/graphics.h>
 
 static OS_TCB        App_TaskStartTCB;
 static CPU_STK_SIZE  App_TaskStartStk[APP_CFG_TASK_START_STK_SIZE];
diff --git a/tests/platform/keyboard_demo.c b/tests/platform/keyboard_demo.c
index e930e4b4..77ede4ec 100644
--- a/tests/platform/keyboard_demo.c
+++ b/tests/platform/keyboard_demo.c
@@ -22,12 +22,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 #include "state.h"
-#include "keyboard.h"
+#include <interfaces/keyboard.h>
 #include "ui.h"
 
 color_t color_yellow_fab413 = {250, 180, 19};
diff --git a/tests/platform/platform_demo.c b/tests/platform/platform_demo.c
index 7883a669..efb981e2 100644
--- a/tests/platform/platform_demo.c
+++ b/tests/platform/platform_demo.c
@@ -20,10 +20,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 
 void platform_test()
 {
diff --git a/tests/platform/printCalib_MDx.c b/tests/platform/printCalib_MDx.c
index 6bc78c95..f7ecffe9 100644
--- a/tests/platform/printCalib_MDx.c
+++ b/tests/platform/printCalib_MDx.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include <nvmem.h>
+#include <interfaces/nvmem.h>
 #include <calibInfo_MDx.h>
 
 void printMD3x0calibration()
diff --git a/tests/platform/printContacts_MDx.c b/tests/platform/printContacts_MDx.c
index 8bcb77e6..b14ab4cb 100644
--- a/tests/platform/printContacts_MDx.c
+++ b/tests/platform/printContacts_MDx.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include <nvmem.h>
+#include <interfaces/nvmem.h>
 #include <cps.h>
 
 int main()