inc/fsfw/datalinklayer/MapPacketExtraction.h

@@ -2,9 +2,9 @@
 #define FSFW_DATALINKLAYER_MAPPACKETEXTRACTION_H_
 
 #include "MapPacketExtractionIF.h"
-#include "../objectmanager/ObjectManagerIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../ipc/MessageQueueSenderIF.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"
 
 class StorageManagerIF;
 

inc/fsfw/datalinklayer/TcTransferFrame.h

@@ -1,8 +1,8 @@
 #ifndef TCTRANSFERFRAME_H_
 #define TCTRANSFERFRAME_H_
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
+#include <cstddef>
 
 /**
  * The TcTransferFrame class simplifies handling of such Frames.

inc/fsfw/osal/InternalErrorCodes.h

@@ -1,39 +1,39 @@
 #ifndef INTERNALERRORCODES_H_
 #define INTERNALERRORCODES_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
 
 class InternalErrorCodes {
 public:
-	static const uint8_t INTERFACE_ID = CLASS_ID::INTERNAL_ERROR_CODES;
+    static const uint8_t INTERFACE_ID = CLASS_ID::INTERNAL_ERROR_CODES;
 
-static const ReturnValue_t NO_CONFIGURATION_TABLE = MAKE_RETURN_CODE(0x01 );
-static const ReturnValue_t NO_CPU_TABLE = MAKE_RETURN_CODE(0x02 );
-static const ReturnValue_t INVALID_WORKSPACE_ADDRESS = MAKE_RETURN_CODE(0x03 );
-static const ReturnValue_t TOO_LITTLE_WORKSPACE = MAKE_RETURN_CODE(0x04 );
-static const ReturnValue_t WORKSPACE_ALLOCATION = MAKE_RETURN_CODE(0x05 );
-static const ReturnValue_t INTERRUPT_STACK_TOO_SMALL = MAKE_RETURN_CODE(0x06 );
-static const ReturnValue_t THREAD_EXITTED = MAKE_RETURN_CODE(0x07 );
-static const ReturnValue_t INCONSISTENT_MP_INFORMATION = MAKE_RETURN_CODE(0x08 );
-static const ReturnValue_t INVALID_NODE = MAKE_RETURN_CODE(0x09 );
-static const ReturnValue_t NO_MPCI = MAKE_RETURN_CODE(0x0a );
-static const ReturnValue_t BAD_PACKET = MAKE_RETURN_CODE(0x0b );
-static const ReturnValue_t OUT_OF_PACKETS = MAKE_RETURN_CODE(0x0c );
-static const ReturnValue_t OUT_OF_GLOBAL_OBJECTS = MAKE_RETURN_CODE(0x0d );
-static const ReturnValue_t OUT_OF_PROXIES = MAKE_RETURN_CODE(0x0e );
-static const ReturnValue_t INVALID_GLOBAL_ID = MAKE_RETURN_CODE(0x0f );
-static const ReturnValue_t BAD_STACK_HOOK = MAKE_RETURN_CODE(0x10 );
-static const ReturnValue_t BAD_ATTRIBUTES = MAKE_RETURN_CODE(0x11 );
-static const ReturnValue_t IMPLEMENTATION_KEY_CREATE_INCONSISTENCY = MAKE_RETURN_CODE(0x12 );
-static const ReturnValue_t IMPLEMENTATION_BLOCKING_OPERATION_CANCEL = MAKE_RETURN_CODE(0x13 );
-static const ReturnValue_t MUTEX_OBTAIN_FROM_BAD_STATE = MAKE_RETURN_CODE(0x14 );
-static const ReturnValue_t UNLIMITED_AND_MAXIMUM_IS_0 = MAKE_RETURN_CODE(0x15 );
+    static const ReturnValue_t NO_CONFIGURATION_TABLE = MAKE_RETURN_CODE(0x01 );
+    static const ReturnValue_t NO_CPU_TABLE = MAKE_RETURN_CODE(0x02 );
+    static const ReturnValue_t INVALID_WORKSPACE_ADDRESS = MAKE_RETURN_CODE(0x03 );
+    static const ReturnValue_t TOO_LITTLE_WORKSPACE = MAKE_RETURN_CODE(0x04 );
+    static const ReturnValue_t WORKSPACE_ALLOCATION = MAKE_RETURN_CODE(0x05 );
+    static const ReturnValue_t INTERRUPT_STACK_TOO_SMALL = MAKE_RETURN_CODE(0x06 );
+    static const ReturnValue_t THREAD_EXITTED = MAKE_RETURN_CODE(0x07 );
+    static const ReturnValue_t INCONSISTENT_MP_INFORMATION = MAKE_RETURN_CODE(0x08 );
+    static const ReturnValue_t INVALID_NODE = MAKE_RETURN_CODE(0x09 );
+    static const ReturnValue_t NO_MPCI = MAKE_RETURN_CODE(0x0a );
+    static const ReturnValue_t BAD_PACKET = MAKE_RETURN_CODE(0x0b );
+    static const ReturnValue_t OUT_OF_PACKETS = MAKE_RETURN_CODE(0x0c );
+    static const ReturnValue_t OUT_OF_GLOBAL_OBJECTS = MAKE_RETURN_CODE(0x0d );
+    static const ReturnValue_t OUT_OF_PROXIES = MAKE_RETURN_CODE(0x0e );
+    static const ReturnValue_t INVALID_GLOBAL_ID = MAKE_RETURN_CODE(0x0f );
+    static const ReturnValue_t BAD_STACK_HOOK = MAKE_RETURN_CODE(0x10 );
+    static const ReturnValue_t BAD_ATTRIBUTES = MAKE_RETURN_CODE(0x11 );
+    static const ReturnValue_t IMPLEMENTATION_KEY_CREATE_INCONSISTENCY = MAKE_RETURN_CODE(0x12 );
+    static const ReturnValue_t IMPLEMENTATION_BLOCKING_OPERATION_CANCEL = MAKE_RETURN_CODE(0x13 );
+    static const ReturnValue_t MUTEX_OBTAIN_FROM_BAD_STATE = MAKE_RETURN_CODE(0x14 );
+    static const ReturnValue_t UNLIMITED_AND_MAXIMUM_IS_0 = MAKE_RETURN_CODE(0x15 );
 
-	virtual ~InternalErrorCodes();
+    virtual ~InternalErrorCodes();
 
-	static ReturnValue_t translate(uint8_t code);
+    static ReturnValue_t translate(uint8_t code);
 private:
-	InternalErrorCodes();
+    InternalErrorCodes();
 };
 
 #endif /* INTERNALERRORCODES_H_ */

inc/fsfw/osal/linux/MessageQueue.h

@@ -1,9 +1,9 @@
 #ifndef FSFW_OSAL_LINUX_MESSAGEQUEUE_H_
 #define FSFW_OSAL_LINUX_MESSAGEQUEUE_H_
 
-#include "../../internalError/InternalErrorReporterIF.h"
-#include "../../ipc/MessageQueueIF.h"
-#include "../../ipc/MessageQueueMessage.h"
+#include "fsfw/internalerror/InternalErrorReporterIF.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
 
 #include <mqueue.h>
 /**

inc/fsfw/pus/CService200ModeCommanding.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_PUS_CSERVICE200MODECOMMANDING_H_
 #define FSFW_PUS_CSERVICE200MODECOMMANDING_H_
 
-#include "../tmtcservices/CommandingServiceBase.h"
+#include "fsfw/tmtcservices/CommandingServiceBase.h"
 
 /**
  * @brief Custom PUS service to set mode of all objects implementing HasModesIF

inc/fsfw/pus/Service17Test.h

@@ -1,8 +1,8 @@
 #ifndef FSFW_PUS_SERVICE17TEST_H_
 #define FSFW_PUS_SERVICE17TEST_H_
 
-#include "../tmtcservices/PusServiceBase.h"
-#include "../objectmanager/SystemObject.h"
+#include "fsfw/tmtcservices/PusServiceBase.h"
+#include "fsfw/objectmanager/SystemObject.h"
 
 /**
  * @brief Test Service

inc/fsfw/pus/Service1TelecommandVerification.h

@@ -1,12 +1,12 @@
 #ifndef FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_H_
 #define FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_H_
 
-#include "../objectmanager/SystemObject.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../tasks/ExecutableObjectIF.h"
-#include "../tmtcservices/AcceptsVerifyMessageIF.h"
-#include "../tmtcservices/PusVerificationReport.h"
-#include "../ipc/MessageQueueIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/tmtcservices/AcceptsVerifyMessageIF.h"
+#include "fsfw/tmtcservices/PusVerificationReport.h"
+#include "fsfw/ipc/MessageQueueIF.h"
 
 /**
  * @brief Verify TC acceptance, start, progress and execution.

inc/fsfw/pus/Service20ParameterManagement.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_PUS_SERVICE20PARAMETERMANAGEMENT_H_
 #define FSFW_PUS_SERVICE20PARAMETERMANAGEMENT_H_
 
-#include "../tmtcservices/CommandingServiceBase.h"
+#include "fsfw/tmtcservices/CommandingServiceBase.h"
 
 /**
  * @brief   PUS Service 20 Parameter Service implementation

inc/fsfw/pus/Service2DeviceAccess.h

@@ -1,9 +1,9 @@
 #ifndef FSFW_PUS_SERVICE2DEVICEACCESS_H_
 #define FSFW_PUS_SERVICE2DEVICEACCESS_H_
 
-#include "../objectmanager/SystemObjectIF.h"
-#include "../devicehandlers/AcceptsDeviceResponsesIF.h"
-#include "../tmtcservices/CommandingServiceBase.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
+#include "fsfw/devicehandlers/AcceptsDeviceResponsesIF.h"
+#include "fsfw/tmtcservices/CommandingServiceBase.h"
 
 /**
  * @brief   Raw Commanding and Wiretapping of devices.

inc/fsfw/pus/Service3Housekeeping.h

@@ -1,9 +1,9 @@
 #ifndef FSFW_PUS_SERVICE3HOUSEKEEPINGSERVICE_H_
 #define FSFW_PUS_SERVICE3HOUSEKEEPINGSERVICE_H_
 
-#include "../housekeeping/AcceptsHkPacketsIF.h"
-#include "../housekeeping/HousekeepingMessage.h"
-#include "../tmtcservices/CommandingServiceBase.h"
+#include "fsfw/housekeeping/AcceptsHkPacketsIF.h"
+#include "fsfw/housekeeping/HousekeepingMessage.h"
+#include "fsfw/tmtcservices/CommandingServiceBase.h"
 
 /**
  * @brief   Manges spacecraft housekeeping reports and

inc/fsfw/pus/Service5EventReporting.h

@@ -1,8 +1,8 @@
 #ifndef FSFW_PUS_SERVICE5EVENTREPORTING_H_
 #define FSFW_PUS_SERVICE5EVENTREPORTING_H_
 
-#include "../tmtcservices/PusServiceBase.h"
-#include "../events/EventMessage.h"
+#include "fsfw/tmtcservices/PusServiceBase.h"
+#include "fsfw/events/EventMessage.h"
 
 /**
  * @brief Report on-board events like information or errors

inc/fsfw/pus/Service8FunctionManagement.h

@@ -1,8 +1,8 @@
 #ifndef FSFW_PUS_SERVICE8FUNCTIONMANAGEMENT_H_
 #define FSFW_PUS_SERVICE8FUNCTIONMANAGEMENT_H_
 
-#include "../action/ActionMessage.h"
-#include "../tmtcservices/CommandingServiceBase.h"
+#include "fsfw/action/ActionMessage.h"
+#include "fsfw/tmtcservices/CommandingServiceBase.h"
 
 /**
  * @brief Functional commanding.

inc/fsfw/pus/Service9TimeManagement.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_PUS_SERVICE9TIMEMANAGEMENT_H_
 #define FSFW_PUS_SERVICE9TIMEMANAGEMENT_H_
 
-#include "../tmtcservices/PusServiceBase.h"
+#include "fsfw/tmtcservices/PusServiceBase.h"
 
 class Service9TimeManagement: public PusServiceBase {
 public:

inc/fsfw/rmap/RMAP.h

@@ -1,8 +1,8 @@
 #ifndef FSFW_RMAP_RMAP_H_
 #define FSFW_RMAP_RMAP_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../rmap/RMAPCookie.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/rmap/RMAPCookie.h"
 
 //SHOULDTODO: clean up includes for RMAP, should be enough to include RMAP.h but right now it's quite chaotic...
 

inc/fsfw/rmap/RMAPCookie.h

@@ -2,7 +2,7 @@
 #define FSFW_RMAP_RMAPCOOKIE_H_
 
 #include "rmapStructs.h"
-#include "../devicehandlers/CookieIF.h"
+#include "fsfw/devicehandlers/CookieIF.h"
 #include <cstddef>
 
 class RMAPChannelIF;

inc/fsfw/rmap/RmapDeviceCommunicationIF.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_
 #define FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_
 
-#include "../devicehandlers/DeviceCommunicationIF.h"
+#include "fsfw/devicehandlers/DeviceCommunicationIF.h"
 
 /**
  * @brief	This class is a implementation of a DeviceCommunicationIF for RMAP calls.

inc/fsfw/thermal/ThermalComponentCore.h

@@ -6,7 +6,7 @@
 #include "AbstractTemperatureSensor.h"
 #include "ThermalModule.h"
 
-#include "../datapoollocal/LocalPoolVariable.h"
+#include "fsfw/datapoollocal/LocalPoolVariable.h"
 
 /**
  * @brief

inc/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h

@@ -1,7 +1,8 @@
-#ifndef FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
-#define FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
+#ifndef FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
+#define FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
+
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
 
-#include "../../returnvalues/HasReturnvaluesIF.h"
 class TmPacketMinimal;
 
 class PacketTimestampInterpreterIF {
@@ -9,9 +10,10 @@ public:
 	virtual ~PacketTimestampInterpreterIF() {}
 	virtual ReturnValue_t getPacketTime(TmPacketMinimal* packet,
 	        timeval* timestamp) const = 0;
-	virtual ReturnValue_t getPacketTimeRaw(TmPacketMinimal* packet, const uint8_t** timePtr, uint32_t* size) const = 0;
+	virtual ReturnValue_t getPacketTimeRaw(TmPacketMinimal* packet, const uint8_t** timePtr,
+	        uint32_t* size) const = 0;
 };
 
 
 
-#endif /* FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_ */
+#endif /* FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_ */

inc/fsfw/tmtcpacket/pus/tm/TmPacketBase.h

@@ -1,13 +1,15 @@
 #ifndef TMTCPACKET_PUS_TMPACKETBASE_H_
 #define TMTCPACKET_PUS_TMPACKETBASE_H_
 
-#include "../../SpacePacketBase.h"
-#include "../../../timemanager/TimeStamperIF.h"
-#include "../../../timemanager/Clock.h"
-#include "../../../objectmanager/SystemObjectIF.h"
+#include "fsfw/tmtcpacket/SpacePacketBase.h"
+#include "fsfw/timemanager/TimeStamperIF.h"
+#include "fsfw/timemanager/Clock.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
+
+namespace Factory {
 
-namespace Factory{
 void setStaticFrameworkObjectIds();
+
 }
 
 

inc/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h

@@ -2,10 +2,10 @@
 #define FSFW_TMTCPACKET_PUS_TMPACKETPUSA_H_
 
 #include "TmPacketBase.h"
-#include "../../SpacePacketBase.h"
-#include "../../../timemanager/TimeStamperIF.h"
-#include "../../../timemanager/Clock.h"
-#include "../../../objectmanager/SystemObjectIF.h"
+#include "fsfw/tmtcpacket/SpacePacketBase.h"
+#include "fsfw/timemanager/TimeStamperIF.h"
+#include "fsfw/timemanager/Clock.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
 
 namespace Factory{
 void setStaticFrameworkObjectIds();

inc/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h

@@ -2,10 +2,10 @@
 #define FSFW_TMTCPACKET_PUS_TMPACKETPUSC_H_
 
 #include "TmPacketBase.h"
-#include "../../SpacePacketBase.h"
-#include "../../../timemanager/TimeStamperIF.h"
-#include "../../../timemanager/Clock.h"
-#include "../../../objectmanager/SystemObjectIF.h"
+#include "fsfw/tmtcpacket/SpacePacketBase.h"
+#include "fsfw/timemanager/TimeStamperIF.h"
+#include "fsfw/timemanager/Clock.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
 
 namespace Factory{
 void setStaticFrameworkObjectIds();

inc/fsfw/tmtcservices/TmTcBridge.h

@@ -4,12 +4,12 @@
 #include "AcceptsTelemetryIF.h"
 #include "AcceptsTelecommandsIF.h"
 
-#include "../objectmanager/SystemObject.h"
-#include "../tasks/ExecutableObjectIF.h"
-#include "../ipc/MessageQueueIF.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../container/DynamicFIFO.h"
-#include "../tmtcservices/TmTcMessage.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/container/DynamicFIFO.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
 
 class TmTcBridge : public AcceptsTelemetryIF,
 		public AcceptsTelecommandsIF,

inc/fsfw/tmtcservices/TmTcMessage.h

@@ -1,8 +1,8 @@
 #ifndef FSFW_TMTCSERVICES_TMTCMESSAGE_H_
 #define FSFW_TMTCSERVICES_TMTCMESSAGE_H_
 
-#include "../ipc/MessageQueueMessage.h"
-#include "../storagemanager/StorageManagerIF.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 /**
  * @brief	This message class is used to pass Telecommand and Telemetry
  * 			packets between tasks.

inc/fsfw/tmtcservices/VerificationReporter.h

@@ -2,7 +2,7 @@
 #define FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_
 
 #include "PusVerificationReport.h"
-#include "../objectmanager/ObjectManagerIF.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
 
 namespace Factory{
 void setStaticFrameworkObjectIds();

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,

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() {
 }

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);

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) {}

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>
 

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>
 

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>
 

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>

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>
 

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>
 

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>
 

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>
 

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
 

src/core/tmtcservices/TmTcMessage.cpp

@@ -1,4 +1,4 @@
-#include "TmTcMessage.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
 
 #include <cstring>
 

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;

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) {
 }

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>
 

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) {

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 {

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) :

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();

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() {
 }

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,

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,

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,

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,

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,

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,

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):

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,

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,

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,

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>
 

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>
 
 

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() {

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() {
 	

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
 

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) {

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() {

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>

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>
 

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>
 

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

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>
 

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>

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();

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;

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;
 

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();

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>
 
 

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>