diff --git a/Framework/Core/include/Framework/DataDescriptorMatcher.h b/Framework/Core/include/Framework/DataDescriptorMatcher.h
index 0b9e24ba885c4..9353aabff699c 100644
--- a/Framework/Core/include/Framework/DataDescriptorMatcher.h
+++ b/Framework/Core/include/Framework/DataDescriptorMatcher.h
@@ -15,7 +15,6 @@
 #include "Framework/DataProcessingHeader.h"
 #include "Framework/RuntimeError.h"
 #include "Headers/DataHeader.h"
-#include "Headers/Stack.h"
 
 #include <array>
 #include <cstdint>
@@ -25,6 +24,12 @@
 #include <variant>
 #endif
 #include <vector>
+#include <ostream>
+
+namespace o2::header
+{
+struct Stack;
+}
 
 namespace o2::framework::data_matcher
 {
diff --git a/Framework/Core/src/DataDescriptorMatcher.cxx b/Framework/Core/src/DataDescriptorMatcher.cxx
index 83d7d053480a1..b7ee5e0f24029 100644
--- a/Framework/Core/src/DataDescriptorMatcher.cxx
+++ b/Framework/Core/src/DataDescriptorMatcher.cxx
@@ -15,6 +15,7 @@
 #include "Framework/DataProcessingHeader.h"
 #include "Framework/VariantHelpers.h"
 #include "Framework/RuntimeError.h"
+#include "Headers/Stack.h"
 #include <iostream>
 
 namespace o2::framework::data_matcher
diff --git a/Framework/Core/test/test_DataDescriptorMatcher.cxx b/Framework/Core/test/test_DataDescriptorMatcher.cxx
index 03feed72d4643..8bcf28ffc4b1e 100644
--- a/Framework/Core/test/test_DataDescriptorMatcher.cxx
+++ b/Framework/Core/test/test_DataDescriptorMatcher.cxx
@@ -16,6 +16,7 @@
 #include "Framework/DataDescriptorMatcher.h"
 #include "Framework/DataDescriptorQueryBuilder.h"
 #include "Framework/InputSpec.h"
+#include "Headers/Stack.h"
 
 #include <boost/test/unit_test.hpp>
 #include <variant>