Build error fix because of duplicate  struct definition