Adapt to refactoring of destiny.h
Adapt to refactoring of socket.h
Companion commit to PR #282