4 files changed, 11 insertions, 17 deletions
diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h
index 6f64208e05..67236aaa49 100644
--- a/src/pal/src/include/pal/palinternal.h
+++ b/src/pal/src/include/pal/palinternal.h
@@ -679,9 +679,6 @@ typedef enum _TimeConversionConstants
 bool
 ReadMemoryValueFromFile(const char* filename, size_t* val);
 
-DWORD
-GetTotalCpuCount();
-
 #ifdef __APPLE__
 bool
 GetApplicationContainerFolder(PathCharString& buffer, const char *applicationGroupId, int applicationGroupIdLength);
diff --git a/src/pal/src/misc/sysinfo.cpp b/src/pal/src/misc/sysinfo.cpp
index 419c3f6708..1a1a12f02f 100644
--- a/src/pal/src/misc/sysinfo.cpp
+++ b/src/pal/src/misc/sysinfo.cpp
@@ -95,7 +95,9 @@ SET_DEFAULT_DEBUG_CHANNEL(MISC);
 #endif
 #endif // __APPLE__
 
-DWORD GetTotalCpuCount()
+DWORD
+PALAPI
+PAL_GetTotalCpuCount()
 {
     int nrcpus = 0;
 
@@ -150,7 +152,7 @@ PAL_GetLogicalCpuCountFromOS()
 
     nrcpus = CPU_COUNT(&cpuSet);
 #else // HAVE_SCHED_GETAFFINITY
-    nrcpus = GetTotalCpuCount();
+    nrcpus = PAL_GetTotalCpuCount();
 #endif // HAVE_SCHED_GETAFFINITY
 
     return nrcpus;
diff --git a/src/pal/src/numa/numa.cpp b/src/pal/src/numa/numa.cpp
index 0c9d4090a5..aabb800bac 100644
--- a/src/pal/src/numa/numa.cpp
+++ b/src/pal/src/numa/numa.cpp
@@ -25,11 +25,6 @@ SET_DEFAULT_DEBUG_CHANNEL(NUMA);
 #include "pal/corunix.hpp"
 #include "pal/thread.hpp"
 
-#if HAVE_PTHREAD_NP_H
-#include <pthread_np.h>
-#endif
-
-#include <pthread.h>
 #include <dlfcn.h>
 #ifdef __FreeBSD__
 #include <stdlib.h>
@@ -43,10 +38,6 @@ SET_DEFAULT_DEBUG_CHANNEL(NUMA);
 
 using namespace CorUnix;
 
-#if HAVE_CPUSET_T
-typedef cpuset_t cpu_set_t;
-#endif
-
 // The highest NUMA node available
 int g_highestNumaNode = 0;
 // Is numa available
@@ -213,7 +204,7 @@ VirtualAllocExNuma(
 #if HAVE_NUMA_H
             if (result != NULL && g_numaAvailable)
             {
-                int nodeMaskLength = (g_highestNumaNode + 1 + sizeof(unsigned long) - 1) / sizeof(unsigned long);
+                int nodeMaskLength = (g_highestNumaNode + sizeof(unsigned long) - 1) / sizeof(unsigned long);
                 unsigned long *nodeMask = (unsigned long*)alloca(nodeMaskLength * sizeof(unsigned long));
                 memset(nodeMask, 0, nodeMaskLength);
 
diff --git a/src/pal/src/thread/thread.cpp b/src/pal/src/thread/thread.cpp
index 122e86014c..ecbf7251cd 100644
--- a/src/pal/src/thread/thread.cpp
+++ b/src/pal/src/thread/thread.cpp
@@ -77,6 +77,10 @@ SET_DEFAULT_DEBUG_CHANNEL(THREAD); // some headers have code with asserts, so do
 extern "C" int _lwp_self ();
 #endif
 
+#if HAVE_CPUSET_T
+typedef cpuset_t cpu_set_t;
+#endif
+
 using namespace CorUnix;
 
 
@@ -2977,16 +2981,16 @@ BOOL
 PALAPI
 PAL_GetCurrentThreadAffinitySet(SIZE_T size, UINT_PTR* data)
 {
+#if HAVE_PTHREAD_GETAFFINITY_NP
     cpu_set_t cpuSet;
     CPU_ZERO(&cpuSet);
 
-#if HAVE_PTHREAD_GETAFFINITY_NP
     int st = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuSet);
 
     if (st == 0)
     {
         const SIZE_T BitsPerBitsetEntry = 8 * sizeof(UINT_PTR);
-        int nrcpus = GetTotalCpuCount();
+        int nrcpus = PAL_GetTotalCpuCount();
 
         // Get info for as much processors as it is possible to fit into the resulting set
         SIZE_T remainingCount = std::min(size * BitsPerBitsetEntry, (SIZE_T)nrcpus);