diff --git a/SConstruct.loader b/SConstruct.loader
index c5a41c3..4182b01 100644
--- a/SConstruct.loader
+++ b/SConstruct.loader
@@ -41,12 +41,13 @@ env = Environment(CC = config.kernel_toolchain + 'gcc',
 		  PROGSUFFIX = '.elf',
 		  ENV = {'PATH' : os.environ['PATH']},
 		  LIBS = ['gcc', 'elf', 'libdev-baremetal', 'c-baremetal', 'gcc'],
-          LIBPATH = [join('build', LIBELF_PATH), join('build', LIBDEV_PATH), join('build', LIBC_PATH)],
+          LIBPATH = [join(join('build', LIBDEV_PATH), 'sys-' + variant), \
+                     join('build', LIBELF_PATH), join('build', LIBC_PATH)],
           CPPPATH = ['#include', LIBDEV_INCPATH, LIBC_INCPATH, LIBELF_INCPATH])
 
 libdev = SConscript('conts/libdev/SConscript', \
                     exports = { 'env' : env, 'arch' : arch, 'platform' : platform, 'type' : variant}, \
-                    duplicate = 0, variant_dir = 'build/conts/libdev')
+                    duplicate = 0, variant_dir = 'build/conts/libdev/sys-' + variant)
 libc = SConscript('loader/libs/c/SConscript', \
                   exports = { 'env' : env, 'arch' : arch, 'platform' : platform, 'type' : variant}, \
                   duplicate = 0, variant_dir = 'build/loader/libs/c')
diff --git a/SConstruct.userlibs b/SConstruct.userlibs
index 13b537e..f671fe4 100644
--- a/SConstruct.userlibs
+++ b/SConstruct.userlibs
@@ -34,10 +34,11 @@ libl4 = SConscript('conts/libl4/SConscript', \
 
 e = env.Clone()
 e.Replace(CPPFLAGS = '')
+type = 'userspace'
 libdev = SConscript('conts/libdev/SConscript', \
                     exports = { 'env' : e, 'arch' : arch, 'platform' : platform, 'type' : 'userspace' }, \
                     duplicate = 0, variant_dir = \
-                    join(BUILDDIR, os.path.relpath('conts/libdev', PROJROOT)))
+                    join(join(BUILDDIR, os.path.relpath('conts/libdev', PROJROOT)), 'sys-' + type))
 
 libc = SConscript('conts/libc/SConscript', \
                   exports = { 'env' : env, 'arch' : arch, 'platform' : platform, 'type' : 'userspace' }, \
diff --git a/conts/examples/example1/SConstruct b/conts/examples/example1/SConstruct
index 2130add..d855e61 100644
--- a/conts/examples/example1/SConstruct
+++ b/conts/examples/example1/SConstruct
@@ -34,7 +34,7 @@ LIBC_INCLUDE = [join(LIBC_DIR, 'include'), \
 
 LIBDEV_RELDIR = 'conts/libdev'
 LIBDEV_DIR = join(PROJROOT, LIBDEV_RELDIR)
-LIBDEV_LIBPATH = join(BUILDDIR, LIBDEV_RELDIR)
+LIBDEV_LIBPATH = join(join(BUILDDIR, LIBDEV_RELDIR), 'sys-userspace')
 LIBDEV_INCLUDE = [join(LIBDEV_DIR, 'uart/include')]
 
 LIBMEM_RELDIR = 'conts/libmem'
diff --git a/conts/libc/SConscript b/conts/libc/SConscript
index e0136c8..be39cd2 100644
--- a/conts/libc/SConscript
+++ b/conts/libc/SConscript
@@ -25,7 +25,7 @@ LIBDEV_INCPATH = [LIBDEV_PATH + '/uart/include']
 e = env.Clone()
 e.Append(CPPPATH = ['include', 'include/sys-' + variant + '/arch-' + arch,
                     LIBDEV_INCPATH],
-         CCFLAGS = ['-nostdinc', '-DVARIANT_' + variant.upper()])
+         CCFLAGS = '-nostdinc')
 
 source = \
         Glob('src/*.c') + \
diff --git a/conts/posix/SConstruct b/conts/posix/SConstruct
index 1471be5..675f95e 100644
--- a/conts/posix/SConstruct
+++ b/conts/posix/SConstruct
@@ -34,8 +34,8 @@ LIBC_INCLUDE = [join(LIBC_DIR, 'include'), \
 
 LIBDEV_RELDIR = 'conts/libdev'
 LIBDEV_DIR = join(PROJROOT, LIBDEV_RELDIR)
-LIBDEV_LIBPATH = join(BUILDDIR, LIBDEV_RELDIR)
-LIBDEV_INCLUDE = [join(LIBDEV_DIR, 'uart/include')]
+LIBDEV_LIBPATH = join(join(BUILDDIR, LIBDEV_RELDIR), 'sys-userspace')
+LIBDEV_INCLUDE = join(LIBDEV_DIR, 'uart/include')
 
 LIBMEM_RELDIR = 'conts/libmem'
 LIBMEM_DIR = join(PROJROOT, LIBMEM_RELDIR)