Index: uspace/lib/libc/Makefile
===================================================================
--- uspace/lib/libc/Makefile	(revision 404464ae7d74eedd5127085aca764297ec8788f4)
+++ uspace/lib/libc/Makefile	(revision 018e1e3f1098da80e76e690d5c5eb0f5bd091873)
@@ -34,5 +34,4 @@
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
-CONSOLE_PREFIX = ../../srv/console
 
 ## Setup toolchain
@@ -40,6 +39,4 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -I$(CONSOLE_PREFIX)
 
 ## Sources
Index: uspace/lib/libc/generic/io/stream.c
===================================================================
--- uspace/lib/libc/generic/io/stream.c	(revision 404464ae7d74eedd5127085aca764297ec8788f4)
+++ uspace/lib/libc/generic/io/stream.c	(revision 018e1e3f1098da80e76e690d5c5eb0f5bd091873)
@@ -43,5 +43,5 @@
 #include <ipc/fb.h>
 #include <ipc/services.h>
-#include <console.h>
+#include <ipc/console.h>
 #include <unistd.h>
 #include <async.h>
Index: uspace/lib/libc/generic/vfs/vfs.c
===================================================================
--- uspace/lib/libc/generic/vfs/vfs.c	(revision 404464ae7d74eedd5127085aca764297ec8788f4)
+++ uspace/lib/libc/generic/vfs/vfs.c	(revision 018e1e3f1098da80e76e690d5c5eb0f5bd091873)
@@ -50,5 +50,5 @@
 #include <string.h>
 #include <ipc/devmap.h>
-#include "../../srv/vfs/vfs.h"
+#include "../../../srv/vfs/vfs.h"
 
 int vfs_phone = -1;
Index: uspace/lib/libc/include/ipc/console.h
===================================================================
--- uspace/lib/libc/include/ipc/console.h	(revision 018e1e3f1098da80e76e690d5c5eb0f5bd091873)
+++ uspace/lib/libc/include/ipc/console.h	(revision 018e1e3f1098da80e76e690d5c5eb0f5bd091873)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libcipc
+ * @{ 
+ */
+/** @file
+ */
+
+#ifndef LIBC_CONSOLE_H_
+#define LIBC_CONSOLE_H_
+
+#define CONSOLE_GETCHAR		1026
+#define CONSOLE_PUTCHAR 	1027
+#define CONSOLE_CLEAR		1028
+#define CONSOLE_GOTO		1029
+#define CONSOLE_GETSIZE		1030
+#define CONSOLE_FLUSH		1031
+#define CONSOLE_SET_STYLE 	1032
+#define CONSOLE_CURSOR_VISIBILITY	1033
+
+#endif
+ 
+/** @}
+ */