Fix/include missing headers

Merged Sina Ackermann requested to merge fix/include-missing-headers into master

Merge request reports