diff --git a/clients/ud/util.c b/clients/ud/util.c
index 084de81301..bb8a63f5e4 100644
--- a/clients/ud/util.c
+++ b/clients/ud/util.c
@@ -14,7 +14,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <fcntl.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>
@@ -24,6 +23,10 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
 #ifdef HAVE_CONIO_H
 #include <conio.h>
 #endif
diff --git a/configure.in b/configure.in
index 5d595e5dc2..319b242441 100644
--- a/configure.in
+++ b/configure.in
@@ -1027,13 +1027,13 @@ if test $ol_enable_cache = no ; then
 	AC_DEFINE(LDAP_NOCACHE,1)
 fi
 if test $ol_enable_dns != no ; then
-	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION)
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION,1)
 fi
 if test $ol_enable_proctitle != no ; then
 	AC_DEFINE(LDAP_PROCTITLE,1)
 fi
 if test $ol_enable_referrals != no ; then
-	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION)
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION,1)
 fi
 if test $ol_enable_cldap != no ; then
 	AC_DEFINE(LDAP_CONNECTIONLESS,1)