diff --git a/include/authentication.hpp b/include/authentication.hpp
index 309c898..7110034 100644
--- a/include/authentication.hpp
+++ b/include/authentication.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "app.hpp"
 #include "common.hpp"
 #include "forward_unauthorized.hpp"
 #include "http_request.hpp"
diff --git a/include/persistent_data.hpp b/include/persistent_data.hpp
index 03efb0a..e93d216 100644
--- a/include/persistent_data.hpp
+++ b/include/persistent_data.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "app.hpp"
 #include "event_service_store.hpp"
 #include "http_request.hpp"
 #include "http_response.hpp"
diff --git a/redfish-core/lib/fabric_adapters.hpp b/redfish-core/lib/fabric_adapters.hpp
index aacb056..a1e273a 100644
--- a/redfish-core/lib/fabric_adapters.hpp
+++ b/redfish-core/lib/fabric_adapters.hpp
@@ -2,6 +2,8 @@
 
 #include "app.hpp"
 #include "dbus_utility.hpp"
+#include "query.hpp"
+#include "registries/privilege_registry.hpp"
 #include "utils/collection.hpp"
 #include "utils/json_utils.hpp"
 
diff --git a/redfish-core/lib/storage.hpp b/redfish-core/lib/storage.hpp
index 35cd6e1..93911e5 100644
--- a/redfish-core/lib/storage.hpp
+++ b/redfish-core/lib/storage.hpp
@@ -18,8 +18,10 @@
 #include "app.hpp"
 #include "dbus_utility.hpp"
 #include "health.hpp"
+#include "human_sort.hpp"
 #include "openbmc_dbus_rest.hpp"
 #include "query.hpp"
+#include "redfish_util.hpp"
 #include "registries/privilege_registry.hpp"
 #include "utils/dbus_utils.hpp"
 
diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 3d29f28..041e072 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -21,6 +21,7 @@
 #include "dbus_utility.hpp"
 #include "query.hpp"
 #include "registries/privilege_registry.hpp"
+#include "task.hpp"
 #include "utils/dbus_utils.hpp"
 #include "utils/sw_utils.hpp"
 
diff --git a/test/redfish-core/include/redfish_aggregator_test.cpp b/test/redfish-core/include/redfish_aggregator_test.cpp
index 345854f..4653a81 100644
--- a/test/redfish-core/include/redfish_aggregator_test.cpp
+++ b/test/redfish-core/include/redfish_aggregator_test.cpp
@@ -1,3 +1,4 @@
+#include "async_resp.hpp"
 #include "redfish_aggregator.hpp"
 
 #include <nlohmann/json.hpp>