put includes into extra-source-files, fixes #2