Small reorder of system headers

src/collection.cpp

@@ -3,9 +3,16 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
-#include "collection.hpp"
 #include "clock.hpp"
+#include "collection.hpp"
 #include "context_allocator.hpp"
 #include "event.hpp"
 #include "exception.hpp"
@@ -14,13 +21,6 @@
 #include "matcher/base.hpp"
 #include "object_store.hpp"
 #include "rule.hpp"
-#include <memory>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <unordered_map>
-#include <utility>
-#include <vector>
 
 namespace ddwaf {
 

src/condition/lfi_detector.cpp

@@ -3,24 +3,24 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <cstddef>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
-#include "condition/lfi_detector.hpp"
 #include "argument_retriever.hpp"
 #include "clock.hpp"
 #include "condition/base.hpp"
+#include "condition/lfi_detector.hpp"
 #include "ddwaf.h"
 #include "exception.hpp"
 #include "exclusion/common.hpp"
 #include "iterator.hpp"
 #include "log.hpp"
 #include "platform.hpp"
 #include "utils.hpp"
-#include <cstddef>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <utility>
-#include <vector>
 
 using namespace std::literals;
 

src/condition/scalar_condition.cpp

@@ -3,8 +3,14 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <memory>
+#include <optional>
+#include <span>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <utility>
 
-#include "scalar_condition.hpp"
 #include "clock.hpp"
 #include "condition/base.hpp"
 #include "ddwaf.h"
@@ -14,16 +20,10 @@
 #include "log.hpp"
 #include "matcher/base.hpp"
 #include "object_store.hpp"
+#include "scalar_condition.hpp"
 #include "transformer/base.hpp"
 #include "transformer/manager.hpp"
 #include "utils.hpp"
-#include <memory>
-#include <optional>
-#include <span>
-#include <string>
-#include <string_view>
-#include <unordered_map>
-#include <utility>
 
 using namespace std::literals;
 

src/condition/shi_detector.cpp

@@ -3,25 +3,25 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <cstddef>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
-#include "condition/shi_detector.hpp"
 #include "argument_retriever.hpp"
 #include "clock.hpp"
 #include "condition/base.hpp"
 #include "condition/match_iterator.hpp"
+#include "condition/shi_detector.hpp"
 #include "condition/structured_condition.hpp"
 #include "ddwaf.h"
 #include "exception.hpp"
 #include "exclusion/common.hpp"
 #include "log.hpp"
 #include "tokenizer/shell.hpp"
 #include "utils.hpp"
-#include <cstddef>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <utility>
-#include <vector>
 
 using namespace std::literals;
 

src/condition/sqli_detector.cpp

@@ -3,11 +3,21 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
-#include "condition/sqli_detector.hpp"
+#include <cstddef>
+#include <limits>
+#include <span>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <variant>
+#include <vector>
+
 #include "argument_retriever.hpp"
 #include "clock.hpp"
 #include "condition/base.hpp"
 #include "condition/match_iterator.hpp"
+#include "condition/sqli_detector.hpp"
 #include "ddwaf.h"
 #include "exception.hpp"
 #include "exclusion/common.hpp"
@@ -19,16 +29,6 @@
 #include "tokenizer/sqlite.hpp"
 #include "utils.hpp"
 
-#include <cstddef>
-#include <limits>
-#include <span>
-#include <stdexcept>
-#include <string>
-#include <string_view>
-#include <utility>
-#include <variant>
-#include <vector>
-
 using namespace std::literals;
 
 namespace ddwaf {

src/condition/ssrf_detector.cpp

@@ -3,12 +3,21 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <array>
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
-#include "condition/ssrf_detector.hpp"
 #include "argument_retriever.hpp"
 #include "clock.hpp"
 #include "condition/base.hpp"
 #include "condition/match_iterator.hpp"
+#include "condition/ssrf_detector.hpp"
 #include "condition/structured_condition.hpp"
 #include "ddwaf.h"
 #include "exception.hpp"
@@ -17,15 +26,6 @@
 #include "matcher/ip_match.hpp"
 #include "uri_utils.hpp"
 #include "utils.hpp"
-#include <array>
-#include <cstddef>
-#include <memory>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <unordered_set>
-#include <utility>
-#include <vector>
 
 using namespace std::literals;
 

src/exclusion/input_filter.cpp

@@ -4,27 +4,22 @@
 // This product includes software developed at Datadog
 // (https://www.datadoghq.com/). Copyright 2023 Datadog, Inc.
 
-// Unless explicitly stated otherwise all files in this repository are
-// dual-licensed under the Apache-2.0 License or BSD-3-Clause License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/)
-// Copyright 2021 Datadog, Inc.
+#include <memory>
+#include <optional>
+#include <set>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
+#include <utility>
 
-#include "exclusion/input_filter.hpp"
 #include "clock.hpp"
+#include "exclusion/input_filter.hpp"
 #include "exclusion/object_filter.hpp"
 #include "expression.hpp"
 #include "log.hpp"
 #include "matcher/base.hpp"
 #include "object_store.hpp"
 #include "rule.hpp"
-#include <memory>
-#include <optional>
-#include <set>
-#include <stdexcept>
-#include <string>
-#include <unordered_map>
-#include <utility>
 
 namespace ddwaf::exclusion {
 

src/exclusion/object_filter.cpp

@@ -3,20 +3,20 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <cstddef>
+#include <stack>
+#include <string_view>
+#include <tuple>
+#include <unordered_set>
 
-#include "exclusion/object_filter.hpp"
 #include "clock.hpp"
 #include "ddwaf.h"
 #include "exception.hpp"
 #include "exclusion/common.hpp"
+#include "exclusion/object_filter.hpp"
 #include "log.hpp"
 #include "object_store.hpp"
 #include "utils.hpp"
-#include <cstddef>
-#include <stack>
-#include <string_view>
-#include <tuple>
-#include <unordered_set>
 
 namespace ddwaf::exclusion {
 

src/exclusion/rule_filter.cpp

@@ -3,15 +3,6 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
-
-#include "clock.hpp"
-#include "exclusion/common.hpp"
-#include "expression.hpp"
-#include "matcher/base.hpp"
-#include "object_store.hpp"
-#include "rule.hpp"
-#include <exclusion/rule_filter.hpp>
-#include <log.hpp>
 #include <memory>
 #include <optional>
 #include <set>
@@ -20,6 +11,15 @@
 #include <unordered_map>
 #include <utility>
 
+#include "clock.hpp"
+#include "exclusion/common.hpp"
+#include "exclusion/rule_filter.hpp"
+#include "expression.hpp"
+#include "log.hpp"
+#include "matcher/base.hpp"
+#include "object_store.hpp"
+#include "rule.hpp"
+
 namespace ddwaf::exclusion {
 
 using excluded_set = rule_filter::excluded_set;

src/obfuscator.cpp

@@ -3,16 +3,16 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
-
-#include "obfuscator.hpp"
-#include "log.hpp"
-#include "re2.h"
-#include "stringpiece.h"
 #include <cstdint>
 #include <memory>
 #include <stdexcept>
 #include <string_view>
 
+#include "log.hpp"
+#include "obfuscator.hpp"
+#include "re2.h"
+#include "stringpiece.h"
+
 namespace ddwaf {
 
 namespace {

src/object_store.cpp

@@ -3,14 +3,14 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <cstddef>
+#include <string>
+#include <string_view>
 
-#include "object_store.hpp"
 #include "ddwaf.h"
 #include "log.hpp"
+#include "object_store.hpp"
 #include "utils.hpp"
-#include <cstddef>
-#include <string>
-#include <string_view>
 
 namespace ddwaf {
 

src/parser/exclusion_parser.cpp

@@ -3,6 +3,13 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <exception>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "condition/base.hpp"
 #include "exception.hpp"
@@ -14,13 +21,6 @@
 #include "parser/parser.hpp"
 #include "parser/specification.hpp"
 #include "utils.hpp"
-#include <exception>
-#include <memory>
-#include <string>
-#include <string_view>
-#include <unordered_map>
-#include <utility>
-#include <vector>
 
 namespace ddwaf::parser::v2 {
 

src/parser/rule_parser.cpp

@@ -3,6 +3,11 @@
 //
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2021 Datadog, Inc.
+#include <exception>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "condition/base.hpp"
 #include "exception.hpp"
@@ -14,11 +19,6 @@
 #include "rule.hpp"
 #include "transformer/base.hpp"
 #include "utils.hpp"
-#include <exception>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
 
 namespace ddwaf::parser::v2 {