add missing imports and grab rMakeServer from the right place
add missing imports and grab rMakeServer from the right place

fedora-conary/rmake-2,fedora-conary/rmake-2,fedora-conary/rmake-2,fedora-conary/rmake-2