put 'mod rpc' back, drop unused include