Fix inclusion handling