prevent 'redefined' warnings and updated dependency list (Breno G. de Oliveira)