diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 83dd1474081..b070bfeda35 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1041,7 +1041,7 @@ parse_hba_line(List *line, int line_num, char *raw_line)
 
 			/* Get the IP address either way */
 			hints.ai_flags = AI_NUMERICHOST;
-			hints.ai_family = PF_UNSPEC;
+			hints.ai_family = AF_UNSPEC;
 			hints.ai_socktype = 0;
 			hints.ai_protocol = 0;
 			hints.ai_addrlen = 0;
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index e355cdee953..479dfa7d3cf 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -348,7 +348,7 @@ pgstat_init(void)
 	 * Create the UDP socket for sending and receiving statistic messages
 	 */
 	hints.ai_flags = AI_PASSIVE;
-	hints.ai_family = PF_UNSPEC;
+	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = 0;
 	hints.ai_addrlen = 0;
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index b1dd1fe52fd..55083b254df 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1354,7 +1354,7 @@ setup_config(void)
 
 		/* for best results, this code should match parse_hba() */
 		hints.ai_flags = AI_NUMERICHOST;
-		hints.ai_family = PF_UNSPEC;
+		hints.ai_family = AF_UNSPEC;
 		hints.ai_socktype = 0;
 		hints.ai_protocol = 0;
 		hints.ai_addrlen = 0;
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 7d6e146dbda..afe941f80b8 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -1363,7 +1363,7 @@ pgpipe(int handles[2])
 		closesocket(s);
 		return -1;
 	}
-	if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
+	if ((handles[1] = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
 	{
 		write_msg(modulename, "pgpipe: could not create second socket: error code %d\n",
 				  WSAGetLastError());