diff --git a/mission/acs/str/ArcsecDatalinkLayer.cpp b/mission/acs/str/ArcsecDatalinkLayer.cpp
index e192be2e..d67f6e75 100644
--- a/mission/acs/str/ArcsecDatalinkLayer.cpp
+++ b/mission/acs/str/ArcsecDatalinkLayer.cpp
@@ -1,7 +1,7 @@
 #include "ArcsecDatalinkLayer.h"
 
 extern "C" {
-#include <common/misc.h>
+#include <wire/common/misc.h>
 }
 
 ArcsecDatalinkLayer::ArcsecDatalinkLayer() : decodeRingBuf(BUFFER_LENGTHS, true) { slipInit(); }
diff --git a/mission/acs/str/ArcsecDatalinkLayer.h b/mission/acs/str/ArcsecDatalinkLayer.h
index b1a7fd94..1453e517 100644
--- a/mission/acs/str/ArcsecDatalinkLayer.h
+++ b/mission/acs/str/ArcsecDatalinkLayer.h
@@ -9,7 +9,7 @@
 #include "fsfw/returnvalues/returnvalue.h"
 
 extern "C" {
-#include <common/SLIP.h>
+#include <wire/common/SLIP.h>
 }
 
 /**
diff --git a/mission/acs/str/ArcsecJsonParamBase.cpp b/mission/acs/str/ArcsecJsonParamBase.cpp
index 6bdaa505..ff1f59d2 100644
--- a/mission/acs/str/ArcsecJsonParamBase.cpp
+++ b/mission/acs/str/ArcsecJsonParamBase.cpp
@@ -4,7 +4,7 @@
 #include <mission/acs/str/arcsecJsonKeys.h>
 
 extern "C" {
-#include <common/genericstructs.h>
+#include <wire/common/genericstructs.h>
 }
 
 ArcsecJsonParamBase::ArcsecJsonParamBase(std::string setName) : setName(setName) {}
diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index b449c036..54af25da 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -4,16 +4,15 @@
 #include <mission/acs/str/strHelpers.h>
 #include <mission/acs/str/strJsonCommands.h>
 
-#include <sagitta/client/actionreq.h>
-#include <sagitta/client/parameter.h>
-#include <sagitta/client/telemetry.h>
+extern "C" {
+#include <sagitta/client/arc_client.h>
+}
 
 #include <atomic>
 #include <fstream>
 #include <thread>
 
 #include "OBSWConfig.h"
-//#include "/common/misc.h"
 
 std::atomic_bool JCFG_DONE(false);
 
diff --git a/mission/acs/str/StarTrackerHandler.h b/mission/acs/str/StarTrackerHandler.h
index 4b8ba449..ea46cb43 100644
--- a/mission/acs/str/StarTrackerHandler.h
+++ b/mission/acs/str/StarTrackerHandler.h
@@ -10,12 +10,15 @@
 #include <thread>
 
 #include "OBSWConfig.h"
-#include "common/SLIP.h"
 #include "devices/powerSwitcherList.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/src/fsfw/serialize/SerializeAdapter.h"
 #include "fsfw/timemanager/Countdown.h"
 
+extern "C" {
+#include <wire/common/SLIP.h>
+}
+
 /**
  * @brief	This is the device handler for the star tracker from arcsec.
  *
diff --git a/thirdparty/sagittactl b/thirdparty/sagittactl
index 3ab9b2cf..64332216 160000
--- a/thirdparty/sagittactl
+++ b/thirdparty/sagittactl
@@ -1 +1 @@
-Subproject commit 3ab9b2cf56dea1cf19c7d46eb88a967939968acd
+Subproject commit 64332216c193fa6483258060b53fc2842c08dcf4