rm unneeded includes

Joachim Wuttkerequested to merge
mv1 into main

Thereby we get rid of a few include cycles in GUI/Model.

Merge request reports