Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision b1834a01038fc2eeb50637bb5cb48a741a03b9fb)
+++ uspace/srv/hid/console/console.c	(revision 3cfe2b8dd986aa1b72746ca06ec25e4e5cb45284)
@@ -34,5 +34,4 @@
 
 #include <async.h>
-#include <atomic.h>
 #include <stdio.h>
 #include <adt/prodcons.h>
@@ -51,4 +50,5 @@
 #include <task.h>
 #include <fibril_synch.h>
+#include <stdatomic.h>
 #include <stdlib.h>
 #include <str.h>
@@ -61,5 +61,5 @@
 
 typedef struct {
-	atomic_t refcnt;      /**< Connection reference count */
+	atomic_flag refcnt;      /**< Connection reference count */
 	prodcons_t input_pc;  /**< Incoming keyboard events */
 
@@ -524,5 +524,5 @@
 	}
 
-	if (atomic_postinc(&cons->refcnt) == 0)
+	if (!atomic_flag_test_and_set(&cons->refcnt))
 		cons_set_cursor_vis(cons, true);
 
@@ -612,5 +612,5 @@
 		for (size_t i = 0; i < CONSOLE_COUNT; i++) {
 			consoles[i].index = i;
-			atomic_set(&consoles[i].refcnt, 0);
+			atomic_flag_clear(&consoles[i].refcnt);
 			fibril_mutex_initialize(&consoles[i].mtx);
 			prodcons_initialize(&consoles[i].input_pc);
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision b1834a01038fc2eeb50637bb5cb48a741a03b9fb)
+++ uspace/srv/vfs/vfs_register.c	(revision 3cfe2b8dd986aa1b72746ca06ec25e4e5cb45284)
@@ -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);