a lot of internal include replacements

src/core/CMakeLists.txt

@@ -9,7 +9,7 @@ add_subdirectory(fdir)
 add_subdirectory(globalfunctions)
 add_subdirectory(health)
 add_subdirectory(housekeeping)
-add_subdirectory(internalError)
+add_subdirectory(internalerror)
 add_subdirectory(ipc)
 add_subdirectory(memory)
 add_subdirectory(modes)
@@ -24,6 +24,5 @@ add_subdirectory(tasks)
 add_subdirectory(tcdistribution)
 add_subdirectory(thermal)
 add_subdirectory(timemanager)
-add_subdirectory(tmstorage)
 add_subdirectory(tmtcpacket)
 add_subdirectory(tmtcservices)

src/core/action/ActionHelper.cpp

@@ -1,9 +1,8 @@
-#include "ActionHelper.h"
-#include "HasActionsIF.h"
+#include "fsfw/action.h"
 
-#include "../ipc/MessageQueueSenderIF.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 ActionHelper::ActionHelper(HasActionsIF* setOwner,
         MessageQueueIF* useThisQueue) :

src/core/action/ActionMessage.cpp

@@ -1,8 +1,7 @@
-#include "ActionMessage.h"
-#include "HasActionsIF.h"
+#include "fsfw/action.h"
 
-#include "../objectmanager/ObjectManager.h"
-#include "../storagemanager/StorageManagerIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
 ActionMessage::ActionMessage() {
 }

src/core/action/CommandActionHelper.cpp

@@ -1,9 +1,6 @@
-#include "ActionMessage.h"
-#include "CommandActionHelper.h"
-#include "CommandsActionsIF.h"
-#include "HasActionsIF.h"
+#include "fsfw/action.h"
 
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) :
         owner(setOwner), queueToUse(NULL), ipcStore(

src/core/action/SimpleActionHelper.cpp

@@ -1,5 +1,4 @@
-#include "HasActionsIF.h"
-#include "SimpleActionHelper.h"
+#include "fsfw/action.h"
 
 SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner,
         MessageQueueIF* useThisQueue) :

src/core/container/SharedRingBuffer.cpp

@@ -1,6 +1,6 @@
-#include "SharedRingBuffer.h"
-#include "../ipc/MutexFactory.h"
-#include "../ipc/MutexGuard.h"
+#include "fsfw/container/SharedRingBuffer.h"
+#include "fsfw/ipc/MutexFactory.h"
+#include "fsfw/ipc/MutexGuard.h"
 
 SharedRingBuffer::SharedRingBuffer(object_id_t objectId, const size_t size,
         bool overwriteOld, size_t maxExcessBytes):

src/core/container/SimpleRingBuffer.cpp

@@ -1,4 +1,5 @@
-#include "SimpleRingBuffer.h"
+#include "fsfw/container/SimpleRingBuffer.h"
+
 #include <cstring>
 
 SimpleRingBuffer::SimpleRingBuffer(const size_t size, bool overwriteOld,

src/core/controller/ControllerBase.cpp

@@ -1,9 +1,9 @@
-#include "ControllerBase.h"
+#include "fsfw/controller/ControllerBase.h"
 
-#include "../subsystem/SubsystemBase.h"
-#include "../ipc/QueueFactory.h"
-#include "../action/HasActionsIF.h"
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/subsystem/SubsystemBase.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/action/HasActionsIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 ControllerBase::ControllerBase(object_id_t setObjectId, object_id_t parentId,
         size_t commandQueueDepth) :

src/core/controller/ExtendedControllerBase.cpp

@@ -1,5 +1,4 @@
-#include "ExtendedControllerBase.h"
-
+#include "fsfw/controller/ExtendedControllerBase.h"
 
 ExtendedControllerBase::ExtendedControllerBase(object_id_t objectId,
         object_id_t parentId, size_t commandQueueDepth):

src/core/datapool/HkSwitchHelper.cpp

@@ -1,5 +1,5 @@
-#include "../datapool/HkSwitchHelper.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/datapool/HkSwitchHelper.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 HkSwitchHelper::HkSwitchHelper(EventReportingProxyIF* eventProxy) :
 		commandActionHelper(this), eventProxy(eventProxy) {

src/core/datapool/PoolDataSetBase.cpp

@@ -1,7 +1,7 @@
-#include "PoolDataSetBase.h"
-#include "ReadCommitIFAttorney.h"
+#include "fsfw/datapool/PoolDataSetBase.h"
+#include "fsfw/datapool/ReadCommitIFAttorney.h"
 
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #include <cstring>
 

src/core/datapool/PoolEntry.cpp

@@ -1,7 +1,8 @@
-#include "PoolEntry.h"
+#include "fsfw/datapool/PoolEntry.h"
+
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
 
-#include "../serviceinterface/ServiceInterface.h"
-#include "../globalfunctions/arrayprinter.h"
 #include <cstring>
 #include <algorithm>
 

src/core/datapoollocal/LocalDataPoolManager.cpp

@@ -1,18 +1,16 @@
-#include "HasLocalDataPoolIF.h"
-#include "LocalDataPoolManager.h"
-#include "LocalPoolObjectBase.h"
-#include "LocalPoolDataSetBase.h"
+#include "fsfw/datapoollocal/LocalDataPoolManager.h"
+#include "fsfw/datapoollocal.h"
 #include "internal/LocalPoolDataSetAttorney.h"
 #include "internal/HasLocalDpIFManagerAttorney.h"
 
-#include "../housekeeping/HousekeepingSetPacket.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../housekeeping/HousekeepingSnapshot.h"
-#include "../housekeeping/AcceptsHkPacketsIF.h"
-#include "../timemanager/CCSDSTime.h"
-#include "../ipc/MutexFactory.h"
-#include "../ipc/MutexGuard.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/housekeeping/HousekeepingSetPacket.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/housekeeping/HousekeepingSnapshot.h"
+#include "fsfw/housekeeping/AcceptsHkPacketsIF.h"
+#include "fsfw/timemanager/CCSDSTime.h"
+#include "fsfw/ipc/MutexFactory.h"
+#include "fsfw/ipc/MutexGuard.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 #include <array>
 #include <cmath>

src/core/datapoollocal/LocalDataSet.cpp

@@ -1,6 +1,7 @@
-#include "LocalDataSet.h"
-#include "../datapoollocal/LocalDataPoolManager.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/datapoollocal/LocalDataSet.h"
+#include "fsfw/datapoollocal/LocalDataPoolManager.h"
+
+#include "fsfw/serialize/SerializeAdapter.h"
 
 #include <cmath>
 #include <cstring>

src/core/datapoollocal/LocalPoolDataSetBase.cpp

@@ -1,13 +1,12 @@
-#include "LocalPoolDataSetBase.h"
-#include "HasLocalDataPoolIF.h"
+#include "fsfw/datapoollocal.h"
 #include "internal/HasLocalDpIFUserAttorney.h"
 
-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../globalfunctions/bitutility.h"
-#include "../datapoollocal/LocalDataPoolManager.h"
-#include "../housekeeping/PeriodicHousekeepingHelper.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/globalfunctions/bitutility.h"
+#include "fsfw/datapoollocal/LocalDataPoolManager.h"
+#include "fsfw/housekeeping/PeriodicHousekeepingHelper.h"
+#include "fsfw/serialize/SerializeAdapter.h"
 
 #include <cmath>
 #include <cstring>

src/core/datapoollocal/LocalPoolObjectBase.cpp

@@ -1,10 +1,10 @@
-#include "LocalPoolObjectBase.h"
-#include "LocalDataPoolManager.h"
-#include "AccessLocalPoolF.h"
-#include "HasLocalDataPoolIF.h"
+#include "fsfw/datapoollocal/LocalPoolObjectBase.h"
+#include "fsfw/datapoollocal/LocalDataPoolManager.h"
+#include "fsfw/datapoollocal/AccessLocalPoolF.h"
+#include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
 #include "internal/HasLocalDpIFUserAttorney.h"
 
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 
 LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, HasLocalDataPoolIF* hkOwner,

src/core/datapoollocal/SharedLocalDataSet.cpp

@@ -1,4 +1,4 @@
-#include "SharedLocalDataSet.h"
+#include "fsfw/datapoollocal/SharedLocalDataSet.h"
 
 
 SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId, sid_t sid,

src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp

@@ -1,7 +1,7 @@
 #include "HasLocalDpIFManagerAttorney.h"
-#include "../LocalPoolObjectBase.h"
-#include "../LocalPoolDataSetBase.h"
-#include "../HasLocalDataPoolIF.h"
+#include "fsfw/datapoollocal/LocalPoolObjectBase.h"
+#include "fsfw/datapoollocal/LocalPoolDataSetBase.h"
+#include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
 
 LocalPoolDataSetBase* HasLocalDpIFManagerAttorney::getDataSetHandle(HasLocalDataPoolIF* clientIF,
         sid_t sid) {

src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_
 #define FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_
 
-#include "../localPoolDefinitions.h"
+#include "fsfw/datapoollocal/localPoolDefinitions.h"
 
 class HasLocalDataPoolIF;
 class LocalPoolDataSetBase;

src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp

@@ -1,6 +1,6 @@
 #include "HasLocalDpIFUserAttorney.h"
-#include "../AccessLocalPoolF.h"
-#include "../HasLocalDataPoolIF.h"
+#include "fsfw/datapoollocal/AccessLocalPoolF.h"
+#include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
 
 AccessPoolManagerIF* HasLocalDpIFUserAttorney::getAccessorHandle(HasLocalDataPoolIF *clientIF) {
 	return clientIF->getAccessorHandle();

src/core/datapoollocal/internal/LocalDpManagerAttorney.h

@@ -1,31 +0,0 @@
-#ifndef FSFW_DATAPOOLLOCAL_LOCALDPMANAGERATTORNEY_H_
-#define FSFW_DATAPOOLLOCAL_LOCALDPMANAGERATTORNEY_H_
-
-#include "../LocalDataPoolManager.h"
-
-/**
- * @brief	This is a helper class implements the Attorney-Client idiom for access to
- * 			LocalDataPoolManager internals
- * @details
- * This helper class provides better control over which classes are allowed to access
- * LocalDataPoolManager internals in a granular and encapsulated way when compared to
- * other methods like direct friend declarations. It allows these classes to use
- * an explicit subset of the pool manager private/protected functions.
- * See: https://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Friendship_and_the_Attorney-Client
- */
-class LocalDpManagerAttorney {
-private:
-    template<typename T> static ReturnValue_t fetchPoolEntry(LocalDataPoolManager& manager,
-            lp_id_t localPoolId, PoolEntry<T> **poolEntry) {
-        return manager.fetchPoolEntry(localPoolId, poolEntry);
-    }
-
-    static MutexIF* getMutexHandle(LocalDataPoolManager& manager) {
-        return manager.getMutexHandle();
-    }
-
-    template<typename T> friend class LocalPoolVariable;
-    template<typename T, uint16_t vecSize> friend class LocalPoolVector;
-};
-
-#endif /* FSFW_DATAPOOLLOCAL_LOCALDPMANAGERATTORNEY_H_ */

src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_
 #define FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_
 
-#include "../LocalPoolDataSetBase.h"
+#include "fsfw/datapoollocal/LocalPoolDataSetBase.h"
 
 class LocalPoolDataSetAttorney {
 private:

src/core/devicehandlers/AssemblyBase.cpp

@@ -1,4 +1,4 @@
-#include "AssemblyBase.h"
+#include "fsfw/devicehandlers/AssemblyBase.h"
 
 AssemblyBase::AssemblyBase(object_id_t objectId, object_id_t parentId,
 		uint16_t commandQueueDepth) :

src/core/devicehandlers/CMakeLists.txt

@@ -0,0 +1,10 @@
+target_sources(${LIB_FSFW_NAME} PRIVATE 
+    AssemblyBase.cpp
+    ChildHandlerBase.cpp
+    ChildHandlerFDIR.cpp
+    DeviceHandlerBase.cpp
+    DeviceHandlerFailureIsolation.cpp
+    DeviceHandlerMessage.cpp
+    DeviceTmReportingWrapper.cpp
+    HealthDevice.cpp
+)

src/core/devicehandlers/ChildHandlerBase.cpp

@@ -1,5 +1,5 @@
-#include "ChildHandlerBase.h"
-#include "../subsystem/SubsystemBase.h"
+#include "fsfw/devicehandlers/ChildHandlerBase.h"
+#include "fsfw/subsystem/SubsystemBase.h"
 
 ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId,
 		object_id_t deviceCommunication, CookieIF * cookie,

src/core/devicehandlers/ChildHandlerFDIR.cpp

@@ -1,4 +1,4 @@
-#include "ChildHandlerFDIR.h"
+#include "fsfw/devicehandlers/ChildHandlerFDIR.h"
 
 ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner,
         object_id_t faultTreeParent, uint32_t recoveryCount) :

src/core/devicehandlers/DeviceHandlerBase.cpp

@@ -1,17 +1,17 @@
-#include "DeviceHandlerBase.h"
-#include "AcceptsDeviceResponsesIF.h"
-#include "DeviceTmReportingWrapper.h"
+#include "fsfw/devicehandlers/DeviceHandlerBase.h"
+#include "fsfw/devicehandlers/AcceptsDeviceResponsesIF.h"
+#include "fsfw/devicehandlers/DeviceTmReportingWrapper.h"
 
-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../thermal/ThermalComponentIF.h"
-#include "../globalfunctions/CRC.h"
-#include "../housekeeping/HousekeepingMessage.h"
-#include "../ipc/MessageQueueMessage.h"
-#include "../ipc/QueueFactory.h"
-#include "../subsystem/SubsystemBase.h"
-#include "../datapoollocal/LocalPoolVariable.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/thermal/ThermalComponentIF.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/housekeeping/HousekeepingMessage.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/subsystem/SubsystemBase.h"
+#include "fsfw/datapoollocal/LocalPoolVariable.h"
 
 object_id_t DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
 object_id_t DeviceHandlerBase::rawDataReceiverId = objects::NO_OBJECT;

src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp

@@ -1,12 +1,12 @@
-#include "DeviceHandlerFailureIsolation.h"
+#include "fsfw/devicehandlers/DeviceHandlerFailureIsolation.h"
 
-#include "../devicehandlers/DeviceHandlerIF.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../modes/HasModesIF.h"
-#include "../health/HealthTableIF.h"
-#include "../power/Fuse.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../thermal/ThermalComponentIF.h"
+#include "fsfw/devicehandlers/DeviceHandlerIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/modes/HasModesIF.h"
+#include "fsfw/health/HealthTableIF.h"
+#include "fsfw/power/Fuse.h"
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/thermal/ThermalComponentIF.h"
 
 object_id_t DeviceHandlerFailureIsolation::powerConfirmationId =
         objects::NO_OBJECT;

src/core/devicehandlers/DeviceHandlerMessage.cpp

@@ -1,5 +1,5 @@
-#include "DeviceHandlerMessage.h"
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/devicehandlers/DeviceHandlerMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 store_address_t DeviceHandlerMessage::getStoreAddress(
 		const CommandMessage* message) {

src/core/devicehandlers/DeviceTmReportingWrapper.cpp

@@ -1,5 +1,5 @@
-#include "DeviceTmReportingWrapper.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/devicehandlers/DeviceTmReportingWrapper.h"
+#include "fsfw/serialize/SerializeAdapter.h"
 
 DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId,
 		ActionId_t actionId, SerializeIF* data) :

src/core/devicehandlers/HealthDevice.cpp

@@ -1,5 +1,5 @@
-#include "HealthDevice.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/devicehandlers/HealthDevice.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 HealthDevice::HealthDevice(object_id_t setObjectId,
 		MessageQueueId_t parentQueue) :

src/core/events/CMakeLists.txt

@@ -1,7 +1,6 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		EventManager.cpp
-		EventMessage.cpp
+target_sources(${LIB_FSFW_NAME} PRIVATE 
+    EventManager.cpp
+    EventMessage.cpp
 )
 
-add_subdirectory(eventmatching)
+add_subdirectory(eventmatching)

src/core/events/EventManager.cpp

@@ -1,8 +1,8 @@
-#include "EventManager.h"
-#include "EventMessage.h"
+#include "fsfw/events/EventManager.h"
+#include "fsfw/events/EventMessage.h"
 
-#include "../ipc/QueueFactory.h"
-#include "../ipc/MutexFactory.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/ipc/MutexFactory.h"
 
 MessageQueueId_t EventManagerIF::eventmanagerQueue = MessageQueueIF::NO_QUEUE;
 

src/core/events/EventMessage.cpp

@@ -1,4 +1,4 @@
-#include "EventMessage.h"
+#include "fsfw/events/EventMessage.h"
 #include <cstring>
 
 EventMessage::EventMessage() {

src/core/events/eventmatching/CMakeLists.txt

@@ -0,0 +1,7 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		EventIdRangeMatcher.cpp
+		EventMatchTree.cpp
+		ReporterRangeMatcher.cpp
+		SeverityRangeMatcher.cpp
+)

src/core/events/eventmatching/EventIdRangeMatcher.cpp

@@ -0,0 +1,12 @@
+#include "fsfw/events/eventmatching/EventIdRangeMatcher.h"
+
+EventIdRangeMatcher::EventIdRangeMatcher(EventId_t lower, EventId_t upper,
+		bool inverted) : EventRangeMatcherBase<EventId_t>(lower, upper, inverted) {
+}
+
+EventIdRangeMatcher::~EventIdRangeMatcher() {
+}
+
+bool EventIdRangeMatcher::match(EventMessage* message) {
+	return rangeMatcher.match(message->getEventId());
+}

src/core/events/eventmatching/EventMatchTree.cpp

@@ -0,0 +1,149 @@
+#include "fsfw/events/eventmatching/EventIdRangeMatcher.h"
+#include "fsfw/events/eventmatching/EventMatchTree.h"
+#include "fsfw/events/eventmatching/ReporterRangeMatcher.h"
+#include "fsfw/events/eventmatching/SeverityRangeMatcher.h"
+
+EventMatchTree::EventMatchTree(StorageManagerIF* storageBackend,
+		bool invertedMatch) :
+		MatchTree<EventMessage*>(end(), 1), factory(storageBackend), invertedMatch(
+				invertedMatch) {
+}
+
+EventMatchTree::~EventMatchTree() {
+}
+
+bool EventMatchTree::match(EventMessage* number) {
+	if (invertedMatch) {
+		return !MatchTree<EventMessage*>::match(number);
+	} else {
+		return MatchTree<EventMessage*>::match(number);
+	}
+}
+
+ReturnValue_t EventMatchTree::addMatch(EventId_t idFrom, EventId_t idTo,
+		bool idInverted, object_id_t reporterFrom, object_id_t reporterTo,
+		bool reporterInverted) {
+	if (idFrom == 0) {
+		//Assuming all events shall be forwarded.
+		idTo = 0;
+		idInverted = true;
+	}
+	if (idTo == 0) {
+		idTo = idFrom;
+	}
+	iterator lastTest;
+	ReturnValue_t result = findOrInsertRangeMatcher<EventId_t,
+			EventIdRangeMatcher>(begin(), idFrom, idTo, idInverted, &lastTest);
+	if (result != HasReturnvaluesIF::RETURN_OK) {
+		return result;
+	}
+	if (reporterFrom == 0) {
+		//No need to add another AND branch
+		return RETURN_OK;
+	}
+	if (reporterTo == 0) {
+		reporterTo = reporterFrom;
+	}
+	return findOrInsertRangeMatcher<object_id_t, ReporterRangeMatcher>(
+			lastTest.left(), reporterFrom, reporterTo, reporterInverted,
+			&lastTest);
+}
+
+ReturnValue_t EventMatchTree::removeMatch(EventId_t idFrom, EventId_t idTo,
+		bool idInverted, object_id_t reporterFrom, object_id_t reporterTo,
+		bool reporterInverted) {
+
+	iterator foundElement;
+
+	if (idFrom == 0) {
+		//Assuming a "forward all events" request.
+		idTo = 0;
+		idInverted = true;
+	}
+	if (idTo == 0) {
+		idTo = idFrom;
+	}
+	foundElement = findRangeMatcher<EventId_t, EventIdRangeMatcher>(begin(),
+			idFrom, idTo, idInverted);
+	if (foundElement == end()) {
+		return NO_MATCH; //Can't tell if too detailed or just not found.
+	}
+	if (reporterFrom == 0) {
+		if (foundElement.left() == end()) {
+			return removeElementAndReconnectChildren(foundElement);
+		} else {
+			return TOO_GENERAL_REQUEST;
+		}
+	}
+	if (reporterTo == 0) {
+		reporterTo = reporterFrom;
+	}
+	foundElement = findRangeMatcher<object_id_t, ReporterRangeMatcher>(
+			foundElement.left(), reporterFrom, reporterTo, reporterInverted);
+	if (foundElement == end()) {
+		return NO_MATCH;
+	} else {
+		return removeElementAndReconnectChildren(foundElement);
+	}
+}
+
+template<typename VALUE_T, typename INSERTION_T>
+inline ReturnValue_t EventMatchTree::findOrInsertRangeMatcher(iterator start,
+		VALUE_T idFrom, VALUE_T idTo, bool inverted, iterator* lastTest) {
+	bool attachToBranch = AND;
+	iterator iter = start;
+	while (iter != end()) {
+		INSERTION_T* matcher = static_cast<INSERTION_T*>(*iter);
+		attachToBranch = OR;
+		*lastTest = iter;
+		if ((matcher->rangeMatcher.lowerBound == idFrom)
+				&& (matcher->rangeMatcher.upperBound == idTo)
+				&& (matcher->rangeMatcher.inverted == inverted)) {
+			return RETURN_OK;
+		} else {
+			iter = iter.right();
+		}
+	}
+	//Only reached if nothing was found.
+	SerializeableMatcherIF<EventMessage*>* newContent = factory.generate<
+			INSERTION_T>(idFrom, idTo, inverted);
+	if (newContent == NULL) {
+		return FULL;
+	}
+	Node* newNode = factory.generate<Node>(newContent);
+	if (newNode == NULL) {
+		//Need to make sure partially generated content is deleted, otherwise, that's a leak.
+		factory.destroy<INSERTION_T>(static_cast<INSERTION_T*>(newContent));
+		return FULL;
+	}
+	*lastTest = insert(attachToBranch, *lastTest, newNode);
+	if (*lastTest == end()) {
+		//This actaully never fails, so creating a dedicated returncode seems an overshoot.
+		return RETURN_FAILED;
+	}
+	return RETURN_OK;
+}
+
+template<typename VALUE_T, typename INSERTION_T>
+EventMatchTree::iterator EventMatchTree::findRangeMatcher(iterator start,
+		VALUE_T idFrom, VALUE_T idTo, bool inverted) {
+	iterator iter = start;
+	while (iter != end()) {
+		INSERTION_T* matcher = static_cast<INSERTION_T*>(*iter);
+		if ((matcher->rangeMatcher.lowerBound == idFrom)
+				&& (matcher->rangeMatcher.upperBound == idTo)
+				&& (matcher->rangeMatcher.inverted == inverted)) {
+			break;
+		} else {
+			iter = iter.right(); //next OR element
+		}
+	}
+	return iter;
+}
+
+ReturnValue_t EventMatchTree::cleanUpElement(iterator position) {
+	factory.destroy(position.element->value);
+	//If deletion fails, delete element anyway, nothing we can do.
+	//SHOULDO: Throw event, or write debug output.
+	return factory.destroy(position.element);
+}

src/core/events/eventmatching/ReporterRangeMatcher.cpp

@@ -0,0 +1,13 @@
+#include "fsfw/events/eventmatching/ReporterRangeMatcher.h"
+
+ReporterRangeMatcher::ReporterRangeMatcher(object_id_t lower, object_id_t upper,
+		bool inverted) : EventRangeMatcherBase<object_id_t>(lower, upper, inverted) {
+}
+
+ReporterRangeMatcher::~ReporterRangeMatcher() {
+	
+}
+
+bool ReporterRangeMatcher::match(EventMessage* message) {
+	return rangeMatcher.match(message->getReporter());
+}

src/core/events/eventmatching/SeverityRangeMatcher.cpp

@@ -0,0 +1,14 @@
+#include "fsfw/events/eventmatching/SeverityRangeMatcher.h"
+#include "fsfw/events/EventMessage.h"
+#include "fsfw/serialize/SerializeAdapter.h"
+
+SeverityRangeMatcher::SeverityRangeMatcher(EventSeverity_t from,
+		EventSeverity_t till, bool inverted) : EventRangeMatcherBase<EventSeverity_t>(from, till, inverted) {
+}
+
+SeverityRangeMatcher::~SeverityRangeMatcher() {
+}
+
+bool SeverityRangeMatcher::match(EventMessage* message) {
+	return rangeMatcher.match(message->getSeverity());
+}

src/core/fdir/EventCorrelation.cpp

@@ -1,4 +1,4 @@
-#include "EventCorrelation.h"
+#include "fsfw/fdir/EventCorrelation.h"
 
 EventCorrelation::EventCorrelation(uint32_t timeout) :
 		eventPending(false) {

src/core/fdir/FailureIsolationBase.cpp

@@ -1,9 +1,9 @@
-#include "../events/EventManagerIF.h"
-#include "FailureIsolationBase.h"
-#include "../health/HasHealthIF.h"
-#include "../health/HealthMessage.h"
-#include "../ipc/QueueFactory.h"
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/events/EventManagerIF.h"
+#include "fsfw/fdir/FailureIsolationBase.h"
+#include "fsfw/health/HasHealthIF.h"
+#include "fsfw/health/HealthMessage.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 FailureIsolationBase::FailureIsolationBase(object_id_t owner,
 		object_id_t parent, uint8_t messageDepth, uint8_t parameterDomainBase) :

src/core/fdir/FaultCounter.cpp

@@ -1,4 +1,4 @@
-#include "FaultCounter.h"
+#include "fsfw/fdir/FaultCounter.h"
 
 FaultCounter::FaultCounter(uint32_t failureThreshold, uint32_t decrementAfterMs,
 		uint8_t setParameterDomain) :

src/core/globalfunctions/AsciiConverter.cpp

@@ -1,4 +1,5 @@
-#include "AsciiConverter.h"
+#include "fsfw/globalfunctions/AsciiConverter.h"
+
 #include <limits>
 #include <cmath>
 

src/core/globalfunctions/CRC.cpp

@@ -1,4 +1,4 @@
-#include "CRC.h"
+#include "fsfw/globalfunctions/CRC.h"
 #include <math.h>
 
 const uint16_t CRC::crc16ccitt_table[256] = {

src/core/globalfunctions/DleEncoder.cpp

@@ -1,4 +1,4 @@
-#include "../globalfunctions/DleEncoder.h"
+#include "fsfw/globalfunctions/DleEncoder.h"
 
 DleEncoder::DleEncoder() {}
 

src/core/globalfunctions/PeriodicOperationDivider.cpp

@@ -1,4 +1,4 @@
-#include "PeriodicOperationDivider.h"
+#include "fsfw/globalfunctions/PeriodicOperationDivider.h"
 
 
 PeriodicOperationDivider::PeriodicOperationDivider(uint32_t divider,

src/core/globalfunctions/Type.cpp

@@ -1,5 +1,5 @@
-#include "Type.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/globalfunctions/Type.h"
+#include "fsfw/serialize/SerializeAdapter.h"
 
 Type::Type() :
 		actualType(UNKNOWN_TYPE) {

src/core/globalfunctions/arrayprinter.cpp

@@ -1,5 +1,6 @@
-#include "arrayprinter.h"
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+
 #include <bitset>
 
 

src/core/globalfunctions/bitutility.cpp

@@ -1,4 +1,4 @@
-#include "bitutility.h"
+#include "fsfw/globalfunctions/bitutility.h"
 
 void bitutil::bitSet(uint8_t *byte, uint8_t position) {
     if(position > 7) {

src/core/globalfunctions/math/QuaternionOperations.cpp

@@ -1,5 +1,5 @@
-#include "QuaternionOperations.h"
-#include "VectorOperations.h"
+#include "fsfw/globalfunctions/math/QuaternionOperations.h"
+#include "fsfw/globalfunctions/math/VectorOperations.h"
 
 #include <cmath>
 #include <cstring>

src/core/globalfunctions/timevalOperations.cpp

@@ -1,4 +1,4 @@
-#include "timevalOperations.h"
+#include "fsfw/globalfunctions/timevalOperations.h"
 
 timeval& operator+=(timeval& lhs, const timeval& rhs) {
 	int64_t sum = lhs.tv_sec * 1000000. + lhs.tv_usec;

src/core/health/HealthHelper.cpp

@@ -1,5 +1,6 @@
-#include "HealthHelper.h"
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/health/HealthHelper.h"
+
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 HealthHelper::HealthHelper(HasHealthIF* owner, object_id_t objectId) :
 		objectId(objectId), owner(owner) {

src/core/health/HealthMessage.cpp

@@ -1,4 +1,4 @@
-#include "HealthMessage.h"
+#include "fsfw/health/HealthMessage.h"
 
 void HealthMessage::setHealthMessage(CommandMessage* message, Command_t command,
 		HasHealthIF::HealthState health, HasHealthIF::HealthState oldHealth) {

src/core/health/HealthTable.cpp

@@ -1,7 +1,8 @@
-#include "HealthTable.h"
-#include "../ipc/MutexGuard.h"
-#include "../ipc/MutexFactory.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/health/HealthTable.h"
+
+#include "fsfw/ipc/MutexGuard.h"
+#include "fsfw/ipc/MutexFactory.h"
+#include "fsfw/serialize/SerializeAdapter.h"
 
 HealthTable::HealthTable(object_id_t objectid) :
 		SystemObject(objectid) {

src/core/housekeeping/CMakeLists.txt

@@ -0,0 +1,4 @@
+target_sources(${LIB_FSFW_NAME} PRIVATE 
+    HousekeepingMessage.cpp
+    PeriodicHousekeepingHelper.cpp
+)

src/core/housekeeping/HousekeepingMessage.cpp

@@ -1,6 +1,7 @@
-#include "HousekeepingMessage.h"
+#include "fsfw/housekeeping/HousekeepingMessage.h"
+
+#include "fsfw/objectmanager/ObjectManager.h"
 
-#include "../objectmanager/ObjectManager.h"
 #include <cstring>
 
 HousekeepingMessage::~HousekeepingMessage() {}

src/core/housekeeping/PeriodicHousekeepingHelper.cpp

@@ -1,6 +1,6 @@
-#include "PeriodicHousekeepingHelper.h"
+#include "fsfw/housekeeping/PeriodicHousekeepingHelper.h"
 
-#include "../datapoollocal/LocalPoolDataSetBase.h"
+#include "fsfw/datapoollocal/LocalPoolDataSetBase.h"
 #include <cmath>
 
 PeriodicHousekeepingHelper::PeriodicHousekeepingHelper(

src/core/internalerror/InternalErrorReporter.cpp

@@ -1,9 +1,9 @@
-#include "InternalErrorReporter.h"
+#include "fsfw/internalerror/InternalErrorReporter.h"
 
-#include "../ipc/QueueFactory.h"
-#include "../ipc/MutexFactory.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../datapool/PoolReadGuard.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/ipc/MutexFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/datapool/PoolReadGuard.h"
 
 InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId,
         uint32_t messageQueueDepth): SystemObject(setObjectId),

src/core/ipc/CommandMessage.cpp

@@ -1,5 +1,6 @@
-#include "CommandMessage.h"
-#include "CommandMessageCleaner.h"
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/ipc/CommandMessageCleaner.h"
+
 #include <cstring>
 
 CommandMessage::CommandMessage() {

src/core/ipc/CommandMessageCleaner.cpp

@@ -1,15 +1,15 @@
-#include "CommandMessageCleaner.h"
+#include "fsfw/ipc/CommandMessageCleaner.h"
 
-#include "../memory/GenericFileSystemMessage.h"
-#include "../devicehandlers/DeviceHandlerMessage.h"
-#include "../health/HealthMessage.h"
-#include "../memory/MemoryMessage.h"
-#include "../modes/ModeMessage.h"
-#include "../monitoring/MonitoringMessage.h"
-#include "../subsystem/modes/ModeSequenceMessage.h"
-#include "../tmstorage/TmStoreMessage.h"
-#include "../housekeeping/HousekeepingMessage.h"
-#include "../parameters/ParameterMessage.h"
+#include "fsfw/memory/GenericFileSystemMessage.h"
+#include "fsfw/devicehandlers/DeviceHandlerMessage.h"
+#include "fsfw/health/HealthMessage.h"
+#include "fsfw/memory/MemoryMessage.h"
+#include "fsfw/modes/ModeMessage.h"
+#include "fsfw/monitoring/MonitoringMessage.h"
+#include "fsfw/subsystem/modes/ModeSequenceMessage.h"
+#include "fsfw/tmstorage/TmStoreMessage.h"
+#include "fsfw/housekeeping/HousekeepingMessage.h"
+#include "fsfw/parameters/ParameterMessage.h"
 
 void CommandMessageCleaner::clearCommandMessage(CommandMessage* message) {
 	switch(message->getMessageType()){

src/core/ipc/MessageQueueMessage.cpp

@@ -1,6 +1,7 @@
-#include "MessageQueueMessage.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../globalfunctions/arrayprinter.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
+
 #include <cstring>
 
 MessageQueueMessage::MessageQueueMessage() :

src/core/memory/GenericFileSystemMessage.cpp

@@ -1,7 +1,7 @@
-#include "GenericFileSystemMessage.h"
+#include "fsfw/memory/GenericFileSystemMessage.h"
 
-#include "../objectmanager/ObjectManager.h"
-#include "../storagemanager/StorageManagerIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
 void GenericFileSystemMessage::setCreateFileCommand(CommandMessage* message,
         store_address_t storeId) {

src/core/memory/MemoryHelper.cpp

@@ -1,10 +1,10 @@
-#include "MemoryHelper.h"
-#include "MemoryMessage.h"
+#include "fsfw/memory/MemoryHelper.h"
+#include "fsfw/memory/MemoryMessage.h"
 
-#include "../globalfunctions/CRC.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../serialize/EndianConverter.h"
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serialize/EndianConverter.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 MemoryHelper::MemoryHelper(HasMemoryIF* workOnThis,
 		MessageQueueIF* useThisQueue):

src/core/memory/MemoryMessage.cpp

@@ -1,6 +1,6 @@
-#include "MemoryMessage.h"
+#include "fsfw/memory/MemoryMessage.h"
 
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 uint32_t MemoryMessage::getAddress(const CommandMessage* message) {
 	return message->getParameter();

src/core/modes/ModeHelper.cpp

@@ -1,8 +1,8 @@
-#include "HasModesIF.h"
-#include "ModeHelper.h"
+#include "fsfw/modes/HasModesIF.h"
+#include "fsfw/modes/ModeHelper.h"
 
-#include "../ipc/MessageQueueSenderIF.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 ModeHelper::ModeHelper(HasModesIF *owner) :
 		commandedMode(HasModesIF::MODE_OFF),

src/core/modes/ModeMessage.cpp

@@ -1,4 +1,4 @@
-#include "ModeMessage.h"
+#include "fsfw/modes/ModeMessage.h"
 
 Mode_t ModeMessage::getMode(const CommandMessage* message) {
 	return message->getParameter();

src/core/objectmanager/ObjectManager.cpp

@@ -1,5 +1,5 @@
-#include "ObjectManager.h"
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 #include <iomanip>

src/core/objectmanager/SystemObject.cpp

@@ -1,6 +1,6 @@
-#include "ObjectManager.h"
-#include "SystemObject.h"
-#include "../events/EventManagerIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/events/EventManagerIF.h"
 
 SystemObject::SystemObject(object_id_t setObjectId, bool doRegister) :
 		objectId(setObjectId), registered(doRegister) {

src/core/parameters/ParameterHelper.cpp

@@ -1,7 +1,7 @@
-#include "ParameterHelper.h"
-#include "ParameterMessage.h"
+#include "fsfw/parameters/ParameterHelper.h"
+#include "fsfw/parameters/ParameterMessage.h"
 
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 ParameterHelper::ParameterHelper(ReceivesParameterMessagesIF* owner):
         owner(owner) {}

src/core/parameters/ParameterMessage.cpp

@@ -1,6 +1,6 @@
-#include "ParameterMessage.h"
+#include "fsfw/parameters/ParameterMessage.h"
 
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 ParameterId_t ParameterMessage::getParameterId(const CommandMessage* message) {
 	return message->getParameter();

src/core/parameters/ParameterWrapper.cpp

@@ -1,6 +1,6 @@
-#include "ParameterWrapper.h"
-#include <FSFWConfig.h>
-#include <fsfw/serviceinterface/ServiceInterface.h>
+#include "fsfw/FSFW.h"
+#include "fsfw/parameters/ParameterWrapper.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 ParameterWrapper::ParameterWrapper() :
 		pointsToStream(false), type(Type::UNKNOWN_TYPE) {

src/core/power/Fuse.cpp

@@ -1,10 +1,10 @@
-#include "Fuse.h"
+#include "fsfw/power/Fuse.h"
 
-#include "../monitoring/LimitViolationReporter.h"
-#include "../monitoring/MonitoringMessageContent.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../serialize/SerialFixedArrayListAdapter.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/monitoring/LimitViolationReporter.h"
+#include "fsfw/monitoring/MonitoringMessageContent.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serialize/SerialFixedArrayListAdapter.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 object_id_t Fuse::powerSwitchId = 0;
 

src/core/power/PowerComponent.cpp

@@ -1,5 +1,5 @@
-#include "PowerComponent.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/power/PowerComponent.h"
+#include "fsfw/serialize/SerializeAdapter.h"
 
 
 PowerComponent::PowerComponent(): switchId1(0xFF), switchId2(0xFF),

src/core/power/PowerSensor.cpp

@@ -1,6 +1,6 @@
-#include "PowerSensor.h"
+#include "fsfw/power/PowerSensor.h"
 
-#include "../ipc/QueueFactory.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 PowerSensor::PowerSensor(object_id_t objectId, sid_t setId,  VariableIds ids,
 		DefaultLimits limits, SensorEvents events, uint16_t confirmationCount) :

src/core/power/PowerSwitcher.cpp

@@ -1,7 +1,7 @@
-#include "PowerSwitcher.h"
+#include "fsfw/power/PowerSwitcher.h"
 
-#include "../objectmanager/ObjectManager.h"
-#include "../serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 PowerSwitcher::PowerSwitcher(uint8_t setSwitch1, uint8_t setSwitch2,
 		PowerSwitcher::State_t setStartState):

src/core/serialize/SerialBufferAdapter.cpp

@@ -1,5 +1,5 @@
-#include "../serialize/SerialBufferAdapter.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/serialize/SerialBufferAdapter.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 #include <cstring>
 
 template<typename count_t>

src/core/serviceinterface/ServiceInterfaceBuffer.cpp

@@ -1,10 +1,10 @@
-#include "ServiceInterfaceBuffer.h"
+#include "fsfw/serviceinterface/ServiceInterfaceBuffer.h"
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 
-#include "../timemanager/Clock.h"
+#include "fsfw/timemanager/Clock.h"
 
-#include "serviceInterfaceDefintions.h"
+#include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
 #include <cstring>
 #include <inttypes.h>
 

src/core/serviceinterface/ServiceInterfacePrinter.cpp

@@ -1,7 +1,7 @@
-#include <FSFWConfig.h>
-#include "ServiceInterfacePrinter.h"
-#include "serviceInterfaceDefintions.h"
-#include "../timemanager/Clock.h"
+#include "fsfw/FSFW.h"
+#include "fsfw/serviceinterface/ServiceInterfacePrinter.h"
+#include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
+#include "fsfw/timemanager/Clock.h"
 
 #include <cstdarg>
 #include <cstdint>

src/core/serviceinterface/ServiceInterfaceStream.cpp

@@ -1,4 +1,4 @@
-#include "ServiceInterfaceStream.h"
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 

src/core/storagemanager/ConstStorageAccessor.cpp

@@ -1,8 +1,8 @@
-#include "ConstStorageAccessor.h"
-#include "StorageManagerIF.h"
+#include "fsfw/storagemanager/ConstStorageAccessor.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../globalfunctions/arrayprinter.h"
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
 
 #include <algorithm>
 

src/core/storagemanager/LocalPool.cpp

@@ -1,7 +1,7 @@
-#include "LocalPool.h"
-#include "FSFWConfig.h"
+#include "fsfw/FSFW.h"
+#include "fsfw/storagemanager/LocalPool.h"
 
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
 #include <cstring>
 

src/core/storagemanager/PoolManager.cpp

@@ -1,5 +1,6 @@
-#include "PoolManager.h"
-#include <FSFWConfig.h>
+#include "fsfw/FSFW.h"
+#include "fsfw/storagemanager/PoolManager.h"
+
 
 PoolManager::PoolManager(object_id_t setObjectId,
         const LocalPoolConfig& localPoolConfig):

src/core/storagemanager/StorageAccessor.cpp

@@ -1,6 +1,7 @@
-#include "StorageAccessor.h"
-#include "StorageManagerIF.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/storagemanager/StorageAccessor.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #include <algorithm>
 

src/core/subsystem/Subsystem.cpp

@@ -1,11 +1,11 @@
-#include "Subsystem.h"
+#include "fsfw/subsystem/Subsystem.h"
 
-#include "../health/HealthMessage.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../serialize/SerialArrayListAdapter.h"
-#include "../serialize/SerialFixedArrayListAdapter.h"
-#include "../serialize/SerializeElement.h"
-#include "../serialize/SerialLinkedListAdapter.h"
+#include "fsfw/health/HealthMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serialize/SerialArrayListAdapter.h"
+#include "fsfw/serialize/SerialFixedArrayListAdapter.h"
+#include "fsfw/serialize/SerializeElement.h"
+#include "fsfw/serialize/SerialLinkedListAdapter.h"
 
 #include <string>
 

src/core/subsystem/SubsystemBase.cpp

@@ -1,8 +1,8 @@
-#include "SubsystemBase.h"
+#include "fsfw/subsystem/SubsystemBase.h"
 
-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 SubsystemBase::SubsystemBase(object_id_t setObjectId, object_id_t parent,
 		Mode_t initialMode, uint16_t commandQueueDepth) :

src/core/subsystem/modes/ModeSequenceMessage.cpp

@@ -1,7 +1,7 @@
-#include "ModeSequenceMessage.h"
+#include "fsfw/subsystem/modes/ModeSequenceMessage.h"
 
-#include "../../objectmanager/ObjectManager.h"
-#include "../../storagemanager/StorageManagerIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
 void ModeSequenceMessage::setModeSequenceMessage(CommandMessage* message,
 		Command_t command, Mode_t sequence, store_address_t storeAddress) {

src/core/subsystem/modes/ModeStore.cpp

@@ -1,4 +1,4 @@
-#include "ModeStore.h"
+#include "fsfw/subsystem/modes/ModeStore.h"
 
 // todo: I think some parts are deprecated. If this is used,  the define
 // USE_MODESTORE could be part of the new FSFWConfig.h file.

src/core/tasks/FixedSequenceSlot.cpp

@@ -1,5 +1,6 @@
-#include "FixedSequenceSlot.h"
-#include "PeriodicTaskIF.h"
+#include "fsfw/tasks/FixedSequenceSlot.h"
+#include "fsfw/tasks/PeriodicTaskIF.h"
+
 #include <cstddef>
 
 FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime,

src/core/tasks/FixedSlotSequence.cpp

@@ -1,5 +1,5 @@
-#include "FixedSlotSequence.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/tasks/FixedSlotSequence.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 #include <cstdlib>
 
 FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :

src/core/tcdistribution/CCSDSDistributor.cpp

@@ -1,8 +1,8 @@
-#include "CCSDSDistributor.h"
+#include "fsfw/tcdistribution/CCSDSDistributor.h"
 
-#include "../objectmanager/ObjectManager.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../tmtcpacket/SpacePacketBase.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcpacket/SpacePacketBase.h"
 
 #define CCSDS_DISTRIBUTOR_DEBUGGING     0
 

src/core/tcdistribution/PUSDistributor.cpp

@@ -1,9 +1,9 @@
-#include "CCSDSDistributorIF.h"
-#include "PUSDistributor.h"
+#include "fsfw/tcdistribution/CCSDSDistributorIF.h"
+#include "fsfw/tcdistribution/PUSDistributor.h"
 
-#include "../objectmanager/ObjectManager.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../tmtcservices/PusVerificationReport.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcservices/PusVerificationReport.h"
 
 #define PUS_DISTRIBUTOR_DEBUGGING     0
 

src/core/tcdistribution/TcDistributor.cpp

@@ -1,8 +1,8 @@
-#include "TcDistributor.h"
+#include "fsfw/tcdistribution/TcDistributor.h"
 
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../tmtcservices/TmTcMessage.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 TcDistributor::TcDistributor(object_id_t objectId) :
 		SystemObject(objectId) {

src/core/tcdistribution/TcPacketCheck.cpp

@@ -1,11 +1,11 @@
-#include "TcPacketCheck.h"
+#include "fsfw/tcdistribution/TcPacketCheck.h"
 
-#include "../globalfunctions/CRC.h"
-#include "../tmtcpacket/pus/tc/TcPacketBase.h"
-#include "../tmtcpacket/pus/tc/TcPacketStoredBase.h"
-#include "../serviceinterface/ServiceInterface.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../tmtcservices/VerificationCodes.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/tmtcpacket/pus/tc/TcPacketBase.h"
+#include "fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/tmtcservices/VerificationCodes.h"
 
 TcPacketCheck::TcPacketCheck(uint16_t setApid): apid(setApid) {
 }

src/core/thermal/AbstractTemperatureSensor.cpp

@@ -1,5 +1,5 @@
-#include "AbstractTemperatureSensor.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/thermal/AbstractTemperatureSensor.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 AbstractTemperatureSensor::AbstractTemperatureSensor(object_id_t setObjectid,
 		ThermalModuleIF *thermalModule) :

src/core/thermal/Heater.cpp

@@ -1,9 +1,9 @@
-#include "Heater.h"
+#include "fsfw/thermal/Heater.h"
 
-#include "../objectmanager/ObjectManager.h"
-#include "../devicehandlers/DeviceHandlerFailureIsolation.h"
-#include "../power/Fuse.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/devicehandlers/DeviceHandlerFailureIsolation.h"
+#include "fsfw/power/Fuse.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 Heater::Heater(uint32_t objectId, uint8_t switch0, uint8_t switch1) :
 HealthDevice(objectId, 0), internalState(STATE_OFF), switch0(switch0), switch1(switch1),

src/core/thermal/RedundantHeater.cpp

@@ -1,4 +1,4 @@
-#include "RedundantHeater.h"
+#include "fsfw/thermal/RedundantHeater.h"
 
 RedundantHeater::~RedundantHeater() {
 }

src/core/thermal/ThermalComponent.cpp

@@ -1,4 +1,4 @@
-#include "ThermalComponent.h"
+#include "fsfw/thermal/ThermalComponent.h"
 
 ThermalComponent::ThermalComponent(object_id_t reportingObjectId,
 		uint8_t domainId, gp_id_t temperaturePoolId,

src/core/thermal/ThermalModule.cpp

@@ -1,8 +1,8 @@
-#include "ThermalModule.h"
-#include "AbstractTemperatureSensor.h"
+#include "fsfw/thermal/ThermalModule.h"
+#include "fsfw/thermal/AbstractTemperatureSensor.h"
 
-#include "../monitoring/LimitViolationReporter.h"
-#include "../monitoring/MonitoringMessageContent.h"
+#include "fsfw/monitoring/LimitViolationReporter.h"
+#include "fsfw/monitoring/MonitoringMessageContent.h"
 
 
 ThermalModule::ThermalModule(gp_id_t moduleTemperaturePoolId,

src/core/timemanager/CCSDSTime.cpp

@@ -1,5 +1,6 @@
-#include "CCSDSTime.h"
-#include <FSFWConfig.h>
+#include "fsfw/FSFW.h"
+#include "fsfw/timemanager/CCSDSTime.h"
+
 #include <cstdio>
 #include <cinttypes>
 #include <cmath>