diff --git a/src/core/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c
index 9d4e3656e2..38a61051c4 100644
--- a/src/core/initrd/nm-initrd-generator.c
+++ b/src/core/initrd/nm-initrd-generator.c
@@ -4,12 +4,12 @@
  */
 
 #include "src/core/nm-default-daemon.h"
-#include "nm-core-utils.h"
+
+#include "libnm-base/nm-config-base.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
-#include "nm-initrd-generator.h"
 #include "libnm-glib-aux/nm-io-utils.h"
-#include "nm-config.h"
+#include "nm-initrd-generator.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/initrd/nmi-ibft-reader.c b/src/core/initrd/nmi-ibft-reader.c
index 7b631b8ca5..1d6e3d6e94 100644
--- a/src/core/initrd/nmi-ibft-reader.c
+++ b/src/core/initrd/nmi-ibft-reader.c
@@ -19,7 +19,6 @@
 
 #include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-platform/nm-platform-utils.h"
-#include "NetworkManagerUtils.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c
index e8521dc7dd..212bf02d3a 100644
--- a/src/core/initrd/tests/test-cmdline-reader.c
+++ b/src/core/initrd/tests/test-cmdline-reader.c
@@ -13,7 +13,6 @@
 #include <sys/socket.h>
 
 #include "libnm-core-intern/nm-core-internal.h"
-#include "NetworkManagerUtils.h"
 
 #include "../nm-initrd-generator.h"
 
diff --git a/src/core/initrd/tests/test-dt-reader.c b/src/core/initrd/tests/test-dt-reader.c
index d9424c9a3d..5e1247ee1d 100644
--- a/src/core/initrd/tests/test-dt-reader.c
+++ b/src/core/initrd/tests/test-dt-reader.c
@@ -13,7 +13,6 @@
 #include <sys/socket.h>
 
 #include "libnm-core-intern/nm-core-internal.h"
-#include "NetworkManagerUtils.h"
 
 #include "../nm-initrd-generator.h"
 
diff --git a/src/core/initrd/tests/test-ibft-reader.c b/src/core/initrd/tests/test-ibft-reader.c
index 5c26659db4..523747c95e 100644
--- a/src/core/initrd/tests/test-ibft-reader.c
+++ b/src/core/initrd/tests/test-ibft-reader.c
@@ -13,7 +13,6 @@
 #include <sys/socket.h>
 
 #include "libnm-core-intern/nm-core-internal.h"
-#include "NetworkManagerUtils.h"
 
 #include "../nm-initrd-generator.h"