Prefer pragma once and add missing include

Marco Cattaneorequested to merge
follow-4829-run2 into run2-patches

The missing include was exposed by gaudi/Gaudi!1645 (merged). Backport of !4829 (merged) and !4825 (merged)

Edited by Marco Cattaneo

Merge request reports