- Include/generation fixes