--- a/libMoaggCore/src/LevelReader.cpp
+++ b/libMoaggCore/src/LevelReader.cpp
@@ -1,4 +1,5 @@
 #include <sstream>
+#include <cstring>
 
 #include "Exception.h"
 #include "Configuration.h"
--- a/libMoaggCore/src/System.cpp
+++ b/libMoaggCore/src/System.cpp
@@ -4,6 +4,7 @@
 #include <cerrno>
 #include <sstream>
 #include <list>
+#include <cstring>
 
 #include "Tools.h"
 #include "SyscallException.h"
--- a/libMoaggCore/src/Tools.cpp
+++ b/libMoaggCore/src/Tools.cpp
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <sstream>
 #include <set>
+#include <cstdlib>
 
 #include "Exception.h"
 #include "Tools.h"
--- a/libMoaggGame/src/Tiles.cpp
+++ b/libMoaggGame/src/Tiles.cpp
@@ -2,6 +2,7 @@
 #include <cassert>
 #include <sstream>
 #include <iomanip>
+#include <memory>
 
 
 #include "Configuration.h"
--- a/testsuite/MyAssertionTraits.h
+++ b/testsuite/MyAssertionTraits.h
@@ -2,6 +2,7 @@
 #define MYASSERTIONTRAITS_H
 
 #include <cppunit/TestAssert.h>
+#include <cstring>
 
 CPPUNIT_NS_BEGIN
 
--- a/tools/convertmap.cpp
+++ b/tools/convertmap.cpp
@@ -3,6 +3,7 @@
 #include <memory>
 #include <list>
 #include <cassert>
+#include <cstdlib>
 
 #include "Matrix.h"
 #include "File.h"
--- a/tools/modifymap.cpp
+++ b/tools/modifymap.cpp
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <memory>
 #include <list>
+#include <cstdlib>
 
 #include "Matrix.h"
 #include "File.h"