style: resolve ambiguous paths on include macros

Update meson and cmake config to only include openrtx and platform paths.
Update files to use <..> for system and external libraries, ".." for
project files and new relative paths as necessary.

Did not attempt to fix areas where includes that should be <..> were
previously ".."

Inspired by #96, closes #359.

Acked-by: Silvano Seva <silseva@fastwebnet.it>

CMakeLists.txt

@@ -63,20 +63,7 @@ target_include_directories(app
   PRIVATE
 
     openrtx/include
-    openrtx/include/rtx
-    openrtx/include/core
-    openrtx/include/calibration
-    openrtx/include/protocols
-    openrtx/include/fonts/adafruit
-    openrtx/include/fonts/symbols
-    platform/drivers/ADC
-    platform/drivers/NVM
-    platform/drivers/GPS
-    platform/drivers/USB
-    platform/drivers/tones
-    platform/drivers/baseband
-    platform/drivers/backlight
-    platform/drivers/chSelector
+    platform
 
     subprojects/codec2
     subprojects/codec2/src

meson.build

@@ -68,24 +68,7 @@ openrtx_src = ['openrtx/src/core/state.c',
                'openrtx/src/protocols/M17/M17FrameDecoder.cpp',
                'openrtx/src/protocols/M17/M17LinkSetupFrame.cpp']
 
-openrtx_inc = ['openrtx/include',
-               'openrtx/include/rtx',
-               'openrtx/include/core',
-               'openrtx/include/calibration',
-               'openrtx/include/protocols',
-               'openrtx/include/fonts/adafruit',
-               'openrtx/include/fonts/symbols',
-               'platform/drivers/ADC',
-               'platform/drivers/NVM',
-               'platform/drivers/GPS',
-               'platform/drivers/SPI',
-               'platform/drivers/USB',
-               'platform/drivers/GPIO',
-               'platform/drivers/tones',
-               'platform/drivers/audio',
-               'platform/drivers/baseband',
-               'platform/drivers/backlight',
-               'platform/drivers/chSelector']
+openrtx_inc = ['openrtx/include', 'platform']
 
 ##
 ## OpenRTX UI sources

openrtx/include/calibration/calibInfo_CS7000.h

@@ -18,7 +18,7 @@
 #ifndef CALIBINFO_CS7000_H
 #define CALIBINFO_CS7000_H
 
-#include <datatypes.h>
+#include "core/datatypes.h"
 #include <stdint.h>
 
 

openrtx/include/calibration/calibInfo_GDx.h

@@ -21,7 +21,7 @@
 #ifndef CALIBINFO_GDX_H
 #define CALIBINFO_GDX_H
 
-#include <datatypes.h>
+#include "core/datatypes.h"
 #include <stdint.h>
 
 /**

openrtx/include/calibration/calibInfo_MDx.h

@@ -21,7 +21,7 @@
 #ifndef CALIBINFO_MDX_H
 #define CALIBINFO_MDX_H
 
-#include <datatypes.h>
+#include "core/datatypes.h"
 #include <stdint.h>
 
 /**

openrtx/include/calibration/calibInfo_Mod17.h

@@ -22,7 +22,7 @@
 #ifndef CALIBINFO_MOD17_H
 #define CALIBINFO_MOD17_H
 
-#include <datatypes.h>
+#include "core/datatypes.h"
 #include <stdint.h>
 
 /**

openrtx/include/core/audio_codec.h

@@ -21,7 +21,7 @@
 #ifndef AUDIO_CODEC_H
 #define AUDIO_CODEC_H
 
-#include <audio_path.h>
+#include "core/audio_path.h"
 #include <stdint.h>
 #include <stdbool.h>
 

openrtx/include/core/audio_path.h

@@ -20,7 +20,7 @@
 #ifndef AUDIO_PATH_H
 #define AUDIO_PATH_H
 
-#include <interfaces/audio.h>
+#include "interfaces/audio.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

openrtx/include/core/audio_stream.h

@@ -24,8 +24,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/types.h>
-#include <audio_path.h>
-#include <interfaces/audio.h>
+#include "core/audio_path.h"
+#include "interfaces/audio.h"
 
 #ifdef __cplusplus
 extern "C" {

openrtx/include/core/cps.h

@@ -23,8 +23,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <datatypes.h>
-#include <rtx.h>
+#include "core/datatypes.h"
+#include "rtx/rtx.h"
 
 // Magic number to identify the binary file
 #define CPS_MAGIC 0x43585452

openrtx/include/core/ctcssDetector.hpp

@@ -28,7 +28,7 @@
 #include <array>
 #include <cstddef>
 #include <cstdint>
-#include <goertzel.hpp>
+#include "core/goertzel.hpp"
 
 /*
  * Goertzel filter coefficients for the 50 CTCSS tones, computed for a sampling

openrtx/include/core/gps.h

@@ -20,7 +20,7 @@
 #ifndef GPS_H
 #define GPS_H
 
-#include <datetime.h>
+#include "core/datetime.h"
 #include <stddef.h>
 #include <stdint.h>
 

openrtx/include/core/graphics.h

@@ -20,12 +20,12 @@
 #ifndef GRAPHICS_H
 #define GRAPHICS_H
 
-#include <datatypes.h>
-#include <symbols.h>
+#include "core/datatypes.h"
+#include "fonts/symbols/symbols.h"
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <gps.h>
+#include "core/gps.h"
 
 #ifdef __cplusplus
 extern "C" {

openrtx/include/core/input.h

@@ -20,7 +20,7 @@
 #ifndef INPUT_H
 #define INPUT_H
 
-#include <interfaces/keyboard.h>
+#include "interfaces/keyboard.h"
 #include <inttypes.h>
 #include <stdbool.h>
 

openrtx/include/core/nvmem_access.h

@@ -21,7 +21,7 @@
 #ifndef NVMEM_ACCESS_H
 #define NVMEM_ACCESS_H
 
-#include <interfaces/nvmem.h>
+#include "interfaces/nvmem.h"
 #include <stdint.h>
 #include <errno.h>
 

openrtx/include/core/settings.h

@@ -21,7 +21,7 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <hwconfig.h>
+#include "hwconfig.h"
 #include <stdbool.h>
 
 typedef enum

openrtx/include/core/state.h

@@ -21,12 +21,12 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include <datatypes.h>
-#include <settings.h>
+#include "core/datatypes.h"
+#include "core/settings.h"
 #include <pthread.h>
 #include <stdbool.h>
-#include <cps.h>
-#include <gps.h>
+#include "core/cps.h"
+#include "core/gps.h"
 
 /**
  * Part of this structure has been commented because the corresponding

openrtx/include/core/utils.h

@@ -20,7 +20,7 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <datatypes.h>
+#include "core/datatypes.h"
 #include <stdint.h>
 #include <stddef.h>
 

openrtx/include/core/voicePromptUtils.h

@@ -20,9 +20,9 @@
 #ifndef VOICE_PROMPT_UTILS_H
 #define VOICE_PROMPT_UTILS_H
 
-#include "cps.h"
+#include "core/cps.h"
 #include "ui/ui_strings.h"
-#include "voicePrompts.h"
+#include "core/voicePrompts.h"
 
 /*
 Please Note!

openrtx/include/core/voicePrompts.h

@@ -20,7 +20,7 @@
 #ifndef VOICEPROMPTS_H
 #define VOICEPROMPTS_H
 
-#include <datatypes.h>
+#include "core/datatypes.h"
 #include <stdbool.h>
 
 /**

openrtx/include/interfaces/cps_io.h

@@ -22,7 +22,7 @@
 #define CPS_IO_H
 
 #include <stdint.h>
-#include <cps.h>
+#include "core/cps.h"
 
 #ifdef __cplusplus
 extern "C" {

openrtx/include/interfaces/nvmem.h

@@ -22,9 +22,9 @@
 #define NVMEM_H
 
 #include <stdint.h>
-#include <cps.h>
-#include <settings.h>
-#include "platform.h"
+#include "core/cps.h"
+#include "core/settings.h"
+#include "interfaces/platform.h"
 
 #ifdef __cplusplus
 extern "C" {

openrtx/include/interfaces/platform.h

@@ -22,8 +22,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <datetime.h>
-#include <hwconfig.h>
+#include "core/datetime.h"
+#include "hwconfig.h"
 
 #ifdef __cplusplus
 extern "C" {

openrtx/include/interfaces/radio.h

@@ -23,7 +23,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <rtx.h>
+#include "rtx/rtx.h"
 
 #ifdef __cplusplus
 extern "C" {

openrtx/include/peripherals/gpio.h

@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <gpio-native.h>
+#include "drivers/GPIO/gpio-native.h"
 
 #ifdef __cplusplus
 extern "C" {

openrtx/include/peripherals/rtc.h

@@ -20,7 +20,7 @@
 #ifndef RTC_H
 #define RTC_H
 
-#include <datetime.h>
+#include "core/datetime.h"
 #include <stdint.h>
 
 /**

openrtx/include/protocols/M17/M17Constants.hpp

@@ -21,7 +21,7 @@
 #ifndef M17_CONSTANTS_H
 #define M17_CONSTANTS_H
 
-#include <M17/M17Datatypes.hpp>
+#include "protocols/M17/M17Datatypes.hpp"
 #include <cstdint>
 #include <array>
 

openrtx/include/protocols/M17/M17DSP.hpp

@@ -27,7 +27,7 @@
 #error This header is C++ only!
 #endif
 
-#include <fir.hpp>
+#include "core/fir.hpp"
 #include <array>
 
 namespace M17

openrtx/include/protocols/M17/M17Demodulator.hpp

@@ -27,19 +27,19 @@
 #error This header is C++ only!
 #endif
 
-#include <iir.hpp>
+#include "core/iir.hpp"
 #include <cstdint>
 #include <cstddef>
 #include <memory>
 #include <array>
-#include <dsp.h>
+#include "core/dsp.h"
 #include <cmath>
-#include <audio_path.h>
-#include <audio_stream.h>
-#include <M17/M17Datatypes.hpp>
-#include <M17/M17Constants.hpp>
-#include <M17/Correlator.hpp>
-#include <M17/Synchronizer.hpp>
+#include "core/audio_path.h"
+#include "core/audio_stream.h"
+#include "protocols/M17/M17Datatypes.hpp"
+#include "protocols/M17/M17Constants.hpp"
+#include "protocols/M17/Correlator.hpp"
+#include "protocols/M17/Synchronizer.hpp"
 
 namespace M17
 {

openrtx/include/protocols/M17/M17Modulator.hpp

@@ -25,10 +25,10 @@
 #error This header is C++ only!
 #endif
 
-#include <audio_stream.h>
-#include <M17/PwmCompensator.hpp>
-#include <M17/M17Constants.hpp>
-#include <audio_path.h>
+#include "core/audio_stream.h"
+#include "protocols/M17/PwmCompensator.hpp"
+#include "protocols/M17/M17Constants.hpp"
+#include "core/audio_path.h"
 #include <cstdint>
 #include <memory>
 #include <array>

openrtx/include/rtx/OpMode.hpp

@@ -21,8 +21,8 @@
 #ifndef OPMODE_H
 #define OPMODE_H
 
-#include <interfaces/delays.h>
-#include "rtx.h"
+#include "interfaces/delays.h"
+#include "rtx/rtx.h"
 
 /**
  * This class provides a standard interface for all the operating modes.

openrtx/include/rtx/OpMode_FM.hpp

@@ -21,7 +21,7 @@
 #ifndef OPMODE_FM_H
 #define OPMODE_FM_H
 
-#include <audio_path.h>
+#include "core/audio_path.h"
 #include "OpMode.hpp"
 
 /**

openrtx/include/rtx/OpMode_M17.hpp

@@ -21,11 +21,11 @@
 #ifndef OPMODE_M17_H
 #define OPMODE_M17_H
 
-#include <M17/M17FrameDecoder.hpp>
-#include <M17/M17FrameEncoder.hpp>
-#include <M17/M17Demodulator.hpp>
-#include <M17/M17Modulator.hpp>
-#include <audio_path.h>
+#include "protocols/M17/M17FrameDecoder.hpp"
+#include "protocols/M17/M17FrameEncoder.hpp"
+#include "protocols/M17/M17Demodulator.hpp"
+#include "protocols/M17/M17Modulator.hpp"
+#include "core/audio_path.h"
 #include "OpMode.hpp"
 
 /**

openrtx/include/rtx/rtx.h

@@ -21,9 +21,9 @@
 #ifndef RTX_H
 #define RTX_H
 
-#include <datatypes.h>
+#include "core/datatypes.h"
 #include <stdint.h>
-#include <cps.h>
+#include "core/cps.h"
 #include <pthread.h>
 
 #ifdef __cplusplus

openrtx/include/ui/ui_default.h

@@ -21,13 +21,13 @@
 #define UI_DEFAULT_H
 
 #include <stdbool.h>
-#include <state.h>
-#include <graphics.h>
-#include <interfaces/keyboard.h>
+#include "core/state.h"
+#include "core/graphics.h"
+#include "interfaces/keyboard.h"
 #include <stdint.h>
-#include <event.h>
-#include <hwconfig.h>
-#include <ui.h>
+#include "core/event.h"
+#include "hwconfig.h"
+#include "core/ui.h"
 
 // Maximum menu entry length
 #define MAX_ENTRY_LEN 21

openrtx/include/ui/ui_mod17.h

@@ -21,14 +21,14 @@
 #define UI_MOD17_H
 
 #include <stdbool.h>
-#include <state.h>
-#include <graphics.h>
-#include <interfaces/keyboard.h>
-#include <calibInfo_Mod17.h>
+#include "core/state.h"
+#include "core/graphics.h"
+#include "interfaces/keyboard.h"
+#include "calibration/calibInfo_Mod17.h"
 #include <stdint.h>
-#include <event.h>
-#include <hwconfig.h>
-#include <ui.h>
+#include "core/event.h"
+#include "hwconfig.h"
+#include "core/ui.h"
 
 // Maximum menu entry length
 #define MAX_ENTRY_LEN 21

openrtx/src/core/audio_codec.c

@@ -18,21 +18,21 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <audio_stream.h>
-#include <audio_codec.h>
+#include "core/audio_stream.h"
+#include "core/audio_codec.h"
 #include <pthread.h>
-#include <threads.h>
+#include "core/threads.h"
 // codec2 system library has a weird include prefix
 #if defined(PLATFORM_LINUX)
 #include <codec2/codec2.h>
 #else
-#include <codec2.h>
+#include "codec2.h"
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <dsp.h>
+#include "core/dsp.h"
 
 #define BUF_SIZE 4
 

openrtx/src/core/audio_path.cpp

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <audio_path.h>
+#include "core/audio_path.h"
 #include <map>
 #include <set>
 

openrtx/src/core/audio_stream.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <audio_stream.h>
+#include "core/audio_stream.h"
 #include <errno.h>
 
 #define MAX_NUM_STREAMS 3

openrtx/src/core/backup.c

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <backup.h>
-#include <xmodem.h>
+#include "core/backup.h"
+#include "core/xmodem.h"
 #include <string.h>
 #include "W25Qx.h"
 

openrtx/src/core/battery.c

@@ -17,8 +17,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <battery.h>
-#include <hwconfig.h>
+#include "core/battery.h"
+#include "hwconfig.h"
 #include <math.h>
 
 /*

openrtx/src/core/chan.c

@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "chan.h"
+#include "core/chan.h"
 
 void chan_init(chan_t *c)
 {

openrtx/src/core/cps.c

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/platform.h>
-#include <cps.h>
+#include "interfaces/platform.h"
+#include "core/cps.h"
 
 const uint16_t ctcss_tone[CTCSS_FREQ_NUM] =
 {

openrtx/src/core/crc.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <crc.h>
+#include "core/crc.h"
 
 uint16_t crc_ccitt(const void *data, const size_t len)
 {

openrtx/src/core/data_conversion.c

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <data_conversion.h>
-#include <hwconfig.h>
+#include "core/data_conversion.h"
+#include "hwconfig.h"
 
 /*
  * Trivial implementation of Cortex M4 SIMD instructions for all the

openrtx/src/core/datetime.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <datetime.h>
+#include "core/datetime.h"
 #include <stdlib.h>
 #include <time.h>
 

openrtx/src/core/dsp.cpp

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <dsp.h>
+#include "core/dsp.h"
 
 int16_t dsp_dcBlockFilter(struct dcBlock *dcb, int16_t sample)
 {

openrtx/src/core/gps.c

@@ -17,11 +17,11 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/platform.h>
-#include <gps.h>
+#include "interfaces/platform.h"
+#include "core/gps.h"
 #include <minmea.h>
 #include <stdio.h>
-#include <state.h>
+#include "core/state.h"
 #include <string.h>
 #include <stdbool.h>
 

openrtx/src/core/graphics.c

@@ -22,39 +22,39 @@
  * It is suitable for both color, grayscale and B/W display
  */
 
-#include <interfaces/display.h>
-#include <hwconfig.h>
-#include <graphics.h>
+#include "interfaces/display.h"
+#include "hwconfig.h"
+#include "core/graphics.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <limits.h>
 #include <stdio.h>
 #include <math.h>
-#include <utils.h>
+#include "core/utils.h"
 
-#include <gfxfont.h>
-#include <TomThumb.h>
-#include <FreeSans6pt7b.h>
-#include <FreeSans8pt7b.h>
-#include <FreeSans9pt7b.h>
-#include <FreeSans10pt7b.h>
-#include <FreeSans12pt7b.h>
-#include <FreeSans16pt7b.h>
-#include <FreeSans18pt7b.h>
-#include <FreeSans24pt7b.h>
-#include <UbuntuRegular6pt7b.h>
-#include <UbuntuRegular8pt7b.h>
-#include <UbuntuRegular9pt7b.h>
-#include <UbuntuRegular10pt7b.h>
-#include <UbuntuRegular12pt7b.h>
-#include <UbuntuRegular16pt7b.h>
-#include <UbuntuRegular18pt7b.h>
-#include <UbuntuRegular24pt7b.h>
+#include "fonts/adafruit/gfxfont.h"
+#include "fonts/adafruit/TomThumb.h"
+#include "fonts/adafruit/FreeSans6pt7b.h"
+#include "fonts/adafruit/FreeSans8pt7b.h"
+#include "fonts/adafruit/FreeSans9pt7b.h"
+#include "fonts/adafruit/FreeSans10pt7b.h"
+#include "fonts/adafruit/FreeSans12pt7b.h"
+#include "fonts/adafruit/FreeSans16pt7b.h"
+#include "fonts/adafruit/FreeSans18pt7b.h"
+#include "fonts/adafruit/FreeSans24pt7b.h"
+#include "fonts/adafruit/UbuntuRegular6pt7b.h"
+#include "fonts/adafruit/UbuntuRegular8pt7b.h"
+#include "fonts/adafruit/UbuntuRegular9pt7b.h"
+#include "fonts/adafruit/UbuntuRegular10pt7b.h"
+#include "fonts/adafruit/UbuntuRegular12pt7b.h"
+#include "fonts/adafruit/UbuntuRegular16pt7b.h"
+#include "fonts/adafruit/UbuntuRegular18pt7b.h"
+#include "fonts/adafruit/UbuntuRegular24pt7b.h"
 
-#include <Symbols5pt7b.h>
-#include <Symbols6pt7b.h>
-#include <Symbols8pt7b.h>
+#include "fonts/symbols/Symbols5pt7b.h"
+#include "fonts/symbols/Symbols6pt7b.h"
+#include "fonts/symbols/Symbols8pt7b.h"
 
 // Variable swap macro
 #define DEG_RAD  0.017453292519943295769236907684886

openrtx/src/core/input.c

@@ -17,10 +17,10 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/delays.h>
+#include "interfaces/delays.h"
 #include <inttypes.h>
 #include <stdbool.h>
-#include <input.h>
+#include "core/input.h"
 
 static long long  keyTs[KBD_NUM_KEYS];  // Timestamp of each keypress
 static uint32_t   longPressSent;        // Flags to manage long-press events

openrtx/src/core/memory_profiling.cpp

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <memory_profiling.h>
+#include "core/memory_profiling.h"
 
 #ifdef _MIOSIX
 

openrtx/src/core/nvmem_access.c

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/nvmem.h>
-#include <nvmem_access.h>
+#include "interfaces/nvmem.h"
+#include "core/nvmem_access.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <errno.h>

openrtx/src/core/openrtx.c

@@ -18,17 +18,17 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/platform.h>
-#include <interfaces/keyboard.h>
-#include <interfaces/display.h>
-#include <interfaces/delays.h>
-#include <interfaces/cps_io.h>
-#include <voicePrompts.h>
-#include <graphics.h>
-#include <openrtx.h>
-#include <threads.h>
-#include <state.h>
-#include <ui.h>
+#include "interfaces/platform.h"
+#include "interfaces/keyboard.h"
+#include "interfaces/display.h"
+#include "interfaces/delays.h"
+#include "interfaces/cps_io.h"
+#include "core/voicePrompts.h"
+#include "core/graphics.h"
+#include "core/openrtx.h"
+#include "core/threads.h"
+#include "core/state.h"
+#include "core/ui.h"
 #ifdef PLATFORM_LINUX
 #include <stdlib.h>
 #endif

openrtx/src/core/queue.c

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <stdio.h>
-#include "queue.h"
+#include "core/queue.h"
 
 void queue_init(queue_t *q)
 {

openrtx/src/core/state.c

@@ -18,17 +18,17 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <ui.h>
+#include "core/ui.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <event.h>
-#include <state.h>
-#include <battery.h>
-#include <hwconfig.h>
-#include <interfaces/platform.h>
-#include <interfaces/nvmem.h>
-#include <interfaces/delays.h>
+#include "core/event.h"
+#include "core/state.h"
+#include "core/battery.h"
+#include "hwconfig.h"
+#include "interfaces/platform.h"
+#include "interfaces/nvmem.h"
+#include "interfaces/delays.h"
 
 state_t state;
 pthread_mutex_t state_mutex;

openrtx/src/core/threads.c

@@ -18,26 +18,26 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <hwconfig.h>
+#include "hwconfig.h"
 #include <pthread.h>
-#include <ui.h>
-#include <state.h>
-#include <threads.h>
-#include <graphics.h>
-#include <interfaces/platform.h>
-#include <interfaces/delays.h>
-#include <interfaces/radio.h>
-#include <event.h>
-#include <rtx.h>
+#include "core/ui.h"
+#include "core/state.h"
+#include "core/threads.h"
+#include "core/graphics.h"
+#include "interfaces/platform.h"
+#include "interfaces/delays.h"
+#include "interfaces/radio.h"
+#include "core/event.h"
+#include "rtx/rtx.h"
 #include <string.h>
-#include <utils.h>
-#include <input.h>
-#include <backup.h>
-#include <gps.h>
-#include <voicePrompts.h>
+#include "core/utils.h"
+#include "core/input.h"
+#include "core/backup.h"
+#include "core/gps.h"
+#include "core/voicePrompts.h"
 
 #if defined(PLATFORM_TTWRPLUS)
-#include <pmu.h>
+#include "pmu.h"
 #endif
 
 /* Mutex for concurrent access to RTX state variable */

openrtx/src/core/utils.c

@@ -18,10 +18,10 @@
  ***************************************************************************/
 
 #include <string.h>
-#include <utils.h>
+#include "core/utils.h"
 #include <stdio.h>
 #include <math.h>
-#include <cps.h>
+#include "core/cps.h"
 
 uint8_t interpCalParameter(const freq_t freq, const freq_t *calPoints,
                            const uint8_t *param, const uint8_t elems)

openrtx/src/core/voicePromptUtils.c

@@ -25,14 +25,14 @@
 
 #include "core/voicePromptUtils.h"
 
-#include <state.h>
+#include "core/state.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <utils.h>
+#include "core/utils.h"
 #include <inttypes.h>
-#include <ui/ui_default.h>
-#include <beeps.h>
+#include "ui/ui_default.h"
+#include "core/beeps.h"
 #include "interfaces/cps_io.h"
 
 const uint16_t BOOT_MELODY[] = {400, 3, 600, 3, 800, 3, 0, 0};

openrtx/src/core/voicePrompts.c

@@ -18,21 +18,21 @@
  *   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/platform.h>
-#include <interfaces/keyboard.h>
-#include <interfaces/delays.h>
-#include <voicePromptUtils.h>
-#include <ui/ui_strings.h>
-#include <voicePrompts.h>
-#include <audio_codec.h>
-#include <audio_path.h>
+#include "interfaces/platform.h"
+#include "interfaces/keyboard.h"
+#include "interfaces/delays.h"
+#include "core/voicePromptUtils.h"
+#include "ui/ui_strings.h"
+#include "core/voicePrompts.h"
+#include "core/audio_codec.h"
+#include "core/audio_path.h"
 #include <strings.h>    // For strncasecmp
 #include <ctype.h>
-#include <state.h>
+#include "core/state.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <beeps.h>
+#include "core/beeps.h"
 #include <errno.h>
 
 static const uint32_t VOICE_PROMPTS_DATA_MAGIC   = 0x5056;  //'VP'

openrtx/src/core/xmodem.c

@@ -18,12 +18,12 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <usb_vcom.h>
+#include "drivers/USB/usb_vcom.h"
 #include <stdbool.h>
 #include <stdlib.h>
-#include <xmodem.h>
+#include "core/xmodem.h"
 #include <string.h>
-#include <crc.h>
+#include "core/crc.h"
 
 #define SOH     (0x01)  // start of 128-byte data packet
 #define STX     (0x02)  // start of 1024-byte data packet

openrtx/src/main.c

@@ -18,15 +18,15 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <openrtx.h>
+#include "core/openrtx.h"
 
 #ifdef PLATFORM_MD9600
-#include <interfaces/platform.h>
-#include <interfaces/delays.h>
+#include "interfaces/platform.h"
+#include "interfaces/delays.h"
 #endif
 
 #ifdef PLATFORM_LINUX
-#include <emulator/sdl_engine.h>
+#include "emulator/sdl_engine.h"
 #endif
 
 int main(void)

openrtx/src/protocols/M17/M17Callsign.cpp

@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 #include <string>
-#include <M17/M17Callsign.hpp>
+#include "protocols/M17/M17Callsign.hpp"
 
 bool M17::encode_callsign(const std::string& callsign, call_t& encodedCall,
                           bool strict)

openrtx/src/protocols/M17/M17DSP.cpp

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <M17/M17DSP.hpp>
-#include <hwconfig.h>
+#include "protocols/M17/M17DSP.hpp"
+#include "hwconfig.h"
 
 #ifdef CONFIG_M17
 Fir< std::tuple_size< decltype(M17::rrc_taps_48k) >::value > M17::rrc_48k(M17::rrc_taps_48k);

openrtx/src/protocols/M17/M17Demodulator.cpp

@@ -20,10 +20,10 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <M17/M17Demodulator.hpp>
-#include <M17/M17DSP.hpp>
-#include <M17/M17Utils.hpp>
-#include <audio_stream.h>
+#include "protocols/M17/M17Demodulator.hpp"
+#include "protocols/M17/M17DSP.hpp"
+#include "protocols/M17/M17Utils.hpp"
+#include "core/audio_stream.h"
 #include <math.h>
 #include <cstring>
 #include <stdio.h>
@@ -32,10 +32,10 @@ using namespace M17;
 
 #ifdef ENABLE_DEMOD_LOG
 
-#include <ringbuf.hpp>
+#include "core/ringbuf.hpp"
 #include <atomic>
 #ifndef PLATFORM_LINUX
-#include <usb_vcom.h>
+#include "drivers/USB/usb_vcom.h"
 #endif
 
 typedef struct

openrtx/src/protocols/M17/M17FrameDecoder.cpp

@@ -18,13 +18,13 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <M17/M17Golay.hpp>
-#include <M17/M17FrameDecoder.hpp>
-#include <M17/M17Interleaver.hpp>
-#include <M17/M17Decorrelator.hpp>
-#include <M17/M17CodePuncturing.hpp>
-#include <M17/M17Constants.hpp>
-#include <M17/M17Utils.hpp>
+#include "protocols/M17/M17Golay.hpp"
+#include "protocols/M17/M17FrameDecoder.hpp"
+#include "protocols/M17/M17Interleaver.hpp"
+#include "protocols/M17/M17Decorrelator.hpp"
+#include "protocols/M17/M17CodePuncturing.hpp"
+#include "protocols/M17/M17Constants.hpp"
+#include "protocols/M17/M17Utils.hpp"
 #include <algorithm>
 
 using namespace M17;

openrtx/src/protocols/M17/M17FrameEncoder.cpp

@@ -18,11 +18,11 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <M17/M17CodePuncturing.hpp>
-#include <M17/M17Decorrelator.hpp>
-#include <M17/M17Interleaver.hpp>
-#include <M17/M17FrameEncoder.hpp>
-#include <M17/M17Constants.hpp>
+#include "protocols/M17/M17CodePuncturing.hpp"
+#include "protocols/M17/M17Decorrelator.hpp"
+#include "protocols/M17/M17Interleaver.hpp"
+#include "protocols/M17/M17FrameEncoder.hpp"
+#include "protocols/M17/M17Constants.hpp"
 
 using namespace M17;
 

openrtx/src/protocols/M17/M17Golay.cpp

@@ -20,7 +20,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <M17/M17Golay.hpp>
+#include "protocols/M17/M17Golay.hpp"
 
 using namespace M17;
 

openrtx/src/protocols/M17/M17LinkSetupFrame.cpp

@@ -19,9 +19,9 @@
  ***************************************************************************/
 
 #include <cstring>
-#include <M17/M17Golay.hpp>
-#include <M17/M17Callsign.hpp>
-#include <M17/M17LinkSetupFrame.hpp>
+#include "protocols/M17/M17Golay.hpp"
+#include "protocols/M17/M17Callsign.hpp"
+#include "protocols/M17/M17LinkSetupFrame.hpp"
 
 using namespace M17;
 

openrtx/src/protocols/M17/M17Modulator.cpp

@@ -21,9 +21,9 @@
 #include <new>
 #include <cstddef>
 #include <cstring>
-#include <M17/M17Modulator.hpp>
-#include <M17/M17Utils.hpp>
-#include <M17/M17DSP.hpp>
+#include "protocols/M17/M17Modulator.hpp"
+#include "protocols/M17/M17Utils.hpp"
+#include "protocols/M17/M17DSP.hpp"
 
 #if defined(PLATFORM_LINUX)
 #include <stdio.h>

openrtx/src/rtx/OpMode_FM.cpp

@@ -18,14 +18,14 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/platform.h>
-#include <interfaces/delays.h>
-#include <interfaces/radio.h>
-#include <OpMode_FM.hpp>
-#include <rtx.h>
+#include "interfaces/platform.h"
+#include "interfaces/delays.h"
+#include "interfaces/radio.h"
+#include "rtx/OpMode_FM.hpp"
+#include "rtx/rtx.h"
 
 #if defined(PLATFORM_TTWRPLUS)
-#include "AT1846S.h"
+#include "drivers/baseband/AT1846S.h"
 #endif
 
 /**

openrtx/src/rtx/OpMode_M17.cpp

@@ -18,19 +18,19 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/platform.h>
-#include <interfaces/delays.h>
-#include <interfaces/audio.h>
-#include <interfaces/radio.h>
-#include <M17/M17Callsign.hpp>
-#include <OpMode_M17.hpp>
-#include <audio_codec.h>
+#include "interfaces/platform.h"
+#include "interfaces/delays.h"
+#include "interfaces/audio.h"
+#include "interfaces/radio.h"
+#include "protocols/M17/M17Callsign.hpp"
+#include "rtx/OpMode_M17.hpp"
+#include "core/audio_codec.h"
 #include <errno.h>
-#include <rtx.h>
+#include "rtx/rtx.h"
 
 #ifdef PLATFORM_MOD17
-#include <calibInfo_Mod17.h>
-#include <interfaces/platform.h>
+#include "calibration/calibInfo_Mod17.h"
+#include "interfaces/platform.h"
 
 extern mod17Calib_t mod17CalData;
 #endif

openrtx/src/rtx/rtx.cpp

@@ -18,12 +18,12 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/radio.h>
-#include <hwconfig.h>
+#include "interfaces/radio.h"
+#include "hwconfig.h"
 #include <string.h>
-#include <rtx.h>
-#include <OpMode_FM.hpp>
-#include <OpMode_M17.hpp>
+#include "rtx/rtx.h"
+#include "rtx/OpMode_FM.hpp"
+#include "rtx/OpMode_M17.hpp"
 
 static pthread_mutex_t   *cfgMutex;     // Mutex for incoming config messages
 static const rtxStatus_t *newCnf;       // Pointer for incoming config messages

openrtx/src/ui/default/ui.c

@@ -66,20 +66,20 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <math.h>
-#include <ui/ui_default.h>
-#include <rtx.h>
-#include <interfaces/platform.h>
-#include <interfaces/display.h>
-#include <interfaces/cps_io.h>
-#include <interfaces/nvmem.h>
-#include <interfaces/delays.h>
+#include "ui/ui_default.h"
+#include "rtx/rtx.h"
+#include "interfaces/platform.h"
+#include "interfaces/display.h"
+#include "interfaces/cps_io.h"
+#include "interfaces/nvmem.h"
+#include "interfaces/delays.h"
 #include <string.h>
-#include <battery.h>
-#include <input.h>
-#include <utils.h>
-#include <hwconfig.h>
-#include <voicePromptUtils.h>
-#include <beeps.h>
+#include "core/battery.h"
+#include "core/input.h"
+#include "core/utils.h"
+#include "hwconfig.h"
+#include "core/voicePromptUtils.h"
+#include "core/beeps.h"
 
 /* UI main screen functions, their implementation is in "ui_main.c" */
 extern void _ui_drawMainBackground();

openrtx/src/ui/default/ui_main.c

@@ -18,14 +18,14 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/platform.h>
-#include <interfaces/cps_io.h>
+#include "interfaces/platform.h"
+#include "interfaces/cps_io.h"
 #include <stdio.h>
 #include <stdint.h>
-#include <ui/ui_default.h>
+#include "ui/ui_default.h"
 #include <string.h>
-#include <ui/ui_strings.h>
-#include <utils.h>
+#include "ui/ui_strings.h"
+#include "core/utils.h"
 
 void _ui_drawMainBackground()
 {

openrtx/src/ui/default/ui_menu.c

@@ -22,18 +22,18 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include <utils.h>
-#include <ui/ui_default.h>
-#include <interfaces/nvmem.h>
-#include <interfaces/cps_io.h>
-#include <interfaces/platform.h>
-#include <interfaces/delays.h>
-#include <memory_profiling.h>
-#include <ui/ui_strings.h>
-#include <core/voicePromptUtils.h>
+#include "core/utils.h"
+#include "ui/ui_default.h"
+#include "interfaces/nvmem.h"
+#include "interfaces/cps_io.h"
+#include "interfaces/platform.h"
+#include "interfaces/delays.h"
+#include "core/memory_profiling.h"
+#include "ui/ui_strings.h"
+#include "core/voicePromptUtils.h"
 
 #ifdef PLATFORM_TTWRPLUS
-#include <SA8x8.h>
+#include "drivers/baseband/SA8x8.h"
 #endif
 
 /* UI main screen helper functions, their implementation is in "ui_main.c" */

openrtx/src/ui/default/ui_strings.c

@@ -21,9 +21,9 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <ui/ui_strings.h>
-#include <ui/EnglishStrings.h>
-#include <ui/SpanishStrings.h>
+#include "ui/ui_strings.h"
+#include "ui/EnglishStrings.h"
+#include "ui/SpanishStrings.h"
 
 const stringsTable_t languages[NUM_LANGUAGES] = {englishStrings,spanishStrings};
 const stringsTable_t* currentLanguage = &languages[0];

openrtx/src/ui/module17/ui.c

@@ -20,17 +20,17 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <ui/ui_mod17.h>
-#include <rtx.h>
-#include <interfaces/platform.h>
-#include <interfaces/display.h>
-#include <interfaces/cps_io.h>
-#include <interfaces/nvmem.h>
-#include <interfaces/delays.h>
+#include "ui/ui_mod17.h"
+#include "rtx/rtx.h"
+#include "interfaces/platform.h"
+#include "interfaces/display.h"
+#include "interfaces/cps_io.h"
+#include "interfaces/nvmem.h"
+#include "interfaces/delays.h"
 #include <string.h>
-#include <battery.h>
-#include <input.h>
-#include <hwconfig.h>
+#include "core/battery.h"
+#include "core/input.h"
+#include "hwconfig.h"
 
 /* UI main screen functions, their implementation is in "ui_main.c" */
 extern void _ui_drawMainBackground();

openrtx/src/ui/module17/ui_main.c

@@ -18,11 +18,11 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/platform.h>
-#include <interfaces/cps_io.h>
+#include "interfaces/platform.h"
+#include "interfaces/cps_io.h"
 #include <stdio.h>
 #include <stdint.h>
-#include <ui/ui_mod17.h>
+#include "ui/ui_mod17.h"
 #include <string.h>
 
 void _ui_drawMainBackground()

openrtx/src/ui/module17/ui_menu.c

@@ -21,14 +21,14 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils.h>
-#include <ui/ui_mod17.h>
-#include <interfaces/nvmem.h>
-#include <interfaces/cps_io.h>
-#include <interfaces/platform.h>
-#include <interfaces/delays.h>
-#include <memory_profiling.h>
-#include <hwconfig.h>
+#include "core/utils.h"
+#include "ui/ui_mod17.h"
+#include "interfaces/nvmem.h"
+#include "interfaces/cps_io.h"
+#include "interfaces/platform.h"
+#include "interfaces/delays.h"
+#include "core/memory_profiling.h"
+#include "hwconfig.h"
 
 /* UI main screen helper functions, their implementation is in "ui_main.c" */
 extern void _ui_drawMainBottom();

platform/drivers/ADC/ADC0_GDx.c

@@ -16,7 +16,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <hwconfig.h>
+#include "hwconfig.h"
 #include "ADC0_GDx.h"
 
 void adc0_init()

platform/drivers/ADC/adc_stm32.h

@@ -18,7 +18,7 @@
 #ifndef ADC_STM32_H
 #define ADC_STM32_H
 
-#include <peripherals/adc.h>
+#include "peripherals/adc.h"
 
 #ifdef __cplusplus
 extern "C" {

platform/drivers/ADC/adc_stm32f4.c

@@ -16,7 +16,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <stm32f4xx.h>
+#include "stm32f4xx.h"
 #include <pthread.h>
 #include <errno.h>
 #include "adc_stm32.h"

platform/drivers/ADC/adc_stm32h7.c

@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <stm32h7xx.h>
+#include "stm32h7xx.h"
 #include <pthread.h>
 #include <errno.h>
 #include "adc_stm32.h"

platform/drivers/CPS/cps_io_libc.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/cps_io.h>
+#include "interfaces/cps_io.h"
 #include <string.h>
 #include <stdio.h>
 #include <time.h>

platform/drivers/CPS/cps_io_native_GDx.c

@@ -19,11 +19,11 @@
  ***************************************************************************/
 
 #include <string.h>
-#include <wchar.h>
-#include <interfaces/delays.h>
-#include <interfaces/cps_io.h>
-#include <nvmem_access.h>
-#include <utils.h>
+#include "wchar.h"
+#include "interfaces/delays.h"
+#include "interfaces/cps_io.h"
+#include "core/nvmem_access.h"
+#include "core/utils.h"
 #include "AT24Cx.h"
 #include "W25Qx.h"
 #include "cps_data_GDx.h"

platform/drivers/CPS/cps_io_native_MD3x0.c

@@ -18,12 +18,12 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/cps_io.h>
-#include <interfaces/delays.h>
-#include <nvmem_access.h>
+#include "interfaces/cps_io.h"
+#include "interfaces/delays.h"
+#include "core/nvmem_access.h"
 #include <string.h>
-#include <wchar.h>
-#include <utils.h>
+#include "wchar.h"
+#include "core/utils.h"
 #include "cps_data_MD3x0.h"
 #include "W25Qx.h"
 

platform/drivers/CPS/cps_io_native_MD9600.c

@@ -18,12 +18,12 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <wchar.h>
+#include "wchar.h"
 #include <string.h>
-#include <interfaces/nvmem.h>
-#include <interfaces/delays.h>
-#include <nvmem_access.h>
-#include <utils.h>
+#include "interfaces/nvmem.h"
+#include "interfaces/delays.h"
+#include "core/nvmem_access.h"
+#include "core/utils.h"
 #include "cps_data_MDUV3x0.h"
 #include "W25Qx.h"
 

platform/drivers/CPS/cps_io_native_MDUV3x0.c

@@ -18,12 +18,12 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <wchar.h>
+#include "wchar.h"
 #include <string.h>
-#include <nvmem_access.h>
-#include <interfaces/delays.h>
-#include <interfaces/cps_io.h>
-#include <utils.h>
+#include "core/nvmem_access.h"
+#include "interfaces/delays.h"
+#include "interfaces/cps_io.h"
+#include "core/utils.h"
 #include "cps_data_MDUV3x0.h"
 #include "W25Qx.h"
 

platform/drivers/CPS/cps_io_native_Mod17.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/cps_io.h>
+#include "interfaces/cps_io.h"
 
 
 /**

platform/drivers/GPIO/gpio-native.h

@@ -19,13 +19,13 @@
 #define GPIO_NATIVE_H
 
 #if defined(STM32F405xx)
-#include <stm32f4xx.h>
-#include <gpio_stm32.h>
+#include "stm32f4xx.h"
+#include "drivers/GPIO/gpio_stm32.h"
 #elif defined(STM32H743xx)
-#include <stm32h7xx.h>
-#include <gpio_stm32.h>
+#include "stm32h7xx.h"
+#include "drivers/GPIO/gpio_stm32.h"
 #elif defined(MK22FN512xx)
-#include <gpio_mk22.h>
+#include "drivers/GPIO/gpio_mk22.h"
 #endif
 
 #endif /* GPIO_NATIVE_H */

platform/drivers/GPIO/gpio_mk22.c

@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include <errno.h>
 #include "MK22F51212.h"
-#include "gpio_mk22.h"
+#include "drivers/GPIO/gpio_mk22.h"
 
 /*
  * MK22 GPIO management is a bit convoluted: instead of having all the registers

platform/drivers/GPIO/gpio_mk22.h

@@ -18,8 +18,8 @@
 #ifndef GPIO_MK22_H
 #define GPIO_MK22_H
 
-#include <peripherals/gpio.h>
-#include <hwconfig.h>
+#include "peripherals/gpio.h"
+#include "hwconfig.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

platform/drivers/GPIO/gpio_shiftReg.c

@@ -15,11 +15,11 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/delays.h>
-#include <peripherals/gpio.h>
+#include "interfaces/delays.h"
+#include "peripherals/gpio.h"
 #include <string.h>
 #include <errno.h>
-#include "gpio_shiftReg.h"
+#include "drivers/GPIO/gpio_shiftReg.h"
 
 void gpioShiftReg_init(const struct gpioDev *dev)
 {

platform/drivers/GPIO/gpio_shiftReg.h

@@ -18,8 +18,8 @@
 #ifndef GPIO_SHIFTREG_H
 #define GPIO_SHIFTREG_H
 
-#include <peripherals/gpio.h>
-#include <peripherals/spi.h>
+#include "peripherals/gpio.h"
+#include "peripherals/spi.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

platform/drivers/GPIO/gpio_stm32.c

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <errno.h>
-#include "gpio_stm32.h"
+#include "drivers/GPIO/gpio_stm32.h"
 
 static inline void setGpioAf(GPIO_TypeDef *port, uint8_t pin, const uint8_t af)
 {

platform/drivers/GPIO/gpio_stm32.h

@@ -18,7 +18,7 @@
 #ifndef GPIO_STM32_H
 #define GPIO_STM32_H
 
-#include <peripherals/gpio.h>
+#include "peripherals/gpio.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

platform/drivers/GPS/gps_linux.c

@@ -21,7 +21,7 @@
 #include <sys/time.h>
 #include <stdbool.h>
 #include <string.h>
-#include <gps.h>
+#include "core/gps.h"
 
 #define MAX_NMEA_LEN 80
 #define NMEA_SAMPLES 8

platform/drivers/GPS/gps_stm32.cpp

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <hwconfig.h>
-#include <rcc.h>
+#include "hwconfig.h"
+#include "rcc.h"
 #include "nmea_rbuf.h"
 #include "gps_stm32.h"
 

platform/drivers/GPS/gps_zephyr.c

@@ -20,8 +20,8 @@
 
 #include <zephyr/drivers/uart.h>
 #include <zephyr/kernel.h>
-#include <hwconfig.h>
-#include <nmea_rbuf.h>
+#include "hwconfig.h"
+#include "drivers/GPS/nmea_rbuf.h"
 
 #if !DT_NODE_HAS_STATUS(DT_ALIAS(gps), okay)
 #error "Please select the correct gps UART device"

platform/drivers/GPS/nmea_rbuf.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <hwconfig.h>
+#include "hwconfig.h"
 #include <stdint.h>
 #include <stddef.h>
 #include <string.h>