diff --git a/configure.ac b/configure.ac
index 6535895a..ea0aba60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ AC_CHECK_HEADERS([sys/param.h])
 AC_CHECK_HEADERS([sys/select.h])
 AC_CHECK_HEADERS([dirent.h])
 AC_CHECK_HEADERS([regex.h])
+AC_CHECK_HEADERS([pthread_np.h])
 AC_CHECK_FUNCS(posix_fadvise)
 AC_CHECK_FUNCS(strptime)
 AC_CHECK_FUNCS(strtok_r)
@@ -48,6 +49,10 @@ AC_CHECK_FUNCS(timegm)
 AC_CHECK_FUNCS(euidaccess)
 AC_CHECK_FUNCS(pipe2)
 
+AC_SEARCH_LIBS([pthread_setname_np], [pthread],
+	AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Define to 1 if you have pthread_setname_np]),
+	AC_SEARCH_LIBS([pthread_set_name_np], [pthread], AC_DEFINE(HAVE_PTHREAD_SET_NAME_NP, 1, [Define to 1 if you have pthread_set_name_np]))
+)
 AC_SEARCH_LIBS([inotify_add_watch], [inotify], [], AC_MSG_ERROR([inotify not found]))
 
 dnl Large File Support (LFS)
diff --git a/src/cache.c b/src/cache.c
index df0e9ce8..79e2244f 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -30,7 +30,7 @@
 #include <time.h>
 #include <string.h>
 #include <pthread.h>
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifdef HAVE_PTHREAD_NP_H
 # include <pthread_np.h>
 #endif
 
@@ -1859,9 +1859,9 @@ cache_init(void)
       goto thread_fail;
     }
 
-#if defined(__linux__)
+#if defined(HAVE_PTHREAD_SETNAME_NP)
   pthread_setname_np(tid_cache, "cache");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
   pthread_set_name_np(tid_cache, "cache");
 #endif
 
diff --git a/src/filescanner.c b/src/filescanner.c
index 4ee6c0cb..b6324dc3 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -38,6 +38,9 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <pthread.h>
+#ifdef HAVE_PTHREAD_NP_H
+# include <pthread_np.h>
+#endif
 
 #include <unistr.h>
 #include <unictype.h>
@@ -45,10 +48,6 @@
 
 #include <event2/event.h>
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-# include <pthread_np.h>
-#endif
-
 #ifdef HAVE_REGEX_H
 # include <regex.h>
 #endif
@@ -2165,9 +2164,9 @@ filescanner_init(void)
       goto thread_fail;
     }
 
-#if defined(__linux__)
+#if defined(HAVE_PTHREAD_SETNAME_NP)
   pthread_setname_np(tid_scan, "filescanner");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
   pthread_set_name_np(tid_scan, "filescanner");
 #endif
 
diff --git a/src/httpd.c b/src/httpd.c
index 278a6422..be68364b 100644
--- a/src/httpd.c
+++ b/src/httpd.c
@@ -28,7 +28,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <pthread.h>
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifdef HAVE_PTHREAD_NP_H
 # include <pthread_np.h>
 #endif
 #include <time.h>
@@ -1401,9 +1401,9 @@ httpd_init(void)
       goto thread_fail;
     }
 
-#if defined(__linux__)
+#if defined(HAVE_PTHREAD_SETNAME_NP)
   pthread_setname_np(tid_httpd, "httpd");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
   pthread_set_name_np(tid_httpd, "httpd");
 #endif
 
diff --git a/src/mpd.c b/src/mpd.c
index c830bf43..cad44b1f 100644
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -28,17 +28,20 @@
 #include <limits.h>
 #include <errno.h>
 #include <pthread.h>
+#ifdef HAVE_PTHREAD_NP_H
+# include <pthread_np.h>
+#endif
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <stdint.h>
 #include <inttypes.h>
 
-# include <event2/event.h>
-# include <event2/buffer.h>
-# include <event2/bufferevent.h>
+#include <event2/event.h>
+#include <event2/buffer.h>
+#include <event2/bufferevent.h>
 #include <event2/http.h>
-# include <event2/listener.h>
+#include <event2/listener.h>
 
 #if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)
 # define USE_EVENTFD
@@ -47,7 +50,6 @@
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 # include <netinet/in.h>
-# include <pthread_np.h>
 #endif
 
 #include "logger.h"
@@ -4896,9 +4898,9 @@ int mpd_init(void)
       goto thread_fail;
     }
 
-#if defined(__linux__)
+#if defined(HAVE_PTHREAD_SETNAME_NP)
   pthread_setname_np(tid_mpd, "mpd");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
   pthread_set_name_np(tid_mpd, "mpd");
 #endif
 
diff --git a/src/player.c b/src/player.c
index 8db0a89c..fd1dbeb2 100644
--- a/src/player.c
+++ b/src/player.c
@@ -31,12 +31,14 @@
 #include <errno.h>
 #include <time.h>
 #include <pthread.h>
+#ifdef HAVE_PTHREAD_NP_H
+# include <pthread_np.h>
+#endif
 
 #if defined(__linux__)
 # include <sys/timerfd.h>
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 # include <signal.h>
-# include <pthread_np.h>
 #endif
 
 #include <event2/event.h>
@@ -4475,13 +4477,12 @@ player_init(void)
       DPRINTF(E_FATAL, L_PLAYER, "Could not spawn player thread: %s\n", strerror(errno));
       goto thread_fail;
     }
-#if defined(__linux__)
+#if defined(HAVE_PTHREAD_SETNAME_NP)
   pthread_setname_np(tid_player, "player");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
   pthread_set_name_np(tid_player, "player");
 #endif
 
-
   return 0;
 
  thread_fail:
diff --git a/src/spotify.c b/src/spotify.c
index 370ce234..61870a1b 100644
--- a/src/spotify.c
+++ b/src/spotify.c
@@ -37,7 +37,7 @@
 #include <sys/queue.h>
 #include <time.h>
 #include <pthread.h>
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifdef HAVE_PTHREAD_NP_H
 # include <pthread_np.h>
 #endif
 
@@ -2311,9 +2311,9 @@ spotify_init(void)
       goto thread_fail;
     }
 
-#if defined(__linux__)
+#if defined(HAVE_PTHREAD_SETNAME_NP)
   pthread_setname_np(tid_spotify, "spotify");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
   pthread_set_name_np(tid_spotify, "spotify");
 #endif
 
diff --git a/src/worker.c b/src/worker.c
index 502a28d8..da6ba097 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <errno.h>
 #include <pthread.h>
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifdef HAVE_PTHREAD_NP_H
 # include <pthread_np.h>
 #endif
 
@@ -343,9 +343,9 @@ worker_init(void)
       goto thread_fail;
     }
 
-#if defined(__linux__)
+#if defined(HAVE_PTHREAD_SETNAME_NP)
   pthread_setname_np(tid_worker, "worker");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
   pthread_set_name_np(tid_worker, "worker");
 #endif