--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:16:16	2401
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:18:21	2403
@@ -23,7 +23,11 @@
 }
 
 # load common includes
-for inc in %SYSCONFDIR%/installer.conf
+for inc in %SYSCONFDIR%/installer.conf \
+	${INSTALLER_LIBDIR}/functions/common.sh \
+	${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
+	${INSTALLER_LIBDIR}/functions/hwdetection.sh \
+	${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
 do
 	if [ -e ${inc} ]
 	then
@@ -48,9 +52,6 @@
 	die "/mnt/cdrom/system/images.conf not found"
 fi
 
-# includes
-source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
-
 ### System/Config Version
 VERSION="%VERSIONTAG%"
 TITLE="${DEFAULT_TITLE} - ${VERSION}"