C-standard syntax fix (added 'struct' behind each type)