diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
index a583c8985..7d572f319 100644
--- a/Foundation/CMakeLists.txt
+++ b/Foundation/CMakeLists.txt
@@ -111,14 +111,14 @@ endif(ANDROID)
 # TODO: Why is this here?
 add_definitions( -DPCRE_STATIC)
 
-# For SetAffinity
+# For POSIX threads on Unix
 if(UNIX AND NOT APPLE)
+	# We still need pthreads on Unix
+	set(SYSLIBS ${SYSLIBS} ${CMAKE_THREAD_LIBS_INIT})
 	INCLUDE (CheckFunctionExists)
 	INCLUDE (CheckCXXSourceCompiles)
 	INCLUDE (CheckLibraryExists)
 	CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "pthread.h" HAVE_PTHREAD_SETAFFINITY_NP)
-	#set(CMAKE_EXTRA_INCLUDE_FILES pthread.h)
-	#CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP)
 	if(NOT HAVE_PTHREAD_SETAFFINITY_NP)
 		message(STATUS "Platform has not PTHREAD_SETAFFINITY_NP")
 	else(HAVE_PTHREAD_SETAFFINITY_NP)
diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt
index 5d0a479e5..2f8af6c87 100644
--- a/PageCompiler/CMakeLists.txt
+++ b/PageCompiler/CMakeLists.txt
@@ -10,7 +10,7 @@ set_target_properties( "${POCO_EXENAME}"
     OUTPUT_NAME cpspc
     )
 
-target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation)
+target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation)
 
 install(
     TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets"
diff --git a/PageCompiler/File2Page/CMakeLists.txt b/PageCompiler/File2Page/CMakeLists.txt
index 68c32362b..cb6d9694b 100644
--- a/PageCompiler/File2Page/CMakeLists.txt
+++ b/PageCompiler/File2Page/CMakeLists.txt
@@ -10,7 +10,7 @@ set_target_properties( "${POCO_EXENAME}"
     OUTPUT_NAME f2cpsp
     )
 
-target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation)
+target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation)
 
 install(
     TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets"