diff --git a/polyp/module-protocol-stub.c b/polyp/module-protocol-stub.c
index b41515fe8..8c06a610a 100644
--- a/polyp/module-protocol-stub.c
+++ b/polyp/module-protocol-stub.c
@@ -62,10 +62,6 @@
 #elif defined(USE_TCP6_SOCKETS)
 #define SOCKET_DESCRIPTION "(TCP/IPv6 sockets)"
 #define SOCKET_USAGE "port=<TCP port number> loopback=<listen on loopback device only?>"
-#ifdef OS_IS_WIN32
-static const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
-static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }};
-#endif
 #else
 #define SOCKET_DESCRIPTION "(UNIX sockets)"
 #define SOCKET_USAGE "socket=<path to UNIX socket>"
diff --git a/polyp/polyplib-context.c b/polyp/polyplib-context.c
index fe5b30662..da91995b9 100644
--- a/polyp/polyplib-context.c
+++ b/polyp/polyplib-context.c
@@ -367,12 +367,12 @@ static void setup_context(struct pa_context *c, struct pa_iochannel *io) {
     assert(!c->pdispatch);
     c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX);
     assert(c->pdispatch);
-/*
+
     if (!c->conf->cookie_valid) {
         pa_context_fail(c, PA_ERROR_AUTHKEY);
         goto finish;
     }
-*/
+
     t = pa_tagstruct_new(NULL, 0);
     assert(t);
     pa_tagstruct_putu32(t, PA_COMMAND_AUTH);
diff --git a/polyp/socket-client.c b/polyp/socket-client.c
index 201733a1c..6d8cb2ab4 100644
--- a/polyp/socket-client.c
+++ b/polyp/socket-client.c
@@ -70,10 +70,6 @@
 
 #define CONNECT_TIMEOUT 5
 
-#ifdef OS_IS_WIN32
-static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }};
-#endif
-
 struct pa_socket_client {
     int ref;
     struct pa_mainloop_api *mainloop;
diff --git a/polyp/socket-server.c b/polyp/socket-server.c
index 2d5e5ac77..c27979da6 100644
--- a/polyp/socket-server.c
+++ b/polyp/socket-server.c
@@ -65,11 +65,6 @@
 #include "util.h"
 #include "log.h"
 
-#ifdef OS_IS_WIN32
-static const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
-static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }};
-#endif
-
 struct pa_socket_server {
     int ref;
     int fd;