[common] Fix includes for new start handling

Merged Thomas Fetzer requested to merge fix/starthandling into master

Merge request reports