Index: tools/export.sh
===================================================================
--- tools/export.sh	(revision e9f777849501b0c10d0b410bb5ecff4e6a4299c6)
+++ tools/export.sh	(revision 2e1dbf7df50b469ea457f74658c86af46e7a9648)
@@ -42,4 +42,5 @@
 	uspace/lib/libclui.a \
 	uspace/lib/libc.a \
+	uspace/lib/libcongfx.a \
 	uspace/lib/libcpp.a \
 	uspace/lib/libdisplay.a \
Index: tools/xcw/bin/helenos-pkg-config
===================================================================
--- tools/xcw/bin/helenos-pkg-config	(revision e9f777849501b0c10d0b410bb5ecff4e6a4299c6)
+++ tools/xcw/bin/helenos-pkg-config	(revision 2e1dbf7df50b469ea457f74658c86af46e7a9648)
@@ -44,6 +44,6 @@
 libmath_libs="$LIB_DIR/libmath.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 $LIB_DIR/libgfxfont.a $LIB_DIR/libriff.a $LIB_DIR/libmemgfx.a"
+libui_cflags="-I$INCLUDE_DIR/libui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx -I$INCLUDE_DIR/libcongfx"
+libui_libs="$LIB_DIR/libui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libcongfx.a $LIB_DIR/libgfx.a $LIB_DIR/libgfxfont.a $LIB_DIR/libriff.a $LIB_DIR/libmemgfx.a"
 
 libgfximage_cflags="-I$INCLUDE_DIR/libgfximage"
Index: tools/xcw/demo/Makefile
===================================================================
--- tools/xcw/demo/Makefile	(revision e9f777849501b0c10d0b410bb5ecff4e6a4299c6)
+++ tools/xcw/demo/Makefile	(revision 2e1dbf7df50b469ea457f74658c86af46e7a9648)
@@ -50,7 +50,7 @@
 INSTALL = install
 TEST = helenos-test
-CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libui libdraw libmath` \
+CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libui libgfximage` \
     -D_HELENOS_SOURCE
-LIBS = `helenos-pkg-config --libs libui libdraw libmath`
+LIBS = `helenos-pkg-config --libs libui libgfximage`
 PREFIX = `helenos-bld-config --install-dir`
 output = viewer