diff options
81 files changed, 378 insertions, 297 deletions
diff --git a/http/http_client.hpp b/http/http_client.hpp index 117584570a..48e8cfdfac 100644 --- a/http/http_client.hpp +++ b/http/http_client.hpp @@ -17,6 +17,8 @@ #include "async_resolve.hpp" #include "http_response.hpp" +#include "logging.hpp" +#include "ssl_key_handler.hpp" #include <boost/asio/connect.hpp> #include <boost/asio/io_context.hpp> @@ -37,8 +39,6 @@ #include <boost/beast/version.hpp> #include <boost/container/devector.hpp> #include <boost/system/error_code.hpp> -#include <logging.hpp> -#include <ssl_key_handler.hpp> #include <cstdlib> #include <functional> diff --git a/http/http_connection.hpp b/http/http_connection.hpp index 45581fdf26..aa8b8c9510 100644 --- a/http/http_connection.hpp +++ b/http/http_connection.hpp @@ -4,7 +4,11 @@ #include "authentication.hpp" #include "http_response.hpp" #include "http_utility.hpp" +#include "json_html_serializer.hpp" #include "logging.hpp" +#include "mutual_tls.hpp" +#include "security_headers.hpp" +#include "ssl_key_handler.hpp" #include "utility.hpp" #include <boost/algorithm/string/predicate.hpp> @@ -21,10 +25,6 @@ #include <boost/beast/ssl/ssl_stream.hpp> #include <boost/beast/websocket.hpp> #include <boost/url/url_view.hpp> -#include <json_html_serializer.hpp> -#include <mutual_tls.hpp> -#include <security_headers.hpp> -#include <ssl_key_handler.hpp> #include <atomic> #include <chrono> diff --git a/http/http_response.hpp b/http/http_response.hpp index b1b15fb362..f9204e4a4e 100644 --- a/http/http_response.hpp +++ b/http/http_response.hpp @@ -1,10 +1,10 @@ #pragma once #include "logging.hpp" #include "nlohmann/json.hpp" +#include "utils/hex_utils.hpp" #include <boost/beast/http/message.hpp> #include <boost/beast/http/string_body.hpp> -#include <utils/hex_utils.hpp> #include <optional> #include <string> diff --git a/http/http_server.hpp b/http/http_server.hpp index 0d224a10d4..cc4fc2294d 100644 --- a/http/http_server.hpp +++ b/http/http_server.hpp @@ -2,6 +2,7 @@ #include "http_connection.hpp" #include "logging.hpp" +#include "ssl_key_handler.hpp" #include <boost/asio/ip/address.hpp> #include <boost/asio/ip/tcp.hpp> @@ -9,7 +10,6 @@ #include <boost/asio/ssl/context.hpp> #include <boost/asio/steady_timer.hpp> #include <boost/beast/ssl/ssl_stream.hpp> -#include <ssl_key_handler.hpp> #include <atomic> #include <chrono> diff --git a/http/routing.hpp b/http/routing.hpp index 8d5def670e..5b3ddfe429 100644 --- a/http/routing.hpp +++ b/http/routing.hpp @@ -1,5 +1,6 @@ #pragma once +#include "async_resp.hpp" #include "common.hpp" #include "dbus_utility.hpp" #include "error_messages.hpp" @@ -12,7 +13,6 @@ #include "verb.hpp" #include "websocket.hpp" -#include <async_resp.hpp> #include <boost/beast/ssl/ssl_stream.hpp> #include <boost/container/flat_map.hpp> diff --git a/http/utility.hpp b/http/utility.hpp index f49aa9b859..4ea44d5863 100644 --- a/http/utility.hpp +++ b/http/utility.hpp @@ -1,6 +1,7 @@ #pragma once -#include <bmcweb_config.h> +#include "bmcweb_config.h" + #include <openssl/crypto.h> #include <boost/callable_traits.hpp> diff --git a/http/websocket.hpp b/http/websocket.hpp index 3e4ef0c40c..0ab13f2cdd 100644 --- a/http/websocket.hpp +++ b/http/websocket.hpp @@ -1,7 +1,7 @@ #pragma once +#include "async_resp.hpp" #include "http_request.hpp" -#include <async_resp.hpp> #include <boost/asio/buffer.hpp> #include <boost/beast/websocket.hpp> diff --git a/include/async_resolve.hpp b/include/async_resolve.hpp index 578d9a9949..0027a054f9 100644 --- a/include/async_resolve.hpp +++ b/include/async_resolve.hpp @@ -1,4 +1,7 @@ #pragma once +#include "dbus_singleton.hpp" +#include "logging.hpp" + #include <boost/asio/ip/address.hpp> #include <boost/asio/ip/basic_endpoint.hpp> #include <boost/asio/ip/tcp.hpp> diff --git a/include/authentication.hpp b/include/authentication.hpp index 84875a9a1d..93e9c8db79 100644 --- a/include/authentication.hpp +++ b/include/authentication.hpp @@ -1,15 +1,15 @@ #pragma once +#include "app.hpp" +#include "common.hpp" +#include "forward_unauthorized.hpp" +#include "http_request.hpp" +#include "http_response.hpp" +#include "http_utility.hpp" +#include "pam_authenticate.hpp" #include "webroutes.hpp" -#include <app.hpp> #include <boost/container/flat_set.hpp> -#include <common.hpp> -#include <forward_unauthorized.hpp> -#include <http_request.hpp> -#include <http_response.hpp> -#include <http_utility.hpp> -#include <pam_authenticate.hpp> #include <random> #include <utility> diff --git a/include/cors_preflight.hpp b/include/cors_preflight.hpp index ae883255a3..43e90738de 100644 --- a/include/cors_preflight.hpp +++ b/include/cors_preflight.hpp @@ -1,8 +1,8 @@ #pragma once -#include <app.hpp> -#include <http_request.hpp> -#include <http_response.hpp> +#include "app.hpp" +#include "http_request.hpp" +#include "http_response.hpp" namespace cors_preflight { diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp index 3bad07002d..094f183e98 100644 --- a/include/dbus_monitor.hpp +++ b/include/dbus_monitor.hpp @@ -1,10 +1,11 @@ #pragma once -#include <app.hpp> -#include <async_resp.hpp> +#include "app.hpp" +#include "async_resp.hpp" +#include "dbus_singleton.hpp" +#include "openbmc_dbus_rest.hpp" + #include <boost/container/flat_map.hpp> #include <boost/container/flat_set.hpp> -#include <dbus_singleton.hpp> -#include <openbmc_dbus_rest.hpp> #include <sdbusplus/bus/match.hpp> #include <sdbusplus/message/types.hpp> #include <websocket.hpp> diff --git a/include/forward_unauthorized.hpp b/include/forward_unauthorized.hpp index 850a0b79b0..4ec770f598 100644 --- a/include/forward_unauthorized.hpp +++ b/include/forward_unauthorized.hpp @@ -1,7 +1,7 @@ #pragma once -#include <http_request.hpp> -#include <http_response.hpp> -#include <http_utility.hpp> +#include "http_request.hpp" +#include "http_response.hpp" +#include "http_utility.hpp" namespace forward_unauthorized { diff --git a/include/google/google_service_root.hpp b/include/google/google_service_root.hpp index f14cffe20b..7d48845714 100644 --- a/include/google/google_service_root.hpp +++ b/include/google/google_service_root.hpp @@ -1,13 +1,14 @@ #pragma once -#include <app.hpp> -#include <async_resp.hpp> -#include <dbus_utility.hpp> -#include <error_messages.hpp> +#include "app.hpp" +#include "async_resp.hpp" +#include "dbus_utility.hpp" +#include "error_messages.hpp" +#include "utils/collection.hpp" +#include "utils/hex_utils.hpp" +#include "utils/json_utils.hpp" + #include <nlohmann/json.hpp> -#include <utils/collection.hpp> -#include <utils/hex_utils.hpp> -#include <utils/json_utils.hpp> #include <array> #include <string_view> diff --git a/include/hostname_monitor.hpp b/include/hostname_monitor.hpp index cb84ad67d0..f0d8bdf322 100644 --- a/include/hostname_monitor.hpp +++ b/include/hostname_monitor.hpp @@ -1,11 +1,13 @@ #pragma once #ifdef BMCWEB_ENABLE_SSL -#include <dbus_singleton.hpp> -#include <dbus_utility.hpp> -#include <include/dbus_utility.hpp> +#include "dbus_singleton.hpp" +#include "dbus_utility.hpp" +#include "include/dbus_utility.hpp" +#include "logging.hpp" +#include "ssl_key_handler.hpp" + #include <sdbusplus/bus/match.hpp> #include <sdbusplus/message/types.hpp> -#include <ssl_key_handler.hpp> namespace crow { diff --git a/include/ibm/locks.hpp b/include/ibm/locks.hpp index e3abb46e92..fd27ef91cb 100644 --- a/include/ibm/locks.hpp +++ b/include/ibm/locks.hpp @@ -1,11 +1,11 @@ #pragma once #include "ibm/utils.hpp" +#include "logging.hpp" #include <boost/algorithm/string/predicate.hpp> #include <boost/container/flat_map.hpp> #include <boost/endian/conversion.hpp> -#include <logging.hpp> #include <nlohmann/json.hpp> #include <filesystem> diff --git a/include/ibm/management_console_rest.hpp b/include/ibm/management_console_rest.hpp index 34befd7fb1..6e4e7bbbfc 100644 --- a/include/ibm/management_console_rest.hpp +++ b/include/ibm/management_console_rest.hpp @@ -1,16 +1,17 @@ #pragma once -#include <app.hpp> -#include <async_resp.hpp> +#include "app.hpp" +#include "async_resp.hpp" +#include "error_messages.hpp" +#include "event_service_manager.hpp" +#include "ibm/locks.hpp" +#include "resource_messages.hpp" +#include "utils/json_utils.hpp" + #include <boost/algorithm/string/predicate.hpp> #include <boost/container/flat_set.hpp> -#include <error_messages.hpp> -#include <event_service_manager.hpp> -#include <ibm/locks.hpp> #include <nlohmann/json.hpp> -#include <resource_messages.hpp> #include <sdbusplus/message/types.hpp> -#include <utils/json_utils.hpp> #include <filesystem> #include <fstream> diff --git a/include/ibm/utils.hpp b/include/ibm/utils.hpp index 217b2f4d1a..256cbc52b5 100644 --- a/include/ibm/utils.hpp +++ b/include/ibm/utils.hpp @@ -1,6 +1,6 @@ #pragma once -#include <logging.hpp> +#include "logging.hpp" #include <filesystem> #include <fstream> diff --git a/include/image_upload.hpp b/include/image_upload.hpp index bdb7b951ac..ab2901ee2b 100644 --- a/include/image_upload.hpp +++ b/include/image_upload.hpp @@ -1,11 +1,13 @@ #pragma once -#include <app.hpp> +#include "app.hpp" +#include "dbus_singleton.hpp" +#include "dbus_utility.hpp" + #include <boost/uuid/uuid.hpp> #include <boost/uuid/uuid_generators.hpp> #include <boost/uuid/uuid_io.hpp> -#include <dbus_singleton.hpp> -#include <dbus_utility.hpp> +#include <sdbusplus/bus/match.hpp> #include <cstdio> #include <fstream> diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp index 1a067ac0fc..942e9c607e 100644 --- a/include/kvm_websocket.hpp +++ b/include/kvm_websocket.hpp @@ -1,8 +1,9 @@ #pragma once +#include "app.hpp" +#include "async_resp.hpp" + #include <sys/socket.h> -#include <app.hpp> -#include <async_resp.hpp> #include <boost/container/flat_map.hpp> #include <websocket.hpp> diff --git a/include/login_routes.hpp b/include/login_routes.hpp index df910e4485..e3b8c195d2 100644 --- a/include/login_routes.hpp +++ b/include/login_routes.hpp @@ -1,14 +1,14 @@ #pragma once +#include "app.hpp" +#include "common.hpp" +#include "http_request.hpp" +#include "http_response.hpp" #include "multipart_parser.hpp" +#include "pam_authenticate.hpp" +#include "webassets.hpp" -#include <app.hpp> #include <boost/container/flat_set.hpp> -#include <common.hpp> -#include <http_request.hpp> -#include <http_response.hpp> -#include <pam_authenticate.hpp> -#include <webassets.hpp> #include <random> diff --git a/include/multipart_parser.hpp b/include/multipart_parser.hpp index a2f63bd167..482426997d 100644 --- a/include/multipart_parser.hpp +++ b/include/multipart_parser.hpp @@ -1,7 +1,8 @@ #pragma once +#include "http_request.hpp" + #include <boost/beast/http/fields.hpp> -#include <http_request.hpp> #include <string> #include <string_view> diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp index 68491cb86b..3472c3a514 100644 --- a/include/nbd_proxy.hpp +++ b/include/nbd_proxy.hpp @@ -14,15 +14,16 @@ // limitations under the License. */ #pragma once -#include <app.hpp> +#include "app.hpp" +#include "dbus_utility.hpp" +#include "privileges.hpp" + #include <boost/asio/buffer.hpp> #include <boost/asio/local/stream_protocol.hpp> #include <boost/asio/write.hpp> #include <boost/beast/core/buffers_to_string.hpp> #include <boost/beast/core/multi_buffer.hpp> #include <boost/container/flat_map.hpp> -#include <dbus_utility.hpp> -#include <privileges.hpp> #include <websocket.hpp> namespace crow diff --git a/include/obmc_console.hpp b/include/obmc_console.hpp index b8f69435fc..3ab13ee4c2 100644 --- a/include/obmc_console.hpp +++ b/include/obmc_console.hpp @@ -1,8 +1,9 @@ #pragma once +#include "app.hpp" +#include "async_resp.hpp" + #include <sys/socket.h> -#include <app.hpp> -#include <async_resp.hpp> #include <boost/asio/local/stream_protocol.hpp> #include <boost/container/flat_set.hpp> #include <websocket.hpp> diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp index c7dbb27c4e..61eaa6e8c7 100644 --- a/include/openbmc_dbus_rest.hpp +++ b/include/openbmc_dbus_rest.hpp @@ -13,6 +13,9 @@ // limitations under the License. #pragma once +#include "app.hpp" +#include "async_resp.hpp" +#include "dbus_singleton.hpp" #include "dbus_utility.hpp" #include "http_request.hpp" #include "http_response.hpp" @@ -23,8 +26,6 @@ #include <systemd/sd-bus.h> #include <tinyxml2.h> -#include <app.hpp> -#include <async_resp.hpp> #include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/split.hpp> @@ -33,8 +34,6 @@ #include <boost/container/flat_map.hpp> #include <boost/container/vector.hpp> #include <boost/iterator/iterator_facade.hpp> -#include <dbus_singleton.hpp> -#include <dbus_utility.hpp> #include <nlohmann/json.hpp> #include <sdbusplus/asio/connection.hpp> #include <sdbusplus/asio/property.hpp> diff --git a/include/persistent_data.hpp b/include/persistent_data.hpp index 7478713161..03efb0a198 100644 --- a/include/persistent_data.hpp +++ b/include/persistent_data.hpp @@ -1,15 +1,16 @@ #pragma once -#include <app.hpp> +#include "app.hpp" +#include "event_service_store.hpp" +#include "http_request.hpp" +#include "http_response.hpp" +#include "sessions.hpp" + #include <boost/beast/http/fields.hpp> #include <boost/uuid/uuid.hpp> #include <boost/uuid/uuid_generators.hpp> #include <boost/uuid/uuid_io.hpp> -#include <event_service_store.hpp> -#include <http_request.hpp> -#include <http_response.hpp> #include <nlohmann/json.hpp> -#include <sessions.hpp> #include <filesystem> #include <fstream> diff --git a/include/random.hpp b/include/random.hpp index 082c4e3008..f5f094689e 100644 --- a/include/random.hpp +++ b/include/random.hpp @@ -2,6 +2,9 @@ #include <openssl/rand.h> +#include <iostream> +#include <limits> + namespace bmcweb { diff --git a/include/security_headers.hpp b/include/security_headers.hpp index 19075fbd73..d724de4e8a 100644 --- a/include/security_headers.hpp +++ b/include/security_headers.hpp @@ -1,8 +1,9 @@ #pragma once -#include <bmcweb_config.h> +#include "bmcweb_config.h" -#include <http_response.hpp> +#include "http_request.hpp" +#include "http_response.hpp" inline void addSecurityHeaders(const crow::Request& req [[maybe_unused]], crow::Response& res) diff --git a/include/sessions.hpp b/include/sessions.hpp index 94a0755e7f..19a1793ff9 100644 --- a/include/sessions.hpp +++ b/include/sessions.hpp @@ -3,15 +3,15 @@ #include "logging.hpp" #include "random.hpp" #include "utility.hpp" +#include "utils/ip_utils.hpp" #include <nlohmann/json.hpp> -#include <utils/ip_utils.hpp> #include <csignal> #include <optional> #include <random> #ifdef BMCWEB_ENABLE_IBM_MANAGEMENT_CONSOLE -#include <ibm/locks.hpp> +#include "ibm/locks.hpp" #endif namespace persistent_data diff --git a/include/ssl_key_handler.hpp b/include/ssl_key_handler.hpp index c6ceb83c2a..73d0b83590 100644 --- a/include/ssl_key_handler.hpp +++ b/include/ssl_key_handler.hpp @@ -1,5 +1,8 @@ #pragma once +#include "logging.hpp" +#include "random.hpp" + #include <openssl/bio.h> #include <openssl/dh.h> #include <openssl/dsa.h> @@ -11,9 +14,10 @@ #include <openssl/ssl.h> #include <boost/asio/ssl/context.hpp> -#include <random.hpp> +#include <optional> #include <random> +#include <string> namespace ensuressl { diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp index 1d3bf96c4c..188bcf2ad3 100644 --- a/include/vm_websocket.hpp +++ b/include/vm_websocket.hpp @@ -1,6 +1,7 @@ #pragma once -#include <app.hpp> +#include "app.hpp" + #include <boost/beast/core/flat_static_buffer.hpp> #include <boost/process/async_pipe.hpp> #include <boost/process/child.hpp> diff --git a/include/webassets.hpp b/include/webassets.hpp index cd57eb30c8..ca4137448f 100644 --- a/include/webassets.hpp +++ b/include/webassets.hpp @@ -1,13 +1,13 @@ #pragma once +#include "app.hpp" +#include "http_request.hpp" +#include "http_response.hpp" +#include "routing.hpp" #include "webroutes.hpp" -#include <app.hpp> #include <boost/algorithm/string/replace.hpp> #include <boost/container/flat_set.hpp> -#include <http_request.hpp> -#include <http_response.hpp> -#include <routing.hpp> #include <filesystem> #include <fstream> diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp index d2a4a74348..7da9100dea 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp @@ -14,12 +14,20 @@ // limitations under the License. */ #pragma once +#include "dbus_utility.hpp" +#include "error_messages.hpp" +#include "event_service_store.hpp" +#include "http_client.hpp" #include "metric_report.hpp" +#include "persistent_data.hpp" +#include "random.hpp" #include "registries.hpp" #include "registries/base_message_registry.hpp" #include "registries/openbmc_message_registry.hpp" #include "registries/task_event_message_registry.hpp" +#include "server_sent_events.hpp" #include "utility.hpp" +#include "utils/json_utils.hpp" #include <sys/inotify.h> @@ -27,15 +35,7 @@ #include <boost/algorithm/string/split.hpp> #include <boost/asio/io_context.hpp> #include <boost/container/flat_map.hpp> -#include <dbus_utility.hpp> -#include <error_messages.hpp> -#include <event_service_store.hpp> -#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> #include <cstdlib> #include <ctime> diff --git a/redfish-core/include/gzfile.hpp b/redfish-core/include/gzfile.hpp index a77c6ab482..844932aa81 100644 --- a/redfish-core/include/gzfile.hpp +++ b/redfish-core/include/gzfile.hpp @@ -1,9 +1,12 @@ #pragma once +#include "logging.hpp" + #include <zlib.h> #include <array> #include <filesystem> +#include <string> #include <vector> class GzFileReader diff --git a/redfish-core/include/query.hpp b/redfish-core/include/query.hpp index f9386dae18..0fa6c1886e 100644 --- a/redfish-core/include/query.hpp +++ b/redfish-core/include/query.hpp @@ -27,7 +27,7 @@ // IWYU pragma: no_include <boost/url/impl/params_view.hpp> // IWYU pragma: no_include <boost/url/impl/url_view.hpp> -#include <redfish_aggregator.hpp> +#include "redfish_aggregator.hpp" namespace redfish { diff --git a/redfish-core/include/redfish_aggregator.hpp b/redfish-core/include/redfish_aggregator.hpp index bd56d680fd..8923fdd2bb 100644 --- a/redfish-core/include/redfish_aggregator.hpp +++ b/redfish-core/include/redfish_aggregator.hpp @@ -1,11 +1,12 @@ #pragma once -#include <aggregation_utils.hpp> +#include "aggregation_utils.hpp" +#include "dbus_utility.hpp" +#include "error_messages.hpp" +#include "http_client.hpp" +#include "http_connection.hpp" + #include <boost/algorithm/string/predicate.hpp> -#include <dbus_utility.hpp> -#include <error_messages.hpp> -#include <http_client.hpp> -#include <http_connection.hpp> #include <array> diff --git a/redfish-core/include/resource_messages.hpp b/redfish-core/include/resource_messages.hpp index 0b0773eb82..315393548b 100644 --- a/redfish-core/include/resource_messages.hpp +++ b/redfish-core/include/resource_messages.hpp @@ -1,7 +1,8 @@ #pragma once +#include "registries/resource_event_message_registry.hpp" + #include <nlohmann/json.hpp> -#include <registries/resource_event_message_registry.hpp> namespace redfish { diff --git a/redfish-core/include/server_sent_events.hpp b/redfish-core/include/server_sent_events.hpp index a92fb7e354..fcc6531d96 100644 --- a/redfish-core/include/server_sent_events.hpp +++ b/redfish-core/include/server_sent_events.hpp @@ -16,9 +16,15 @@ */ #pragma once +#include "logging.hpp" + +#include <boost/asio/ip/tcp.hpp> #include <boost/asio/strand.hpp> #include <boost/beast/http/buffer_body.hpp> #include <boost/beast/http/message.hpp> +#include <boost/beast/http/read.hpp> +#include <boost/beast/http/serializer.hpp> +#include <boost/beast/http/write.hpp> #include <boost/beast/version.hpp> #include <cstdlib> diff --git a/redfish-core/include/utils/chassis_utils.hpp b/redfish-core/include/utils/chassis_utils.hpp index 33e8bb7070..9c7c7db6bc 100644 --- a/redfish-core/include/utils/chassis_utils.hpp +++ b/redfish-core/include/utils/chassis_utils.hpp @@ -1,8 +1,8 @@ #pragma once +#include "async_resp.hpp" #include "dbus_utility.hpp" - -#include <async_resp.hpp> +#include "error_messages.hpp" #include <array> #include <string_view> diff --git a/redfish-core/include/utils/collection.hpp b/redfish-core/include/utils/collection.hpp index b66ab5d05c..f2f0669d11 100644 --- a/redfish-core/include/utils/collection.hpp +++ b/redfish-core/include/utils/collection.hpp @@ -1,8 +1,13 @@ #pragma once +#include "async_resp.hpp" #include "dbus_utility.hpp" +#include "error_messages.hpp" +#include "http/utility.hpp" +#include "human_sort.hpp" -#include <human_sort.hpp> +#include <boost/url/url.hpp> +#include <nlohmann/json.hpp> #include <span> #include <string> diff --git a/redfish-core/include/utils/sw_utils.hpp b/redfish-core/include/utils/sw_utils.hpp index e2b90caca2..67cb115e77 100644 --- a/redfish-core/include/utils/sw_utils.hpp +++ b/redfish-core/include/utils/sw_utils.hpp @@ -1,10 +1,12 @@ #pragma once -#include <async_resp.hpp> -#include <dbus_utility.hpp> -#include <generated/enums/resource.hpp> +#include "async_resp.hpp" +#include "dbus_utility.hpp" +#include "error_messages.hpp" +#include "generated/enums/resource.hpp" +#include "utils/dbus_utils.hpp" + #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> #include <algorithm> #include <string> diff --git a/redfish-core/include/utils/systemd_utils.hpp b/redfish-core/include/utils/systemd_utils.hpp index ad157dc793..4757283006 100644 --- a/redfish-core/include/utils/systemd_utils.hpp +++ b/redfish-core/include/utils/systemd_utils.hpp @@ -17,6 +17,9 @@ #include <systemd/sd-id128.h> +#include <array> +#include <string> + namespace redfish { diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp index 71e744983f..f5f9360a14 100644 --- a/redfish-core/include/utils/telemetry_utils.hpp +++ b/redfish-core/include/utils/telemetry_utils.hpp @@ -1,8 +1,16 @@ #pragma once #include "dbus_utility.hpp" +#include "http/utility.hpp" +#include "logging.hpp" #include "utility.hpp" +#include <boost/container/flat_map.hpp> +#include <boost/container/flat_set.hpp> +#include <sdbusplus/message/native_types.hpp> + +#include <string> + namespace redfish { diff --git a/redfish-core/lib/account_service.hpp b/redfish-core/lib/account_service.hpp index 131f59f7a2..abf255eb00 100644 --- a/redfish-core/lib/account_service.hpp +++ b/redfish-core/lib/account_service.hpp @@ -15,19 +15,19 @@ */ #pragma once +#include "app.hpp" +#include "dbus_utility.hpp" +#include "error_messages.hpp" #include "generated/enums/account_service.hpp" +#include "openbmc_dbus_rest.hpp" +#include "persistent_data.hpp" +#include "query.hpp" #include "registries/privilege_registry.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" -#include <app.hpp> -#include <dbus_utility.hpp> -#include <error_messages.hpp> -#include <openbmc_dbus_rest.hpp> -#include <persistent_data.hpp> -#include <query.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/json_utils.hpp> #include <optional> #include <string> diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp index f580f96587..74a22d4355 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp @@ -1,9 +1,9 @@ #pragma once -#include <app.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> -#include <utils/sw_utils.hpp> +#include "app.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/sw_utils.hpp" namespace redfish { diff --git a/redfish-core/lib/cable.hpp b/redfish-core/lib/cable.hpp index 3cb8c1d3f5..e724118ecc 100644 --- a/redfish-core/lib/cable.hpp +++ b/redfish-core/lib/cable.hpp @@ -1,12 +1,14 @@ #pragma once #include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/collection.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" -#include <query.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/json_utils.hpp> #include <array> #include <string_view> diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp index f5633793b1..65f5262077 100644 --- a/redfish-core/lib/certificate_service.hpp +++ b/redfish-core/lib/certificate_service.hpp @@ -1,18 +1,22 @@ #pragma once +#include "app.hpp" +#include "async_resp.hpp" #include "dbus_utility.hpp" +#include "http_response.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" +#include "utils/time_utils.hpp" -#include <app.hpp> -#include <async_resp.hpp> #include <boost/system/linux_error.hpp> -#include <http_response.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> +#include <sdbusplus/bus/match.hpp> #include <sdbusplus/unpack_properties.hpp> #include <array> +#include <memory> #include <string_view> namespace redfish diff --git a/redfish-core/lib/chassis.hpp b/redfish-core/lib/chassis.hpp index f08a3f32b0..81f82543ec 100644 --- a/redfish-core/lib/chassis.hpp +++ b/redfish-core/lib/chassis.hpp @@ -15,18 +15,18 @@ */ #pragma once +#include "app.hpp" #include "dbus_utility.hpp" #include "health.hpp" #include "led.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/collection.hpp" +#include "utils/dbus_utils.hpp" #include "utils/json_utils.hpp" -#include <app.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/collection.hpp> -#include <utils/dbus_utils.hpp> #include <array> #include <string_view> diff --git a/redfish-core/lib/environment_metrics.hpp b/redfish-core/lib/environment_metrics.hpp index f46ef34f13..fd7668e3a8 100644 --- a/redfish-core/lib/environment_metrics.hpp +++ b/redfish-core/lib/environment_metrics.hpp @@ -1,6 +1,8 @@ #pragma once #include "app.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "utils/chassis_utils.hpp" #include <memory> diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp index cccae8bff3..2fe4654ab0 100644 --- a/redfish-core/lib/ethernet.hpp +++ b/redfish-core/lib/ethernet.hpp @@ -15,18 +15,19 @@ */ #pragma once +#include "app.hpp" +#include "dbus_singleton.hpp" #include "dbus_utility.hpp" +#include "error_messages.hpp" +#include "health.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "utils/ip_utils.hpp" +#include "utils/json_utils.hpp" -#include <app.hpp> #include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/split.hpp> #include <boost/container/flat_set.hpp> -#include <dbus_singleton.hpp> -#include <error_messages.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> -#include <utils/json_utils.hpp> #include <array> #include <optional> diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp index 882640912d..81f47c2cd3 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp @@ -14,14 +14,14 @@ // limitations under the License. */ #pragma once +#include "app.hpp" #include "event_service_manager.hpp" +#include "http/utility.hpp" +#include "logging.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" -#include <app.hpp> #include <boost/beast/http/fields.hpp> -#include <http/utility.hpp> -#include <logging.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <span> diff --git a/redfish-core/lib/health.hpp b/redfish-core/lib/health.hpp index 6805a2d400..143b0fcd44 100644 --- a/redfish-core/lib/health.hpp +++ b/redfish-core/lib/health.hpp @@ -15,11 +15,11 @@ */ #pragma once +#include "app.hpp" #include "async_resp.hpp" +#include "dbus_singleton.hpp" #include "dbus_utility.hpp" -#include <app.hpp> -#include <dbus_singleton.hpp> #include <nlohmann/json.hpp> #include <array> diff --git a/redfish-core/lib/hypervisor_system.hpp b/redfish-core/lib/hypervisor_system.hpp index 27d0c35dad..c675be35b8 100644 --- a/redfish-core/lib/hypervisor_system.hpp +++ b/redfish-core/lib/hypervisor_system.hpp @@ -1,16 +1,17 @@ #pragma once +#include "app.hpp" +#include "dbus_singleton.hpp" #include "dbus_utility.hpp" +#include "error_messages.hpp" +#include "ethernet.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "utils/ip_utils.hpp" +#include "utils/json_utils.hpp" -#include <app.hpp> #include <boost/container/flat_set.hpp> -#include <dbus_singleton.hpp> -#include <error_messages.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> -#include <utils/json_utils.hpp> #include <array> #include <optional> diff --git a/redfish-core/lib/led.hpp b/redfish-core/lib/led.hpp index 902e5c86c5..4c4c513a81 100644 --- a/redfish-core/lib/led.hpp +++ b/redfish-core/lib/led.hpp @@ -15,11 +15,11 @@ */ #pragma once +#include "app.hpp" #include "async_resp.hpp" #include "dbus_utility.hpp" #include "redfish_util.hpp" -#include <app.hpp> #include <sdbusplus/asio/property.hpp> namespace redfish diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp index 2f3c8ab498..7930a88698 100644 --- a/redfish-core/lib/log_services.hpp +++ b/redfish-core/lib/log_services.hpp @@ -15,20 +15,25 @@ */ #pragma once +#include "app.hpp" #include "dbus_utility.hpp" +#include "error_messages.hpp" #include "gzfile.hpp" #include "http_utility.hpp" #include "human_sort.hpp" +#include "query.hpp" #include "registries.hpp" #include "registries/base_message_registry.hpp" #include "registries/openbmc_message_registry.hpp" +#include "registries/privilege_registry.hpp" #include "task.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/time_utils.hpp" #include <systemd/sd-journal.h> #include <tinyxml2.h> #include <unistd.h> -#include <app.hpp> #include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/replace.hpp> @@ -36,13 +41,8 @@ #include <boost/beast/http/verb.hpp> #include <boost/container/flat_map.hpp> #include <boost/system/linux_error.hpp> -#include <error_messages.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/time_utils.hpp> #include <array> #include <charconv> diff --git a/redfish-core/lib/manager_diagnostic_data.hpp b/redfish-core/lib/manager_diagnostic_data.hpp index f4d169818a..66fc661131 100644 --- a/redfish-core/lib/manager_diagnostic_data.hpp +++ b/redfish-core/lib/manager_diagnostic_data.hpp @@ -1,11 +1,14 @@ #pragma once -#include <app.hpp> -#include <async_resp.hpp> -#include <http_request.hpp> +#include "app.hpp" +#include "async_resp.hpp" +#include "http_request.hpp" +#include "privileges.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "routing.hpp" + #include <nlohmann/json.hpp> -#include <privileges.hpp> -#include <routing.hpp> #include <string> diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp index 7194eb03da..74008cb40a 100644 --- a/redfish-core/lib/managers.hpp +++ b/redfish-core/lib/managers.hpp @@ -22,6 +22,7 @@ #include "redfish_util.hpp" #include "registries/privilege_registry.hpp" #include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" #include "utils/sw_utils.hpp" #include "utils/systemd_utils.hpp" #include "utils/time_utils.hpp" diff --git a/redfish-core/lib/memory.hpp b/redfish-core/lib/memory.hpp index 395d6a0743..3e3360b608 100644 --- a/redfish-core/lib/memory.hpp +++ b/redfish-core/lib/memory.hpp @@ -15,18 +15,19 @@ */ #pragma once +#include "app.hpp" +#include "dbus_utility.hpp" #include "health.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/collection.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/hex_utils.hpp" +#include "utils/json_utils.hpp" -#include <app.hpp> -#include <dbus_utility.hpp> #include <nlohmann/json.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/collection.hpp> -#include <utils/hex_utils.hpp> -#include <utils/json_utils.hpp> #include <array> #include <string_view> diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp index 9d6f109360..41e7e930bf 100644 --- a/redfish-core/lib/message_registries.hpp +++ b/redfish-core/lib/message_registries.hpp @@ -15,16 +15,15 @@ */ #pragma once +#include "app.hpp" +#include "query.hpp" #include "registries.hpp" #include "registries/base_message_registry.hpp" #include "registries/openbmc_message_registry.hpp" +#include "registries/privilege_registry.hpp" #include "registries/resource_event_message_registry.hpp" #include "registries/task_event_message_registry.hpp" -#include <app.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> - #include <array> namespace redfish diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp index 48fc9346d8..eb69ff0186 100644 --- a/redfish-core/lib/metric_report.hpp +++ b/redfish-core/lib/metric_report.hpp @@ -1,13 +1,13 @@ #pragma once +#include "app.hpp" +#include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "utils/collection.hpp" #include "utils/telemetry_utils.hpp" #include "utils/time_utils.hpp" -#include <app.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <array> diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp index 7a7b5aaaf1..ab03ea0b3c 100644 --- a/redfish-core/lib/metric_report_definition.hpp +++ b/redfish-core/lib/metric_report_definition.hpp @@ -1,17 +1,18 @@ #pragma once +#include "app.hpp" +#include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "sensors.hpp" +#include "utils/collection.hpp" +#include "utils/dbus_utils.hpp" #include "utils/telemetry_utils.hpp" #include "utils/time_utils.hpp" -#include <app.hpp> #include <boost/container/flat_map.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> #include <array> #include <map> diff --git a/redfish-core/lib/network_protocol.hpp b/redfish-core/lib/network_protocol.hpp index e3698cefa1..00324d73e6 100644 --- a/redfish-core/lib/network_protocol.hpp +++ b/redfish-core/lib/network_protocol.hpp @@ -15,17 +15,17 @@ */ #pragma once +#include "app.hpp" +#include "dbus_utility.hpp" #include "error_messages.hpp" #include "openbmc_dbus_rest.hpp" +#include "query.hpp" #include "redfish_util.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/json_utils.hpp" +#include "utils/stl_utils.hpp" -#include <app.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> -#include <utils/json_utils.hpp> -#include <utils/stl_utils.hpp> #include <optional> #include <variant> diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp index 1e196632ab..c91e52dd48 100644 --- a/redfish-core/lib/pcie.hpp +++ b/redfish-core/lib/pcie.hpp @@ -16,17 +16,16 @@ #pragma once +#include "app.hpp" #include "dbus_utility.hpp" #include "generated/enums/pcie_device.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/dbus_utils.hpp" -#include <app.hpp> #include <boost/system/linux_error.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> namespace redfish { diff --git a/redfish-core/lib/pcie_slots.hpp b/redfish-core/lib/pcie_slots.hpp index 668987df2c..d25b66bafe 100644 --- a/redfish-core/lib/pcie_slots.hpp +++ b/redfish-core/lib/pcie_slots.hpp @@ -1,16 +1,16 @@ #pragma once +#include "app.hpp" #include "error_messages.hpp" #include "generated/enums/pcie_slot.hpp" +#include "pcie.hpp" +#include "registries/privilege_registry.hpp" #include "utility.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" -#include <app.hpp> -#include <pcie.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/json_utils.hpp> namespace redfish { diff --git a/redfish-core/lib/power.hpp b/redfish-core/lib/power.hpp index 88f6a0ca69..4d94e57664 100644 --- a/redfish-core/lib/power.hpp +++ b/redfish-core/lib/power.hpp @@ -16,13 +16,13 @@ */ #pragma once +#include "app.hpp" #include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "sensors.hpp" #include "utils/chassis_utils.hpp" -#include <app.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <array> diff --git a/redfish-core/lib/processor.hpp b/redfish-core/lib/processor.hpp index f5203a92ea..879c04b234 100644 --- a/redfish-core/lib/processor.hpp +++ b/redfish-core/lib/processor.hpp @@ -15,22 +15,22 @@ */ #pragma once +#include "app.hpp" #include "dbus_singleton.hpp" #include "dbus_utility.hpp" #include "error_messages.hpp" #include "health.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/collection.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" -#include <app.hpp> #include <boost/container/flat_map.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/message/native_types.hpp> #include <sdbusplus/unpack_properties.hpp> #include <sdbusplus/utility/dedup_variant.hpp> -#include <utils/collection.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/json_utils.hpp> #include <array> #include <string_view> diff --git a/redfish-core/lib/redfish_sessions.hpp b/redfish-core/lib/redfish_sessions.hpp index d1314a5767..b3b4e7af71 100644 --- a/redfish-core/lib/redfish_sessions.hpp +++ b/redfish-core/lib/redfish_sessions.hpp @@ -15,14 +15,13 @@ */ #pragma once +#include "app.hpp" #include "error_messages.hpp" +#include "http/utility.hpp" #include "persistent_data.hpp" - -#include <app.hpp> -#include <http/utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> -#include <utils/json_utils.hpp> +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/json_utils.hpp" namespace redfish { diff --git a/redfish-core/lib/redfish_util.hpp b/redfish-core/lib/redfish_util.hpp index 04d6ceb303..2bf66badb3 100644 --- a/redfish-core/lib/redfish_util.hpp +++ b/redfish-core/lib/redfish_util.hpp @@ -16,7 +16,10 @@ #pragma once #ifndef BMCWEB_ENABLE_REDFISH_ONE_CHASSIS -#include <dbus_utility.hpp> +#include "async_resp.hpp" +#include "dbus_utility.hpp" +#include "error_messages.hpp" + #include <sdbusplus/asio/property.hpp> #include <charconv> diff --git a/redfish-core/lib/redfish_v1.hpp b/redfish-core/lib/redfish_v1.hpp index 487fb1cf75..b4349abb5b 100644 --- a/redfish-core/lib/redfish_v1.hpp +++ b/redfish-core/lib/redfish_v1.hpp @@ -1,13 +1,14 @@ #pragma once +#include "app.hpp" #include "error_messages.hpp" +#include "http_request.hpp" +#include "http_response.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "schemas.hpp" #include "utility.hpp" -#include <app.hpp> -#include <http_request.hpp> -#include <http_response.hpp> -#include <schemas.hpp> - #include <string> namespace redfish diff --git a/redfish-core/lib/roles.hpp b/redfish-core/lib/roles.hpp index 962a1c2491..413cd8c040 100644 --- a/redfish-core/lib/roles.hpp +++ b/redfish-core/lib/roles.hpp @@ -15,10 +15,11 @@ */ #pragma once -#include <app.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> +#include "app.hpp" +#include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" + #include <sdbusplus/asio/property.hpp> #include <variant> diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp index f5c4c3ba1a..1aaeaf1d0a 100644 --- a/redfish-core/lib/sensors.hpp +++ b/redfish-core/lib/sensors.hpp @@ -15,25 +15,24 @@ */ #pragma once +#include "app.hpp" +#include "dbus_singleton.hpp" #include "dbus_utility.hpp" #include "generated/enums/sensor.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" +#include "utils/query_param.hpp" -#include <app.hpp> #include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/find.hpp> #include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/split.hpp> #include <boost/range/algorithm/replace_copy_if.hpp> -#include <dbus_singleton.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/json_utils.hpp> -#include <utils/query_param.hpp> #include <array> #include <cmath> diff --git a/redfish-core/lib/service_root.hpp b/redfish-core/lib/service_root.hpp index 451c84ccce..98d39d61a7 100644 --- a/redfish-core/lib/service_root.hpp +++ b/redfish-core/lib/service_root.hpp @@ -15,16 +15,17 @@ */ #pragma once -#include <bmcweb_config.h> +#include "bmcweb_config.h" + +#include "app.hpp" +#include "async_resp.hpp" +#include "http_request.hpp" +#include "persistent_data.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/systemd_utils.hpp" -#include <app.hpp> -#include <async_resp.hpp> -#include <http_request.hpp> #include <nlohmann/json.hpp> -#include <persistent_data.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> -#include <utils/systemd_utils.hpp> namespace redfish { diff --git a/redfish-core/lib/storage.hpp b/redfish-core/lib/storage.hpp index 44ed7ff93c..1b297f39e0 100644 --- a/redfish-core/lib/storage.hpp +++ b/redfish-core/lib/storage.hpp @@ -15,16 +15,16 @@ */ #pragma once +#include "app.hpp" #include "dbus_utility.hpp" #include "health.hpp" #include "openbmc_dbus_rest.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/dbus_utils.hpp" -#include <app.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> #include <array> #include <string_view> diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp index e476592c27..ab5a80e5de 100644 --- a/redfish-core/lib/systems.hpp +++ b/redfish-core/lib/systems.hpp @@ -15,6 +15,7 @@ */ #pragma once +#include "app.hpp" #include "dbus_singleton.hpp" #include "dbus_utility.hpp" #include "health.hpp" @@ -22,16 +23,15 @@ #include "pcie.hpp" #include "query.hpp" #include "redfish_util.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/json_utils.hpp" +#include "utils/sw_utils.hpp" #include "utils/time_utils.hpp" -#include <app.hpp> #include <boost/container/flat_map.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/json_utils.hpp> -#include <utils/sw_utils.hpp> #include <array> #include <string_view> diff --git a/redfish-core/lib/task.hpp b/redfish-core/lib/task.hpp index 6b0096c8ce..105d4cdd95 100644 --- a/redfish-core/lib/task.hpp +++ b/redfish-core/lib/task.hpp @@ -15,15 +15,19 @@ */ #pragma once -#include <app.hpp> +#include "app.hpp" +#include "dbus_utility.hpp" +#include "event_service_manager.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "task_messages.hpp" + #include <boost/asio/post.hpp> #include <boost/asio/steady_timer.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> -#include <task_messages.hpp> +#include <sdbusplus/bus/match.hpp> #include <chrono> +#include <memory> #include <variant> namespace redfish diff --git a/redfish-core/lib/telemetry_service.hpp b/redfish-core/lib/telemetry_service.hpp index afedbc636a..0eaf89bf9f 100644 --- a/redfish-core/lib/telemetry_service.hpp +++ b/redfish-core/lib/telemetry_service.hpp @@ -1,14 +1,14 @@ #pragma once +#include "app.hpp" +#include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/dbus_utils.hpp" #include "utils/telemetry_utils.hpp" -#include <app.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> namespace redfish { diff --git a/redfish-core/lib/thermal.hpp b/redfish-core/lib/thermal.hpp index 83f79af3ff..cc548e17d0 100644 --- a/redfish-core/lib/thermal.hpp +++ b/redfish-core/lib/thermal.hpp @@ -15,12 +15,11 @@ */ #pragma once +#include "app.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "sensors.hpp" -#include <app.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> - namespace redfish { diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp index 4da1ed5fdb..33630cd9d4 100644 --- a/redfish-core/lib/trigger.hpp +++ b/redfish-core/lib/trigger.hpp @@ -1,14 +1,15 @@ #pragma once +#include "app.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "utils/collection.hpp" +#include "utils/dbus_utils.hpp" #include "utils/telemetry_utils.hpp" +#include "utils/time_utils.hpp" -#include <app.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> #include <sdbusplus/asio/property.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> #include <array> #include <string_view> diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp index fe6024b699..a9174a1e9e 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp @@ -17,14 +17,16 @@ #include "bmcweb_config.h" -#include <app.hpp> -#include <dbus_utility.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> +#include "app.hpp" +#include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/dbus_utils.hpp" +#include "utils/sw_utils.hpp" + #include <sdbusplus/asio/property.hpp> +#include <sdbusplus/bus/match.hpp> #include <sdbusplus/unpack_properties.hpp> -#include <utils/dbus_utils.hpp> -#include <utils/sw_utils.hpp> namespace redfish { diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp index ed027a7a7f..7c53f7e5f9 100644 --- a/redfish-core/lib/virtual_media.hpp +++ b/redfish-core/lib/virtual_media.hpp @@ -15,14 +15,15 @@ */ #pragma once -#include <account_service.hpp> -#include <app.hpp> +#include "account_service.hpp" +#include "app.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" +#include "utils/json_utils.hpp" + #include <boost/process/async_pipe.hpp> #include <boost/type_traits/has_dereference.hpp> #include <boost/url/url_view.hpp> -#include <query.hpp> -#include <registries/privilege_registry.hpp> -#include <utils/json_utils.hpp> namespace redfish { diff --git a/src/security_headers_middleware_test.cpp b/src/security_headers_middleware_test.cpp index 80df725458..99f1f5b370 100644 --- a/src/security_headers_middleware_test.cpp +++ b/src/security_headers_middleware_test.cpp @@ -1,4 +1,5 @@ -#include <app.hpp> +#include "app.hpp" + #include <security_headers_middleware.hpp> #include <gmock/gmock.h> diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp index 05c10cc025..1dbeb061ae 100644 --- a/src/webserver_main.cpp +++ b/src/webserver_main.cpp @@ -1,29 +1,31 @@ -#include <bmcweb_config.h> +#include "bmcweb_config.h" + +#include "app.hpp" +#include "cors_preflight.hpp" +#include "dbus_monitor.hpp" +#include "dbus_singleton.hpp" +#include "hostname_monitor.hpp" +#include "ibm/management_console_rest.hpp" +#include "image_upload.hpp" +#include "kvm_websocket.hpp" +#include "login_routes.hpp" +#include "nbd_proxy.hpp" +#include "obmc_console.hpp" +#include "openbmc_dbus_rest.hpp" +#include "redfish.hpp" +#include "redfish_aggregator.hpp" +#include "security_headers.hpp" +#include "ssl_key_handler.hpp" +#include "vm_websocket.hpp" +#include "webassets.hpp" + #include <systemd/sd-daemon.h> -#include <app.hpp> #include <boost/asio/io_context.hpp> -#include <cors_preflight.hpp> -#include <dbus_monitor.hpp> -#include <dbus_singleton.hpp> #include <google/google_service_root.hpp> -#include <hostname_monitor.hpp> -#include <ibm/management_console_rest.hpp> -#include <image_upload.hpp> -#include <kvm_websocket.hpp> -#include <login_routes.hpp> -#include <nbd_proxy.hpp> -#include <obmc_console.hpp> -#include <openbmc_dbus_rest.hpp> -#include <redfish.hpp> -#include <redfish_aggregator.hpp> #include <sdbusplus/asio/connection.hpp> #include <sdbusplus/bus.hpp> #include <sdbusplus/server.hpp> -#include <security_headers.hpp> -#include <ssl_key_handler.hpp> -#include <vm_websocket.hpp> -#include <webassets.hpp> #include <exception> #include <memory> |