s4-rpc: remove some unnecessary #include lines