diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d5537c267..ed8c8075dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,9 +331,10 @@ if(NOT HAVE_GMTIME_R)
     endif()
 endif()
 
-check_symbol_exists(SYS_getrandom "sys/syscall.h" HAVE_SYS_GETRANDOM)
-check_symbol_exists(getentropy "unistd.h" HAVE_GETENTROPY)
-check_symbol_exists(KERN_ARND "sys/sysctl.h" HAVE_SYSCTL_ARND)
+check_symbol_exists(getrandom "sys/random.h" HAVE_GETRANDOM)
+check_symbol_exists(getentropy "sys/random.h" HAVE_GETENTROPY_RAND)
+check_symbol_exists(sysctl "sys/sysctl.h" "sys/types.h" HAVE_SYSCTL)
+check_symbol_exists(KERN_ARND "sys/sysctl.h" "sys/types.h" HAVE_SYSCTL_ARND)
 
 check_symbol_exists(O_CLOEXEC "fcntl.h" HAVE_O_CLOEXEC)
 check_symbol_exists(getauxval "sys/auxv.h" HAVE_STRONG_GETAUXVAL)
diff --git a/src/config/gridcoin-config.h.cmake.in b/src/config/gridcoin-config.h.cmake.in
index 94a13f41a3..3449c78498 100644
--- a/src/config/gridcoin-config.h.cmake.in
+++ b/src/config/gridcoin-config.h.cmake.in
@@ -66,11 +66,9 @@
 #cmakedefine01 HAVE_SYSTEM
 #cmakedefine HAVE_GMTIME_R
 
-// Define if the Linux getrandom system call is available
-#cmakedefine HAVE_SYS_GETRANDOM
-// Define if the BSD getentropy system call is available
-#cmakedefine HAVE_GETENTROPY
-// Define if the BSD sysctl(KERN_ARND) is available
+#cmakedefine HAVE_GETRANDOM
+#cmakedefine HAVE_GETENTROPY_RAND
+#cmakedefine HAVE_SYSCTL
 #cmakedefine HAVE_SYSCTL_ARND
 
 #cmakedefine01 HAVE_O_CLOEXEC