Move more header files explicitly into abc/core.hxx