fix includes, struct names
now it builds ok.