From 17ab36bbdb27c97e3532c79df6aaba3e285ba6a6 Mon Sep 17 00:00:00 2001
From: Jerome Hue <hue.jerome@yahoo.fr>
Date: Tue, 13 Feb 2024 16:58:31 +0100
Subject: [PATCH] Fix merge conflict

---
 CMakePresets.json                    |  2 +-
 Sts1CobcSw/CommandParser.cpp         |  1 +
 Sts1CobcSw/CommandParser.hpp         |  1 +
 Sts1CobcSw/Edu/Edu.cpp               |  7 +++---
 Sts1CobcSw/Edu/Edu.hpp               |  3 ---
 Sts1CobcSw/Edu/ProgramQueue.cpp      |  3 +--
 Sts1CobcSw/Edu/ProgramQueue.hpp      |  5 ++--
 Sts1CobcSw/EduHeartbeatThread.cpp    |  1 -
 Sts1CobcSw/EduProgramQueueThread.cpp |  5 +++-
 Sts1CobcSw/FileSystem/FileSystem.cpp |  1 +
 Sts1CobcSw/FileSystem/FileSystem.hpp |  2 +-
 Sts1CobcSw/FileSystem/FileSystem.ipp |  2 +-
 Sts1CobcSw/Hal/Spi.cpp               |  2 ++
 Sts1CobcSw/Hal/Spi.hpp               |  3 +--
 Sts1CobcSw/Hal/Spi.ipp               |  4 +++-
 Sts1CobcSw/Hal/Uart.cpp              |  2 ++
 Sts1CobcSw/Hal/Uart.hpp              |  2 +-
 Sts1CobcSw/HelloDummy.cpp            |  3 +--
 Sts1CobcSw/Periphery/Flash.cpp       |  4 ++--
 Sts1CobcSw/Periphery/Flash.hpp       |  1 +
 Sts1CobcSw/Periphery/Fram.hpp        |  2 +-
 Sts1CobcSw/Periphery/Rf.cpp          |  3 +++
 Sts1CobcSw/Serial/Byte.hpp           |  2 +-
 Sts1CobcSw/Serial/Serial.hpp         |  2 ++
 Sts1CobcSw/Utility/Crc32.cpp         |  6 ++---
 Sts1CobcSw/Utility/Time.hpp          |  2 +-
 iwyu.imp                             | 36 +++++++++++++++++++++++++---
 27 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index 0d1c62ba..7a6501be 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -47,7 +47,7 @@
       "name": "include-what-you-use",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_CXX_INCLUDE_WHAT_YOU_USE": "include-what-you-use;-Xiwyu;--mapping_file=${sourceDir}/iwyu.imp"
+        "CMAKE_CXX_INCLUDE_WHAT_YOU_USE": "include-what-you-use;-Xiwyu;--mapping_file=${sourceDir}/iwyu.imp;-Xiwyu;--no_fwd_decls"
       }
     },
     {
diff --git a/Sts1CobcSw/CommandParser.cpp b/Sts1CobcSw/CommandParser.cpp
index e695da66..7a1f522b 100644
--- a/Sts1CobcSw/CommandParser.cpp
+++ b/Sts1CobcSw/CommandParser.cpp
@@ -1,5 +1,6 @@
 #include <Sts1CobcSw/CommandParser.hpp>
 #include <Sts1CobcSw/Edu/Edu.hpp>
+#include <Sts1CobcSw/Edu/ProgramQueue.hpp>
 #include <Sts1CobcSw/EduProgramQueueThread.hpp>
 #include <Sts1CobcSw/Utility/Time.hpp>
 
diff --git a/Sts1CobcSw/CommandParser.hpp b/Sts1CobcSw/CommandParser.hpp
index 9bd8effd..7342b744 100644
--- a/Sts1CobcSw/CommandParser.hpp
+++ b/Sts1CobcSw/CommandParser.hpp
@@ -4,6 +4,7 @@
 
 #include <etl/vector.h>
 
+#include <bit>
 #include <cstddef>
 #include <cstdint>
 #include <span>
diff --git a/Sts1CobcSw/Edu/Edu.cpp b/Sts1CobcSw/Edu/Edu.cpp
index ad74494a..b5667f89 100644
--- a/Sts1CobcSw/Edu/Edu.cpp
+++ b/Sts1CobcSw/Edu/Edu.cpp
@@ -4,16 +4,17 @@
 #include <Sts1CobcSw/Hal/IoNames.hpp>
 #include <Sts1CobcSw/Hal/Uart.hpp>
 #include <Sts1CobcSw/Periphery/PersistentState.hpp>
+#include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/Serial/Serial.hpp>
 #include <Sts1CobcSw/Utility/Crc32.hpp>
 #include <Sts1CobcSw/Utility/Span.hpp>
 
+#include <rodos_no_using_namespace.h>
+
 #include <etl/vector.h>
 
-#include <algorithm>
 #include <array>
-#include <cinttypes>
-#include <cstddef>
+#include <span>
 
 
 namespace sts1cobcsw::edu
diff --git a/Sts1CobcSw/Edu/Edu.hpp b/Sts1CobcSw/Edu/Edu.hpp
index 5ba6b850..b5a29bbb 100644
--- a/Sts1CobcSw/Edu/Edu.hpp
+++ b/Sts1CobcSw/Edu/Edu.hpp
@@ -3,9 +3,6 @@
 
 #include <Sts1CobcSw/Edu/Types.hpp>
 #include <Sts1CobcSw/Outcome/Outcome.hpp>
-#include <Sts1CobcSw/Serial/Byte.hpp>
-
-#include <rodos_no_using_namespace.h>
 
 #include <cstdint>
 
diff --git a/Sts1CobcSw/Edu/ProgramQueue.cpp b/Sts1CobcSw/Edu/ProgramQueue.cpp
index 891893db..e682fe1e 100644
--- a/Sts1CobcSw/Edu/ProgramQueue.cpp
+++ b/Sts1CobcSw/Edu/ProgramQueue.cpp
@@ -1,6 +1,5 @@
 #include <Sts1CobcSw/Edu/ProgramQueue.hpp>
-
-#include <rodos_no_using_namespace.h>
+#include <Sts1CobcSw/Serial/Serial.hpp>
 
 
 // TODO: Change namespace here too, or move it back to Sts1CobSw/
diff --git a/Sts1CobcSw/Edu/ProgramQueue.hpp b/Sts1CobcSw/Edu/ProgramQueue.hpp
index 3440328a..e5b770de 100644
--- a/Sts1CobcSw/Edu/ProgramQueue.hpp
+++ b/Sts1CobcSw/Edu/ProgramQueue.hpp
@@ -4,15 +4,14 @@
 // clang-format off
 #include <cstdint>
 // ringbuffer.h does not include <cstdint> even though it requires it
-#include <rodos/support/support-libs/ringbuffer.h>
+// #include <rodos/support/support-libs/ringbuffer.h>
 // clang-format on
 
-#include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/Serial/Serial.hpp>
 
-#include <etl/string.h>
 #include <etl/vector.h>
 
+#include <bit>
 #include <cstddef>
 
 
diff --git a/Sts1CobcSw/EduHeartbeatThread.cpp b/Sts1CobcSw/EduHeartbeatThread.cpp
index 6c64ce3b..3d85189f 100644
--- a/Sts1CobcSw/EduHeartbeatThread.cpp
+++ b/Sts1CobcSw/EduHeartbeatThread.cpp
@@ -1,4 +1,3 @@
-#include <Sts1CobcSw/Edu/Edu.hpp>
 #include <Sts1CobcSw/Hal/GpioPin.hpp>
 #include <Sts1CobcSw/Hal/IoNames.hpp>
 #include <Sts1CobcSw/ThreadPriorities.hpp>
diff --git a/Sts1CobcSw/EduProgramQueueThread.cpp b/Sts1CobcSw/EduProgramQueueThread.cpp
index 020db98b..836fbfce 100644
--- a/Sts1CobcSw/EduProgramQueueThread.cpp
+++ b/Sts1CobcSw/EduProgramQueueThread.cpp
@@ -4,15 +4,18 @@
 #include <Sts1CobcSw/Edu/Types.hpp>
 #include <Sts1CobcSw/EduCommunicationErrorThread.hpp>
 #include <Sts1CobcSw/EduProgramQueueThread.hpp>
-#include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/ThreadPriorities.hpp>
 #include <Sts1CobcSw/TopicsAndSubscribers.hpp>
 #include <Sts1CobcSw/Utility/Time.hpp>
 
+#include <rodos/support/support-libs/ringbuffer.h>
 #include <rodos_no_using_namespace.h>
 
+#include <etl/vector.h>
+
 #include <algorithm>
 #include <cinttypes>
+#include <cstdint>
 
 
 namespace sts1cobcsw
diff --git a/Sts1CobcSw/FileSystem/FileSystem.cpp b/Sts1CobcSw/FileSystem/FileSystem.cpp
index 8d182b9c..48035ae1 100644
--- a/Sts1CobcSw/FileSystem/FileSystem.cpp
+++ b/Sts1CobcSw/FileSystem/FileSystem.cpp
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <array>
+#include <iterator>
 #include <span>
 
 
diff --git a/Sts1CobcSw/FileSystem/FileSystem.hpp b/Sts1CobcSw/FileSystem/FileSystem.hpp
index f444be5f..df2f284c 100644
--- a/Sts1CobcSw/FileSystem/FileSystem.hpp
+++ b/Sts1CobcSw/FileSystem/FileSystem.hpp
@@ -37,4 +37,4 @@ auto Ls(char const * path) -> int;
 }
 
 
-#include <Sts1CobcSw/FileSystem/FileSystem.ipp>
+#include <Sts1CobcSw/FileSystem/FileSystem.ipp>  // IWYU pragma: keep
diff --git a/Sts1CobcSw/FileSystem/FileSystem.ipp b/Sts1CobcSw/FileSystem/FileSystem.ipp
index 415856b8..bb02c026 100644
--- a/Sts1CobcSw/FileSystem/FileSystem.ipp
+++ b/Sts1CobcSw/FileSystem/FileSystem.ipp
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <Sts1CobcSw/FileSystem/FileSystem.hpp>
+#include <Sts1CobcSw/FileSystem/FileSystem.hpp>  // IWYU pragma: keep
 
 
 namespace sts1cobcsw::fs
diff --git a/Sts1CobcSw/Hal/Spi.cpp b/Sts1CobcSw/Hal/Spi.cpp
index 65cdab56..dad79908 100644
--- a/Sts1CobcSw/Hal/Spi.cpp
+++ b/Sts1CobcSw/Hal/Spi.cpp
@@ -1,5 +1,7 @@
 #include <Sts1CobcSw/Hal/Spi.hpp>
 
+#include <rodos_no_using_namespace.h>
+
 
 namespace sts1cobcsw::hal
 {
diff --git a/Sts1CobcSw/Hal/Spi.hpp b/Sts1CobcSw/Hal/Spi.hpp
index ceabe6e7..5216911c 100644
--- a/Sts1CobcSw/Hal/Spi.hpp
+++ b/Sts1CobcSw/Hal/Spi.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <rodos_no_using_namespace.h>
 
 #include <cstddef>
@@ -22,4 +21,4 @@ auto ReadFrom(RODOS::HAL_SPI * spi, std::span<T, extent> data) -> void;
 }
 
 
-#include <Sts1CobcSw/Hal/Spi.ipp>
+#include <Sts1CobcSw/Hal/Spi.ipp>  // IWYU pragma: keep
diff --git a/Sts1CobcSw/Hal/Spi.ipp b/Sts1CobcSw/Hal/Spi.ipp
index 42f8617c..45e33aef 100644
--- a/Sts1CobcSw/Hal/Spi.ipp
+++ b/Sts1CobcSw/Hal/Spi.ipp
@@ -3,6 +3,8 @@
 
 #include <Sts1CobcSw/Hal/Spi.hpp>
 
+#include <rodos_no_using_namespace.h>  // IWYU pragma: keep
+
 
 namespace sts1cobcsw::hal
 {
@@ -24,4 +26,4 @@ inline auto ReadFrom(RODOS::HAL_SPI * spi, std::span<T, extent> data) -> void
     // return value at runtime.
     spi->read(data.data(), data.size_bytes());
 }
-}
\ No newline at end of file
+}
diff --git a/Sts1CobcSw/Hal/Uart.cpp b/Sts1CobcSw/Hal/Uart.cpp
index 2d3b5ded..180cb529 100644
--- a/Sts1CobcSw/Hal/Uart.cpp
+++ b/Sts1CobcSw/Hal/Uart.cpp
@@ -1,5 +1,7 @@
 #include <Sts1CobcSw/Hal/Uart.hpp>
 
+#include <rodos_no_using_namespace.h>
+
 
 namespace sts1cobcsw::hal
 {
diff --git a/Sts1CobcSw/Hal/Uart.hpp b/Sts1CobcSw/Hal/Uart.hpp
index 8dda4fd9..e643f50c 100644
--- a/Sts1CobcSw/Hal/Uart.hpp
+++ b/Sts1CobcSw/Hal/Uart.hpp
@@ -42,4 +42,4 @@ template<typename T, std::size_t extent>
 }
 
 
-#include <Sts1CobcSw/Hal/Uart.ipp>
+#include <Sts1CobcSw/Hal/Uart.ipp>  // IWYU pragma: keep
diff --git a/Sts1CobcSw/HelloDummy.cpp b/Sts1CobcSw/HelloDummy.cpp
index 1d505888..ccc15c0b 100644
--- a/Sts1CobcSw/HelloDummy.cpp
+++ b/Sts1CobcSw/HelloDummy.cpp
@@ -2,8 +2,7 @@
 
 #include <rodos_no_using_namespace.h>
 
-#include <span>
-#include <string_view>
+#include <etl/string.h>
 
 
 namespace RODOS
diff --git a/Sts1CobcSw/Periphery/Flash.cpp b/Sts1CobcSw/Periphery/Flash.cpp
index a2121b6c..e80c0575 100644
--- a/Sts1CobcSw/Periphery/Flash.cpp
+++ b/Sts1CobcSw/Periphery/Flash.cpp
@@ -8,9 +8,9 @@
 
 #include <rodos_no_using_namespace.h>
 
-#include <algorithm>
+#include <array>
 #include <bit>
-#include <string_view>
+#include <tuple>
 
 
 namespace sts1cobcsw
diff --git a/Sts1CobcSw/Periphery/Flash.hpp b/Sts1CobcSw/Periphery/Flash.hpp
index e4e7f6b7..f132e965 100644
--- a/Sts1CobcSw/Periphery/Flash.hpp
+++ b/Sts1CobcSw/Periphery/Flash.hpp
@@ -4,6 +4,7 @@
 #include <Sts1CobcSw/Serial/Byte.hpp>
 
 #include <array>
+#include <cstddef>
 #include <cstdint>
 #include <span>
 
diff --git a/Sts1CobcSw/Periphery/Fram.hpp b/Sts1CobcSw/Periphery/Fram.hpp
index f0baaf81..1d18a212 100644
--- a/Sts1CobcSw/Periphery/Fram.hpp
+++ b/Sts1CobcSw/Periphery/Fram.hpp
@@ -41,4 +41,4 @@ auto ReadFrom(Address address, void * data, std::size_t nBytes) -> void;
 }
 
 
-#include <Sts1CobcSw/Periphery/Fram.ipp>
+#include <Sts1CobcSw/Periphery/Fram.ipp>  // IWYU pragma: keep
diff --git a/Sts1CobcSw/Periphery/Rf.cpp b/Sts1CobcSw/Periphery/Rf.cpp
index 0d4e165c..afd34436 100644
--- a/Sts1CobcSw/Periphery/Rf.cpp
+++ b/Sts1CobcSw/Periphery/Rf.cpp
@@ -8,7 +8,10 @@
 
 #include <array>
 #include <climits>
+#include <cstddef>
+#include <iterator>
 #include <span>
+#include <type_traits>
 
 
 namespace sts1cobcsw::periphery::rf
diff --git a/Sts1CobcSw/Serial/Byte.hpp b/Sts1CobcSw/Serial/Byte.hpp
index 136eb680..d52f4629 100644
--- a/Sts1CobcSw/Serial/Byte.hpp
+++ b/Sts1CobcSw/Serial/Byte.hpp
@@ -15,4 +15,4 @@ constexpr auto operator"" _b(unsigned long long number) -> Byte;
 }
 
 
-#include <Sts1CobcSw/Serial/Byte.ipp>
+#include <Sts1CobcSw/Serial/Byte.ipp>  // IWYU pragma: keep
diff --git a/Sts1CobcSw/Serial/Serial.hpp b/Sts1CobcSw/Serial/Serial.hpp
index 53051b8a..e7e7a0a5 100644
--- a/Sts1CobcSw/Serial/Serial.hpp
+++ b/Sts1CobcSw/Serial/Serial.hpp
@@ -14,6 +14,7 @@
 
 
 #include <Sts1CobcSw/Serial/Byte.hpp>
+#include <Sts1CobcSw/Serial/Serial.hpp>
 
 // We need std::byteswap which is C++23 but for some reason clang-tidy crashes when using C++23, so
 // we use the ETL version
@@ -24,6 +25,7 @@
 #include <cstddef>
 #include <cstring>
 #include <span>
+#include <tuple>
 #include <type_traits>
 
 
diff --git a/Sts1CobcSw/Utility/Crc32.cpp b/Sts1CobcSw/Utility/Crc32.cpp
index a51c991d..f0e0df18 100644
--- a/Sts1CobcSw/Utility/Crc32.cpp
+++ b/Sts1CobcSw/Utility/Crc32.cpp
@@ -1,16 +1,16 @@
 #include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/Utility/Crc32.hpp>
 
+#include <stm32f4xx.h>
 #include <stm32f4xx_crc.h>
 #include <stm32f4xx_dma.h>
 #include <stm32f4xx_rcc.h>
 
-#include <rodos_no_using_namespace.h>
-
 #include <array>
-#include <bit>
 #include <climits>
+#include <cstddef>
 #include <cstring>
+#include <type_traits>
 
 
 namespace sts1cobcsw::utility
diff --git a/Sts1CobcSw/Utility/Time.hpp b/Sts1CobcSw/Utility/Time.hpp
index 25028fcb..87edfc51 100644
--- a/Sts1CobcSw/Utility/Time.hpp
+++ b/Sts1CobcSw/Utility/Time.hpp
@@ -23,4 +23,4 @@ auto PrintFormattedSystemUtc() -> void;
 }
 
 
-#include <Sts1CobcSw/Utility/Time.ipp>
+#include <Sts1CobcSw/Utility/Time.ipp>  // IWYU pragma: keep
diff --git a/iwyu.imp b/iwyu.imp
index 57bfce1c..c4589d69 100644
--- a/iwyu.imp
+++ b/iwyu.imp
@@ -41,8 +41,38 @@
   # Include support libs we use by their full path
   { include: ["<ringbuffer.h>", "private", "<rodos/support/support-libs/ringbuffer.h>", "public"] },
 
-  { include: ["\"Sts1CobcwSw/Hal/Spi.ipp\"", "private", "\"Sts1CobcwSw/Hal/Spi.hpp\"", "public"] },
-  { include: ["\"Sts1CobcwSw/Hal/GpioPin.ipp\"", "private", "\"Sts1CobcwSw/Hal/GpioPin.hpp\"", "public"] },
-  { include: ["\"Sts1CobcwSw/Utility/Time.ipp\"", "private", "\"Sts1CobcwSw/Utility/Time.hpp\"", "public"] }
+  { include: ["\"Sts1CobcSw/FileSystem/FileSystem.ipp\"", "private", "<Sts1CobcSw/FileSystem/FileSystem.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Spi.ipp\"",               "private", "<Sts1CobcSw/Hal/Spi.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/GpioPin.ipp\"",           "private", "<Sts1CobcSw/Hal/GpioPin.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Time.ipp\"",          "private", "<Sts1CobcSw/Utility/Time.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Periphery/Fram.ipp\"",        "private", "<Sts1CobcSw/Periphery/Fram.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Byte.ipp\"",           "private", "<Sts1CobcSw/Serial/Byte.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Serial.ipp\"",         "private", "<Sts1CobcSw/Serial/Serial.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Span.ipp\"",          "private", "<Sts1CobcSw/Utility/Span.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Edu/Structs.ipp\"",           "private", "<Sts1CobcSw/Edu/Structs.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Uart.ipp\"",              "private", "<Sts1CobcSw/Hal/Uart.hpp>", "public"] },
+
+  { include: ["\"Sts1CobcSw/FileSystem/FileSystem.ipp\"", "private", "<Sts1CobcSw/FileSystem/FileSystem.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Spi.ipp\"",               "private", "<Sts1CobcSw/Hal/Spi.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/GpioPin.ipp\"",           "private", "<Sts1CobcSw/Hal/GpioPin.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Time.ipp\"",          "private", "<Sts1CobcSw/Utility/Time.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Periphery/Fram.ipp\"",        "private", "<Sts1CobcSw/Periphery/Fram.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Byte.ipp\"",           "private", "<Sts1CobcSw/Serial/Byte.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Serial.ipp\"",         "private", "<Sts1CobcSw/Serial/Serial.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Span.ipp\"",          "private", "<Sts1CobcSw/Utility/Span.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Edu/Structs.ipp\"",           "private", "<Sts1CobcSw/Edu/Structs.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Uart.ipp\"",              "private", "<Sts1CobcSw/Hal/Uart.ipp>", "public"] },
+
+  { include: ["\"Sts1CobcSw/FileSystem/FileSystem.hpp\"", "public", "<Sts1CobcSw/FileSystem/FileSystem.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Spi.hpp\"",               "public", "<Sts1CobcSw/Hal/Spi.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/GpioPin.hpp\"",           "public", "<Sts1CobcSw/Hal/GpioPin.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Time.hpp\"",          "public", "<Sts1CobcSw/Utility/Time.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Periphery/Fram.hpp\"",        "public", "<Sts1CobcSw/Periphery/Fram.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Byte.hpp\"",           "public", "<Sts1CobcSw/Serial/Byte.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Serial.hpp\"",         "public", "<Sts1CobcwSw/Serial/Serial.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Span.hpp\"",          "public", "<Sts1CobcSw/Utility/Span.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Edu/Structs.hpp\"",           "public", "<Sts1CobcSw/Edu/Structs.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Uart.hpp\"",              "public", "<Sts1CobcSw/Hal/Uart.hpp>", "public"] }
+
 
 ]