Index: uspace/lib/c/include/net/modules.h
===================================================================
--- uspace/lib/c/include/net/modules.h	(revision 32fef47bf1b96f02c8a4ccc9728b95e42ef4624a)
+++ 	(revision )
@@ -1,56 +1,0 @@
-/*
- * Copyright (c) 2009 Lukas Mejdrech
- * 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
- * Generic module functions.
- *
- * @todo MAKE IT POSSIBLE TO REMOVE THIS FILE VIA EITHER REPLACING PART OF ITS
- * FUNCTIONALITY OR VIA INTEGRATING ITS FUNCTIONALITY MORE TIGHTLY WITH THE REST
- * OF THE SYSTEM.
- */
-
-#ifndef LIBC_MODULES_H_
-#define LIBC_MODULES_H_
-
-#include <async.h>
-#include <ipc/services.h>
-#include <sys/time.h>
-
-extern void answer_call(ipc_callid_t, int, ipc_call_t *, size_t);
-extern async_sess_t *bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t);
-extern void refresh_answer(ipc_call_t *, size_t *);
-
-#endif
-
-/** @}
- */
Index: uspace/lib/c/include/ns.h
===================================================================
--- uspace/lib/c/include/ns.h	(revision 32fef47bf1b96f02c8a4ccc9728b95e42ef4624a)
+++ uspace/lib/c/include/ns.h	(revision f061e40457bcea583cf7b5dcf8f060bb2895c00f)
@@ -37,11 +37,14 @@
 
 #include <sys/types.h>
+#include <ipc/services.h>
 #include <task.h>
 #include <async.h>
 
 extern int service_register(sysarg_t);
-extern async_sess_t *service_connect(exch_mgmt_t, sysarg_t, sysarg_t, sysarg_t);
-extern async_sess_t *service_connect_blocking(exch_mgmt_t, sysarg_t, sysarg_t,
+extern async_sess_t *service_connect(exch_mgmt_t, services_t, sysarg_t, sysarg_t);
+extern async_sess_t *service_connect_blocking(exch_mgmt_t, services_t, sysarg_t,
     sysarg_t);
+extern async_sess_t *service_bind(services_t, sysarg_t, sysarg_t, sysarg_t,
+    async_client_conn_t);
 
 extern int ns_ping(void);