Index: uspace/lib/libc/include/devmap.h
===================================================================
--- uspace/lib/libc/include/devmap.h	(revision 854c56404e598d97ec7618e179465613a3cdeba4)
+++ uspace/lib/libc/include/devmap.h	(revision 854c56404e598d97ec7618e179465613a3cdeba4)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 libc
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_DEVMAP_H_
+#define LIBC_DEVMAP_H_
+
+#include <ipc/devmap.h>
+#include <async.h>
+
+typedef int dev_handle_t;
+
+extern int devmap_driver_register(const char *, async_client_conn_t);
+extern int devmap_device_get_handle(const char *, dev_handle_t *,
+    unsigned int);
+extern int devmap_device_connect(dev_handle_t, unsigned int);
+extern int devmap_device_register(int, const char *, int *);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/include/ipc/devmap.h
===================================================================
--- uspace/lib/libc/include/ipc/devmap.h	(revision c5747fed053576a6a75fe794c2cce48244874acc)
+++ uspace/lib/libc/include/ipc/devmap.h	(revision 854c56404e598d97ec7618e179465613a3cdeba4)
@@ -34,4 +34,5 @@
 #define DEVMAP_DEVMAP_H_
 
+#include <atomic.h>
 #include <ipc/ipc.h>
 #include <libadt/list.h>
Index: uspace/lib/libc/include/vfs/vfs.h
===================================================================
--- uspace/lib/libc/include/vfs/vfs.h	(revision c5747fed053576a6a75fe794c2cce48244874acc)
+++ uspace/lib/libc/include/vfs/vfs.h	(revision 854c56404e598d97ec7618e179465613a3cdeba4)
@@ -41,5 +41,5 @@
 
 extern int mount(const char *, const char *, const char *, const char *,
-    const unsigned int flags);
+    unsigned int flags);
 
 #endif