diff --git a/acinclude.m4 b/acinclude.m4
index a8a88b4..ff3d4cc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,103 +1,2 @@
-dnl Taken from Unix Network Programming, W. Richard Stevens
-
-dnl ##################################################################
-dnl We cannot use the AC_CHECK_TYPE macros becasue AC_CHECK_TYPE
-dnl #includes only <sys/types.h>, <stdlib.h>, and <stddef.h>.
-dnl Unfortunately, many implementations today hide typedefs in wierd
-dnl locations: Solaris 2.5.1 has uint8_t and uint32_t in <pthread.h>.
-dnl SunOS 4.1.x has int8_t in <sys/bittypes.h>.
-dnl So we define our own macro AC_UNP_CHECK_TYPE that does the same
-dnl #includes as "unp.h", and then looks for the typedef.
-dnl
-dnl This macro should be invoked after all the header checks have been
-dnl performed, since we #include "confdefs.h" below, and then use the
-dnl HAVE_foo_H values that is can #define.
-dnl
-AC_DEFUN([AC_UNP_CHECK_TYPE],
-	 [AC_MSG_CHECKING(if $1 defined)
-	  AC_CACHE_VAL(ac_cv_type_$1,
-		[AC_TRY_COMPILE(
-[
-#include	"confdefs.h"	/* the header built by configure so far */
-#ifdef	HAVE_SYS_TYPES_H
-#  include	<sys/types.h>
-#endif
-#ifdef	HAVE_SYS_SOCKET_H
-#  include	<sys/socket.h>
-#endif
-#ifdef	HAVE_SYS_TIME_H
-#  include	<sys/time.h>
-#endif
-#ifdef	HAVE_NETINET_IN_H
-#  include	<netinet/in.h>
-#endif
-#ifdef	HAVE_ARPA_INET_H
-#  include	<arpa/inet.h>
-#endif
-#ifdef	HAVE_ERRNO_H
-#  include	<errno.h>
-#endif
-#ifdef	HAVE_FCNTL_H
-#  include	<fcntl.h>
-#endif
-#ifdef	HAVE_NETDB_H
-#  include	<netdb.h>
-#endif
-#ifdef	HAVE_SIGNAL_H
-#  include	<signal.h>
-#endif
-#ifdef	HAVE_STDIO_H
-#  include	<stdio.h>
-#endif
-#ifdef	HAVE_STDLIB_H
-#  include	<stdlib.h>
-#endif
-#ifdef	HAVE_STRING_H
-#  include	<string.h>
-#endif
-#ifdef	HAVE_SYS_STAT_H
-#  include	<sys/stat.h>
-#endif
-#ifdef	HAVE_SYS_UIO_H
-#  include	<sys/uio.h>
-#endif
-#ifdef	HAVE_UNISTD_H
-#  include	<unistd.h>
-#endif
-#ifdef	HAVE_SYS_WAIT_H
-#  include	<sys/wait.h>
-#endif
-#ifdef	HAVE_SYS_UN_H
-#  include	<sys/un.h>
-#endif
-#ifdef	HAVE_SYS_SELECT_H
-#  include	<sys/select.h>
-#endif
-#ifdef	HAVE_STRINGS_H
-#  include	<strings.h>
-#endif
-#ifdef	HAVE_SYS_IOCTL_H
-#  include	<sys/ioctl.h>
-#endif
-#ifdef	HAVE_SYS_FILIO_H
-#  include	<sys/filio.h>
-#endif
-#ifdef	HAVE_SYS_SOCKIO_H
-#  include	<sys/sockio.h>
-#endif
-#ifdef	HAVE_PTHREAD_H
-#  include	<pthread.h>
-#endif
-#ifdef  HAVE_STDINT_H
-#  include	<stdint.h>
-#endif
-],
-		[ $1 foo ],
-		[ac_cv_type_$1=yes],
-		[ac_cv_type_$1=no])])
-	AC_MSG_RESULT([$ac_cv_type_$1])
-	if test $ac_cv_type_$1 = no ; then
-                AH_TEMPLATE([$1], [Defined with the proper type.])
-		AC_DEFINE($1, $2)
-	fi
-])
\ No newline at end of file
+m4_include([m4macros/argenable.m4])
+m4_include([m4macros/typecheck.m4])
diff --git a/autogen.sh b/autogen.sh
index 78e0028..a871f25 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,9 +6,8 @@
 # can now be used...
 #
 
-test -d config || mkdir config
 set -x
-aclocal -I config \
+aclocal \
   && autoheader \
   && automake --gnu --add-missing \
   && autoconf
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index 3b93b74..0000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-config.guess
-config.sub
diff --git a/config/ltmain.sh b/ltmain.sh
similarity index 100%
rename from config/ltmain.sh
rename to ltmain.sh
diff --git a/config/argenable.m4 b/m4macros/argenable.m4
similarity index 100%
rename from config/argenable.m4
rename to m4macros/argenable.m4
diff --git a/config/typecheck.m4 b/m4macros/typecheck.m4
similarity index 100%
rename from config/typecheck.m4
rename to m4macros/typecheck.m4