fix struct redefinition issue