Fixes to be able to build public headers in isolation

Marco Clemencicrequested to merge
fix-public-headers-build into master

Fixes problems detected via gaudi/Gaudi!1394 (merged).

Merge request reports