Index: uspace/lib/c/meson.build
===================================================================
--- uspace/lib/c/meson.build	(revision 696b405386c8f231d8955f78acc39dd81137ea5c)
+++ uspace/lib/c/meson.build	(revision f167c851099aef2600cce71c5e10cc3f3dc8ee11)
@@ -62,29 +62,32 @@
 	'common/adt/checksum.c',
 	'common/adt/circ_buf.c',
+	'common/adt/hash_table.c',
 	'common/adt/list.c',
-	'common/adt/hash_table.c',
 	'common/adt/odict.c',
+	'common/gsort.c',
 	'common/printf/printf_core.c',
+	'common/stdc/bsearch.c',
+	'common/stdc/calloc.c',
 	'common/stdc/ctype.c',
 	'common/stdc/mem.c',
-	'common/stdc/bsearch.c',
 	'common/stdc/qsort.c',
-	'common/stdc/calloc.c',
 	'common/stdc/uchar.c',
 	'common/stdc/wchar.c',
-	'common/gsort.c',
 	'common/str.c',
 	'common/str_error.c',
 	'common/strtol.c',
 
-	'generic/libc.c',
 	'generic/adt/prodcons.c',
+	'generic/arg_parse.c',
 	'generic/as.c',
-	'generic/ddi.c',
-	'generic/perm.c',
+	'generic/assert.c',
+	'generic/async/client.c',
+	'generic/async/ports.c',
+	'generic/async/server.c',
 	'generic/capa.c',
 	'generic/config.c',
 	'generic/context.c',
 	'generic/dbgcon.c',
+	'generic/ddi.c',
 	'generic/device/clock_dev.c',
 	'generic/device/hw_res.c',
@@ -93,36 +96,45 @@
 	'generic/dirent.c',
 	'generic/dlfcn.c',
+	'generic/double_to_str.c',
 	'generic/elf/elf.c',
 	'generic/elf/elf_load.c',
 	'generic/elf/elf_mod.c',
+	'generic/errno.c',
 	'generic/event.c',
-	'generic/errno.c',
+	'generic/getopt.c',
+	'generic/ieee_double.c',
+	'generic/imath.c',
 	'generic/inttypes.c',
-	'generic/loc.c',
-	'generic/string.c',
-	'generic/l18n/langs.c',
-	'generic/pcb.c',
-	'generic/pio_trace.c',
-	'generic/smc.c',
-	'generic/task.c',
-	'generic/imath.c',
 	'generic/io/asprintf.c',
 	'generic/io/io.c',
-	'generic/io/printf.c',
+	'generic/io/kio.c',
+	'generic/io/klog.c',
 	'generic/io/log.c',
 	'generic/io/logctl.c',
-	'generic/io/kio.c',
-	'generic/io/klog.c',
+	'generic/io/printf.c',
 	'generic/io/snprintf.c',
+	'generic/io/table.c',
 	'generic/io/vprintf.c',
 	'generic/io/vsnprintf.c',
-	'generic/io/table.c',
+	'generic/ipc.c',
 	'generic/irq.c',
-	'generic/ieee_double.c',
+	'generic/l18n/langs.c',
+	'generic/libc.c',
+	'generic/loader.c',
+	'generic/loc.c',
+	'generic/malloc.c',
+	'generic/ns.c',
+	'generic/pcb.c',
+	'generic/perm.c',
+	'generic/pio_trace.c',
 	'generic/power_of_ten.c',
-	'generic/double_to_str.c',
-	'generic/malloc.c',
 	'generic/rndgen.c',
+	'generic/setjmp.c',
 	'generic/shutdown.c',
+	'generic/smc.c',
+	'generic/stack.c',
+	'generic/stacktrace.c',
+	'generic/stats.c',
+	'generic/stdio.c',
 	'generic/stdio/scanf.c',
 	'generic/stdio/sprintf.c',
@@ -130,42 +142,30 @@
 	'generic/stdio/sstream.c',
 	'generic/stdio/vsprintf.c',
+	'generic/stdlib.c',
+	'generic/string.c',
+	'generic/sysinfo.c',
+	'generic/task.c',
 	'generic/thread/fibril.c',
 	'generic/thread/fibril_synch.c',
+	'generic/thread/futex.c',
+	'generic/thread/mpsc.c',
 	'generic/thread/thread.c',
 	'generic/thread/tls.c',
-	'generic/thread/futex.c',
-	'generic/thread/mpsc.c',
-	'generic/sysinfo.c',
-	'generic/ipc.c',
-	'generic/ns.c',
-	'generic/async/client.c',
-	'generic/async/server.c',
-	'generic/async/ports.c',
-	'generic/loader.c',
-	'generic/getopt.c',
 	'generic/time.c',
 	'generic/tmpfile.c',
-	'generic/stdio.c',
-	'generic/stdlib.c',
+	'generic/ubsan.c',
 	'generic/udebug.c',
+	'generic/uuid.c',
 	'generic/vfs/canonify.c',
 	'generic/vfs/inbox.c',
 	'generic/vfs/mtab.c',
 	'generic/vfs/vfs.c',
-	'generic/setjmp.c',
-	'generic/stack.c',
-	'generic/stacktrace.c',
-	'generic/arg_parse.c',
-	'generic/stats.c',
-	'generic/assert.c',
-	'generic/ubsan.c',
-	'generic/uuid.c',
 )
 
 if CONFIG_RTLD
 	src += files(
-		'generic/rtld/rtld.c',
 		'generic/rtld/dynamic.c',
 		'generic/rtld/module.c',
+		'generic/rtld/rtld.c',
 		'generic/rtld/symbol.c',
 	)
@@ -192,6 +192,6 @@
 	'test/qsort.c',
 	'test/sprintf.c',
+	'test/stdio.c',
 	'test/stdio/scanf.c',
-	'test/stdio.c',
 	'test/stdlib.c',
 	'test/str.c',