redefined point in service.h and removed common.h