Moved things to the proper rpcxxx.h header.