diff --git a/crypto/bio/socket.c b/crypto/bio/socket.c
index 0520c3e830..f70ea9214f 100644
--- a/crypto/bio/socket.c
+++ b/crypto/bio/socket.c
@@ -67,7 +67,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
 #include <winsock2.h>
 OPENSSL_MSVC_PRAGMA(warning(pop))
 
-#pragma comment(lib, "Ws2_32.lib")
+OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
 #endif
 
 #include "internal.h"
diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index 1527173720..76caa4e670 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -33,7 +33,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
 #include <ws2tcpip.h>
 OPENSSL_MSVC_PRAGMA(warning(pop))
 
-#pragma comment(lib, "Ws2_32.lib")
+OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
 #endif
 
 #include <assert.h>
diff --git a/tool/transport_common.cc b/tool/transport_common.cc
index 9a3612c870..d5326b5c81 100644
--- a/tool/transport_common.cc
+++ b/tool/transport_common.cc
@@ -40,7 +40,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
 OPENSSL_MSVC_PRAGMA(warning(pop))
 
 typedef int ssize_t;
-#pragma comment(lib, "Ws2_32.lib")
+OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
 #endif
 
 #include <openssl/err.h>