diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
index 98373e8f1..a89f42175 100755
--- a/core/src/CMakeLists.txt
+++ b/core/src/CMakeLists.txt
@@ -205,3 +205,9 @@ add_executable(${PROJECT_NAME}_test ${TEST_SRC})
 target_link_libraries(${PROJECT_NAME}_test ${ERESSEA_LIBRARY})
 
 add_test(${PROJECT_NAME} ${PROJECT_NAME}_test)
+
+IF (MSVC)
+    find_package (MSVC MODULE)
+    MSVC_CRT_SECURE_NO_WARNINGS (${ERESSEA_LIBRARY})
+ENDIF (MSVC)
+
diff --git a/core/src/bindings/bind_gmtool.c b/core/src/bindings/bind_gmtool.c
index bb0e89d14..194a94906 100644
--- a/core/src/bindings/bind_gmtool.c
+++ b/core/src/bindings/bind_gmtool.c
@@ -13,6 +13,8 @@
 
 #include <tolua.h>
 
+#include <string.h>
+
 static int tolua_run_mapper(lua_State * L)
 {
   run_mapper();