Index: uspace/srv/console/Makefile
===================================================================
--- uspace/srv/console/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/console/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/devmap/Makefile
===================================================================
--- uspace/srv/devmap/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/devmap/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/fb/Makefile
===================================================================
--- uspace/srv/fb/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/fb/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/fs/fat/Makefile
===================================================================
--- uspace/srv/fs/fat/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/fs/fat/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../../Makefile.config
+-include ../../../../Makefile.config
 
 LIBC_PREFIX = ../../../lib/libc
Index: uspace/srv/fs/tmpfs/Makefile
===================================================================
--- uspace/srv/fs/tmpfs/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/fs/tmpfs/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../../Makefile.config
+-include ../../../../Makefile.config
 
 LIBC_PREFIX = ../../../lib/libc
Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/kbd/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,10 +30,9 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
-include $(LIBC_PREFIX)/Makefile.toolchain 
-include ../../../Makefile.config
+include $(LIBC_PREFIX)/Makefile.toolchain
 
 CFLAGS += -Iinclude -I../libadt/include
Index: uspace/srv/loader/Makefile
===================================================================
--- uspace/srv/loader/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/loader/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -28,5 +28,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 ## Setup toolchain
Index: uspace/srv/ns/Makefile
===================================================================
--- uspace/srv/ns/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/ns/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/pci/Makefile
===================================================================
--- uspace/srv/pci/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/pci/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/pci/libpci/Makefile
===================================================================
--- uspace/srv/pci/libpci/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/pci/libpci/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -4,5 +4,5 @@
 # Modified and ported to HelenOS by Jakub Jermar
 
-include ../../../Makefile.config
+-include ../../../../Makefile.config
 
 LIBC_PREFIX=$(shell cd ../../../lib/libc; pwd)
Index: uspace/srv/rd/Makefile
===================================================================
--- uspace/srv/rd/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/rd/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -30,5 +30,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/vfs/Makefile
===================================================================
--- uspace/srv/vfs/Makefile	(revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e)
+++ uspace/srv/vfs/Makefile	(revision fc11b8a9a4cb9eb89129fd82cf7f9706cb5658de)
@@ -31,5 +31,5 @@
 #
 
-include ../../Makefile.config
+-include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc