Re-introduce missing xdata headers
This merge request reintroduces some xdata headers that were removed in the reorganisation in !37 (merged) (testing with subsystem code revealed that forward declaration is not sufficient for use with std::is_same
)