diff --git a/include/heim_threads.h b/include/heim_threads.h
index 405372918..8770e174d 100644
--- a/include/heim_threads.h
+++ b/include/heim_threads.h
@@ -92,8 +92,8 @@
 #define HEIMDAL_MUTEX_unlock(m) pthread_mutex_unlock(m)
 #define HEIMDAL_MUTEX_destroy(m) pthread_mutex_destroy(m)
 
-#define HEIMDAL_RWLOCK rwlock_t
-#define HEIMDAL_RWLOCK_INITIALIZER RWLOCK_INITIALIZER
+#define HEIMDAL_RWLOCK pthread_rwlock_t
+#define HEIMDAL_RWLOCK_INITIALIZER PTHREAD_RWLOCK_INITIALIZER
 #define	HEIMDAL_RWLOCK_init(l) pthread_rwlock_init(l, NULL)
 #define	HEIMDAL_RWLOCK_rdlock(l) pthread_rwlock_rdlock(l)
 #define	HEIMDAL_RWLOCK_wrlock(l) pthread_rwlock_wrlock(l)
@@ -215,7 +215,7 @@ heim_rwlock_trywrlock(heim_rwlock_t *l)
     return EBUSY;
 }
 
-static inline vint
+static inline int
 heim_rwlock_unlock(heim_rwlock_t *l)
 {
     if (l->exclusive) {