diff --git a/repos/base/include/base/flex_iterator.h b/repos/base/include/util/flex_iterator.h
similarity index 100%
rename from repos/base/include/base/flex_iterator.h
rename to repos/base/include/util/flex_iterator.h
diff --git a/repos/ports/src/virtualbox/guest_memory.h b/repos/ports/src/virtualbox/guest_memory.h
index a9b95db497..24146a5a9c 100644
--- a/repos/ports/src/virtualbox/guest_memory.h
+++ b/repos/ports/src/virtualbox/guest_memory.h
@@ -28,7 +28,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/repos/ports/src/virtualbox/nova/sup.cc b/repos/ports/src/virtualbox/nova/sup.cc
index f5dee5288b..a6875d8b0a 100644
--- a/repos/ports/src/virtualbox/nova/sup.cc
+++ b/repos/ports/src/virtualbox/nova/sup.cc
@@ -15,7 +15,7 @@
/* Genode includes */
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/repos/ports/src/virtualbox/nova/vcpu.h b/repos/ports/src/virtualbox/nova/vcpu.h
index 6fe08d9352..fa41ef898f 100644
--- a/repos/ports/src/virtualbox/nova/vcpu.h
+++ b/repos/ports/src/virtualbox/nova/vcpu.h
@@ -18,7 +18,7 @@
/* Genode includes */
#include
#include
-#include
+#include
#include
#include