diff --git a/CMakeLists.txt b/CMakeLists.txt
index a975f2dec00..36a63f16065 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -751,7 +751,7 @@ if (Threads_FOUND)
   set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
   # Determine which threading package to use
-  CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
+  #CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
   if (WIN32)
     # When Win32 is available, we use those threads
     set (H5_HAVE_WIN_THREADS 1)
diff --git a/HDF5Examples/CMakeLists.txt b/HDF5Examples/CMakeLists.txt
index f476196dc77..a5d97b47f3a 100644
--- a/HDF5Examples/CMakeLists.txt
+++ b/HDF5Examples/CMakeLists.txt
@@ -102,7 +102,7 @@ if (Threads_FOUND)
   set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
   # Determine which threading package to use
-  CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
+  #CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
   if (WIN32)
     # When Win32 is available, we use those threads
     set (H5_HAVE_WIN_THREADS 1)
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 779cd0ac8ca..ea659aa9322 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -436,7 +436,6 @@ if (MINGW OR NOT WINDOWS)
       HAVE_ATTRIBUTE
       HAVE_BUILTIN_EXPECT
       PTHREAD_BARRIER
-      SYSTEM_SCOPE_THREADS
       HAVE_SOCKLEN_T
   )
     HDF_FUNCTION_TEST (${other_test})
diff --git a/configure.ac b/configure.ac
index 4287c3acf7b..59d0c0567f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2157,7 +2157,7 @@ if test "X$THREADS" = "Xyes"; then
     ## Check for C11 threads, we want to use C11 threads unless the builder
     ## explicitly specifies --with-pthreads=(yes | path(s))
     AC_SUBST([HAVE_C11_THREADS]) HAVE_C11_THREADS=no
-    AC_CHECK_HEADERS([threads.h],[HAVE_THREADS_H="yes"],[HAVE_THREADS_H="no"])
+    #AC_CHECK_HEADERS([threads.h],[HAVE_THREADS_H="yes"],[HAVE_THREADS_H="no"])
     if test "x$HAVE_THREADS_H" = "xyes"; then
         # Default or no --> C11 threads
         if test "$withval" = "default" -o "$withval" = "no" ; then