Index: uspace/lib/c/generic/adt/hash_table.c
===================================================================
--- uspace/lib/c/generic/adt/hash_table.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/adt/hash_table.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -51,6 +51,6 @@
 #include <adt/hash_table.h>
 #include <adt/list.h>
-#include <malloc.h>
 #include <assert.h>
+#include <stdlib.h>
 #include <str.h>
 
Index: uspace/lib/c/generic/as.c
===================================================================
--- uspace/lib/c/generic/as.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/as.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -40,5 +40,4 @@
 #include <stdint.h>
 #include <bitops.h>
-#include <malloc.h>
 #include "private/libc.h"
 
Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/async.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -113,5 +113,5 @@
 #include <libarch/barrier.h>
 #include <stdbool.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <mem.h>
 #include <stdlib.h>
Index: uspace/lib/c/generic/clipboard.c
===================================================================
--- uspace/lib/c/generic/clipboard.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/clipboard.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -45,5 +45,5 @@
 #include <ipc/services.h>
 #include <loc.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 
Index: uspace/lib/c/generic/device/hw_res.c
===================================================================
--- uspace/lib/c/generic/device/hw_res.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/device/hw_res.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -36,5 +36,5 @@
 #include <errno.h>
 #include <async.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 int hw_res_get_resource_list(async_sess_t *sess,
Index: uspace/lib/c/generic/device/hw_res_parsed.c
===================================================================
--- uspace/lib/c/generic/device/hw_res_parsed.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/device/hw_res_parsed.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -34,7 +34,7 @@
 
 #include <device/hw_res_parsed.h>
-#include <malloc.h>
 #include <assert.h>
 #include <errno.h>
+#include <stdlib.h>
 
 static void hw_res_parse_add_dma_channel(hw_res_list_parsed_t *out,
Index: uspace/lib/c/generic/devman.c
===================================================================
--- uspace/lib/c/generic/devman.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/devman.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -44,5 +44,5 @@
 #include <async.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 static FIBRIL_MUTEX_INITIALIZE(devman_driver_block_mutex);
Index: uspace/lib/c/generic/fibril.c
===================================================================
--- uspace/lib/c/generic/fibril.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/fibril.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -39,5 +39,5 @@
 #include <stack.h>
 #include <tls.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <abi/mm/as.h>
 #include <as.h>
Index: uspace/lib/c/generic/gsort.c
===================================================================
--- uspace/lib/c/generic/gsort.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/gsort.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -43,5 +43,5 @@
 #include <inttypes.h>
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 /** Immediate buffer size.
Index: uspace/lib/c/generic/inet/addr.c
===================================================================
--- uspace/lib/c/generic/inet/addr.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/inet/addr.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -39,5 +39,5 @@
 #include <stdio.h>
 #include <stddef.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <bitops.h>
 #include <inttypes.h>
Index: uspace/lib/c/generic/io/chargrid.c
===================================================================
--- uspace/lib/c/generic/io/chargrid.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/io/chargrid.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -34,5 +34,5 @@
 
 #include <io/style.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <stdbool.h>
Index: uspace/lib/c/generic/io/console.c
===================================================================
--- uspace/lib/c/generic/io/console.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/io/console.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -38,5 +38,5 @@
 #include <async.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <vfs/vfs_sess.h>
 #include <io/console.h>
Index: uspace/lib/c/generic/io/io.c
===================================================================
--- uspace/lib/c/generic/io/io.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/io/io.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -38,5 +38,5 @@
 #include <errno.h>
 #include <stdbool.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <async.h>
 #include <io/kio.h>
Index: uspace/lib/c/generic/ipc.c
===================================================================
--- uspace/lib/c/generic/ipc.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/ipc.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -43,5 +43,5 @@
 #include <ipc/ipc.h>
 #include <libc.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <adt/list.h>
Index: uspace/lib/c/generic/loc.c
===================================================================
--- uspace/lib/c/generic/loc.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/loc.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -36,5 +36,5 @@
 #include <async.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/generic/pio_trace.c
===================================================================
--- uspace/lib/c/generic/pio_trace.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/pio_trace.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -35,5 +35,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <adt/list.h>
 #include <fibril_synch.h>
Index: uspace/lib/c/generic/stats.c
===================================================================
--- uspace/lib/c/generic/stats.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/stats.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -39,5 +39,5 @@
 #include <stdio.h>
 #include <inttypes.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #define SYSINFO_STATS_MAX_PATH  64
Index: uspace/lib/c/generic/str.c
===================================================================
--- uspace/lib/c/generic/str.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/str.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -37,10 +37,9 @@
 
 #include <str.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <assert.h>
-#include <stdint.h>
 #include <ctype.h>
-#include <malloc.h>
 #include <errno.h>
 #include <align.h>
Index: uspace/lib/c/generic/sysinfo.c
===================================================================
--- uspace/lib/c/generic/sysinfo.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/sysinfo.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -37,5 +37,5 @@
 #include <str.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdbool.h>
 #include <stddef.h>
Index: uspace/lib/c/generic/task.c
===================================================================
--- uspace/lib/c/generic/task.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/task.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -45,5 +45,5 @@
 #include <errno.h>
 #include <ns.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <libc.h>
 #include "private/ns.h"
Index: uspace/lib/c/generic/time.c
===================================================================
--- uspace/lib/c/generic/time.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/time.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -51,5 +51,4 @@
 #include <loc.h>
 #include <device/clock_dev.h>
-#include <malloc.h>
 #include <thread.h>
 
Index: uspace/lib/c/generic/tls.c
===================================================================
--- uspace/lib/c/generic/tls.c	(revision 39026d7c7b8398cf28a13ecd9f768d4f5d82e2b9)
+++ uspace/lib/c/generic/tls.c	(revision 40feeac3d6d981d671abe77b20b3aa999c586faf)
@@ -39,5 +39,5 @@
 #include <align.h>
 #include <tls.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>