Index: tools/xcw/bin/helenos-bld-config
===================================================================
--- tools/xcw/bin/helenos-bld-config	(revision 705ca2bc3e43a3353d68e38f27197c4e17570898)
+++ tools/xcw/bin/helenos-bld-config	(revision 9df0f64255a1e09efd87f6b2371e99e87f9e8350)
@@ -33,7 +33,10 @@
 
 SRC_ROOT="$(dirname "$0")/../../.."
-MAKEFILE_COMMON="$SRC_ROOT"/Makefile.common
-MAKEFILE_CONFIG="$SRC_ROOT"/Makefile.config
-CONFIG_MK="$SRC_ROOT"/uspace/export/config.mk
+if [ -z "$EXPORT_DIR" ]; then
+	EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
+MAKEFILE_COMMON="$EXPORT_DIR"/Makefile.common
+MAKEFILE_CONFIG="$EXPORT_DIR"/Makefile.config
+CONFIG_MK="$EXPORT_DIR"/config.mk
 
 # Extract simple 'name = value' variable definition from Makefile
Index: tools/xcw/bin/helenos-cc
===================================================================
--- tools/xcw/bin/helenos-cc	(revision 705ca2bc3e43a3353d68e38f27197c4e17570898)
+++ tools/xcw/bin/helenos-cc	(revision 9df0f64255a1e09efd87f6b2371e99e87f9e8350)
@@ -34,4 +34,7 @@
 XCW="$(dirname "$0")"
 SRC_ROOT="$XCW/../../.."
+if [ -z "$EXPORT_DIR" ]; then
+	EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
 CC="$("$XCW"/helenos-bld-config --cc)"
@@ -49,5 +52,4 @@
     "$@" \
     -I"$XCW"/../include \
-    -I"$SRC_ROOT"/uspace/lib/c/include \
-    -I"$SRC_ROOT"/abi/include \
-    -I"$SRC_ROOT"/uspace/lib/c/arch/"$UARCH"/include
+    -I"$EXPORT_DIR"/include/libc \
+    -I"$EXPORT_DIR"/include
Index: tools/xcw/bin/helenos-ld
===================================================================
--- tools/xcw/bin/helenos-ld	(revision 705ca2bc3e43a3353d68e38f27197c4e17570898)
+++ tools/xcw/bin/helenos-ld	(revision 9df0f64255a1e09efd87f6b2371e99e87f9e8350)
@@ -34,4 +34,7 @@
 XCW="$(dirname "$0")"
 SRC_ROOT="$XCW/../../.."
+if [ -z "$EXPORT_DIR" ]; then
+	EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
 CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
@@ -43,6 +46,6 @@
     $CFLAGS \
     "$@" \
-    "$SRC_ROOT"/uspace/lib/c/crt0.o \
-    "$SRC_ROOT"/uspace/lib/c/crt1.o \
-    "$SRC_ROOT"/uspace/lib/c/libc.a \
+    "$EXPORT_DIR"/lib/crt0.o \
+    "$EXPORT_DIR"/lib/crt1.o \
+    "$EXPORT_DIR"/lib/libc.a \
     -lgcc
Index: tools/xcw/bin/helenos-pkg-config
===================================================================
--- tools/xcw/bin/helenos-pkg-config	(revision 705ca2bc3e43a3353d68e38f27197c4e17570898)
+++ tools/xcw/bin/helenos-pkg-config	(revision 9df0f64255a1e09efd87f6b2371e99e87f9e8350)
@@ -35,21 +35,24 @@
 SRC_ROOT="$XCW/../../.."
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
+if [ -z "$EXPORT_DIR" ]; then
+	EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
+INCLUDE_DIR="$EXPORT_DIR/include"
+LIB_DIR="$EXPORT_DIR/lib"
 
-libmath_cflags="-I$SRC_ROOT/uspace/lib/math/include\
-    -I$SRC_ROOT/uspace/lib/math/arch/$UARCH/include"
-libmath_libs="$SRC_ROOT/uspace/lib/math/libmath.a"
+libmath_cflags="-I$INCLUDE_DIR/libmath"
+libmath_libs="$LIB_DIR/libmath.a"
 
-libgui_cflags="-I$SRC_ROOT/uspace/lib/gui"
-libgui_libs="$SRC_ROOT/uspace/lib/gui/libgui.a"
+libgui_cflags="-I$INCLUDE_DIR/libgui"
+libgui_libs="$LIB_DIR/libgui.a"
 
-libdraw_cflags="-I$SRC_ROOT/uspace/lib/draw"
-libdraw_libs="$SRC_ROOT/uspace/lib/draw/libdraw.a \
-    $SRC_ROOT/uspace/lib/softrend/libsoftrend.a"
+libdraw_cflags="-I$INCLUDE_DIR/libdraw"
+libdraw_libs="$LIB_DIR/libdraw.a $LIB_DIR/libsoftrend.a"
 
-libhound_cflags="-I$SRC_ROOT/uspace/lib/hound/include"
-libhound_libs="$SRC_ROOT/uspace/lib/hound/libhound.a"
+libhound_cflags="-I$INCLUDE_DIR/libhound"
+libhound_libs="$LIB_DIR/libhound.a"
 
-libpcm_cflags="-I$SRC_ROOT/uspace/lib/pcm/include"
-libpcm_libs="$SRC_ROOT/uspace/lib/pcm/libpcm.a"
+libpcm_cflags="-I$INCLUDE_DIR/libpcm"
+libpcm_libs="$LIB_DIR/libpcm.a"
 
 action=none