diff --git a/include/sessions.hpp b/include/sessions.hpp
index 52e7450..3dabff4 100644
--- a/include/sessions.hpp
+++ b/include/sessions.hpp
@@ -4,15 +4,7 @@
 #include "random.hpp"
 #include "utility.hpp"
 
-#include <openssl/rand.h>
-
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
-#include <dbus_singleton.hpp>
 #include <nlohmann/json.hpp>
-#include <random.hpp>
-#include <sdbusplus/bus/match.hpp>
 #include <utils/ip_utils.hpp>
 
 #include <csignal>
diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index 56c7dcf..cf1cdde 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -31,6 +31,7 @@
 #include <http_client.hpp>
 #include <persistent_data.hpp>
 #include <random.hpp>
+#include <sdbusplus/bus/match.hpp>
 #include <server_sent_events.hpp>
 #include <utils/json_utils.hpp>