diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d48aea..e60138a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,9 @@ if( WIN32 )
 	endif( CMAKE_COMPILER_IS_GNUCXX )
 endif( WIN32 )
 
+if( CMAKE_COMPILER_IS_GNUCXX )
+	set( ZDRAY_LIBS "${ZLIB_LIBRARIES}" pthread )
+endif( CMAKE_COMPILER_IS_GNUCXX )
 
 set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${REL_LINKER_FLAGS}" )
 set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} ${REL_LINKER_FLAGS}" )
diff --git a/src/lightmap/collision.cpp b/src/lightmap/collision.cpp
index 3f6c8a8..15c7c61 100644
--- a/src/lightmap/collision.cpp
+++ b/src/lightmap/collision.cpp
@@ -23,6 +23,7 @@
 #include "collision.h"
 #include <algorithm>
 #include <functional>
+#include <cfloat>
 #ifndef NO_SSE
 #include <immintrin.h>
 #endif
diff --git a/src/lightmap/surfaces.h b/src/lightmap/surfaces.h
index 4e3049f..5c51ba3 100644
--- a/src/lightmap/surfaces.h
+++ b/src/lightmap/surfaces.h
@@ -30,6 +30,7 @@
 #include <vector>
 #include <memory>
 #include <string>
+#include <cstring>
 
 #include "framework/tarray.h"
 #include "lightmap/collision.h"