Fixing issue with includes