Update two includes to not rely on target headers anymore