From 942ecc89bd92e5e4bbfa61a441cad71bbd7f37fe Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 27 Jan 2021 18:03:56 +0100
Subject: [PATCH] include updates

---
 monitoring/MonitoringMessageContent.h |  2 +-
 osal/rtems/PollingTask.cpp            | 14 ++++++++++----
 timemanager/Stopwatch.cpp             |  3 +++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/monitoring/MonitoringMessageContent.h b/monitoring/MonitoringMessageContent.h
index d830e3136..0314d7edc 100644
--- a/monitoring/MonitoringMessageContent.h
+++ b/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{
diff --git a/osal/rtems/PollingTask.cpp b/osal/rtems/PollingTask.cpp
index 3c9a994ca..8cfec942d 100644
--- a/osal/rtems/PollingTask.cpp
+++ b/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;
diff --git a/timemanager/Stopwatch.cpp b/timemanager/Stopwatch.cpp
index 5d67e6c1f..04ccab726 100644
--- a/timemanager/Stopwatch.cpp
+++ b/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(