diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp
index 8d30472..040bd40 100644
--- a/redfish-core/src/error_messages.cpp
+++ b/redfish-core/src/error_messages.cpp
@@ -23,15 +23,17 @@
 
 #include <array>
 #include <cstddef>
-#include <cstdint>
 #include <source_location>
 #include <span>
-#include <string>
 #include <string_view>
 
 // Clang can't seem to decide whether this header needs to be included or not,
 // and is inconsistent.  Include it for now
 // NOLINTNEXTLINE(misc-include-cleaner)
+#include <cstdint>
+// NOLINTNEXTLINE(misc-include-cleaner)
+#include <string>
+// NOLINTNEXTLINE(misc-include-cleaner)
 #include <utility>
 
 namespace redfish
diff --git a/redfish-core/src/heartbeat_messages.cpp b/redfish-core/src/heartbeat_messages.cpp
index 28991dc..1d7a033 100644
--- a/redfish-core/src/heartbeat_messages.cpp
+++ b/redfish-core/src/heartbeat_messages.cpp
@@ -23,6 +23,10 @@
 // Clang can't seem to decide whether this header needs to be included or not,
 // and is inconsistent.  Include it for now
 // NOLINTNEXTLINE(misc-include-cleaner)
+#include <cstdint>
+// NOLINTNEXTLINE(misc-include-cleaner)
+#include <string>
+// NOLINTNEXTLINE(misc-include-cleaner)
 #include <utility>
 
 namespace redfish
diff --git a/redfish-core/src/resource_messages.cpp b/redfish-core/src/resource_messages.cpp
index 17ef0c4..74d8bd0 100644
--- a/redfish-core/src/resource_messages.cpp
+++ b/redfish-core/src/resource_messages.cpp
@@ -23,6 +23,10 @@
 // Clang can't seem to decide whether this header needs to be included or not,
 // and is inconsistent.  Include it for now
 // NOLINTNEXTLINE(misc-include-cleaner)
+#include <cstdint>
+// NOLINTNEXTLINE(misc-include-cleaner)
+#include <string>
+// NOLINTNEXTLINE(misc-include-cleaner)
 #include <utility>
 
 namespace redfish
diff --git a/redfish-core/src/subscription.cpp b/redfish-core/src/subscription.cpp
index 69836a8..5d6d629 100644
--- a/redfish-core/src/subscription.cpp
+++ b/redfish-core/src/subscription.cpp
@@ -22,7 +22,6 @@
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/beast/http/field.hpp>
-#include <boost/beast/http/fields.hpp>
 #include <boost/beast/http/verb.hpp>
 #include <boost/system/errc.hpp>
 #include <boost/url/format.hpp>
diff --git a/redfish-core/src/task_messages.cpp b/redfish-core/src/task_messages.cpp
index 79c312a..867e735 100644
--- a/redfish-core/src/task_messages.cpp
+++ b/redfish-core/src/task_messages.cpp
@@ -17,14 +17,16 @@
 
 #include <array>
 #include <cstddef>
-#include <cstdint>
 #include <span>
-#include <string>
 #include <string_view>
 
 // Clang can't seem to decide whether this header needs to be included or not,
 // and is inconsistent.  Include it for now
 // NOLINTNEXTLINE(misc-include-cleaner)
+#include <cstdint>
+// NOLINTNEXTLINE(misc-include-cleaner)
+#include <string>
+// NOLINTNEXTLINE(misc-include-cleaner)
 #include <utility>
 
 namespace redfish
diff --git a/redfish-core/src/update_messages.cpp b/redfish-core/src/update_messages.cpp
index a11cd6a..afaf0ac 100644
--- a/redfish-core/src/update_messages.cpp
+++ b/redfish-core/src/update_messages.cpp
@@ -17,14 +17,16 @@
 
 #include <array>
 #include <cstddef>
-#include <cstdint>
 #include <span>
-#include <string>
 #include <string_view>
 
 // Clang can't seem to decide whether this header needs to be included or not,
 // and is inconsistent.  Include it for now
 // NOLINTNEXTLINE(misc-include-cleaner)
+#include <cstdint>
+// NOLINTNEXTLINE(misc-include-cleaner)
+#include <string>
+// NOLINTNEXTLINE(misc-include-cleaner)
 #include <utility>
 
 namespace redfish