--- a/upnp/inc/ithread.h
+++ b/upnp/inc/ithread.h
@@ -304,12 +304,8 @@
  *      Returns EINVAL if the kind is not supported.
  *      See man page for pthread_mutexattr_setkind_np
  *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
-#else
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
-#endif /* UPNP_USE_RWLOCK */
-
+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
+#define ithread_mutexattr_settype pthread_mutexattr_settype
 /****************************************************************************
  * Function: ithread_mutexattr_getkind_np
  *
@@ -329,12 +325,8 @@
  *      Always returns 0.
  *      See man page for pthread_mutexattr_getkind_np
  *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
-#else
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
-#endif /* UPNP_USE_RWLOCK */
-
+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
+#define ithread_mutexattr_gettype pthread_mutexattr_gettype
 /****************************************************************************
  * Function: ithread_mutex_init
  *