diff --git a/bmc/version-handler/test/version_mock.hpp b/bmc/version-handler/test/version_mock.hpp
index 80d3748..4cae248 100644
--- a/bmc/version-handler/test/version_mock.hpp
+++ b/bmc/version-handler/test/version_mock.hpp
@@ -1,4 +1,4 @@
-#include "buildjson.hpp"
+#include "handler_config.hpp"
 #include "image_mock.hpp"
 #include "triggerable_mock.hpp"
 #include "version_handler.hpp"
diff --git a/bmc/version-handler/version_handler.cpp b/bmc/version-handler/version_handler.cpp
index 7cccf62..f2ab881 100644
--- a/bmc/version-handler/version_handler.cpp
+++ b/bmc/version-handler/version_handler.cpp
@@ -1,5 +1,11 @@
 #include "version_handler.hpp"
 
+#include <algorithm>
+#include <cstring>
+#include <ios>
+#include <limits>
+#include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
diff --git a/bmc/version-handler/version_handler.hpp b/bmc/version-handler/version_handler.hpp
index 128ec09..4a3d7d4 100644
--- a/bmc/version-handler/version_handler.hpp
+++ b/bmc/version-handler/version_handler.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "buildjson.hpp"
+#include "handler_config.hpp"
 #include "image_handler.hpp"
 #include "status.hpp"
 #include "util.hpp"