Index: kernel/generic/include/atomic.h
===================================================================
--- kernel/generic/include/atomic.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/atomic.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -40,13 +40,4 @@
 #include <stdatomic.h>
 
-// TODO: Remove.
-// Before <stdatomic.h> was available, there was only one atomic type
-// equivalent to atomic_size_t. This means that in some places, atomic_t can
-// be replaced with a more appropriate type (e.g. atomic_bool for flags or
-// a signed type for potentially signed values).
-// So atomic_t should be replaced with the most appropriate type on a case by
-// case basis, and after there are no more uses, remove this type.
-typedef atomic_size_t atomic_t;
-
 #define atomic_predec(val) \
 	(atomic_fetch_sub((val), 1) - 1)
Index: kernel/generic/include/cap/cap.h
===================================================================
--- kernel/generic/include/cap/cap.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/cap/cap.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -80,5 +80,5 @@
 typedef struct kobject {
 	kobject_type_t type;
-	atomic_t refcnt;
+	atomic_size_t refcnt;
 
 	/** Mutex protecting caps_list */
Index: kernel/generic/include/cpu.h
===================================================================
--- kernel/generic/include/cpu.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/cpu.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -58,5 +58,5 @@
 	context_t saved_context;
 
-	atomic_t nrdy;
+	atomic_size_t nrdy;
 	runq_t rq[RQ_COUNT];
 	volatile size_t needs_relink;
Index: kernel/generic/include/halt.h
===================================================================
--- kernel/generic/include/halt.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/halt.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -38,5 +38,5 @@
 #include <atomic.h>
 
-extern atomic_t haltstate;
+extern atomic_bool haltstate;
 
 extern void halt(void) __attribute__((noreturn));
Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/ipc/ipc.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -71,5 +71,5 @@
 	struct call *hangup_call;
 	ipc_phone_state_t state;
-	atomic_t active_calls;
+	atomic_size_t active_calls;
 	/** User-defined label */
 	sysarg_t label;
@@ -90,5 +90,5 @@
 	 * Number of answers the answerbox is expecting to eventually arrive.
 	 */
-	atomic_t active_calls;
+	atomic_size_t active_calls;
 
 	/** Phones connected to this answerbox. */
Index: kernel/generic/include/mm/slab.h
===================================================================
--- kernel/generic/include/mm/slab.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/mm/slab.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -99,9 +99,9 @@
 
 	/* Statistics */
-	atomic_t allocated_slabs;
-	atomic_t allocated_objs;
-	atomic_t cached_objs;
+	atomic_size_t allocated_slabs;
+	atomic_size_t allocated_objs;
+	atomic_size_t cached_objs;
 	/** How many magazines in magazines list */
-	atomic_t magazine_counter;
+	atomic_size_t magazine_counter;
 
 	/* Slabs */
Index: kernel/generic/include/proc/scheduler.h
===================================================================
--- kernel/generic/include/proc/scheduler.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/proc/scheduler.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -52,5 +52,5 @@
 } runq_t;
 
-extern atomic_t nrdy;
+extern atomic_size_t nrdy;
 extern void scheduler_init(void);
 
Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 695111767fafc5271a762ff1be8ac2bd6229f2d7)
+++ kernel/generic/include/proc/task.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -87,7 +87,7 @@
 
 	/** Number of references (i.e. threads). */
-	atomic_t refcount;
+	atomic_size_t refcount;
 	/** Number of threads that haven't exited yet. */
-	atomic_t lifecount;
+	atomic_size_t lifecount;
 
 	/** Task permissions. */