chg: structs.h again usable for C and C++