done

src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp

@@ -1,6 +1,6 @@
-#include "TcPacketStoredPus.h"
+#include "fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h"
 
-#include "../../../serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #include <cstring>
 

src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp

@@ -1,7 +1,7 @@
-#include "TmPacketStoredPusC.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h"
 
-#include "../../../serviceinterface/ServiceInterface.h"
-#include "../../../tmtcservices/TmTcMessage.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
 
 #include <cstring>
 

src/osal/common/TcpIpBase.cpp

@@ -1,5 +1,5 @@
-#include "TcpIpBase.h"
-#include "../../platform.h"
+#include "fsfw/osal/common/TcpIpBase.h"
+#include "fsfw/platform.h"
 
 #ifdef PLATFORM_UNIX
 #include <errno.h>

src/osal/common/TcpTmTcBridge.cpp

@@ -1,15 +1,16 @@
-#include "TcpTmTcBridge.h"
-#include "tcpipHelpers.h"
+#include "fsfw/platform.h"
+#include "fsfw/osal/common/TcpTmTcBridge.h"
+#include "fsfw/osal/common/tcpipHelpers.h"
 
-#include <fsfw/serviceinterface/ServiceInterface.h>
-#include <fsfw/ipc/MutexGuard.h>
-#include <fsfw/osal/common/TcpTmTcBridge.h>
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/ipc/MutexGuard.h"
+#include "fsfw/osal/common/TcpTmTcBridge.h"
 
-#ifdef _WIN32
+#ifdef PLATFORM_WIN
 
 #include <ws2tcpip.h>
 
-#elif defined(__unix__)
+#elif defined PLATFORM_UNIX
 
 #include <netdb.h>
 #include <arpa/inet.h>

src/osal/common/TcpTmTcServer.cpp

@@ -1,15 +1,15 @@
-#include "TcpTmTcServer.h"
-#include "TcpTmTcBridge.h"
-#include "tcpipHelpers.h"
+#include "fsfw/osal/common/TcpTmTcServer.h"
+#include "fsfw/osal/common/TcpTmTcBridge.h"
+#include "fsfw/osal/common/tcpipHelpers.h"
 
-#include "../../platform.h"
-#include "../../container/SharedRingBuffer.h"
-#include "../../ipc/MessageQueueSenderIF.h"
-#include "../../ipc/MutexGuard.h"
-#include "../../objectmanager/ObjectManager.h"
+#include "fsfw/platform.h"
+#include "fsfw/container/SharedRingBuffer.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"
+#include "fsfw/ipc/MutexGuard.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
-#include "../../serviceinterface/ServiceInterface.h"
-#include "../../tmtcservices/TmTcMessage.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
 
 #ifdef PLATFORM_WIN
 #include <winsock2.h>

src/osal/common/UdpTcPollingTask.cpp

@@ -1,9 +1,10 @@
-#include "UdpTcPollingTask.h"
-#include "tcpipHelpers.h"
-#include "../../platform.h"
-#include "../../globalfunctions/arrayprinter.h"
-#include "../../serviceinterface/ServiceInterface.h"
-#include "../../objectmanager/ObjectManager.h"
+#include "fsfw/osal/common/UdpTcPollingTask.h"
+#include "fsfw/osal/common/tcpipHelpers.h"
+
+#include "fsfw/platform.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 #ifdef PLATFORM_WIN
 #include <winsock2.h>

src/osal/common/UdpTmTcBridge.cpp

@@ -1,9 +1,9 @@
-#include "UdpTmTcBridge.h"
-#include "tcpipHelpers.h"
+#include "fsfw/osal/common/UdpTmTcBridge.h"
+#include "fsfw/osal/common/tcpipHelpers.h"
 
-#include "../../platform.h"
-#include "../../serviceinterface/ServiceInterface.h"
-#include "../../ipc/MutexGuard.h"
+#include "fsfw/platform.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/ipc/MutexGuard.h"
 
 #ifdef PLATFORM_WIN
 #include <ws2tcpip.h>

src/osal/linux/PeriodicPosixTask.cpp

@@ -1,8 +1,8 @@
-#include "PeriodicPosixTask.h"
+#include "fsfw/osal/linux/PeriodicPosixTask.h"
 
-#include "../../objectmanager/ObjectManager.h"
-#include "../../tasks/ExecutableObjectIF.h"
-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #include <errno.h>
 

src/osal/linux/PosixThread.cpp

@@ -1,7 +1,7 @@
-#include "PosixThread.h"
-#include "unixUtility.h"
+#include "fsfw/osal/linux/PosixThread.h"
+#include "fsfw/osal/linux/unixUtility.h"
 
-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #include <cstring>
 #include <errno.h>

src/osal/linux/unixUtility.cpp

@@ -1,6 +1,6 @@
-#include "FSFWConfig.h"
-#include "unixUtility.h"
-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/FSFW.h"
+#include "fsfw/osal/linux/unixUtility.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #include <cstring>
 #include <errno.h>