FIX: Error including socket client/server in rpc.h
ADD: INtime support