more include replacements

2021-07-13 20:58:45 +02:00
parent 936d0e9f0c
commit a6de52e212
75 changed files with 304 additions and 323 deletions
--- a/src/core/thermal/ThermalComponentCore.cpp
+++ b/src/core/thermal/ThermalComponentCore.cpp
@ -1,5 +1,5 @@
-#include "ThermalComponentCore.h"
-#include "tcsDefinitions.h"
+#include "fsfw/thermal/ThermalComponentCore.h"
+#include "fsfw/thermal/tcsDefinitions.h"

 ThermalComponentCore::ThermalComponentCore(object_id_t reportingObjectId,
        uint8_t domainId, gp_id_t temperaturePoolId,
--- a/src/core/thermal/ThermalMonitorReporter.cpp
+++ b/src/core/thermal/ThermalMonitorReporter.cpp
@ -1,7 +1,7 @@
-#include "ThermalMonitorReporter.h"
-#include "ThermalComponentIF.h"
+#include "fsfw/thermal/ThermalMonitorReporter.h"
+#include "fsfw/thermal/ThermalComponentIF.h"

-#include "../monitoring/MonitoringIF.h"
+#include "fsfw/monitoring/MonitoringIF.h"

 ThermalMonitorReporter::~ThermalMonitorReporter() {
 }
--- a/src/core/timemanager/TimeMessage.cpp
+++ b/src/core/timemanager/TimeMessage.cpp
@ -1,4 +1,4 @@
-#include "TimeMessage.h"
+#include "fsfw/timemanager/TimeMessage.h"

 TimeMessage::TimeMessage() {
 	this->messageSize += sizeof(timeval) + sizeof(uint32_t);
--- a/src/core/timemanager/TimeStamper.cpp
+++ b/src/core/timemanager/TimeStamper.cpp
@ -1,5 +1,6 @@
-#include "TimeStamper.h"
-#include "Clock.h"
+#include "fsfw/timemanager/TimeStamper.h"
+#include "fsfw/timemanager/Clock.h"
+
 #include <cstring>

 TimeStamper::TimeStamper(object_id_t objectId): SystemObject(objectId) {}
--- a/src/core/tmtcpacket/pus/tc/TcPacketPus.cpp
+++ b/src/core/tmtcpacket/pus/tc/TcPacketPus.cpp
@ -1,5 +1,5 @@
-#include "TcPacketPus.h"
-#include "../../../globalfunctions/CRC.h"
+#include "fsfw/tmtcpacket/pus/tc/TcPacketPus.h"
+#include "fsfw/globalfunctions/CRC.h"

 #include <cstring>

--- a/src/core/tmtcpacket/pus/tc/TcPacketStoredBase.cpp
+++ b/src/core/tmtcpacket/pus/tc/TcPacketStoredBase.cpp
@ -1,8 +1,8 @@
-#include "TcPacketStoredBase.h"
+#include "fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h"

-#include "../../../objectmanager/ObjectManager.h"
-#include "../../../serviceinterface/ServiceInterface.h"
-#include "../../../objectmanager/frameworkObjects.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/frameworkObjects.h"

 #include <cstring>

--- a/src/core/tmtcpacket/pus/tm/TmPacketBase.cpp
+++ b/src/core/tmtcpacket/pus/tm/TmPacketBase.cpp
@ -1,10 +1,10 @@
-#include "TmPacketBase.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketBase.h"

-#include "../../../globalfunctions/CRC.h"
-#include "../../../globalfunctions/arrayprinter.h"
-#include "../../../objectmanager/ObjectManager.h"
-#include "../../../serviceinterface/ServiceInterface.h"
-#include "../../../timemanager/CCSDSTime.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/timemanager/CCSDSTime.h"

 #include <cstring>

--- a/src/core/tmtcpacket/pus/tm/TmPacketMinimal.cpp
+++ b/src/core/tmtcpacket/pus/tm/TmPacketMinimal.cpp
@ -1,5 +1,5 @@
-#include "TmPacketMinimal.h"
-#include "../PacketTimestampInterpreterIF.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h"
+#include "fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h"

 #include <cstddef>
 #include <ctime>
--- a/src/core/tmtcpacket/pus/tm/TmPacketPusA.cpp
+++ b/src/core/tmtcpacket/pus/tm/TmPacketPusA.cpp
@ -1,11 +1,11 @@
-#include "TmPacketPusA.h"
-#include "TmPacketBase.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketPusA.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketBase.h"

-#include "../../../globalfunctions/CRC.h"
-#include "../../../globalfunctions/arrayprinter.h"
-#include "../../../objectmanager/ObjectManagerIF.h"
-#include "../../../serviceinterface/ServiceInterfaceStream.h"
-#include "../../../timemanager/CCSDSTime.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/timemanager/CCSDSTime.h"

 #include <cstring>

--- a/src/core/tmtcpacket/pus/tm/TmPacketPusC.cpp
+++ b/src/core/tmtcpacket/pus/tm/TmPacketPusC.cpp
@ -1,11 +1,11 @@
-#include "TmPacketPusC.h"
-#include "TmPacketBase.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketPusC.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketBase.h"

-#include "../../../globalfunctions/CRC.h"
-#include "../../../globalfunctions/arrayprinter.h"
-#include "../../../objectmanager/ObjectManagerIF.h"
-#include "../../../serviceinterface/ServiceInterfaceStream.h"
-#include "../../../timemanager/CCSDSTime.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/timemanager/CCSDSTime.h"

 #include <cstring>

--- a/src/core/tmtcpacket/pus/tm/TmPacketStoredBase.cpp
+++ b/src/core/tmtcpacket/pus/tm/TmPacketStoredBase.cpp
@ -1,8 +1,8 @@
-#include "TmPacketStoredBase.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h"

-#include "../../../objectmanager/ObjectManager.h"
-#include "../../../serviceinterface/ServiceInterface.h"
-#include "../../../tmtcservices/TmTcMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"

 #include <cstring>

--- a/src/core/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp
+++ b/src/core/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp
@ -1,7 +1,7 @@
-#include "TmPacketStoredPusA.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h"

-#include "../../../serviceinterface/ServiceInterface.h"
-#include "../../../tmtcservices/TmTcMessage.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"

 #include <cstring>

--- a/src/core/tmtcservices/TmTcBridge.cpp
+++ b/src/core/tmtcservices/TmTcBridge.cpp
@ -1,9 +1,9 @@
-#include "TmTcBridge.h"
+#include "fsfw/tmtcservices/TmTcBridge.h"

-#include "../objectmanager/ObjectManager.h"
-#include "../ipc/QueueFactory.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../globalfunctions/arrayprinter.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/globalfunctions/arrayprinter.h"

 #define TMTCBRIDGE_WIRETAPPING 0

--- a/src/core/tmtcservices/TmTcMessage.cpp
+++ b/src/core/tmtcservices/TmTcMessage.cpp
@ -1,4 +1,4 @@
-#include "TmTcMessage.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"

 #include <cstring>

--- a/src/core/tmtcservices/VerificationReporter.cpp
+++ b/src/core/tmtcservices/VerificationReporter.cpp
@ -1,11 +1,11 @@
-#include "VerificationReporter.h"
-#include "AcceptsVerifyMessageIF.h"
-#include "PusVerificationReport.h"
+#include "fsfw/tmtcservices/VerificationReporter.h"
+#include "fsfw/tmtcservices/AcceptsVerifyMessageIF.h"
+#include "fsfw/tmtcservices/PusVerificationReport.h"

-#include "../objectmanager/ObjectManager.h"
-#include "../ipc/MessageQueueIF.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/frameworkObjects.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/frameworkObjects.h"

 object_id_t VerificationReporter::messageReceiver =
 		objects::PUS_SERVICE_1_VERIFICATION;
--- a/src/opt/datalinklayer/Farm1StateWait.cpp
+++ b/src/opt/datalinklayer/Farm1StateWait.cpp
@ -1,15 +1,7 @@
-/**
- * @file	Farm1StateWait.cpp
- * @brief	This file defines the Farm1StateWait class.
- * @date	24.04.2013
- * @author	baetz
- */
-
-
-#include "ClcwIF.h"
-#include "Farm1StateWait.h"
-#include "TcTransferFrame.h"
-#include "VirtualChannelReception.h"
+#include "fsfw/datalinklayer/ClcwIF.h"
+#include "fsfw/datalinklayer/Farm1StateWait.h"
+#include "fsfw/datalinklayer/TcTransferFrame.h"
+#include "fsfw/datalinklayer/VirtualChannelReception.h"

 Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
 }
--- a/src/opt/datalinklayer/MapPacketExtraction.cpp
+++ b/src/opt/datalinklayer/MapPacketExtraction.cpp
@ -1,12 +1,12 @@
-#include "MapPacketExtraction.h"
+#include "fsfw/datalinklayer/MapPacketExtraction.h"

-#include "../ipc/QueueFactory.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../tmtcpacket/SpacePacketBase.h"
-#include "../tmtcservices/AcceptsTelecommandsIF.h"
-#include "../tmtcservices/TmTcMessage.h"
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/tmtcpacket/SpacePacketBase.h"
+#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"

 #include <cstring>

--- a/src/opt/datalinklayer/TcTransferFrame.cpp
+++ b/src/opt/datalinklayer/TcTransferFrame.cpp
@ -1,17 +1,8 @@
-/**
- * @file	TcTransferFrame.cpp
- * @brief	This file defines the TcTransferFrame class.
- * @date	27.04.2013
- * @author	baetz
- */
-
-
-
-#include "TcTransferFrame.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/datalinklayer/TcTransferFrame.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

 TcTransferFrame::TcTransferFrame() {
-	 frame = NULL;
+	 frame = nullptr;
 }

 TcTransferFrame::TcTransferFrame(uint8_t* setData) {
--- a/src/opt/datalinklayer/TcTransferFrameLocal.cpp
+++ b/src/opt/datalinklayer/TcTransferFrameLocal.cpp
@ -1,14 +1,8 @@
-/**
- * @file	TcTransferFrameLocal.cpp
- * @brief	This file defines the TcTransferFrameLocal class.
- * @date	27.04.2013
- * @author	baetz
- */
+#include "fsfw/datalinklayer/TcTransferFrameLocal.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

-#include "TcTransferFrameLocal.h"
-#include "../globalfunctions/CRC.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include <string.h>
+#include <cstring>

 TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid,
 		uint8_t vcId, uint8_t sequenceNumber, uint8_t setSegmentHeader, uint8_t* data, uint16_t dataSize, uint16_t forceCrc) {
@ -38,7 +32,7 @@ TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uin
 			this->getFullFrame()[getFullSize()-1] = (crc & 0x00FF);
 		} else {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-			sif::debug << "TcTransferFrameLocal: dataSize too large: " << dataSize << std::endl;
+			sif::warning << "TcTransferFrameLocal: dataSize too large: " << dataSize << std::endl;
 #endif
 		}
 	} else {
--- a/src/opt/datalinklayer/VirtualChannelReception.cpp
+++ b/src/opt/datalinklayer/VirtualChannelReception.cpp
@ -5,9 +5,9 @@
 * @author	baetz
 */

-#include "BCFrame.h"
-#include "VirtualChannelReception.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/datalinklayer/BCFrame.h"
+#include "fsfw/datalinklayer/VirtualChannelReception.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

 VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId,
 		uint8_t setSlidingWindowWidth) :
--- a/src/opt/monitoring/LimitViolationReporter.cpp
+++ b/src/opt/monitoring/LimitViolationReporter.cpp
@ -1,9 +1,9 @@
-#include "LimitViolationReporter.h"
-#include "MonitoringIF.h"
-#include "ReceivesMonitoringReportsIF.h"
+#include "fsfw/monitoring/LimitViolationReporter.h"
+#include "fsfw/monitoring/MonitoringIF.h"
+#include "fsfw/monitoring/ReceivesMonitoringReportsIF.h"

-#include "../objectmanager/ObjectManager.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serialize/SerializeAdapter.h"

 ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF* data) {
 	ReturnValue_t result = checkClassLoaded();
--- a/src/opt/monitoring/MonitoringMessage.cpp
+++ b/src/opt/monitoring/MonitoringMessage.cpp
@ -1,5 +1,5 @@
-#include "MonitoringMessage.h"
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/monitoring/MonitoringMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"

 MonitoringMessage::~MonitoringMessage() {
 }
--- a/src/opt/pus/CService200ModeCommanding.cpp
+++ b/src/opt/pus/CService200ModeCommanding.cpp
@ -1,11 +1,11 @@
-#include "CService200ModeCommanding.h"
-#include "servicepackets/Service200Packets.h"
+#include "fsfw/pus/CService200ModeCommanding.h"
+#include "fsfw/pus/servicepackets/Service200Packets.h"

-#include "../modes/HasModesIF.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../serialize/SerialLinkedListAdapter.h"
-#include "../modes/ModeMessage.h"
+#include "fsfw/modes/HasModesIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serialize/SerialLinkedListAdapter.h"
+#include "fsfw/modes/ModeMessage.h"

 CService200ModeCommanding::CService200ModeCommanding(object_id_t objectId,
        uint16_t apid, uint8_t serviceId, uint8_t numParallelCommands,
--- a/src/opt/pus/CService201HealthCommanding.cpp
+++ b/src/opt/pus/CService201HealthCommanding.cpp
@ -1,10 +1,10 @@
-#include "CService201HealthCommanding.h"
-#include "servicepackets/Service201Packets.h"
+#include "fsfw/pus/CService201HealthCommanding.h"
+#include "fsfw/pus/servicepackets/Service201Packets.h"

-#include "../health/HasHealthIF.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../health/HealthMessage.h"
+#include "fsfw/health/HasHealthIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/health/HealthMessage.h"


 CService201HealthCommanding::CService201HealthCommanding(object_id_t objectId,
--- a/src/opt/pus/Service17Test.cpp
+++ b/src/opt/pus/Service17Test.cpp
@ -1,9 +1,9 @@
-#include "Service17Test.h"
-#include <FSFWConfig.h>
+#include "fsfw/FSFW.h"
+#include "fsfw/pus/Service17Test.h"

-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/SystemObject.h"
-#include "../tmtcpacket/pus/tm/TmPacketStored.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketStored.h"


 Service17Test::Service17Test(object_id_t objectId,
--- a/src/opt/pus/Service1TelecommandVerification.cpp
+++ b/src/opt/pus/Service1TelecommandVerification.cpp
@ -1,12 +1,12 @@
-#include "Service1TelecommandVerification.h"
-#include "servicepackets/Service1Packets.h"
+#include "fsfw/pus/Service1TelecommandVerification.h"
+#include "fsfw/pus/servicepackets/Service1Packets.h"

-#include "../ipc/QueueFactory.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../tmtcservices/PusVerificationReport.h"
-#include "../tmtcpacket/pus/tm/TmPacketStored.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../tmtcservices/AcceptsTelemetryIF.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/tmtcservices/PusVerificationReport.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketStored.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcservices/AcceptsTelemetryIF.h"

 Service1TelecommandVerification::Service1TelecommandVerification(
        object_id_t objectId, uint16_t apid, uint8_t serviceId,
--- a/src/opt/pus/Service20ParameterManagement.cpp
+++ b/src/opt/pus/Service20ParameterManagement.cpp
@ -1,11 +1,11 @@
-#include "Service20ParameterManagement.h"
-#include "servicepackets/Service20Packets.h"
+#include "fsfw/pus/Service20ParameterManagement.h"
+#include "fsfw/pus/servicepackets/Service20Packets.h"

-#include "../serviceinterface/ServiceInterface.h"
-#include "../parameters/HasParametersIF.h"
-#include "../parameters/ParameterMessage.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../parameters/ReceivesParameterMessagesIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/parameters/HasParametersIF.h"
+#include "fsfw/parameters/ParameterMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/parameters/ReceivesParameterMessagesIF.h"


 Service20ParameterManagement::Service20ParameterManagement(object_id_t objectId, uint16_t apid,
--- a/src/opt/pus/Service2DeviceAccess.cpp
+++ b/src/opt/pus/Service2DeviceAccess.cpp
@ -1,15 +1,15 @@
-#include "Service2DeviceAccess.h"
-#include "servicepackets/Service2Packets.h"
+#include "fsfw/pus/Service2DeviceAccess.h"
+#include "fsfw/pus/servicepackets/Service2Packets.h"

-#include "../objectmanager/ObjectManager.h"
-#include "../devicehandlers/DeviceHandlerIF.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../devicehandlers/DeviceHandlerMessage.h"
-#include "../serialize/EndianConverter.h"
-#include "../action/ActionMessage.h"
-#include "../serialize/SerializeAdapter.h"
-#include "../serialize/SerialLinkedListAdapter.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/devicehandlers/DeviceHandlerIF.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/devicehandlers/DeviceHandlerMessage.h"
+#include "fsfw/serialize/EndianConverter.h"
+#include "fsfw/action/ActionMessage.h"
+#include "fsfw/serialize/SerializeAdapter.h"
+#include "fsfw/serialize/SerialLinkedListAdapter.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

 Service2DeviceAccess::Service2DeviceAccess(object_id_t objectId,
        uint16_t apid, uint8_t serviceId, uint8_t numberOfParallelCommands,
--- a/src/opt/pus/Service3Housekeeping.cpp
+++ b/src/opt/pus/Service3Housekeeping.cpp
@ -1,8 +1,8 @@
-#include "Service3Housekeeping.h"
-#include "servicepackets/Service3Packets.h"
+#include "fsfw/pus/Service3Housekeeping.h"
+#include "fsfw/pus/servicepackets/Service3Packets.h"

-#include "../objectmanager/ObjectManager.h"
-#include "../datapoollocal/HasLocalDataPoolIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/datapoollocal/HasLocalDataPoolIF.h"

 Service3Housekeeping::Service3Housekeeping(object_id_t objectId, uint16_t apid,
        uint8_t serviceId):
--- a/src/opt/pus/Service5EventReporting.cpp
+++ b/src/opt/pus/Service5EventReporting.cpp
@ -1,11 +1,11 @@
-#include "Service5EventReporting.h"
-#include "servicepackets/Service5Packets.h"
+#include "fsfw/pus/Service5EventReporting.h"
+#include "fsfw/pus/servicepackets/Service5Packets.h"

-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../events/EventManagerIF.h"
-#include "../ipc/QueueFactory.h"
-#include "../tmtcpacket/pus/tm/TmPacketStored.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/events/EventManagerIF.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketStored.h"


 Service5EventReporting::Service5EventReporting(object_id_t objectId,
--- a/src/opt/pus/Service8FunctionManagement.cpp
+++ b/src/opt/pus/Service8FunctionManagement.cpp
@ -1,12 +1,12 @@
-#include "Service8FunctionManagement.h"
-#include "servicepackets/Service8Packets.h"
+#include "fsfw/pus/Service8FunctionManagement.h"
+#include "fsfw/pus/servicepackets/Service8Packets.h"

-#include "../objectmanager/ObjectManager.h"
-#include "../objectmanager/SystemObjectIF.h"
-#include "../action/HasActionsIF.h"
-#include "../devicehandlers/DeviceHandlerIF.h"
-#include "../serialize/SerializeAdapter.h"
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
+#include "fsfw/action/HasActionsIF.h"
+#include "fsfw/devicehandlers/DeviceHandlerIF.h"
+#include "fsfw/serialize/SerializeAdapter.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

 Service8FunctionManagement::Service8FunctionManagement(object_id_t objectId,
 		uint16_t apid, uint8_t serviceId, uint8_t numParallelCommands,
--- a/src/opt/pus/Service9TimeManagement.cpp
+++ b/src/opt/pus/Service9TimeManagement.cpp
@ -1,9 +1,9 @@
-#include "Service9TimeManagement.h"
-#include "servicepackets/Service9Packets.h"
+#include "fsfw/pus/Service9TimeManagement.h"
+#include "fsfw/pus/servicepackets/Service9Packets.h"

-#include "../timemanager/CCSDSTime.h"
-#include "../events/EventManagerIF.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/timemanager/CCSDSTime.h"
+#include "fsfw/events/EventManagerIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"


 Service9TimeManagement::Service9TimeManagement(object_id_t objectId,
--- a/src/opt/rmap/RMAP.cpp
+++ b/src/opt/rmap/RMAP.cpp
@ -1,8 +1,8 @@
-#include "RMAP.h"
-#include "rmapStructs.h"
-#include "RMAPChannelIF.h"
+#include "fsfw/rmap/RMAP.h"
+#include "fsfw/rmap/rmapStructs.h"
+#include "fsfw/rmap/RMAPChannelIF.h"

-#include "../devicehandlers/DeviceCommunicationIF.h"
+#include "fsfw/devicehandlers/DeviceCommunicationIF.h"

 #include <cstddef>

--- a/src/opt/rmap/RMAPCookie.cpp
+++ b/src/opt/rmap/RMAPCookie.cpp
@ -1,5 +1,6 @@
-#include "RMAPChannelIF.h"
-#include "RMAPCookie.h"
+#include "fsfw/rmap/RMAPChannelIF.h"
+#include "fsfw/rmap/RMAPCookie.h"
+
 #include <cstddef>


--- a/src/opt/rmap/RmapDeviceCommunicationIF.cpp
+++ b/src/opt/rmap/RmapDeviceCommunicationIF.cpp
@ -1,5 +1,5 @@
-#include "RmapDeviceCommunicationIF.h"
-#include "RMAP.h"
+#include "fsfw/rmap/RmapDeviceCommunicationIF.h"
+#include "fsfw/rmap/RMAP.h"

 //TODO Cast here are all potential bugs
 RmapDeviceCommunicationIF::~RmapDeviceCommunicationIF() {
--- a/src/opt/tmstorage/TmStoreMessage.cpp
+++ b/src/opt/tmstorage/TmStoreMessage.cpp
@ -1,5 +1,5 @@
-#include "TmStoreMessage.h"
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/tmstorage/TmStoreMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"

 TmStoreMessage::~TmStoreMessage() {
 	
--- a/src/osal/common/tcpipCommon.cpp
+++ b/src/osal/common/tcpipCommon.cpp
@ -1,7 +1,8 @@
-#include "tcpipCommon.h"
-#include <fsfw/serviceinterface/ServiceInterface.h>
+#include "fsfw/platform.h"
+#include "fsfw/osal/common/tcpipCommon.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

-#ifdef _WIN32
+#ifdef PLATFORM_WIN
 #include <ws2tcpip.h>
 #endif

--- a/src/osal/freertos/MessageQueue.cpp
+++ b/src/osal/freertos/MessageQueue.cpp
@ -1,7 +1,7 @@
 #include "MessageQueue.h"
 #include "QueueMapManager.h"
-#include "../../objectmanager/ObjectManager.h"
-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

 MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize):
        maxMessageSize(maxMessageSize) {
--- a/src/osal/linux/BinarySemaphore.cpp
+++ b/src/osal/linux/BinarySemaphore.cpp
@ -1,11 +1,11 @@
-#include "BinarySemaphore.h"
-#include "unixUtility.h"
-#include "../../serviceinterface/ServiceInterfacePrinter.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/osal/linux/BinarySemaphore.h"
+#include "fsfw/osal/linux/unixUtility.h"
+#include "fsfw/serviceinterface/ServiceInterfacePrinter.h"
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"

 #include <time.h>
 #include <errno.h>
-#include <string.h>
+#include <cstring>


 BinarySemaphore::BinarySemaphore() {
--- a/src/osal/linux/Clock.cpp
+++ b/src/osal/linux/Clock.cpp
@ -1,5 +1,5 @@
-#include "../../serviceinterface/ServiceInterfaceStream.h"
-#include "../../timemanager/Clock.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/timemanager/Clock.h"

 #include <sys/time.h>
 #include <sys/sysinfo.h>
--- a/src/osal/linux/CountingSemaphore.cpp
+++ b/src/osal/linux/CountingSemaphore.cpp
@ -1,7 +1,7 @@
-#include "CountingSemaphore.h"
-#include "unixUtility.h"
+#include "fsfw/osal/linux/CountingSemaphore.h"
+#include "fsfw/osal/linux/unixUtility.h"

-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

 #include <errno.h>

--- a/src/osal/linux/FixedTimeslotTask.cpp
+++ b/src/osal/linux/FixedTimeslotTask.cpp
@ -1,7 +1,7 @@
-#include "FixedTimeslotTask.h"
+#include "fsfw/osal/linux/FixedTimeslotTask.h"

-#include "../../objectmanager/ObjectManager.h"
-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"

 #include <limits.h>

--- a/src/osal/linux/InternalErrorCodes.cpp
+++ b/src/osal/linux/InternalErrorCodes.cpp
@ -1,4 +1,4 @@
-#include "../../osal/InternalErrorCodes.h"
+#include "fsfw/osal/InternalErrorCodes.h"

 ReturnValue_t InternalErrorCodes::translate(uint8_t code) {
 	//TODO This class can be removed
--- a/src/osal/linux/MessageQueue.cpp
+++ b/src/osal/linux/MessageQueue.cpp
@ -1,8 +1,8 @@
-#include "MessageQueue.h"
-#include "unixUtility.h"
+#include "fsfw/osal/linux/MessageQueue.h"
+#include "fsfw/osal/linux/unixUtility.h"

-#include "../../serviceinterface/ServiceInterface.h"
-#include "../../objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"

 #include <fstream>

--- a/src/osal/linux/Mutex.cpp
+++ b/src/osal/linux/Mutex.cpp
@ -1,8 +1,8 @@
-#include "Mutex.h"
-#include "unixUtility.h"
+#include "fsfw/osal/linux/Mutex.h"
+#include "fsfw/osal/linux/unixUtility.h"

-#include "../../serviceinterface/ServiceInterface.h"
-#include "../../timemanager/Clock.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/timemanager/Clock.h"

 #include <cstring>
 #include <errno.h>
--- a/src/osal/linux/MutexFactory.cpp
+++ b/src/osal/linux/MutexFactory.cpp
@ -1,6 +1,6 @@
-#include "Mutex.h"
+#include "fsfw/osal/linux/Mutex.h"

-#include "../../ipc/MutexFactory.h"
+#include "fsfw/ipc/MutexFactory.h"

 //TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
 MutexFactory* MutexFactory::factoryInstance = new MutexFactory();
--- a/src/osal/linux/QueueFactory.cpp
+++ b/src/osal/linux/QueueFactory.cpp
@ -1,14 +1,12 @@
-#include "../../ipc/QueueFactory.h"
-#include "MessageQueue.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/osal/linux/MessageQueue.h"

-#include "../../ipc/messageQueueDefinitions.h"
-#include "../../ipc/MessageQueueSenderIF.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/ipc/messageQueueDefinitions.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"

 #include <mqueue.h>
 #include <errno.h>

-
 #include <cstring>

 QueueFactory* QueueFactory::factoryInstance = nullptr;
--- a/src/osal/linux/SemaphoreFactory.cpp
+++ b/src/osal/linux/SemaphoreFactory.cpp
@ -1,8 +1,7 @@
-#include "BinarySemaphore.h"
-#include "CountingSemaphore.h"
+#include "fsfw/osal/linux/BinarySemaphore.h"
+#include "fsfw/osal/linux/CountingSemaphore.h"

-#include "../../tasks/SemaphoreFactory.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/tasks/SemaphoreFactory.h"

 SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;

--- a/src/osal/linux/TaskFactory.cpp
+++ b/src/osal/linux/TaskFactory.cpp
@ -1,9 +1,9 @@
-#include "FixedTimeslotTask.h"
-#include "PeriodicPosixTask.h"
+#include "fsfw/osal/linux/FixedTimeslotTask.h"
+#include "fsfw/osal/linux/PeriodicPosixTask.h"

-#include "../../tasks/TaskFactory.h"
-#include "../../serviceinterface/ServiceInterface.h"
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/tasks/TaskFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"

 //TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
 TaskFactory* TaskFactory::factoryInstance = new TaskFactory();
--- a/src/osal/linux/Timer.cpp
+++ b/src/osal/linux/Timer.cpp
@ -1,5 +1,5 @@
-#include "Timer.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/osal/linux/Timer.h"
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
 #include <errno.h>


--- a/src/osal/linux/tcpipHelpers.cpp
+++ b/src/osal/linux/tcpipHelpers.cpp
@ -1,7 +1,7 @@
-#include "../common/tcpipHelpers.h"
+#include "fsfw/osal/common/tcpipHelpers.h"

-#include "../../serviceinterface/ServiceInterface.h"
-#include "../../tasks/TaskFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tasks/TaskFactory.h"

 #include <errno.h>
 #include <string>