Fixing warnigns about multiple definitions