diff --git a/http/utility.hpp b/http/utility.hpp
index 74a35da..41182e4 100644
--- a/http/utility.hpp
+++ b/http/utility.hpp
@@ -1,18 +1,21 @@
 #pragma once
-#include "nlohmann/json.hpp"
 
 #include <openssl/crypto.h>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include <array>
 #include <chrono>
 #include <cstdint>
-#include <cstring>
+#include <ctime>
 #include <functional>
-#include <regex>
+#include <limits>
 #include <stdexcept>
 #include <string>
+#include <string_view>
 #include <tuple>
+#include <type_traits>
+#include <utility>
 
 namespace crow
 {
diff --git a/include/human_sort.hpp b/include/human_sort.hpp
index 5676994..0d6e35d 100644
--- a/include/human_sort.hpp
+++ b/include/human_sort.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <functional>
-#include <sstream>
 #include <string_view>
 
 namespace details
diff --git a/redfish-core/include/error_messages.hpp b/redfish-core/include/error_messages.hpp
index 5bee7b0..7eeeaea 100644
--- a/redfish-core/include/error_messages.hpp
+++ b/redfish-core/include/error_messages.hpp
@@ -19,6 +19,8 @@
 #include <nlohmann/json.hpp>
 #include <source_location.hpp>
 
+#include <string>
+
 namespace redfish
 {
 
diff --git a/redfish-core/include/utils/hex_utils.hpp b/redfish-core/include/utils/hex_utils.hpp
index c9fe7ef..8ca3a81 100644
--- a/redfish-core/include/utils/hex_utils.hpp
+++ b/redfish-core/include/utils/hex_utils.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <cstddef>
 #include <string>
 
 template <typename IntegerType>
diff --git a/redfish-core/include/utils/stl_utils.hpp b/redfish-core/include/utils/stl_utils.hpp
index 04d02cb..f582b86 100644
--- a/redfish-core/include/utils/stl_utils.hpp
+++ b/redfish-core/include/utils/stl_utils.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <algorithm>
-#include <string>
+#include <vector>
 
 namespace redfish
 {
diff --git a/redfish-core/include/utils/time_utils.hpp b/redfish-core/include/utils/time_utils.hpp
index cef8aa5..b4bc778 100644
--- a/redfish-core/include/utils/time_utils.hpp
+++ b/redfish-core/include/utils/time_utils.hpp
@@ -2,11 +2,16 @@
 
 #include "logging.hpp"
 
+#include <algorithm>
 #include <charconv>
 #include <chrono>
 #include <cmath>
+#include <compare>
+#include <cstddef>
 #include <optional>
+#include <ratio>
 #include <string>
+#include <string_view>
 #include <system_error>
 
 namespace redfish
diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp
index 3fd48a2..83ebbfe 100644
--- a/redfish-core/src/error_messages.cpp
+++ b/redfish-core/src/error_messages.cpp
@@ -13,8 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
+#include "http_response.hpp"
+
+#include <boost/beast/http/status.hpp>
 #include <error_messages.hpp>
 #include <logging.hpp>
+#include <nlohmann/json.hpp>
 
 namespace redfish
 {