Index: tools/export.sh
===================================================================
--- tools/export.sh	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ tools/export.sh	(revision 140e21aee7cb469dbb9e36c340b47d356eff8547)
@@ -39,18 +39,18 @@
 
 EXPORT_LIBS=" \
-	uspace/lib/libmath.a \
+	uspace/lib/c/libstartfiles.a \
 	uspace/lib/libclui.a \
+	uspace/lib/libc.a \
+	uspace/lib/libcpp.a \
 	uspace/lib/libdisplay.a \
 	uspace/lib/libgfx.a \
-	uspace/lib/libgui.a \
+	uspace/lib/libgfximage.a \
+	uspace/lib/libhound.a \
 	uspace/lib/libipcgfx.a \
-	uspace/lib/libdraw.a \
-	uspace/lib/libsoftrend.a \
-	uspace/lib/libhound.a \
+	uspace/lib/libmath.a \
 	uspace/lib/libpcm.a \
-	uspace/lib/libcpp.a \
-	uspace/lib/libc.a \
-	uspace/lib/c/libstartfiles.a \
+	uspace/lib/libpixconv.a \
 	uspace/lib/libposix.a \
+	uspace/lib/libui.a \
 "
 
Index: tools/xcw/bin/helenos-pkg-config
===================================================================
--- tools/xcw/bin/helenos-pkg-config	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ tools/xcw/bin/helenos-pkg-config	(revision 140e21aee7cb469dbb9e36c340b47d356eff8547)
@@ -1,5 +1,5 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2020 Jiri Svoboda
 # All rights reserved.
 #
@@ -44,9 +44,9 @@
 libmath_libs="$LIB_DIR/libmath.a"
 
-libgui_cflags="-I$INCLUDE_DIR/libgui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
-libgui_libs="$LIB_DIR/libgui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.a"
+libui_cflags="-I$INCLUDE_DIR/libui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
+libui_libs="$LIB_DIR/libui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.a"
 
-libdraw_cflags="-I$INCLUDE_DIR/libdraw"
-libdraw_libs="$LIB_DIR/libdraw.a $LIB_DIR/libsoftrend.a"
+libgfximage_cflags="-I$INCLUDE_DIR/libgfximage"
+libgfximage_libs="$LIB_DIR/libgfximage.a $LIB_DIR/libpixconv.a"
 
 libhound_cflags="-I$INCLUDE_DIR/libhound"
@@ -75,6 +75,6 @@
 	(.*)
 	    case "$1" in
-	    (libgui) ;;
-	    (libdraw) ;;
+	    (libui) ;;
+	    (libgfximage) ;;
 	    (libmath) ;;
 	    (libhound) ;;