[PATCH v3 17/26] rpc: Remove unused includes