diff --git a/src/nvmath/nvmath.h b/src/nvmath/nvmath.h
index a3143c5..a889161 100644
--- a/src/nvmath/nvmath.h
+++ b/src/nvmath/nvmath.h
@@ -164,10 +164,8 @@ namespace nv
     {
 #if NV_OS_WIN32 || NV_OS_XBOX
         return _isnan(f) != 0;
-#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_NETBSD || NV_OS_OPENBSD || NV_OS_ORBIS
+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_NETBSD || NV_OS_OPENBSD || NV_OS_ORBIS || NV_OS_LINUX
         return isnan(f);
-#elif NV_OS_LINUX
-        return isnanf(f);
 #else
 #   error "isNan not supported"
 #endif
diff --git a/src/nvthread/nvthread.cpp b/src/nvthread/nvthread.cpp
index b727f2e..866593d 100644
--- a/src/nvthread/nvthread.cpp
+++ b/src/nvthread/nvthread.cpp
@@ -8,7 +8,9 @@
 #include "Win32.h"
 #elif NV_OS_UNIX
 #include <sys/types.h>
+#if !NV_OS_LINUX
 #include <sys/sysctl.h>
+#endif
 #include <unistd.h>
 #elif NV_OS_DARWIN
 #import <stdio.h>