diff --git a/aclocal.m4 b/aclocal.m4
index b6e6ca9700480569597b0a3251581883d6602206..6e8e2e667cd15d0b18275ddb3fe9282bd37bd17f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -347,13 +347,13 @@ AC_DEFUN([OL_C_UPPER_LOWER],
 AC_MSG_CHECKING([if toupper() requires islower()])
 AC_CACHE_VAL(ol_cv_c_upper_lower,[
 	AC_TRY_RUN([
-#include <ctypes.h>
+#include <ctype.h>
 main()
 {
 	if ('C' == toupper('C'))
-		exit 0;
+		exit(0);
 	else
-		exit 1;
+		exit(1);
 }],
 	[ol_cv_c_upper_lower=no],
 	[ol_cv_c_upper_lower=yes],
diff --git a/configure b/configure
index 516047020cee796d2148667252c98025098e99ab..0ee9272d2c4a3fd4f77b5a9a5148ef6b3770778c 100755
--- a/configure
+++ b/configure
@@ -5444,13 +5444,13 @@ else
 #line 5445 "configure"
 #include "confdefs.h"
 
-#include <ctypes.h>
+#include <ctype.h>
 main()
 {
 	if ('C' == toupper('C'))
-		exit 0;
+		exit(0);
 	else
-		exit 1;
+		exit(1);
 }
 EOF
 if { (eval echo configure:5457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
diff --git a/include/ac/ctype.h b/include/ac/ctype.h
new file mode 100644
index 0000000000000000000000000000000000000000..e16a5ec80fa759f10599d6746a3f0024f56bcf63
--- /dev/null
+++ b/include/ac/ctype.h
@@ -0,0 +1,16 @@
+/* Generic ctype.h */
+
+#ifndef _AC_CTYPE_H
+#define _AC_CTYPE_H
+
+#include <ctype.h>
+
+#ifdef C_UPPER_LOWER
+# define TOUPPER(c)	(islower(c) ? toupper(c) : (c))
+# define TOLOWER(c)	(islower(c) ? toupper(c) : (c))
+#else
+# define TOUPPER(c)	toupper(c)
+# define TOLOWER(c)	tolower(c)
+#endif
+
+#endif /* _AC_CTYPE_H */
diff --git a/include/ac/errno.h b/include/ac/errno.h
index edeb90764e3bdcb9e8fc7a87a73ba3d8d15a3cb6..b4854c8ba027b1c762f0a0796e271ae6a7b9ece4 100644
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -9,6 +9,11 @@
 # include <errno.h>
 #endif
 
+#ifdef DECL_SYS_ERRLIST 
+extern int      sys_nerr;
+extern char     *sys_errlist[];
+#endif
+    
 /* use _POSIX_VERSION for POSIX.1 code */
 
 #endif /* _AC_ERRNO_H */
diff --git a/include/ac/regex.h b/include/ac/regex.h
index c646a08d9312a541cb6b708776b98e3bdf9472e6..cc21e66215d2650e3ca7092e22b07d7ac953032c 100644
--- a/include/ac/regex.h
+++ b/include/ac/regex.h
@@ -8,12 +8,16 @@
 #include <sys/types.h>
 #endif
 
-#ifdef HAVE_REGEX_H
+#ifndef HAVE_REGEX_H
+/*	NO POSIX REGEX!!
+	you'll need to install a POSIX compatible REGEX library.
+	Either Henry Spencer's or GNU regex will do.
+
+	For NT: http://people.delphi.com/gjc/hs_regex.html
+*/
+#else
 	/* have regex.h, assume it's POSIX compliant */
 #	include <regex.h>
-#else
-	/* no regex.h, use compatibility library */
-#	include <regex-compat.h>
-#endif /* ! regex.h */
+#endif /* regex.h */
 
 #endif /* _AC_REGEX_H_ */
diff --git a/include/ac/signal.h b/include/ac/signal.h
new file mode 100644
index 0000000000000000000000000000000000000000..56597a0bfe7879a2ce477dd1a33e72a24e9d654d
--- /dev/null
+++ b/include/ac/signal.h
@@ -0,0 +1,14 @@
+/* Generic signal.h */
+
+#ifndef _AC_SIGNAL_H
+#define _AC_SIGNAL_H
+
+#include <signal.h>
+
+#ifdef HAVE_SIGSET
+#define SIGNAL sigset
+#else
+#define SIGNAL signal
+#endif
+
+#endif /* _AC_SIGNAL_H */
diff --git a/include/portable.h.nt b/include/portable.h.nt
index b81d8d1656cf5ece01c751e56ef57daa5dee4e37..d715fb1bbe06dd03bf56db3de60a9d81a7452f4a 100644
--- a/include/portable.h.nt
+++ b/include/portable.h.nt
@@ -31,6 +31,9 @@ is provided ``as is'' without express or implied warranty.
 #ifndef _LDAP_PORTABLE_H
 #define _LDAP_PORTABLE_H
 
+/* we installed Henry Spencer's REGEX */
+#define HAVE_REGEX_H 1
+
 /* win32 specific stuff */
 #define strcasecmp	stricmp
 #define strncasecmp	strnicmp