fix(?) circular dependence on generated headers