Index: uspace/app/tester/proc/common.h
===================================================================
--- uspace/app/tester/proc/common.h	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/app/tester/proc/common.h	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -44,5 +44,5 @@
 #define STR_JOB_OK      "job-ok"
 
-#define DUMMY_TASK     "/root/app/tester"
+#define DUMMY_TASK     "/app/tester"
 #define DUMMY_TASK_ARG "proc_dummy_task"
 
Index: uspace/app/vlaunch/vlaunch.c
===================================================================
--- uspace/app/vlaunch/vlaunch.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/app/vlaunch/vlaunch.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -76,5 +76,5 @@
 	int retval;
 	rc = task_wait(&wait, NULL, &retval);
-	if ((rc != EOK)) {
+	if (rc != EOK) {
 		printf("%s: Error retrieving retval from %s (%s)\n", NAME,
 		    app, str_error(rc));
Index: uspace/lib/c/generic/async/client.c
===================================================================
--- uspace/lib/c/generic/async/client.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/async/client.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -191,9 +191,4 @@
 
 	return session;
-}
-
-cap_phone_handle_t async_session_phone(async_sess_t *sess)
-{
-	return sess->phone;
 }
 
Index: uspace/lib/c/generic/async/server.c
===================================================================
--- uspace/lib/c/generic/async/server.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/async/server.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -390,7 +390,8 @@
  *                    calls routed through that phone.
  * @param in_task_id  Identification of the incoming connection.
- * @param call        Call data of the opening call. If call is NULL, it's
- *                    either a callback connection that was opened by
- *                    accepting the IPC_M_CONNECT_TO_ME call.
+ * @param call        Call data of the opening call. If call is NULL, the
+ *                    connection was opened by accepting the
+ *                    IPC_M_CONNECT_TO_ME call and this function is called
+ *                    directly by the server.
  * @param handler     Connection handler.
  * @param data        Client argument to pass to the connection handler.
@@ -967,4 +968,5 @@
 
 	// TODO: Log the error.
+
 	if (call->cap_handle != CAP_NIL)
 		/* Unknown call from unknown phone - hang it up */
@@ -1740,6 +1742,5 @@
 	async_sess_t *sess = create_session(phandle, mgmt, 0, 0, 0);
 	if (sess == NULL) {
-		ipc_hangup(phandle);
-		async_answer_0(&call, errno);
+		async_answer_0(&call, ENOMEM);
 	} else {
 		/* Acknowledge the connected phone */
Index: uspace/lib/c/generic/inetping.c
===================================================================
--- uspace/lib/c/generic/inetping.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/inetping.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -60,5 +60,4 @@
 	inetping_sess = loc_service_connect(inetping_svc, INTERFACE_INETPING,
 	    IPC_AUTOSTART);
-
 	if (inetping_sess == NULL)
 		return ENOENT;
Index: uspace/lib/c/generic/libc.c
===================================================================
--- uspace/lib/c/generic/libc.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/libc.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -51,7 +51,7 @@
 #include "private/libc.h"
 #include "private/async.h"
+#include "private/malloc.h"
 #include "private/io.h"
 #include "private/fibril.h"
-#include "private/malloc.h"
 #include "private/task.h"
 #include "private/taskman.h"
Index: uspace/lib/c/generic/loader.c
===================================================================
--- uspace/lib/c/generic/loader.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/loader.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -33,16 +33,16 @@
  */
 
-#include <async.h>
-#include <errno.h>
 #include <ipc/loader.h>
 #include <ipc/services.h>
 #include <ipc/taskman.h>
+#include <ns.h>
+#include <task.h>
+#include <str.h>
 #include <libc.h>
+#include <stdlib.h>
+#include <async.h>
+#include <errno.h>
+#include <vfs/vfs.h>
 #include <loader/loader.h>
-#include <ns.h>
-#include <stdlib.h>
-#include <str.h>
-#include <task.h>
-#include <vfs/vfs.h>
 
 #include "private/loader.h"
Index: uspace/lib/c/generic/loc.c
===================================================================
--- uspace/lib/c/generic/loc.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/loc.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -325,5 +325,5 @@
 	async_exch_t *exch;
 
-	if ((flags & IPC_FLAG_BLOCKING))
+	if (flags & IPC_FLAG_BLOCKING)
 		exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER);
 	else {
Index: uspace/lib/c/generic/private/async.h
===================================================================
--- uspace/lib/c/generic/private/async.h	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/private/async.h	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -42,5 +42,4 @@
 #include <time.h>
 #include <stdbool.h>
-#include <stdatomic.h>
 
 /** Session data */
@@ -109,5 +108,4 @@
 extern async_sess_t *create_session(cap_phone_handle_t, exch_mgmt_t,
     sysarg_t, sysarg_t, sysarg_t);
-extern cap_phone_handle_t async_session_phone(async_sess_t *);
 
 #endif
Index: uspace/lib/c/generic/task.c
===================================================================
--- uspace/lib/c/generic/task.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/generic/task.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -35,5 +35,9 @@
 /** @file
  */
-
+#include <task.h>
+#include <loader/loader.h>
+#include <stdarg.h>
+#include <str.h>
+#include <macros.h>
 #include <assert.h>
 #include <async.h>
@@ -43,10 +47,4 @@
 #include <ipc/taskman.h>
 #include <libc.h>
-#include <loader/loader.h>
-#include <macros.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <str.h>
-#include <task.h>
 #include <taskman.h>
 #include <vfs/vfs.h>
@@ -424,5 +422,4 @@
 	wait.flags = flags;
 	errno_t rc = task_setup_wait(id, &wait);
-
 	if (rc != EOK)
 		return rc;
Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/include/async.h	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -131,6 +131,4 @@
 extern void *async_get_client_data_by_id(task_id_t);
 extern void async_put_client_data_by_id(task_id_t);
-
-extern void async_set_implicit_connection(async_port_handler_t);
 
 extern errno_t async_create_port(iface_t, async_port_handler_t, void *,
Index: uspace/lib/c/include/ipc/taskman.h
===================================================================
--- uspace/lib/c/include/ipc/taskman.h	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/include/ipc/taskman.h	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -39,14 +39,15 @@
 
 typedef enum {
+	TASKMAN_NEW_TASK = IPC_FIRST_USER_METHOD,
+	TASKMAN_CONNECT_TO_NS,
+	TASKMAN_CONNECT_TO_LOADER
+} taskman_connection_t;
+
+typedef enum {
 	TASKMAN_WAIT = IPC_FIRST_USER_METHOD,
 	TASKMAN_RETVAL,
 	TASKMAN_EVENT_CALLBACK,
-	TASKMAN_NEW_TASK,
-
 	TASKMAN_I_AM_NS,
-	TASKMAN_I_AM_LOADER,
-
-	TASKMAN_CONNECT_TO_NS,
-	TASKMAN_CONNECT_TO_LOADER
+	TASKMAN_I_AM_LOADER
 } taskman_request_t;
 
Index: uspace/lib/c/include/task.h
===================================================================
--- uspace/lib/c/include/task.h	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/c/include/task.h	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -68,8 +68,7 @@
     __attribute__((sentinel));
 
+extern void task_cancel_wait(task_wait_t *);
 extern errno_t task_wait(task_wait_t *, task_exit_t *, int *);
 extern errno_t task_wait_task_id(task_id_t, int, task_exit_t *, int *);
-
-extern void task_cancel_wait(task_wait_t *);
 
 extern errno_t task_retval(int);
Index: uspace/lib/gui/window.c
===================================================================
--- uspace/lib/gui/window.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/lib/gui/window.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -626,5 +626,4 @@
 	async_sess_t *reg_sess =
 	    loc_service_connect(reg_dsid, INTERFACE_COMPOSITOR, ipc_flags);
-
 	if (reg_sess == NULL) {
 		free(win);
@@ -642,5 +641,4 @@
 
 	win->osess = loc_service_connect(out_dsid, INTERFACE_COMPOSITOR, ipc_flags);
-
 	if (win->osess == NULL) {
 		free(win);
@@ -649,5 +647,4 @@
 
 	win->isess = loc_service_connect(in_dsid, INTERFACE_COMPOSITOR, ipc_flags);
-
 	if (win->isess == NULL) {
 		async_hangup(win->osess);
Index: uspace/srv/devman/driver.c
===================================================================
--- uspace/srv/devman/driver.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/devman/driver.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -36,8 +36,7 @@
 #include <io/log.h>
 #include <vfs/vfs.h>
-#include <dirent.h>
 #include <loc.h>
+#include <str_error.h>
 #include <stdio.h>
-#include <str_error.h>
 #include <sysman/ctl.h>
 #include <task.h>
Index: uspace/srv/devman/drv_conn.c
===================================================================
--- uspace/srv/devman/drv_conn.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/devman/drv_conn.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -36,17 +36,17 @@
 
 #include <assert.h>
+#include <ipc/services.h>
+#include <ns.h>
 #include <async.h>
+#include <stdio.h>
 #include <errno.h>
+#include <str_error.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
+#include <stdlib.h>
+#include <str.h>
 #include <io/log.h>
 #include <ipc/devman.h>
-#include <ipc/services.h>
 #include <loc.h>
-#include <ns.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <str.h>
-#include <str_error.h>
 #include <sysman/broker.h>
 
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/hid/compositor/compositor.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -2267,4 +2267,5 @@
 	if (!list_empty(&viewport_list))
 		input_activate(input);
+
 ret:
 	fibril_mutex_unlock(&discovery_mtx);
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/loader/main.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -39,5 +39,5 @@
  * loader.
  *
- * The apparent caller uses his phone to send the pathname and various other
+ * The apparent caller uses its phone to send the pathname and various other
  * information to the loader. This is normally done by the C library
  * and completely hidden from applications.
@@ -49,15 +49,15 @@
 #include <stddef.h>
 #include <ipc/services.h>
+#include <ipc/loader.h>
+#include <ns.h>
+#include <loader/pcb.h>
+#include <entry_point.h>
+#include <errno.h>
+#include <async.h>
+#include <str.h>
 #include <as.h>
-#include <async.h>
 #include <elf/elf.h>
 #include <elf/elf_load.h>
-#include <entry_point.h>
-#include <errno.h>
 #include <fibril_synch.h>
-#include <ipc/loader.h>
-#include <loader/pcb.h>
-#include <ns.h>
-#include <str.h>
 #include <task.h>
 #include <taskman.h>
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/locsrv/locsrv.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -36,17 +36,17 @@
  */
 
-#include <assert.h>
+#include <ipc/services.h>
+#include <ns.h>
 #include <async.h>
+#include <stdio.h>
 #include <errno.h>
-#include <ipc/loc.h>
-#include <ipc/services.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <macros.h>
-#include <ns.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
 #include <str_error.h>
+#include <ipc/loc.h>
+#include <assert.h>
 #include <sysman/broker.h>
 #include <sysman/ctl.h>
Index: uspace/srv/logger/main.c
===================================================================
--- uspace/srv/logger/main.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/logger/main.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -83,5 +83,4 @@
 
 	printf("%s: Accepting connections\n", NAME);
-
 	task_retval(EOK);
 	async_manager();
Index: uspace/srv/ns/ns.c
===================================================================
--- uspace/srv/ns/ns.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/ns/ns.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -132,8 +132,7 @@
 		return rc;
 	}
+
 	task_retval(0);
-
 	printf("%s: Accepting connections\n", NAME);
-
 	async_manager();
 
Index: uspace/srv/taskman/task.h
===================================================================
--- uspace/srv/taskman/task.h	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/taskman/task.h	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -69,5 +69,5 @@
 	/* Link to listeners list. */
 	link_t listeners;
-	/* Session for notifications to task. */
+	/* Session for sending event notifications to registrar. */
 	async_sess_t *sess;
 } task_t;
Index: uspace/srv/vfs/Makefile
===================================================================
--- uspace/srv/vfs/Makefile	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/vfs/Makefile	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -30,5 +30,4 @@
 USPACE_PREFIX = ../..
 LIBS = sysman
-EXTRA_CFLAGS += -I$(USPACE_PREFIX)/lib/sysman/include
 BINARY = vfs
 STATIC_NEEDED = y
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/vfs/vfs.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -41,5 +41,4 @@
 #include <abi/ipc/methods.h>
 #include <ns.h>
-#include <as.h>
 #include <async.h>
 #include <stdatomic.h>
@@ -48,9 +47,11 @@
 #include <stdio.h>
 #include <ipc/services.h>
-#include <macros.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <str.h>
+#include <as.h>
+#include <macros.h>
 #include <sysman/broker.h>
+
 #include "vfs.h"
 
Index: uspace/srv/vfs/vfs.h
===================================================================
--- uspace/srv/vfs/vfs.h	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/vfs/vfs.h	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -178,5 +178,5 @@
 extern fs_handle_t fs_name_to_handle(const char *, unsigned int instance, bool);
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
-extern int vfs_get_fstypes(vfs_fstypes_t *);
+extern errno_t vfs_get_fstypes(vfs_fstypes_t *);
 extern errno_t fs_unit_name(const char *, unsigned int, char **);
 
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision 8a745123480a46364e19651f0bf27ce3f5d2864f)
+++ uspace/srv/vfs/vfs_register.c	(revision 22d990c966669e1b95d6d5422ac538d5ccedcb94)
@@ -36,18 +36,18 @@
  */
 
+#include <ipc/services.h>
+#include <async.h>
+#include <fibril.h>
+#include <fibril_synch.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <str.h>
+#include <ctype.h>
+#include <stdbool.h>
 #include <adt/list.h>
 #include <as.h>
 #include <assert.h>
-#include <async.h>
 #include <stdatomic.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fibril.h>
-#include <fibril_synch.h>
-#include <ipc/services.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <str.h>
 #include <sysman/broker.h>
 #include "vfs.h"