diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index da5bb5fc5d..1bdcbe4f63 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -151,12 +151,12 @@ static int	Lock_AF_UNIX(const char *unixSocketDir, const char *unixSocketPath);
 static int	Setup_AF_UNIX(const char *sock_path);
 
 static const PQcommMethods PqCommSocketMethods = {
-	socket_comm_reset,
-	socket_flush,
-	socket_flush_if_writable,
-	socket_is_send_pending,
-	socket_putmessage,
-	socket_putmessage_noblock
+	.comm_reset = socket_comm_reset,
+	.flush = socket_flush,
+	.flush_if_writable = socket_flush_if_writable,
+	.is_send_pending = socket_is_send_pending,
+	.putmessage = socket_putmessage,
+	.putmessage_noblock = socket_putmessage_noblock
 };
 
 const PQcommMethods *PqCommMethods = &PqCommSocketMethods;
diff --git a/src/backend/libpq/pqmq.c b/src/backend/libpq/pqmq.c
index 39e77ef945..253181f47a 100644
--- a/src/backend/libpq/pqmq.c
+++ b/src/backend/libpq/pqmq.c
@@ -37,12 +37,12 @@ static int	mq_putmessage(char msgtype, const char *s, size_t len);
 static void mq_putmessage_noblock(char msgtype, const char *s, size_t len);
 
 static const PQcommMethods PqCommMqMethods = {
-	mq_comm_reset,
-	mq_flush,
-	mq_flush_if_writable,
-	mq_is_send_pending,
-	mq_putmessage,
-	mq_putmessage_noblock
+	.comm_reset = mq_comm_reset,
+	.flush = mq_flush,
+	.flush_if_writable = mq_flush_if_writable,
+	.is_send_pending = mq_is_send_pending,
+	.putmessage = mq_putmessage,
+	.putmessage_noblock = mq_putmessage_noblock
 };
 
 /*