Index: uspace/app/init/Makefile
===================================================================
--- uspace/app/init/Makefile	(revision a5facfb86a78af274a63eecc25079a65df2b5e7f)
+++ uspace/app/init/Makefile	(revision 87bedd1cbe679b447c12df73b2c8e154cd0a0d55)
@@ -35,4 +35,5 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
+CFLAGS += -I../../..
 LIBS = $(LIBC_PREFIX)/libc.a
 
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision a5facfb86a78af274a63eecc25079a65df2b5e7f)
+++ uspace/app/init/init.c	(revision 87bedd1cbe679b447c12df73b2c8e154cd0a0d55)
@@ -48,4 +48,5 @@
 #include <string.h>
 #include <devmap.h>
+#include <config.h>
 #include "init.h"
 
@@ -242,9 +243,12 @@
 	 * non-blocking.
 	 */
+#ifdef CONFIG_START_BD
 	srv_start("/srv/ata_bd");
 	srv_start("/srv/gxe_bd");
-	
+#endif	
+#ifdef CONFIG_MOUNT_DATA
 	mount_data();
-	
+#endif
+
 	getvc("vc0", "/app/bdsh");
 	getvc("vc1", "/app/bdsh");