[PATCH 6/8] remove circular dependency between serv.h and options.h