Cleaning up C struct generation using struct redefinition (and hence changing compilers to use the c11 std, may break cl)