diff --git a/.gitmodules b/.gitmodules
index 9fde3f4d1260c351a43b02e6767ae4db1001d88e..30a229992e84a25a9323f9a9a446d55157b9b86f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "skyward-boardcore"]
 	path = skyward-boardcore
 	url = ../skyward-boardcore.git
-[submodule "libs/mavlink_skyward_lib"]
-	path = libs/mavlink_skyward_lib
-	url = ../mavlink_skyward_lib.git
diff --git a/libs/mavlink_skyward_lib b/libs/mavlink_skyward_lib
deleted file mode 160000
index 58c58bb6466f486151bb620bfa7c7fb5bc7a3059..0000000000000000000000000000000000000000
--- a/libs/mavlink_skyward_lib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 58c58bb6466f486151bb620bfa7c7fb5bc7a3059
diff --git a/sbs.conf b/sbs.conf
index 11fb34ead9d81fec8c2b620e7e269d3cb3de13de..5810afc1087a0bf07aa2d463fd195663b6ae939a 100644
--- a/sbs.conf
+++ b/sbs.conf
@@ -66,6 +66,7 @@
 # TESTS_PATH:       tests folder
 # SRC_PATH:         shared sources folder
 # SBS_BASE:         boardcore folder
+# PROJECT_INCLUDES: folders to be included with -I
 
 [SBS_PROJECT]
 Type:             project
@@ -73,13 +74,12 @@ ENTRY_PATH:       src/entrypoints
 TESTS_PATH:       src/tests
 SRC_PATH:         src/
 SBS_BASE:         skyward-boardcore
-PROJECT_INCLUDES: libs
-
+PROJECT_INCLUDES: skyward-boardcore
 
 #-----------------------------------#
 #          List of Sources          #
 #-----------------------------------#
-# [name]    -> can be included using '%name'
+# [name]    -> can be included by boards and tests using '%name'
 #     Type: srcfiles
 #     Files: a '\n'-separated list of f
 
@@ -107,7 +107,7 @@ FIles:      src/boards/Ignition/IgnitionManager.cpp
 #--------------------------#
 #          Boards          #
 #--------------------------#
-# [boardname]  -> compile using 'sbs -b boardname'
+# [boardname]  -> compile using '.sbs -b boardname'
 #     BoardId: see the list at the top of this file
 #     BinName: name of the final binary (without extension!)
 #     Include: a space-separated list of files, %something will be substituted
@@ -225,8 +225,6 @@ Main:       drivers/hbridge-test
 Type:       test
 BoardId:    stm32f429zi_skyward_homeone
 BinName:    test-mavlink
-Include:	%shared %mavlink %gamma868
+Include:    %shared %gamma868
 Defines:   -DDEBUG
-Main:       drivers/test-mavlink
-
-
+Main:       drivers/test-mavlink
\ No newline at end of file
diff --git a/skyward-boardcore b/skyward-boardcore
index 886564c4cc819af602313b2b6c0ae9c42ab82d7c..e06a0324eea3105cd49e85a11b275897130a9ead 160000
--- a/skyward-boardcore
+++ b/skyward-boardcore
@@ -1 +1 @@
-Subproject commit 886564c4cc819af602313b2b6c0ae9c42ab82d7c
+Subproject commit e06a0324eea3105cd49e85a11b275897130a9ead
diff --git a/src/tests/drivers/test-mavlink.cpp b/src/tests/drivers/test-mavlink.cpp
index bd64ce81d0c0f01aca98c7d0f7518ad698ba00bd..821f75f0c04f90543bb51636c30a8f21e67cd84a 100644
--- a/src/tests/drivers/test-mavlink.cpp
+++ b/src/tests/drivers/test-mavlink.cpp
@@ -20,9 +20,12 @@
  * THE SOFTWARE.
  */
 
+#include <skyward-boardcore/libs/mavlink_skyward_lib/mavlink_lib/r2a/mavlink.h>
+
 #include <Common.h>
 #include <drivers/gamma868/Gamma868.h>
-#include "drivers/mavlink/MavManager.h"
+#include <drivers/mavlink/MavManager.h>
+
 
 using namespace miosix;