Moved from citadel.h to server.h