Apro_gen fix. Include paths optimized