Merge pull request #2840 from swisspol/sys_repository_include Make sure sys/repository.h includes the required headers