GEN: fixes for dupliate header includes