Clean up more includes (#37527)

Split out of #37344

diff --cc src/oom/oomd-manager.c
Simple merge

diff --cc src/portable/portabled.c
Simple merge

diff --cc src/timesync/timesyncd-manager.c
Simple merge

diff --cc src/vmspawn/vmspawn.c
Simple merge