diff --git a/lib-src/enigma-core/ecl_cache.hh b/lib-src/enigma-core/ecl_cache.hh
index 94603134..c4ac311d 100644
--- a/lib-src/enigma-core/ecl_cache.hh
+++ b/lib-src/enigma-core/ecl_cache.hh
@@ -20,6 +20,7 @@
 #define ECL_CACHE_HH
 
 #include <unordered_map>
+#include <memory>
 
 namespace ecl {
 
diff --git a/lib-src/enigma-core/ecl_font.hh b/lib-src/enigma-core/ecl_font.hh
index b8856c5e..cbee404a 100644
--- a/lib-src/enigma-core/ecl_font.hh
+++ b/lib-src/enigma-core/ecl_font.hh
@@ -21,6 +21,7 @@
 
 #include <string>
 #include <vector>
+#include <memory>
 
 namespace ecl {
 
diff --git a/lib-src/enigma-core/ecl_system.hh b/lib-src/enigma-core/ecl_system.hh
index 7d088a1d..a219a686 100644
--- a/lib-src/enigma-core/ecl_system.hh
+++ b/lib-src/enigma-core/ecl_system.hh
@@ -21,6 +21,7 @@
 
 #include <string>
 #include <set>
+#include <ctime>
 
 namespace ecl {
 
diff --git a/lib-src/enigma-core/ecl_video.hh b/lib-src/enigma-core/ecl_video.hh
index 72c4ea8b..c8896c83 100644
--- a/lib-src/enigma-core/ecl_video.hh
+++ b/lib-src/enigma-core/ecl_video.hh
@@ -20,6 +20,7 @@
 #define ECL_VIDEO_HH_INCLUDED
 
 #include "ecl_geom.hh"
+#include <memory>
 
 #include "SDL.h"
 
diff --git a/src/Utf8ToXML.cc b/src/Utf8ToXML.cc
index bdea9495..37f9ad6f 100644
--- a/src/Utf8ToXML.cc
+++ b/src/Utf8ToXML.cc
@@ -21,6 +21,7 @@
 
 #include "main.hh"
 
+#include <cstring>
 #include <xercesc/util/TransService.hpp>
 #include <xercesc/util/XMLString.hpp>
 
diff --git a/src/d_models.cc b/src/d_models.cc
index 5c364d61..1233bef1 100644
--- a/src/d_models.cc
+++ b/src/d_models.cc
@@ -27,6 +27,7 @@
 #include "video.hh"
 
 #include <cstdio>
+#include <cstring>
 #include <iostream>
 
 #ifndef CXXLUA
diff --git a/src/file.cc b/src/file.cc
index 9eac3eda..b8fa2416 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -33,6 +33,7 @@
 #include <fstream>
 #include <ios>
 #include <sstream>
+#include <cstring>
 
 using namespace ecl;
 
diff --git a/src/video.cc b/src/video.cc
index 55cf9a3e..01dfb5de 100644
--- a/src/video.cc
+++ b/src/video.cc
@@ -490,7 +490,7 @@ void VideoEngineImpl::Init() {
     UpdateBrightness();
 // Mac icon is set via Makefile
 #ifndef MACOSX
-    if (Surface *icon = enigma::GetImage("enigma_marble")) {
+    if (ecl::Surface *icon = enigma::GetImage("enigma_marble")) {
         SDL_SetWindowIcon(window, icon->get_surface());
     }
 #endif
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 329d9092..be77d80f 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable(tolua tolua.c toluabind.c toluabind.h)
-target_link_libraries(tolua lua)
+target_link_libraries(tolua lua m)