Index: tools/export.sh
===================================================================
--- tools/export.sh	(revision 1388f7f08c41cba76c34b0f31d86da64f7e07c6f)
+++ tools/export.sh	(revision 265989d0000a155475ae82dec8b76ea0e7bf664b)
@@ -41,5 +41,8 @@
 	uspace/lib/libmath.a \
 	uspace/lib/libclui.a \
+	uspace/lib/libdisplay.a \
+	uspace/lib/libgfx.a \
 	uspace/lib/libgui.a \
+	uspace/lib/libipcgfx.a \
 	uspace/lib/libdraw.a \
 	uspace/lib/libsoftrend.a \
Index: tools/xcw/bin/helenos-pkg-config
===================================================================
--- tools/xcw/bin/helenos-pkg-config	(revision 1388f7f08c41cba76c34b0f31d86da64f7e07c6f)
+++ tools/xcw/bin/helenos-pkg-config	(revision 265989d0000a155475ae82dec8b76ea0e7bf664b)
@@ -44,6 +44,6 @@
 libmath_libs="$LIB_DIR/libmath.a"
 
-libgui_cflags="-I$INCLUDE_DIR/libgui"
-libgui_libs="$LIB_DIR/libgui.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"
 
 libdraw_cflags="-I$INCLUDE_DIR/libdraw"
Index: uspace/app/gfxdemo/gfxdemo.c
===================================================================
--- uspace/app/gfxdemo/gfxdemo.c	(revision 1388f7f08c41cba76c34b0f31d86da64f7e07c6f)
+++ uspace/app/gfxdemo/gfxdemo.c	(revision 265989d0000a155475ae82dec8b76ea0e7bf664b)
@@ -399,5 +399,5 @@
 	printf("Init canvas..\n");
 
-	window = window_open("comp:0/winreg", NULL,
+	window = window_open(DISPLAY_DEFAULT, NULL,
 	    WINDOW_MAIN | WINDOW_DECORATED, "GFX Demo");
 	if (window == NULL) {
@@ -462,5 +462,5 @@
 	printf("Init display..\n");
 
-	rc = display_open(NULL, &display);
+	rc = display_open(DISPLAY_DEFAULT, &display);
 	if (rc != EOK) {
 		printf("Error opening display.\n");
Index: uspace/app/terminal/main.c
===================================================================
--- uspace/app/terminal/main.c	(revision 1388f7f08c41cba76c34b0f31d86da64f7e07c6f)
+++ uspace/app/terminal/main.c	(revision 265989d0000a155475ae82dec8b76ea0e7bf664b)
@@ -46,5 +46,5 @@
 	errno_t rc;
 
-	rc = display_open(NULL, &display);
+	rc = display_open(DISPLAY_DEFAULT, &display);
 	if (rc != EOK) {
 		printf("%s: Error opening display.\n", NAME);
Index: uspace/lib/display/include/types/display.h
===================================================================
--- uspace/lib/display/include/types/display.h	(revision 1388f7f08c41cba76c34b0f31d86da64f7e07c6f)
+++ uspace/lib/display/include/types/display.h	(revision 265989d0000a155475ae82dec8b76ea0e7bf664b)
@@ -40,5 +40,9 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <stddef.h>
 #include <stdint.h>
+
+/** Use the default display service (argument to display_open() */
+#define DISPLAY_DEFAULT NULL
 
 /** Display server session */
Index: uspace/lib/meson.build
===================================================================
--- uspace/lib/meson.build	(revision 1388f7f08c41cba76c34b0f31d86da64f7e07c6f)
+++ uspace/lib/meson.build	(revision 265989d0000a155475ae82dec8b76ea0e7bf664b)
@@ -33,4 +33,5 @@
 	'c',
 	'math',
+	'display',
 	'gui',
 	'draw',