Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -93,6 +93,6 @@
 
 $(CLEANS):
-	-$(MAKE) -C $(basename $@) clean ARCH=$(ARCH)
+	-$(MAKE) -C $(basename $@) clean
 
 $(BUILDS):
-	$(MAKE) -C $(basename $@) all ARCH=$(ARCH) COMPILER=$(COMPILER)
+	$(MAKE) -C $(basename $@) all
Index: uspace/app/klog/Makefile
===================================================================
--- uspace/app/klog/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/app/klog/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/app/tester/Makefile
===================================================================
--- uspace/app/tester/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/app/tester/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/app/tetris/Makefile
===================================================================
--- uspace/app/tetris/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/app/tetris/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -1,2 +1,4 @@
+include ../../Makefile.config
+
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
Index: uspace/app/trace/Makefile
===================================================================
--- uspace/app/trace/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/app/trace/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/lib/libblock/Makefile
===================================================================
--- uspace/lib/libblock/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/lib/libblock/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -30,4 +30,6 @@
 ## Common compiler flags
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../libc
Index: uspace/lib/libc/Makefile
===================================================================
--- uspace/lib/libc/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/lib/libc/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Common compiler flags
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = $(shell pwd)
Index: uspace/lib/libfs/Makefile
===================================================================
--- uspace/lib/libfs/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/lib/libfs/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -30,4 +30,6 @@
 ## Common compiler flags
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../libc
Index: uspace/lib/softfloat/Makefile
===================================================================
--- uspace/lib/softfloat/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/lib/softfloat/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Common compiler flags
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../libc
Index: uspace/lib/softint/Makefile
===================================================================
--- uspace/lib/softint/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/lib/softint/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Common compiler flags
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../libc
Index: uspace/srv/console/Makefile
===================================================================
--- uspace/srv/console/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/console/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/devmap/Makefile
===================================================================
--- uspace/srv/devmap/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/devmap/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/fb/Makefile
===================================================================
--- uspace/srv/fb/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/fb/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/fs/fat/Makefile
===================================================================
--- uspace/srv/fs/fat/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/fs/fat/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../../Makefile.config
 
 LIBC_PREFIX = ../../../lib/libc
Index: uspace/srv/fs/tmpfs/Makefile
===================================================================
--- uspace/srv/fs/tmpfs/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/fs/tmpfs/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../../Makefile.config
 
 LIBC_PREFIX = ../../../lib/libc
Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/kbd/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/loader/Makefile
===================================================================
--- uspace/srv/loader/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/loader/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -28,5 +28,4 @@
 #
 
-include ../../../version
 include ../../Makefile.config
 
Index: uspace/srv/ns/Makefile
===================================================================
--- uspace/srv/ns/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/ns/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/pci/Makefile
===================================================================
--- uspace/srv/pci/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/pci/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/rd/Makefile
===================================================================
--- uspace/srv/rd/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/rd/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -29,4 +29,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
Index: uspace/srv/vfs/Makefile
===================================================================
--- uspace/srv/vfs/Makefile	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ uspace/srv/vfs/Makefile	(revision 24d6efc8e72031267fcfce1174923ae8cd84c6ce)
@@ -30,4 +30,6 @@
 ## Setup toolchain
 #
+
+include ../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc