From ae39042b02a2705efbe51cfb4afbc418756933c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?=
 <26327373+vkucera@users.noreply.github.com>
Date: Tue, 7 Jul 2026 19:12:20 +0200
Subject: [PATCH] ASoA: Fix includes

---
 Framework/Core/include/Framework/ASoA.h | 69 ++++++++++++++++---------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
index a21532e42e692..693a3a4ee3dec 100644
--- a/Framework/Core/include/Framework/ASoA.h
+++ b/Framework/Core/include/Framework/ASoA.h
@@ -16,29 +16,53 @@
 #error "Please do not include this file in ROOT dictionary generation"
 #endif
 
-#include "Framework/ConcreteDataMatcher.h"
-#include "Framework/Pack.h"                   // IWYU pragma: export
-#include "Framework/FunctionalHelpers.h"      // IWYU pragma: export
-#include "Headers/DataHeader.h"               // IWYU pragma: export
-#include "Headers/DataHeaderHelpers.h"        // IWYU pragma: export
-#include "Framework/CompilerBuiltins.h"       // IWYU pragma: export
-#include "Framework/Traits.h"                 // IWYU pragma: export
-#include "Framework/Expressions.h"            // IWYU pragma: export
-#include "Framework/ArrowTypes.h"             // IWYU pragma: export
 #include "Framework/ArrowTableSlicingCache.h" // IWYU pragma: export
-#include "Framework/SliceCache.h"             // IWYU pragma: export
-#include "Framework/VariantHelpers.h"         // IWYU pragma: export
+#include "Framework/ArrowTypes.h"             // IWYU pragma: export
+#include "Framework/CompilerBuiltins.h"       // IWYU pragma: export
+#include "Framework/ConcreteDataMatcher.h"
+#include "Framework/Expressions.h"       // IWYU pragma: export
+#include "Framework/FunctionalHelpers.h" // IWYU pragma: export
+#include "Framework/Pack.h"              // IWYU pragma: export
+#include "Framework/SliceCache.h"        // IWYU pragma: export
+#include "Framework/StringHelpers.h"
+#include "Framework/Traits.h" // IWYU pragma: export
+#include "Framework/TypeIdHelpers.h"
+#include "Framework/VariantHelpers.h"  // IWYU pragma: export
+#include "Headers/DataHeader.h"        // IWYU pragma: export
+#include "Headers/DataHeaderHelpers.h" // IWYU pragma: export
+
+#include <TBufferFile.h> // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN_FULL)
+
+#include <algorithm>
+#include <array>         // IWYU pragma: export
+#include <arrow/array.h> // IWYU pragma: export
 #include <arrow/array/array_binary.h>
-#include <arrow/table.h>              // IWYU pragma: export
-#include <arrow/array.h>              // IWYU pragma: export
-#include <arrow/util/config.h>        // IWYU pragma: export
-#include <gandiva/selection_vector.h> // IWYU pragma: export
-#include <array>                      // IWYU pragma: export
+#include <arrow/array/array_nested.h>
+#include <arrow/table.h> // IWYU pragma: export
+#include <arrow/type_fwd.h>
+#include <arrow/type.h>
+#include <arrow/util/config.h> // IWYU pragma: export
 #include <cassert>
-#include <fmt/format.h>
+#include <cctype>
 #include <concepts>
+#include <cstdint>
 #include <cstring>
-#include <gsl/span> // IWYU pragma: export
+#include <fmt/format.h>
+#include <functional>
+#include <gandiva/selection_vector.h> // IWYU pragma: export
+#include <gsl/span>                   // IWYU pragma: export
+#include <iterator>
+#include <memory>
+#include <numeric>
+#include <ranges>
+#include <set>
+#include <span>
+#include <string_view>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 namespace o2::framework
 {
@@ -1581,11 +1605,10 @@ template <soa::is_table T>
 using PresliceOptional = PresliceBase<T, PreslicePolicySorted, true>;
 
 template <typename T>
-concept is_preslice = std::derived_from<T, PreslicePolicyBase>&&
-  requires(T)
-{
-  T::optional;
-};
+concept is_preslice = std::derived_from<T, PreslicePolicyBase> &&
+                      requires(T) {
+                        T::optional;
+                      };
 
 /// Can be user to group together a number of Preslice declaration
 /// to avoid the limit of 100 data members per task