Fixed issues with includes