diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41c7e4be..cb57f3ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,9 @@ cxx_feature_check(GNU_POSIX_REGEX)
 cxx_feature_check(POSIX_REGEX)
 cxx_feature_check(STEADY_CLOCK)
 
+# Ensure we have pthreads
+find_package(Threads REQUIRED)
+
 # Set up directories
 include_directories(${PROJECT_SOURCE_DIR}/include)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90e7b892..811d0755 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,20 +19,22 @@ endif()
 
 add_library(benchmark ${SOURCE_FILES} ${RE_FILES})
 
-find_package(Threads REQUIRED)
-target_link_libraries(benchmark ${CMAKE_THREAD_LIBS_INIT})
 
 set_target_properties(benchmark PROPERTIES
   OUTPUT_NAME "benchmark"
   VERSION ${GENERIC_LIB_VERSION}
   SOVERSION ${GENERIC_LIB_SOVERSION}
-  )
+)
+
+# Link threads.
+target_link_libraries(benchmark ${CMAKE_THREAD_LIBS_INIT})
 
 # We need extra libraries on Windows
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   target_link_libraries(benchmark Shlwapi)
 endif()
 
+# Expose public API
 target_include_directories(benchmark PUBLIC ${PROJECT_SOURCE_DIR}/include)
 
 # Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)