Remove the unneeded KService includes and add the actually needed ones