diff --git a/subprojects/ncsid/src/ncsi_state_machine.cpp b/subprojects/ncsid/src/ncsi_state_machine.cpp
index 40e78e7..b2e0286 100644
--- a/subprojects/ncsid/src/ncsi_state_machine.cpp
+++ b/subprojects/ncsid/src/ncsi_state_machine.cpp
@@ -19,7 +19,6 @@
 #include "platforms/nemora/portable/ncsi_fsm.h"
 
 #include <arpa/inet.h>
-#include <fmt/format.h>
 #include <fmt/printf.h>
 #include <netinet/ether.h>
 #include <unistd.h>
@@ -28,7 +27,6 @@
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
-#include <iostream>
 #include <string>
 #include <thread>
 #include <utility>
diff --git a/subprojects/ncsid/src/net_config.cpp b/subprojects/ncsid/src/net_config.cpp
index e9b390b..8316837 100644
--- a/subprojects/ncsid/src/net_config.cpp
+++ b/subprojects/ncsid/src/net_config.cpp
@@ -14,7 +14,6 @@
 
 #include "net_config.h"
 
-#include <fmt/format.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -27,6 +26,7 @@
 #include <cstdio>
 #include <cstring>
 #include <filesystem>
+#include <format>
 #include <utility>
 #include <variant>
 
@@ -138,16 +138,16 @@
 
     try
     {
-        auto netdir = fmt::format("/run/systemd/network/00-bmc-{}.network.d",
+        auto netdir = std::format("/run/systemd/network/00-bmc-{}.network.d",
                                   iface_name_);
         std::filesystem::create_directories(netdir);
-        auto netfile = fmt::format("{}/60-ncsi-mac.conf", netdir);
+        auto netfile = std::format("{}/60-ncsi-mac.conf", netdir);
         auto fd = stdplus::fd::open(
             netfile,
             stdplus::fd::OpenFlags(stdplus::fd::OpenAccess::WriteOnly)
                 .set(stdplus::fd::OpenFlag::Create),
             0644);
-        auto contents = fmt::format("[Link]\nMACAddress={}\n",
+        auto contents = std::format("[Link]\nMACAddress={}\n",
                                     std::get<std::string>(mac_value));
         stdplus::fd::writeExact(fd, contents);
     }