Index: uspace/app/barber/barber.c
===================================================================
--- uspace/app/barber/barber.c	(revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6)
+++ uspace/app/barber/barber.c	(revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb)
@@ -45,6 +45,6 @@
 #include <window.h>
 #include <canvas.h>
-#include <surface.h>
-#include <codec/tga.gz.h>
+#include <draw/surface.h>
+#include <draw/codec.h>
 #include "images.h"
 
Index: uspace/app/fontviewer/fontviewer.c
===================================================================
--- uspace/app/fontviewer/fontviewer.c	(revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6)
+++ uspace/app/fontviewer/fontviewer.c	(revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb)
@@ -41,10 +41,9 @@
 #include <window.h>
 #include <canvas.h>
-#include <surface.h>
-#include <codec/tga.h>
+#include <draw/surface.h>
+#include <draw/codec.h>
 #include <task.h>
-#include <drawctx.h>
-#include <font/embedded.h>
-#include <font/pcf.h>
+#include <draw/drawctx.h>
+#include <draw/font.h>
 #include <stdarg.h>
 #include <io/verify.h>
Index: uspace/app/viewer/viewer.c
===================================================================
--- uspace/app/viewer/viewer.c	(revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6)
+++ uspace/app/viewer/viewer.c	(revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb)
@@ -41,6 +41,6 @@
 #include <window.h>
 #include <canvas.h>
-#include <surface.h>
-#include <codec/tga.h>
+#include <draw/surface.h>
+#include <draw/codec.h>
 #include <task.h>
 #include <str.h>
Index: uspace/app/vlaunch/vlaunch.c
===================================================================
--- uspace/app/vlaunch/vlaunch.c	(revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6)
+++ uspace/app/vlaunch/vlaunch.c	(revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb)
@@ -46,8 +46,8 @@
 #include <canvas.h>
 
-#include <surface.h>
-#include <source.h>
-#include <drawctx.h>
-#include <codec/tga.h>
+#include <draw/surface.h>
+#include <draw/source.h>
+#include <draw/drawctx.h>
+#include <draw/codec.h>
 
 #include "images.h"