Correct the struct and add the header