fixed issues with includes