diff --git a/datapool/PoolEntry.cpp b/datapool/PoolEntry.cpp
index b1ccb260a..369799c27 100644
--- a/datapool/PoolEntry.cpp
+++ b/datapool/PoolEntry.cpp
@@ -3,6 +3,7 @@
 #include "../serviceinterface/ServiceInterfaceStream.h"
 #include "../globalfunctions/arrayprinter.h"
 #include <cstring>
+#include <algorithm>
 
 template <typename T>
 PoolEntry<T>::PoolEntry(std::initializer_list<T> initValue, uint8_t setLength,
diff --git a/health/HealthTableIF.h b/health/HealthTableIF.h
index d61e67616..727c44961 100644
--- a/health/HealthTableIF.h
+++ b/health/HealthTableIF.h
@@ -5,6 +5,8 @@
 #include "../objectmanager/ObjectManagerIF.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
 
+#include <utility>
+
 class HealthTableIF: public ManagesHealthIF {
 public:
 	virtual ~HealthTableIF() {}
diff --git a/objectmanager/ObjectManager.cpp b/objectmanager/ObjectManager.cpp
index a7e3ac4c0..251dbc707 100644
--- a/objectmanager/ObjectManager.cpp
+++ b/objectmanager/ObjectManager.cpp
@@ -1,6 +1,9 @@
 #include "ObjectManager.h"
 #include "../serviceinterface/ServiceInterfaceStream.h"
+
+#if CPP_OSTREAM_ENABLED == 1
 #include <iomanip>
+#endif
 #include <cstdlib>
 
 ObjectManager::ObjectManager( void (*setProducer)() ):
diff --git a/serviceinterface/ServiceInterfaceBuffer.cpp b/serviceinterface/ServiceInterfaceBuffer.cpp
index 222c1e2c4..abe296cb4 100644
--- a/serviceinterface/ServiceInterfaceBuffer.cpp
+++ b/serviceinterface/ServiceInterfaceBuffer.cpp
@@ -1,7 +1,10 @@
-#include "../timemanager/Clock.h"
 #include "ServiceInterfaceBuffer.h"
+
+#if CPP_OSTREAM_ENABLED == 1
+
+#include "../timemanager/Clock.h"
+
 #include "serviceInterfaceDefintions.h"
-#include <FSFWConfig.h>
 #include <cstring>
 #include <inttypes.h>
 
@@ -252,3 +255,5 @@ void ServiceInterfaceBuffer::initSocket() {
 }
 
 #endif //ML505
+
+#endif /* CPP_OSTREAM_ENABLED == 1 */
diff --git a/serviceinterface/ServiceInterfaceBuffer.h b/serviceinterface/ServiceInterfaceBuffer.h
index 8f2a601c2..d13143cdc 100644
--- a/serviceinterface/ServiceInterfaceBuffer.h
+++ b/serviceinterface/ServiceInterfaceBuffer.h
@@ -3,6 +3,9 @@
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include <FSFWConfig.h>
+
+#if CPP_OSTREAM_ENABLED == 1
+
 #include <iostream>
 #include <sstream>
 #include <iomanip>
@@ -147,5 +150,6 @@ private:
 };
 #endif //ML505
 
+#endif /* CPP_OSTREAM_ENABLED == 1 */
 
 #endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACEBUFFER_H_ */
diff --git a/serviceinterface/ServiceInterfaceStream.cpp b/serviceinterface/ServiceInterfaceStream.cpp
index 056434604..c618d989a 100644
--- a/serviceinterface/ServiceInterfaceStream.cpp
+++ b/serviceinterface/ServiceInterfaceStream.cpp
@@ -1,5 +1,7 @@
 #include "ServiceInterfaceStream.h"
 
+#if CPP_OSTREAM_ENABLED == 1
+
 ServiceInterfaceStream::ServiceInterfaceStream(std::string setMessage,
 		bool addCrToPreamble, bool buffered, bool errStream, uint16_t port) :
 		std::ostream(&streambuf),
@@ -13,3 +15,5 @@ std::string* ServiceInterfaceStream::getPreamble() {
 	return streambuf.getPreamble();
 }
 
+#endif
+
diff --git a/serviceinterface/ServiceInterfaceStream.h b/serviceinterface/ServiceInterfaceStream.h
index cd2adf859..ddeded805 100644
--- a/serviceinterface/ServiceInterfaceStream.h
+++ b/serviceinterface/ServiceInterfaceStream.h
@@ -2,6 +2,9 @@
 #define FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_
 
 #include "ServiceInterfaceBuffer.h"
+
+#if CPP_OSTREAM_ENABLED == 1
+
 #include <iostream>
 #include <cstdio>
 
@@ -48,4 +51,6 @@ extern ServiceInterfaceStream warning;
 extern ServiceInterfaceStream error;
 }
 
+#endif /* CPP_OSTREAM_ENABLED == 1 */
+
 #endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_ */