Fix image generation
Update includes