include updates

monitoring/MonitoringMessageContent.h

@@ -10,7 +10,7 @@
 #include "../serialize/SerialFixedArrayListAdapter.h"
 #include "../serialize/SerializeElement.h"
 #include "../serialize/SerialLinkedListAdapter.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../serviceinterface/ServiceInterface.h"
 #include "../timemanager/TimeStamperIF.h"
 
 namespace Factory{

osal/rtems/PollingTask.cpp

@@ -1,18 +1,24 @@
+#include "PollingTask.h"
+#include "RtemsBasic.h"
+
 #include "../../tasks/FixedSequenceSlot.h"
 #include "../../objectmanager/SystemObjectIF.h"
 #include "../../objectmanager/ObjectManagerIF.h"
-#include "PollingTask.h"
-#include "RtemsBasic.h"
 #include "../../returnvalues/HasReturnvaluesIF.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "../../serviceinterface/ServiceInterface.h"
+
 #include <rtems/bspIo.h>
 #include <rtems/rtems/ratemon.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/rtems/types.h>
-#include <stddef.h>
 #include <sys/_stdint.h>
+
+#if FSFW_CPP_OSTREAM_ENABLED == 1
 #include <iostream>
+#endif
+
+#include <cstddef>
 #include <list>
 
 uint32_t PollingTask::deadlineMissedCount = 0;

timemanager/Stopwatch.cpp

@@ -1,6 +1,9 @@
 #include "Stopwatch.h"
 #include "../serviceinterface/ServiceInterface.h"
+
+#if FSFW_CPP_OSTREAM_ENABLED == 1
 #include <iomanip>
+#endif
 
 Stopwatch::Stopwatch(bool displayOnDestruction,
         StopwatchDisplayMode displayMode): displayOnDestruction(