problems with includes after reorganising source