diff --git a/acconfig.h b/acconfig.h
index 7c8889b6f4..3d40c40326 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -87,10 +87,6 @@
 #define LDAP_NEEDS_PROTOTYPES 1
 #endif
 
-#ifdef HAVE_STDDEF_H
-#	include <stddef.h>
-#endif
-
 #ifndef LDAP_REL_ENG
 #if (LDAP_VENDOR_VERSION == 000000) && !defined(LDAP_DEVEL)
 #define LDAP_DEVEL
@@ -100,6 +96,10 @@
 #endif
 #endif
 
+#ifdef HAVE_STDDEF_H
+#	include <stddef.h>
+#endif
+
 #ifdef HAVE_EBCDIC 
 /* ASCII/EBCDIC converting replacements for stdio funcs
  * vsnprintf and snprintf are used too, but they are already
diff --git a/configure b/configure
index 3ac7186856..1bbc5af899 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.506 2003/12/10 07:45:54 hyc Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.507 2003/12/14 05:46:35 kurt Exp  
 
 # This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #
diff --git a/include/portable.h.in b/include/portable.h.in
index 51171d558f..03445bf0af 100644
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -1047,10 +1047,6 @@
 #define LDAP_NEEDS_PROTOTYPES 1
 #endif
 
-#ifdef HAVE_STDDEF_H
-#	include <stddef.h>
-#endif
-
 #ifndef LDAP_REL_ENG
 #if (LDAP_VENDOR_VERSION == 000000) && !defined(LDAP_DEVEL)
 #define LDAP_DEVEL
@@ -1060,6 +1056,10 @@
 #endif
 #endif
 
+#ifdef HAVE_STDDEF_H
+#	include <stddef.h>
+#endif
+
 #ifdef HAVE_EBCDIC 
 /* ASCII/EBCDIC converting replacements for stdio funcs
  * vsnprintf and snprintf are used too, but they are already