diff --git a/inc/Platform/x86/TimeGetter.hpp b/inc/Platform/x86/TimeGetter.hpp
index 7cb15d7389c5b3a7e3c9f69de719ca2ac0332c3e..d5da817d62de9548c355a0e757c8ebc275e40614 100644
--- a/inc/Platform/x86/TimeGetter.hpp
+++ b/inc/Platform/x86/TimeGetter.hpp
@@ -1,7 +1,6 @@
 #ifndef ECSS_SERVICES_TIMEGETTER_HPP
 #define ECSS_SERVICES_TIMEGETTER_HPP
 
-#include <iostream>
 #include <cstdint>
 #include <ctime>
 
diff --git a/inc/Services/MemoryManagementService.hpp b/inc/Services/MemoryManagementService.hpp
index 9ae1de6e9bcd4a7aa8503c2a4475e4fe820f7085..95fca1ce82f975d26e14a87276a7b581bcab229e 100644
--- a/inc/Services/MemoryManagementService.hpp
+++ b/inc/Services/MemoryManagementService.hpp
@@ -2,7 +2,6 @@
 #define ECSS_SERVICES_MEMMANGSERVICE_HPP
 
 #include <memory>
-#include <iostream>
 #include "Service.hpp"
 #include "Helpers/CRCHelper.hpp"
 #include "ErrorHandler.hpp"
diff --git a/src/ErrorHandler.cpp b/src/ErrorHandler.cpp
index be57cb6023a3c847b47e02f71b15f0d19202b2f3..e7bacfb0f1561985485542a48b29425cf8047d10 100644
--- a/src/ErrorHandler.cpp
+++ b/src/ErrorHandler.cpp
@@ -1,5 +1,4 @@
-#include <iostream>
-#include <cxxabi.h>
+#include "ECSS_Configuration.hpp"
 #include <ErrorHandler.hpp>
 #include <ServicePool.hpp>
 #include "Services/RequestVerificationService.hpp"
diff --git a/src/Services/MemoryManagementService.cpp b/src/Services/MemoryManagementService.cpp
index 7bee194156e2858671a33bd70febec9b18fdf843..e14fce311ad01d1d9f7a2d3cfd46476c52042f41 100644
--- a/src/Services/MemoryManagementService.cpp
+++ b/src/Services/MemoryManagementService.cpp
@@ -2,7 +2,6 @@
 #ifdef SERVICE_MEMORY
 
 #include "Services/MemoryManagementService.hpp"
-#include <iostream>
 #include <cerrno>
 #include <etl/String.hpp>