s4: add some missing header dependencies.