-#include <errno.h>
-#include <msp/strings/formatter.h>
+#include <cerrno>
+#include <msp/strings/format.h>
#include "datagramsocket.h"
namespace Msp {
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "inet.h"
using namespace std;
#include <msp/core/except.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "inet6.h"
using namespace std;
#else
#include <netdb.h>
#endif
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "socket.h"
#include "resolve.h"
#include <sys/socket.h>
#endif
#include <iostream>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include <msp/time/units.h>
#include "socket.h"
#include <cerrno>
#include <msp/core/refptr.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "streamlistensocket.h"
#include "streamsocket.h"
#endif
#include <cerrno>
#include <msp/io/poll.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "streamsocket.h"
namespace Msp {