util: remove unneeded includes