fix order of includes in server