diff --git a/acinclude.m4 b/acinclude.m4
index d987488..4234291 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -73,87 +73,6 @@ AC_SYS_LARGEFILE
 
 ])
 
-dnl expand nested ${foo}/bar
-AC_DEFUN([TUXBOX_EXPAND_VARIABLE], [
-	__$1="$2"
-	for __CNT in false false false false true; do dnl max 5 levels of indirection
-		$1=`eval echo "$__$1"`
-		echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable
-		__$1="${$1}"
-	done
-	$__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand
-])
-
-AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE], [
-AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [
-	_$2=$withval
-	if test "$TARGET" = "cdk"; then
-		$2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO
-	else
-		$2=$withval
-	fi
-	TARGET_$2=${$2}
-], [
-	# RFC 1925: "you can always add another level of indirection..."
-	TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
-	if test "$TARGET" = "cdk"; then
-		TUXBOX_EXPAND_VARIABLE(_$2,"${target$3}$5")
-	else
-		_$2=${$2}
-	fi
-	TARGET_$2=$_$2
-])
-dnl AC_SUBST($2)
-AC_DEFINE_UNQUOTED($2,"$_$2",$7)
-AC_SUBST(TARGET_$2)
-])
-
-AC_DEFUN([TUXBOX_APPS_DIRECTORY], [
-AC_REQUIRE([TUXBOX_APPS])
-
-if test "$TARGET" = "cdk"; then
-	datadir="\${prefix}/share"
-	sysconfdir="\${prefix}/etc"
-	localstatedir="\${prefix}/var"
-	libdir="\${prefix}/lib"
-	targetdatadir="\${TARGET_PREFIX}/share"
-	targetsysconfdir="\${TARGET_PREFIX}/etc"
-	targetlocalstatedir="\${TARGET_PREFIX}/var"
-	targetlibdir="\${TARGET_PREFIX}/lib"
-fi
-
-TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config,
-	[--with-configdir=PATH], [where to find config files])
-
-TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
-	[--with-datadir=PATH], [where to find data files])
-
-TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
-	[--with-fontdir=PATH], [where to find fonts])
-
-TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games,
-	[--with-gamesdir=PATH], [where to find games])
-
-TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
-	[--with-libdir=PATH], [where to find internal libs])
-
-TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
-	[--with-plugindir=PATH], [where to find plugins])
-
-TUXBOX_APPS_DIRECTORY_ONE(themesdir, THEMESDIR, datadir, /share, /tuxbox/neutrino/themes,
-	[--with-themesdir=PATH], [where to find themes])
-])
-
-dnl automake <= 1.6 needs this specifications
-AC_SUBST(CONFIGDIR)
-AC_SUBST(DATADIR)
-AC_SUBST(FONTDIR)
-AC_SUBST(GAMESDIR)
-AC_SUBST(LIBDIR)
-AC_SUBST(PLUGINDIR)
-AC_SUBST(THEMESDIR)
-dnl end workaround
-
 AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
 	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox]),