diff --git a/bmc/buildjson.cpp b/bmc/buildjson.cpp
index 9c0bb9c..a32fbcb 100644
--- a/bmc/buildjson.cpp
+++ b/bmc/buildjson.cpp
@@ -16,6 +16,7 @@
 #include "buildjson.hpp"
 
 #include "file_handler.hpp"
+#include "general_systemd.hpp"
 
 #include <nlohmann/json.hpp>
 #include <sdbusplus/bus.hpp>
diff --git a/bmc/buildjson.hpp b/bmc/buildjson.hpp
index d6b69fd..d6b707e 100644
--- a/bmc/buildjson.hpp
+++ b/bmc/buildjson.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "fs.hpp"
-#include "general_systemd.hpp"
 #include "image_handler.hpp"
+#include "status.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/bmc/firmware-handler/firmware_handlers_builder.cpp b/bmc/firmware-handler/firmware_handlers_builder.cpp
index d5f029c..13bfd69 100644
--- a/bmc/firmware-handler/firmware_handlers_builder.cpp
+++ b/bmc/firmware-handler/firmware_handlers_builder.cpp
@@ -17,6 +17,7 @@
 
 #include "file_handler.hpp"
 #include "fs.hpp"
+#include "general_systemd.hpp"
 #include "skip_action.hpp"
 
 #include <nlohmann/json.hpp>