structs prefix repaired, typedef needs special treatment