diff --git a/repos/base-hw/src/core/kernel_log.cc b/repos/base-hw/src/core/kernel_log.cc
index 712ec991ba..cbeba18755 100644
--- a/repos/base-hw/src/core/kernel_log.cc
+++ b/repos/base-hw/src/core/kernel_log.cc
@@ -12,9 +12,7 @@
  * under the terms of the GNU Affero General Public License version 3.
  */
 
-/* base-internal includes */
-#include <base/internal/unmanaged_singleton.h>
-
+/* base-hw Core includes */
 #include <board.h>
 #include <platform.h>
 #include <kernel/log.h>
diff --git a/repos/base-hw/src/core/pager.h b/repos/base-hw/src/core/pager.h
index ed51123820..3387ae1f07 100644
--- a/repos/base-hw/src/core/pager.h
+++ b/repos/base-hw/src/core/pager.h
@@ -21,9 +21,6 @@
 #include <base/signal.h>
 #include <pager/capability.h>
 
-/* base-internal includes */
-#include <base/internal/unmanaged_singleton.h>
-
 /* core-local includes */
 #include <kernel/signal_receiver.h>
 #include <hw/mapping.h>
diff --git a/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc b/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc
index 61f2e9ccd9..9c3248ec6c 100644
--- a/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc
+++ b/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc
@@ -14,6 +14,9 @@
 /* Genode includes */
 #include <util/construct_at.h>
 
+/* base internal includes */
+#include <base/internal/unmanaged_singleton.h>
+
 /* core includes */
 #include <kernel/core_interface.h>
 #include <vm_session_component.h>
diff --git a/repos/base-hw/src/core/spec/riscv/platform_support.cc b/repos/base-hw/src/core/spec/riscv/platform_support.cc
index 7199d4e6e2..702c1b0c35 100644
--- a/repos/base-hw/src/core/spec/riscv/platform_support.cc
+++ b/repos/base-hw/src/core/spec/riscv/platform_support.cc
@@ -16,8 +16,6 @@
 #include <board.h>
 #include <cpu.h>
 
-#include <base/internal/unmanaged_singleton.h>
-
 using namespace Genode;
 
 
diff --git a/repos/base-hw/src/core/spec/x86_64/cpu.h b/repos/base-hw/src/core/spec/x86_64/cpu.h
index aae870cb83..71efd48df6 100644
--- a/repos/base-hw/src/core/spec/x86_64/cpu.h
+++ b/repos/base-hw/src/core/spec/x86_64/cpu.h
@@ -26,7 +26,6 @@
 
 /* base includes */
 #include <base/internal/align_at.h>
-#include <base/internal/unmanaged_singleton.h>
 
 /* core includes */
 #include <fpu.h>