Index: uspace/app/barber/barber.c
===================================================================
--- uspace/app/barber/barber.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/barber/barber.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <task.h>
 #include <loc.h>
Index: uspace/app/bdsh/tok.c
===================================================================
--- uspace/app/bdsh/tok.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/bdsh/tok.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -29,5 +29,4 @@
 #include <str.h>
 #include <assert.h>
-#include <malloc.h>
 #include <stdlib.h>
 #include <stddef.h>
Index: uspace/app/date/date.c
===================================================================
--- uspace/app/date/date.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/date/date.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -33,5 +33,5 @@
 #include <loc.h>
 #include <time.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <getopt.h>
 #include <ctype.h>
Index: uspace/app/fontviewer/fontviewer.c
===================================================================
--- uspace/app/fontviewer/fontviewer.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/fontviewer/fontviewer.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,5 @@
 #include <stdlib.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdbool.h>
 #include <window.h>
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/init/init.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -41,5 +41,5 @@
 #include <errno.h>
 #include <task.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <macros.h>
 #include <str.h>
Index: uspace/app/killall/killall.c
===================================================================
--- uspace/app/killall/killall.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/killall/killall.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -39,5 +39,5 @@
 #include <stats.h>
 #include <str_error.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #define NAME  "killall"
Index: uspace/app/kio/kio.c
===================================================================
--- uspace/app/kio/kio.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/kio/kio.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -43,5 +43,5 @@
 #include <io/kio.h>
 #include <sysinfo.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <fibril_synch.h>
 #include <adt/list.h>
Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/mkexfat/mkexfat.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -43,5 +43,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <byteorder.h>
 #include <align.h>
Index: uspace/app/netstart/self_test.c
===================================================================
--- uspace/app/netstart/self_test.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/netstart/self_test.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,5 +37,5 @@
 
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 
Index: uspace/app/stats/stats.c
===================================================================
--- uspace/app/stats/stats.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/stats/stats.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -42,5 +42,5 @@
 #include <errno.h>
 #include <stdlib.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <inttypes.h>
 #include <stdbool.h>
Index: uspace/app/sysinfo/sysinfo.c
===================================================================
--- uspace/app/sysinfo/sysinfo.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/sysinfo/sysinfo.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -39,5 +39,5 @@
 #include <stdint.h>
 #include <sysinfo.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 static void dump_bytes_hex(char *data, size_t size)
Index: uspace/app/tester/mm/common.c
===================================================================
--- uspace/app/tester/mm/common.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/tester/mm/common.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -29,5 +29,5 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <as.h>
 #include <adt/list.h>
Index: uspace/app/tester/mm/malloc2.c
===================================================================
--- uspace/app/tester/mm/malloc2.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/tester/mm/malloc2.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -30,5 +30,4 @@
 #include <stdlib.h>
 #include <stddef.h>
-#include <malloc.h>
 #include "../tester.h"
 
Index: uspace/app/tester/mm/mapping1.c
===================================================================
--- uspace/app/tester/mm/mapping1.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/tester/mm/mapping1.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -30,5 +30,4 @@
 #include <stdlib.h>
 #include <stddef.h>
-#include <malloc.h>
 #include <as.h>
 #include <errno.h>
Index: uspace/app/tester/mm/pager1.c
===================================================================
--- uspace/app/tester/mm/pager1.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/tester/mm/pager1.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -30,5 +30,4 @@
 #include <vfs/vfs.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <as.h>
 #include <ns.h>
Index: uspace/app/vcalc/vcalc.c
===================================================================
--- uspace/app/vcalc/vcalc.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/vcalc/vcalc.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -38,5 +38,5 @@
 #include <stdbool.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <io/pixel.h>
 #include <task.h>
Index: uspace/app/vdemo/vdemo.c
===================================================================
--- uspace/app/vdemo/vdemo.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/vdemo/vdemo.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 #include <stdbool.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <io/pixel.h>
 #include <task.h>
Index: uspace/app/viewer/viewer.c
===================================================================
--- uspace/app/viewer/viewer.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/viewer/viewer.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,5 +37,5 @@
 #include <vfs/vfs.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdbool.h>
 #include <window.h>
Index: uspace/app/vlaunch/vlaunch.c
===================================================================
--- uspace/app/vlaunch/vlaunch.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/vlaunch/vlaunch.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <task.h>
 #include <str_error.h>
Index: uspace/app/wavplay/main.c
===================================================================
--- uspace/app/wavplay/main.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/wavplay/main.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,5 +37,5 @@
 #include <errno.h>
 #include <fibril_synch.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str_error.h>
 #include <stdio.h>
Index: uspace/app/wifi_supplicant/wifi_supplicant.c
===================================================================
--- uspace/app/wifi_supplicant/wifi_supplicant.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/app/wifi_supplicant/wifi_supplicant.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -40,4 +40,5 @@
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <loc.h>
 
Index: uspace/drv/bus/isa/isa.c
===================================================================
--- uspace/drv/bus/isa/isa.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/drv/bus/isa/isa.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -49,5 +49,5 @@
 #include <ctype.h>
 #include <macros.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <ipc/irc.h>
Index: uspace/drv/bus/usb/ohci/hw_struct/hcca.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,5 +37,5 @@
 #define DRV_OHCI_HW_STRUCT_HCCA_H
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <macros.h>
Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/drv/char/ns8250/ns8250.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -46,5 +46,5 @@
 #include <ctype.h>
 #include <macros.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <ddi.h>
Index: uspace/drv/fb/kfb/port.c
===================================================================
--- uspace/drv/fb/kfb/port.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/drv/fb/kfb/port.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -42,5 +42,5 @@
 #include <errno.h>
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <mem.h>
 #include <as.h>
Index: uspace/drv/nic/ar9271/ath_usb.c
===================================================================
--- uspace/drv/nic/ar9271/ath_usb.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/drv/nic/ar9271/ath_usb.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 #include <usb/dev/pipes.h>
 #include <usb/debug.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <errno.h>
 #include "ath_usb.h"
Index: uspace/drv/nic/ar9271/wmi.c
===================================================================
--- uspace/drv/nic/ar9271/wmi.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/drv/nic/ar9271/wmi.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 #include <usb/debug.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <mem.h>
 #include <byteorder.h>
Index: uspace/lib/block/block.c
===================================================================
--- uspace/lib/block/block.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/block/block.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -49,5 +49,5 @@
 #include <macros.h>
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <stacktrace.h>
Index: uspace/lib/c/arch/ia64/src/tls.c
===================================================================
--- uspace/lib/c/arch/ia64/src/tls.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/arch/ia64/src/tls.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,4 @@
 
 #include <tls.h>
-#include <malloc.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/generic/adt/hash_table.c
===================================================================
--- uspace/lib/c/generic/adt/hash_table.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/adt/hash_table.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/as.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/async.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/clipboard.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/device/hw_res.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/device/hw_res_parsed.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/devman.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/fibril.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/gsort.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/inet/addr.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/io/chargrid.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/io/console.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/io/io.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/ipc.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/loc.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/pio_trace.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/stats.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/str.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/sysinfo.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/task.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/time.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -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 b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/generic/tls.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -39,5 +39,5 @@
 #include <align.h>
 #include <tls.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 
Index: uspace/lib/c/include/adt/fifo.h
===================================================================
--- uspace/lib/c/include/adt/fifo.h	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/include/adt/fifo.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -46,5 +46,5 @@
 #define LIBC_FIFO_H_
 
-#include <malloc.h>
+#include <stdlib.h>
 
 typedef unsigned long fifo_count_t;
Index: uspace/lib/c/include/ieee80211/ieee80211.h
===================================================================
--- uspace/lib/c/include/ieee80211/ieee80211.h	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/include/ieee80211/ieee80211.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -38,5 +38,4 @@
 #define LIBC_IEEE80211_H_
 
-#include <malloc.h>
 #include <adt/list.h>
 #include <nic/nic.h>
Index: uspace/lib/c/include/ipc/dev_iface.h
===================================================================
--- uspace/lib/c/include/ipc/dev_iface.h	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/include/ipc/dev_iface.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -30,5 +30,5 @@
 #define LIBC_IPC_DEV_IFACE_H_
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <types/common.h>
 
Index: uspace/lib/c/include/ipc/devman.h
===================================================================
--- uspace/lib/c/include/ipc/devman.h	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/c/include/ipc/devman.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,6 +36,6 @@
 #include <ipc/common.h>
 #include <adt/list.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 
 #define DEVMAN_NAME_MAXLEN  256
Index: uspace/lib/compress/gzip.c
===================================================================
--- uspace/lib/compress/gzip.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/compress/gzip.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -31,6 +31,6 @@
 #include <errno.h>
 #include <mem.h>
-#include <malloc.h>
 #include <byteorder.h>
+#include <stdlib.h>
 #include "gzip.h"
 #include "inflate.h"
Index: uspace/lib/draw/codec/tga.gz.c
===================================================================
--- uspace/lib/draw/codec/tga.gz.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/codec/tga.gz.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,5 @@
 #include <errno.h>
 #include <gzip.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "tga.gz.h"
 #include "tga.h"
Index: uspace/lib/draw/cursor.c
===================================================================
--- uspace/lib/draw/cursor.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/cursor.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -34,5 +34,5 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "cursor.h"
Index: uspace/lib/draw/cursor/embedded.c
===================================================================
--- uspace/lib/draw/cursor/embedded.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/cursor/embedded.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,5 +37,5 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "../gfx/cursor-11x18.h"
Index: uspace/lib/draw/drawctx.c
===================================================================
--- uspace/lib/draw/drawctx.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/drawctx.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,5 @@
 #include <assert.h>
 #include <adt/list.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "drawctx.h"
Index: uspace/lib/draw/font.c
===================================================================
--- uspace/lib/draw/font.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/font.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,6 +35,6 @@
  */
 
-#include <malloc.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <str.h>
 
Index: uspace/lib/draw/font/bitmap_backend.c
===================================================================
--- uspace/lib/draw/font/bitmap_backend.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/font/bitmap_backend.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,6 +35,6 @@
  */
 
-#include <malloc.h>
 #include <errno.h>
+#include <stdlib.h>
 
 #include "../font.h"
Index: uspace/lib/draw/font/embedded.c
===================================================================
--- uspace/lib/draw/font/embedded.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/font/embedded.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,6 +36,6 @@
 
 #include <stdint.h>
-#include <malloc.h>
 #include <errno.h>
+#include <stdlib.h>
 
 #include "../gfx/font-8x16.h"
Index: uspace/lib/draw/font/pcf.c
===================================================================
--- uspace/lib/draw/font/pcf.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/font/pcf.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,4 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <malloc.h>
 #include <errno.h>
 #include <byteorder.h>
@@ -42,4 +41,5 @@
 #include <align.h>
 #include <offset.h>
+#include <stdlib.h>
 
 #include "pcf.h"
Index: uspace/lib/draw/path.c
===================================================================
--- uspace/lib/draw/path.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/path.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 
 #include <assert.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "path.h"
Index: uspace/lib/draw/surface.c
===================================================================
--- uspace/lib/draw/surface.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/draw/surface.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,8 +35,8 @@
  */
 
-#include <malloc.h>
 #include <mem.h>
 #include <as.h>
 #include <assert.h>
+#include <stdlib.h>
 #include "surface.h"
 
Index: uspace/lib/ext4/src/directory.c
===================================================================
--- uspace/lib/ext4/src/directory.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/ext4/src/directory.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -38,6 +38,6 @@
 #include <byteorder.h>
 #include <errno.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include <str.h>
 #include "ext4/directory.h"
Index: uspace/lib/ext4/src/extent.c
===================================================================
--- uspace/lib/ext4/src/extent.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/ext4/src/extent.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,6 +37,6 @@
 #include <byteorder.h>
 #include <errno.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include "ext4/balloc.h"
 #include "ext4/extent.h"
Index: uspace/lib/ext4/src/ops.c
===================================================================
--- uspace/lib/ext4/src/ops.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/ext4/src/ops.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -42,6 +42,6 @@
 #include <libfs.h>
 #include <macros.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include <str.h>
 #include <ipc/loc.h>
Index: uspace/lib/ext4/src/superblock.c
===================================================================
--- uspace/lib/ext4/src/superblock.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/ext4/src/superblock.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -40,6 +40,6 @@
 #include <byteorder.h>
 #include <errno.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include "ext4/superblock.h"
 
Index: uspace/lib/fmtutil/fmtutil.c
===================================================================
--- uspace/lib/fmtutil/fmtutil.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/fmtutil/fmtutil.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -29,6 +29,6 @@
 #include <io/console.h>
 #include <errno.h>
-#include <malloc.h>
 #include <fmtutil.h>
+#include <stdlib.h>
 
 typedef struct {
Index: uspace/lib/graph/graph.c
===================================================================
--- uspace/lib/graph/graph.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/graph/graph.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -38,6 +38,6 @@
 #include <inttypes.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <as.h>
+#include <stdlib.h>
 #include "graph.h"
 
Index: uspace/lib/gui/button.c
===================================================================
--- uspace/lib/gui/button.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/button.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 
 #include <str.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <drawctx.h>
 #include <surface.h>
Index: uspace/lib/gui/canvas.c
===================================================================
--- uspace/lib/gui/canvas.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/canvas.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -34,5 +34,5 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <transform.h>
 #include <source.h>
Index: uspace/lib/gui/connection.c
===================================================================
--- uspace/lib/gui/connection.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/connection.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <adt/list.h>
 #include <adt/prodcons.h>
Index: uspace/lib/gui/grid.c
===================================================================
--- uspace/lib/gui/grid.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/grid.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <surface.h>
 #include "window.h"
Index: uspace/lib/gui/label.c
===================================================================
--- uspace/lib/gui/label.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/label.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,6 +35,6 @@
 
 #include <str.h>
-#include <malloc.h>
 #include <drawctx.h>
+#include <stdlib.h>
 #include <surface.h>
 #include <font/embedded.h>
Index: uspace/lib/gui/minimal.c
===================================================================
--- uspace/lib/gui/minimal.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/minimal.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -34,5 +34,5 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <surface.h>
 
Index: uspace/lib/gui/terminal.c
===================================================================
--- uspace/lib/gui/terminal.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/terminal.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <io/chargrid.h>
 #include <surface.h>
Index: uspace/lib/gui/window.c
===================================================================
--- uspace/lib/gui/window.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/gui/window.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -40,5 +40,5 @@
 
 #include <as.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 
Index: uspace/lib/usbhid/src/hiddescriptor.c
===================================================================
--- uspace/lib/usbhid/src/hiddescriptor.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/usbhid/src/hiddescriptor.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,8 +36,8 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <mem.h>
 #include <usb/debug.h>
 #include <assert.h>
+#include <stdlib.h>
 
 
Index: uspace/lib/usbhid/src/hidparser.c
===================================================================
--- uspace/lib/usbhid/src/hidparser.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/usbhid/src/hidparser.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <mem.h>
 #include <usb/debug.h>
Index: uspace/lib/usbhid/src/hidpath.c
===================================================================
--- uspace/lib/usbhid/src/hidpath.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/lib/usbhid/src/hidpath.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,6 +36,6 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include <usb/debug.h>
 #include <assert.h>
Index: uspace/srv/audio/hound/audio_data.c
===================================================================
--- uspace/srv/audio/hound/audio_data.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/audio/hound/audio_data.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,5 +35,5 @@
 
 #include <macros.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "audio_data.h"
Index: uspace/srv/audio/hound/connection.c
===================================================================
--- uspace/srv/audio/hound/connection.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/audio/hound/connection.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -34,6 +34,6 @@
  */
 
-#include <malloc.h>
 #include <errno.h>
+#include <stdlib.h>
 
 #include "log.h"
Index: uspace/srv/audio/hound/hound_ctx.c
===================================================================
--- uspace/srv/audio/hound/hound_ctx.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/audio/hound/hound_ctx.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,7 +35,7 @@
  */
 
-#include <malloc.h>
 #include <macros.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <str_error.h>
 
Index: uspace/srv/clipboard/clipboard.c
===================================================================
--- uspace/srv/clipboard/clipboard.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/clipboard/clipboard.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -33,7 +33,7 @@
 #include <ipc/clipboard.h>
 #include <loc.h>
-#include <malloc.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <task.h>
 
Index: uspace/srv/devman/util.h
===================================================================
--- uspace/srv/devman/util.h	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/devman/util.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,6 +35,6 @@
 
 #include <ctype.h>
+#include <stdlib.h>
 #include <str.h>
-#include <malloc.h>
 
 extern char *get_abs_path(const char *, const char *, const char *);
Index: uspace/srv/fs/cdfs/cdfs_ops.c
===================================================================
--- uspace/srv/fs/cdfs/cdfs_ops.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/cdfs/cdfs_ops.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -42,5 +42,4 @@
 #include <adt/hash_table.h>
 #include <adt/hash.h>
-#include <malloc.h>
 #include <mem.h>
 #include <loc.h>
@@ -49,4 +48,5 @@
 #include <block.h>
 #include <scsi/mmc.h>
+#include <stdlib.h>
 #include <str.h>
 #include <byteorder.h>
Index: uspace/srv/fs/exfat/exfat_directory.c
===================================================================
--- uspace/srv/fs/exfat/exfat_directory.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/exfat/exfat_directory.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -43,5 +43,5 @@
 #include <byteorder.h>
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 #include <align.h>
Index: uspace/srv/fs/exfat/exfat_fat.c
===================================================================
--- uspace/srv/fs/exfat/exfat_fat.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/exfat/exfat_fat.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -48,6 +48,6 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include <str.h>
 
Index: uspace/srv/fs/exfat/exfat_idx.c
===================================================================
--- uspace/srv/fs/exfat/exfat_idx.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/exfat/exfat_idx.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -45,5 +45,5 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 /** Each instance of this type describes one interval of freed VFS indices. */
Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -59,6 +59,6 @@
 #include <fibril_synch.h>
 #include <align.h>
-#include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 /** Mutex protecting the list of cached free FAT nodes. */
Index: uspace/srv/fs/fat/fat_fat.c
===================================================================
--- uspace/srv/fs/fat/fat_fat.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/fat/fat_fat.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -48,6 +48,6 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 
 #define IS_ODD(number)	(number & 0x1)
Index: uspace/srv/fs/fat/fat_idx.c
===================================================================
--- uspace/srv/fs/fat/fat_idx.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/fat/fat_idx.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -45,5 +45,5 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 /** Each instance of this type describes one interval of freed VFS indices. */
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/fat/fat_ops.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -56,5 +56,5 @@
 #include <fibril_synch.h>
 #include <align.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #define FAT_NODE(node)	((node) ? (fat_node_t *) (node)->data : NULL)
Index: uspace/srv/fs/locfs/locfs_ops.c
===================================================================
--- uspace/srv/fs/locfs/locfs_ops.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/locfs/locfs_ops.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -39,5 +39,5 @@
 #include <stdbool.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 #include <libfs.h>
Index: uspace/srv/fs/mfs/mfs.h
===================================================================
--- uspace/srv/fs/mfs/mfs.h	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/mfs/mfs.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -39,7 +39,7 @@
 #include <libfs.h>
 #include <adt/list.h>
-#include <malloc.h>
 #include <mem.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/srv/fs/udf/udf_file.c
===================================================================
--- uspace/srv/fs/udf/udf_file.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/udf/udf_file.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -38,5 +38,5 @@
 #include <libfs.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <inttypes.h>
 #include <io/log.h>
Index: uspace/srv/fs/udf/udf_idx.c
===================================================================
--- uspace/srv/fs/udf/udf_idx.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/udf/udf_idx.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -40,5 +40,5 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <adt/hash_table.h>
 #include <adt/hash.h>
Index: uspace/srv/fs/udf/udf_ops.c
===================================================================
--- uspace/srv/fs/udf/udf_ops.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/udf/udf_ops.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -51,5 +51,5 @@
 #include <fibril_synch.h>
 #include <align.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <inttypes.h>
 #include <io/log.h>
Index: uspace/srv/fs/udf/udf_osta.c
===================================================================
--- uspace/srv/fs/udf/udf_osta.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/udf/udf_osta.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -45,5 +45,5 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 #include <macros.h>
Index: uspace/srv/fs/udf/udf_volume.c
===================================================================
--- uspace/srv/fs/udf/udf_volume.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/fs/udf/udf_volume.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -39,6 +39,6 @@
 #include <libfs.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <str.h>
-#include <malloc.h>
 #include <mem.h>
 #include <inttypes.h>
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/hid/compositor/compositor.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -44,5 +44,5 @@
 #include <align.h>
 #include <as.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include <atomic.h>
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/hid/console/console.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -47,8 +47,8 @@
 #include <io/output.h>
 #include <align.h>
-#include <malloc.h>
 #include <as.h>
 #include <task.h>
 #include <fibril_synch.h>
+#include <stdlib.h>
 #include "console.h"
 
Index: uspace/srv/hid/input/proto/mousedev.c
===================================================================
--- uspace/srv/hid/input/proto/mousedev.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/hid/input/proto/mousedev.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -38,9 +38,9 @@
 #include <stdio.h>
 #include <vfs/vfs_sess.h>
-#include <malloc.h>
 #include <async.h>
 #include <errno.h>
 #include <ipc/mouseev.h>
 #include <loc.h>
+#include <stdlib.h>
 #include "../mouse.h"
 #include "../mouse_port.h"
Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/hid/output/output.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -27,7 +27,7 @@
  */
 
+#include <errno.h>
 #include <stddef.h>
-#include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <macros.h>
 #include <as.h>
Index: uspace/srv/hid/output/port/kfb.c
===================================================================
--- uspace/srv/hid/output/port/kfb.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/hid/output/port/kfb.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -41,5 +41,5 @@
 #include <sysinfo.h>
 #include <ddi.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <mem.h>
 #include <as.h>
Index: uspace/srv/hid/output/proto/vt100.c
===================================================================
--- uspace/srv/hid/output/proto/vt100.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/hid/output/proto/vt100.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -32,7 +32,7 @@
 #include <inttypes.h>
 #include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <stddef.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <io/color.h>
 #include <types/common.h>
Index: uspace/srv/hid/remcons/user.c
===================================================================
--- uspace/srv/hid/remcons/user.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/hid/remcons/user.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -34,4 +34,5 @@
 #include <async.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <adt/prodcons.h>
 #include <errno.h>
@@ -40,5 +41,4 @@
 #include <io/keycode.h>
 #include <align.h>
-#include <malloc.h>
 #include <as.h>
 #include <fibril_synch.h>
Index: uspace/srv/klog/klog.c
===================================================================
--- uspace/srv/klog/klog.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/klog/klog.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -44,5 +44,5 @@
 #include <io/klog.h>
 #include <sysinfo.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <fibril_synch.h>
 #include <adt/list.h>
Index: uspace/srv/logger/ctl.c
===================================================================
--- uspace/srv/logger/ctl.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/logger/ctl.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -35,6 +35,6 @@
  */
 
-#include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <io/logctl.h>
Index: uspace/srv/logger/logs.c
===================================================================
--- uspace/srv/logger/logs.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/logger/logs.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -31,8 +31,8 @@
  */
 #include <assert.h>
-#include <malloc.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <str.h>
-#include <stdio.h>
-#include <errno.h>
 #include "logger.h"
 
Index: uspace/srv/logger/main.c
===================================================================
--- uspace/srv/logger/main.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/logger/main.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -43,7 +43,7 @@
 #include <async.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <str_error.h>
-#include <malloc.h>
 #include "logger.h"
 
Index: uspace/srv/logger/writer.c
===================================================================
--- uspace/srv/logger/writer.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/logger/writer.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -43,8 +43,8 @@
 #include <ns.h>
 #include <async.h>
+#include <errno.h>
 #include <stdio.h>
-#include <errno.h>
+#include <stdlib.h>
 #include <str_error.h>
-#include <malloc.h>
 #include "logger.h"
 
Index: uspace/srv/net/inetsrv/ndp.c
===================================================================
--- uspace/srv/net/inetsrv/ndp.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/net/inetsrv/ndp.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,5 +37,5 @@
 #include <errno.h>
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <io/log.h>
 #include "ntrans.h"
Index: uspace/srv/ns/clonable.c
===================================================================
--- uspace/srv/ns/clonable.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/ns/clonable.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -38,5 +38,5 @@
 #include <assert.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <loader/loader.h>
 #include "clonable.h"
Index: uspace/srv/ns/service.c
===================================================================
--- uspace/srv/ns/service.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/ns/service.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -36,5 +36,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "service.h"
 #include "ns.h"
Index: uspace/srv/ns/task.c
===================================================================
--- uspace/srv/ns/task.c	(revision b5abaf7c8551d1f27dee4024aa0f8824ee2e9317)
+++ uspace/srv/ns/task.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <assert.h>
+#include <macros.h>
 #include <stdio.h>
-#include <macros.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <types/task.h>
 #include "task.h"