diff --git a/libraries/libldap/rdwr.c b/libraries/libldap/rdwr.c
index c996e48bca..71dc537a87 100644
--- a/libraries/libldap/rdwr.c
+++ b/libraries/libldap/rdwr.c
@@ -40,6 +40,9 @@
 #include <ac/time.h>
 
 #include "ldap-int.h"
+
+#ifdef LDAP_R_COMPILE
+
 #include "ldap_pvt_thread.h" /* Get the thread interface */
 #define LDAP_THREAD_RDWR_IMPLEMENTATION
 #include "ldap_thr_debug.h"  /* May rename the symbols defined below */
@@ -456,3 +459,5 @@ int ldap_pvt_thread_rdwr_active(ldap_pvt_thread_rdwr_t *rwlock)
 #endif /* LDAP_RDWR_DEBUG */
 
 #endif /* LDAP_THREAD_HAVE_RDWR */
+
+#endif /* LDAP_R_COMPILE */
diff --git a/libraries/libldap/rq.c b/libraries/libldap/rq.c
index 3721c1a775..e4d21b2d85 100644
--- a/libraries/libldap/rq.c
+++ b/libraries/libldap/rq.c
@@ -29,6 +29,9 @@
 #include <ac/time.h>
 
 #include "ldap-int.h"
+
+#ifdef LDAP_R_COMPILE
+
 #include "ldap_pvt_thread.h"
 #include "ldap_queue.h"
 #include "ldap_rq.h"
@@ -219,3 +222,4 @@ ldap_pvt_runqueue_persistent_backload(
 	return count;
 }
 
+#endif /* LDAP_R_COMPILE */
diff --git a/libraries/libldap/threads.c b/libraries/libldap/threads.c
index 7d62b60457..cac0a44a11 100644
--- a/libraries/libldap/threads.c
+++ b/libraries/libldap/threads.c
@@ -22,6 +22,10 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
+#include "ldap-int.h"
+
+#ifdef LDAP_R_COMPILE
+
 #include "ldap_pvt_thread.h" /* Get the thread interface */
 #include "ldap_thr_debug.h"  /* May redirect thread initialize/destroy calls */
 
@@ -103,3 +107,5 @@ ldap_pvt_thread_sleep(
 	return 0;
 }
 #endif
+
+#endif /* LDAP_R_COMPILE */
diff --git a/libraries/libldap/tpool.c b/libraries/libldap/tpool.c
index 9c061e66f1..5df3dd76af 100644
--- a/libraries/libldap/tpool.c
+++ b/libraries/libldap/tpool.c
@@ -25,6 +25,9 @@
 #include <ac/errno.h>
 
 #include "ldap-int.h"
+
+#ifdef LDAP_R_COMPILE
+
 #include "ldap_pvt_thread.h" /* Get the thread interface */
 #include "ldap_queue.h"
 #define LDAP_THREAD_POOL_IMPLEMENTATION
@@ -1439,3 +1442,5 @@ ldap_pvt_thread_t ldap_pvt_thread_pool_tid( void *vctx )
 	return ctx->ltu_id;
 }
 #endif /* LDAP_THREAD_HAVE_TPOOL */
+
+#endif /* LDAP_R_COMPILE */