diff --git a/src/dbus_singleton.cpp b/src/dbus_singleton.cpp
index b3b808b..0c937d1 100644
--- a/src/dbus_singleton.cpp
+++ b/src/dbus_singleton.cpp
@@ -1,5 +1,7 @@
 #include "dbus_singleton.hpp"
 
+#include <sdbusplus/asio/connection.hpp>
+
 namespace crow
 {
 namespace connections
diff --git a/src/json_html_serializer.cpp b/src/json_html_serializer.cpp
index 8322f1d..5473b1d 100644
--- a/src/json_html_serializer.cpp
+++ b/src/json_html_serializer.cpp
@@ -2,11 +2,18 @@
 
 #include "http_response.hpp"
 
+#include <boost/beast/http/field.hpp>
 #include <nlohmann/json.hpp>
 
-#include <algorithm>
 #include <array>
-#include <limits>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <iterator>
+#include <string>
+#include <type_traits>
+#include <utility>
 
 namespace json_html_util
 {
diff --git a/src/ossl_random.cpp b/src/ossl_random.cpp
index f196a8b..1261977 100644
--- a/src/ossl_random.cpp
+++ b/src/ossl_random.cpp
@@ -1,8 +1,10 @@
 #include "ossl_random.hpp"
 
-#include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/random_generator.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
+#include <string>
+
 std::string bmcweb::getRandomUUID()
 {
     using bmcweb::OpenSSLGenerator;
diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index 67e2aae..cc8e1bc 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -4,6 +4,7 @@
 #include "cors_preflight.hpp"
 #include "dbus_monitor.hpp"
 #include "dbus_singleton.hpp"
+#include "event_service_manager.hpp"
 #include "google/google_service_root.hpp"
 #include "hostname_monitor.hpp"
 #include "ibm/management_console_rest.hpp"