Merge branch 'zuckschwerdt-fix-dont-export-test-symbols'
refactoring: changing all relative includes