more issues with includes