diff --git a/Makefile.am b/Makefile.am
index 8797b29..e08a69b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
-MAINTAINERCLEANFILES = Makefile.in configure config.h.in \
-                       stamp-h.in config.log config.cache \
-                       config.status
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
+                       stamp-h.in config.log config.cache config.status
 
 if HAVE_DOXYGEN
 DOC_DIR = doc
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 6a69887..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,41 +0,0 @@
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc
-
-dnl written by thomas vander stichele
-
-AC_DEFUN(AS_AC_EXPAND,
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix=/usr/local
-  fi
-  exec_prefix_save=$exec_prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    if test "x$prefix_save" = "xNONE"; then
-      exec_prefix=/usr/local
-    else
-      exec_prefix=$prefix
-    fi
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var" = "x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  [$1]=$full_var
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
-
diff --git a/config/Makefile.am b/config/Makefile.am
index 64347d1..aa4b8a9 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -4,11 +4,8 @@
 # get distributed as a side-effect.
 
 EXTRA_DIST = configure.host depcomp cpu os
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.sub \
+MAINTAINERCLEANFILES = Makefile.in config.guess config.sub \
                        install-sh ltmain.sh missing mkinstalldirs 
 
-# Link all relevant headers into the `sysdeps' directory.  The order
-# of these loops determines header file precedence.
-
 SUBDIRS =	sysdeps
 DIST_SUBDIRS =	sysdeps