Index: uspace/lib/c/arch/abs32le/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/tls.h	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/abs32le/include/libarch/tls.h	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -39,5 +39,4 @@
 
 #include <libc.h>
-#include <unistd.h>
 
 typedef struct {
Index: uspace/lib/c/arch/abs32le/src/entry.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/entry.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/abs32le/src/entry.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -30,5 +30,4 @@
  */
 
-#include <unistd.h>
 #include <libarch/entry.h>
 #include "../../../generic/private/libc.h"
Index: uspace/lib/c/arch/abs32le/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -31,5 +31,4 @@
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdbool.h>
 #include <stacktrace.h>
Index: uspace/lib/c/arch/abs32le/src/thread_entry.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/thread_entry.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/abs32le/src/thread_entry.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -30,5 +30,4 @@
  */
 
-#include <unistd.h>
 #include "../../../generic/private/thread.h"
 
Index: uspace/lib/c/arch/abs32le/src/tls.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/tls.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/abs32le/src/tls.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -32,5 +32,4 @@
 #include <tls.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 tcb_t * tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/arch/riscv64/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/tls.h	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/riscv64/include/libarch/tls.h	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -39,5 +39,4 @@
 
 #include <libc.h>
-#include <unistd.h>
 
 typedef struct {
Index: uspace/lib/c/arch/riscv64/src/entry.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/entry.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/riscv64/src/entry.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -30,5 +30,4 @@
  */
 
-#include <unistd.h>
 #include <libarch/entry.h>
 #include "../../../generic/private/libc.h"
Index: uspace/lib/c/arch/riscv64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/stacktrace.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/riscv64/src/stacktrace.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -31,5 +31,4 @@
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdbool.h>
 #include <stacktrace.h>
Index: uspace/lib/c/arch/riscv64/src/thread_entry.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/thread_entry.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/riscv64/src/thread_entry.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -30,5 +30,4 @@
  */
 
-#include <unistd.h>
 #include "../../../generic/private/thread.h"
 
Index: uspace/lib/c/arch/riscv64/src/tls.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/tls.c	(revision f2338407dd7bc780955a89da886fff9b8c761691)
+++ uspace/lib/c/arch/riscv64/src/tls.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -32,5 +32,4 @@
 #include <tls.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)