diff --git a/mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h b/mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h
index 14875871072..73ebda292d4 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h
+++ b/mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h
@@ -105,7 +105,6 @@ extern "C" {
 #endif /* _WINDOWS */
 
 #ifdef XP_OS2
-#include <os2sock.h>
 #include <io.h>
 #endif /* XP_OS2 */
 
diff --git a/mozilla/directory/c-sdk/ldap/libraries/libldap/open.c b/mozilla/directory/c-sdk/ldap/libraries/libldap/open.c
index 9007ee2d3dc..379e2130dad 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/libldap/open.c
+++ b/mozilla/directory/c-sdk/ldap/libraries/libldap/open.c
@@ -380,12 +380,18 @@ nsldapi_initialize_defaults( void )
 	pthread_mutex_init( &nsldapi_init_mutex, NULL );
 #endif /* _WINDOWS */
 
+#if defined(USE_PTHREADS) || defined(_WINDOWS)
 	pthread_mutex_lock( &nsldapi_init_mutex );
 
 	if ( nsldapi_initialized ) {
 		pthread_mutex_unlock( &nsldapi_init_mutex );
 		return;
 	}
+#else
+         if ( nsldapi_initialized ) {
+                 return;
+         }
+#endif /* use_pthreads || _windows */
 
 #ifdef USE_PTHREADS
         if ( pthread_key_create(&nsldapi_key, free ) != 0) {
@@ -447,6 +453,8 @@ nsldapi_initialize_defaults( void )
 #endif /* _WINDOWS */
 	nsldapi_initialized = 1;
 	pthread_mutex_unlock( &nsldapi_init_mutex );
+#else
+        nsldapi_initialized = 1;
 #endif /* use_pthreads || _windows */
 }