Remove unnecessary includes; remove dependency of error reporting on main window

t.knopffrequested to merge
reorg_dirs into develop

Small improvements in the source code structure to disentangle dependencies.

Merge request reports