Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -27,6 +27,6 @@
  */
 
-#include <async.h>
 #include <errno.h>
+#include <fibril.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: uspace/app/mkbd/main.c
===================================================================
--- uspace/app/mkbd/main.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/app/mkbd/main.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -39,4 +39,5 @@
 #include <stdlib.h>
 #include <errno.h>
+#include <fibril.h>
 #include <str_error.h>
 #include <stdbool.h>
Index: uspace/app/sysinst/rdimg.c
===================================================================
--- uspace/app/sysinst/rdimg.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/app/sysinst/rdimg.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -34,4 +34,5 @@
 
 #include <errno.h>
+#include <fibril.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: uspace/app/tester/stdio/logger2.c
===================================================================
--- uspace/app/tester/stdio/logger2.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/app/tester/stdio/logger2.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -30,6 +30,6 @@
 #include <stdlib.h>
 #include <errno.h>
+#include <fibril.h>
 #include <io/log.h>
-#include <async.h>
 #include "../tester.h"
 
Index: uspace/app/wavplay/drec.c
===================================================================
--- uspace/app/wavplay/drec.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/app/wavplay/drec.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -36,4 +36,5 @@
 #include <assert.h>
 #include <errno.h>
+#include <fibril.h>
 #include <str_error.h>
 #include <audio_pcm_iface.h>
Index: uspace/drv/bus/usb/xhci/hw_struct/common.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/common.h	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/drv/bus/usb/xhci/hw_struct/common.h	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -45,4 +45,5 @@
 #include <ddi.h>
 #include <errno.h>
+#include <fibril.h>
 
 #define host2xhci(size, val) host2uint##size##_t_le((val))
Index: uspace/drv/test/test2/test2.c
===================================================================
--- uspace/drv/test/test2/test2.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/drv/test/test2/test2.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -31,7 +31,7 @@
 
 #include <assert.h>
-#include <async.h>
 #include <stdio.h>
 #include <errno.h>
+#include <fibril.h>
 #include <str.h>
 #include <str_error.h>
Index: uspace/lib/c/generic/async/server.c
===================================================================
--- uspace/lib/c/generic/async/server.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/lib/c/generic/async/server.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -1003,5 +1003,5 @@
 
 /** Add one manager to manager list. */
-fid_t async_create_manager(void)
+static fid_t async_create_manager(void)
 {
 	fid_t fid = fibril_create_generic(async_manager_fibril, NULL, PAGE_SIZE);
Index: uspace/lib/c/generic/irc.c
===================================================================
--- uspace/lib/c/generic/irc.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/lib/c/generic/irc.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -36,4 +36,5 @@
 #include <async.h>
 #include <errno.h>
+#include <fibril.h>
 #include <ipc/irc.h>
 #include <ipc/services.h>
Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/lib/c/include/async.h	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -41,5 +41,4 @@
 
 #include <ipc/common.h>
-#include <fibril.h>
 #include <time.h>
 #include <stdbool.h>
@@ -473,5 +472,4 @@
 
 errno_t async_spawn_notification_handler(void);
-fid_t async_create_manager(void);
 
 #endif
Index: uspace/lib/posix/src/time.c
===================================================================
--- uspace/lib/posix/src/time.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/lib/posix/src/time.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -46,5 +46,5 @@
 #include <assert.h>
 
-#include <async.h>
+#include <fibril.h>
 #include <malloc.h>
 #include <task.h>
Index: uspace/lib/posix/src/unistd.c
===================================================================
--- uspace/lib/posix/src/unistd.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/lib/posix/src/unistd.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -47,4 +47,5 @@
 #include <fcntl.h>
 
+#include <fibril.h>
 #include <task.h>
 #include <stats.h>
Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -38,4 +38,5 @@
 #define LIBUSBHOST_HOST_HCD_H
 
+#include <fibril.h>
 #include <ddf/driver.h>
 #include <usb/request.h>
Index: uspace/srv/hid/isdv4_tablet/isdv4.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.c	(revision dcec5d278ae2475206d8419b68c1f859074936a1)
+++ uspace/srv/hid/isdv4_tablet/isdv4.c	(revision fec7ba0dc652cc9b10575bcf70be9f369491905c)
@@ -27,6 +27,6 @@
  */
 
-#include <async.h>
 #include <errno.h>
+#include <fibril.h>
 #include <io/chardev.h>
 #include <mem.h>