Tried to fix redefinition errors.