Fixed redefinition of static structures