diff --git a/src/MessageParser.cpp b/src/MessageParser.cpp
index 3529e6f1d2756823dba695ac1ab5f9ff3235eec0..fe2426e5d394ca2d63e6036793417267e645ad47 100644
--- a/src/MessageParser.cpp
+++ b/src/MessageParser.cpp
@@ -1,4 +1,7 @@
+#include <cstring>
+#include "ErrorHandler.hpp"
 #include "MessageParser.hpp"
+#include "macros.hpp"
 #include "Services/TestService.hpp"
 #include "Services/RequestVerificationService.hpp"
 
diff --git a/test/MessageParser.cpp b/test/MessageParser.cpp
index 5d443e767852b58534109c18e6f35478c7141385..25265d55137c85cdb7fbdbf1796cafb3d6d1f1f5 100644
--- a/test/MessageParser.cpp
+++ b/test/MessageParser.cpp
@@ -2,6 +2,7 @@
 #include <Services/TestService.hpp>
 #include <Services/RequestVerificationService.hpp>
 #include <Message.hpp>
+#include <cstring>
 #include "MessageParser.hpp"
 #include "Services/ServiceTests.hpp"