Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision b1834a01038fc2eeb50637bb5cb48a741a03b9fb)
+++ uspace/srv/vfs/vfs_register.c	(revision 508b0df1a393bdc2b6b8e8f8f45be1a5be4a868b)
@@ -49,5 +49,5 @@
 #include <as.h>
 #include <assert.h>
-#include <atomic.h>
+#include <stdatomic.h>
 #include <vfs/vfs.h>
 #include "vfs.h"
@@ -57,7 +57,5 @@
 LIST_INITIALIZE(fs_list);
 
-atomic_t fs_handle_next = {
-	.count = 1
-};
+static atomic_int fs_handle_next = 1;
 
 /** Verify the VFS info structure.
@@ -236,5 +234,5 @@
 	 * system a global file system handle.
 	 */
-	fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
+	fs_info->fs_handle = atomic_fetch_add(&fs_handle_next, 1);
 	async_answer_1(req, EOK, (sysarg_t) fs_info->fs_handle);