bugfix, wrong order of file includes