diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index e562a68079..01247e739c 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -259,7 +259,7 @@ slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
 		$(WRAP_LIBS)
 	rm -f $(SLAPTOOLS)
 	for i in $(SLAPTOOLS); do \
-		$(LN_S) slapd $$i; done
+		$(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
 
 
 sslapd: version.o
diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 65f358085b..9aece1f6b5 100644
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -47,6 +47,10 @@
 
 #include <ldap_pvt.h>
 
+#ifdef HAVE_WINSOCK
+#define mkdir(a,b)	mkdir(a)
+#endif
+
 #ifdef HAVE_NT_SERVICE_MANAGER
 #define	MAIN_RETURN(x)	return
 #define SERVICE_EXIT( e, n )	do { \