We're assuming STDC all the way.

include/ac/errno.h

@@ -3,10 +3,10 @@
 #ifndef _AC_ERRNO_H
 #define _AC_ERRNO_H
 
-#if defined( HAVE_SYS_ERRNO_H )
-# include <sys/errno.h>
-#elif defined( HAVE_ERRNO_H )
+#if defined( HAVE_ERRNO_H )
 # include <errno.h>
+#elif defined( HAVE_SYS_ERRNO_H )
+# include <sys/errno.h>
 #endif
 
 #ifdef DECL_SYS_ERRLIST 

include/ac/socket.h

@@ -88,6 +88,7 @@
 #define PDP_ENDIAN  3412		/* LSB first in word, MSW first in long */
 
 /* assume autoconf's AC_C_BIGENDIAN has been run */
+/* if it hasn't, we assume (maybe falsely) the order is LITTLE ENDIAN */
 #ifdef WORDS_BIGENDIAN
 #define BYTE_ORDER  BIG_ENDIAN
 #else

include/ac/string.h

@@ -3,7 +3,7 @@
 #ifndef _AC_STRING_H
 #define _AC_STRING_H
 
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 #	include <string.h>
 #else
 #	ifndef HAVE_STRCHR
@@ -18,18 +18,15 @@
 #	endif
 #endif
 
-#ifdef HAVE_MEMMOVE
-#	define SAFEMEMCPY( d, s, n )		 	memmove((s), (d), (n))
+#if defined( HAVE_MEMMOVE )
+#define SAFEMEMCPY( d, s, n )		 	memmove((s), (d), (n))
+#elif defined( HAVE_BCOPY )
+#define SAFEMEMCPY( d, s, n ) 		bcopy((s), (d), (n))
+#elif defined( MACOS )
+#define SAFEMEMCPY( d, s, n ) 	BlockMoveData((Ptr)(s), (Ptr)(d), (n))
 #else
-#	ifdef HAVE_BCOPY
-#		define SAFEMEMCPY( d, s, n ) 		bcopy((s), (d), (n))
-#	else
-#		ifdef MACOS
-#			define SAFEMEMCPY( d, s, n ) 	BlockMoveData((Ptr)(s), (Ptr)(d), (n))
-#		else
-#			define SAFEMEMCPY( d, s, n )	memmove((s), (d), (n))
-#		endif
-#	endif
+/* nothing left but memcpy() */
+#define SAFEMEMCPY( d, s, n )	memcpy((s), (d), (n))
 #endif
 
 #endif /* _AC_STRING_H */

include/ac/time.h

@@ -6,12 +6,10 @@
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
+#elif HAVE_SYS_TIME_H
+# include <sys/time.h>
 #else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+# include <time.h>
 #endif
 
 #endif /* _AC_TIME_H */