diff --git a/emper/Runtime.cpp b/emper/Runtime.cpp
index 8625d70416aa14661efd927d8bb224e1b1167b0a..6510636c5977bd766e9da2ef67da406493b87ede 100644
--- a/emper/Runtime.cpp
+++ b/emper/Runtime.cpp
@@ -4,14 +4,13 @@
 
 #include <numa.h>
 #include <pthread.h>	// for pthread_t, pthread_attr_init
-
-#include <cerrno>	 // for errno
 // Non portable.
 #include <sched.h>				// for cpu_set_t, CPU_SET, CPU_ZERO
 #include <sys/sysinfo.h>	// for get_nprocs
 #include <unistd.h>
 
 #include <array>
+#include <cerrno>
 #include <cstdlib>	// for rand, srand, abort
 #include <cstring>
 #include <fstream>	// IWYU pragma: keep
@@ -40,6 +39,7 @@
 #include "lib/ShardedFileBuffer.hpp"
 #include "lib/env.hpp"
 #include "log/LogBuffer.hpp"
+#include "sleep_strategy/SemaphoreWorkerSleepStrategy.hpp"
 #include "stats/FromAnywhere.hpp"
 #include "stats/Worker.hpp"
 
@@ -57,6 +57,7 @@
 
 #ifndef EMPER_HAS_GETTID
 #include <syscall.h>
+
 #define gettid() (syscall(SYS_gettid))
 #endif
 
diff --git a/emper/io/GlobalIoContext.cpp b/emper/io/GlobalIoContext.cpp
index 73452ac0911cc653b9422b5d0e6e8302eb081684..91e9c60ba511d1ecb522313ba5a50ee2878bc91f 100644
--- a/emper/io/GlobalIoContext.cpp
+++ b/emper/io/GlobalIoContext.cpp
@@ -25,7 +25,7 @@
 #include "io/SubmitActor.hpp"
 #include "lib/TaggedPtr.hpp"
 #include "lib/sync/Semaphore.hpp"
-#include "sleep_strategy/WorkerSleepStrategy.hpp"
+#include "sleep_strategy/SemaphoreWorkerSleepStrategy.hpp"
 
 using emper::lib::TaggedPtr;
 
diff --git a/emper/lib/sync/SpuriousFutex2Semaphore.cpp b/emper/lib/sync/SpuriousFutex2Semaphore.cpp
index 72ffa3901253a873465e376c551ca3a02076698d..349e0a0bffd1b3503e4ec69d86d05ba287fb4ad6 100644
--- a/emper/lib/sync/SpuriousFutex2Semaphore.cpp
+++ b/emper/lib/sync/SpuriousFutex2Semaphore.cpp
@@ -10,7 +10,6 @@
 #include <cerrno>
 
 #include "Worker.hpp"
-#include "emper-config.h"
 
 #ifndef SYS_futex_waitv
 #define SYS_futex_waitv 449
diff --git a/iwyu-mappings.imp b/iwyu-mappings.imp
index bbe2308cdadfde1136ebfff1d41c3c8c6dd07c53..a3161cf2e57eaf67e3555bc74870b5fff0d1dbba 100644
--- a/iwyu-mappings.imp
+++ b/iwyu-mappings.imp
@@ -23,5 +23,6 @@
 	{ include: ["<boost/cstdint.hpp>", "private", "<cstdint>", "public"], },
 
 	{ symbol: ["__kernel_timespec", "private", "<liburing.h>", "public" ] },
+	{ symbol: ["__s32", "private", "<liburing.h>", "public" ] },
 	{ symbol: ["std::filesystem", "private", "<filesystem>", "public" ] },
 ]