Index: tools/xcw/bin/helenos-cc
===================================================================
--- tools/xcw/bin/helenos-cc	(revision a5c468e1202a50cf26350e4a4d16303bc7323265)
+++ tools/xcw/bin/helenos-cc	(revision b501de784dd26902c687e3142fa124f7aecd3384)
@@ -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