c743e42e22
Limit these extra header includes to only when specific igen files include us until we can move the includes to the igen fils directly.