diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index ed8659fd8edd924bc2e5922b211ecb0fc9afe715..88a701c8be047f982dfbe0aac9c4903eb02cfafa 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -20,9 +20,6 @@
 #include "lutil.h"
 #include "slap.h"
 
-/* I guess this should be declared in ldap_pvt.h */
-extern void * ldap_pvt_tls_sb_ctx( Sockbuf *sb );
-
 /* protected by connections_mutex */
 static ldap_pvt_thread_mutex_t connections_mutex;
 static Connection *connections = NULL;
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index e9f0a09509eb940469e0c6efd84cb5735fa0d03a..9a71105692dd5c2cfca56a48c7f2dd6d2fb38334 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -66,6 +66,7 @@ do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0)
 
 #ifdef HAVE_NT_SERVICE_MANAGER
 /* in nt_main.c */
+/* externs are frowned upon, but so is NT :-) */
 extern ldap_pvt_thread_cond_t			started_event;
 extern int	  is_NT_Service;
 #endif
diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 780cbb0a50ed9bbc39cd6aebe2ddab9d792caf71..665600c5c1c421ef56f7110eb810f88138e58ad8 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -28,10 +28,6 @@
 #define INQUOTEDVALUE	7
 #define B4SEPARATOR		8
 
-/* schema_init.c */
-extern int 
-dnNormalize( Syntax *syntax, struct berval *val, struct berval **normalized );
-
 /*
  * dn_validate - validate and compress dn.  the dn is
  * compressed in place are returned if valid.
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index b1beef495d5c19c2537cf587ee6d1493fe19b5c0..0411a8d35fe06b4ec25c425dbada49247042efe1 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -21,9 +21,6 @@
 #include "lutil.h"
 #include "ldif.h"
 
-/* I guess this should be declared in ldap_pvt.h */
-extern int ldap_pvt_tls_init_def_ctx( void );
-
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
 #endif
@@ -35,7 +32,8 @@ struct sockaddr_in	bind_addr;
 /* in nt_main.c */
 LDAP_LUTIL_V(SERVICE_STATUS)		SLAPDServiceStatus;
 LDAP_LUTIL_V(SERVICE_STATUS_HANDLE)	hSLAPDServiceStatus;
-extern ldap_pvt_thread_cond_t	started_event,		stopped_event;
+/* externs are frowned upon, but so is NT :-) */
+extern ldap_pvt_thread_cond_t	started_event, stopped_event;
 extern int	  is_NT_Service;
 
 void CommenceStartupProcessing( LPCTSTR serverName,