fix redefinition warnings