Split headers in two to fix a cyclic dependency