diff --git a/src/core/iomgr/sockaddr_win32.h b/src/core/iomgr/sockaddr_win32.h
index bdec72c761068629115a8be4ebea8eb039f571c1..ef306e3cc3c2a29a62cfd0dd9af4fb0c07c6e3fb 100644
--- a/src/core/iomgr/sockaddr_win32.h
+++ b/src/core/iomgr/sockaddr_win32.h
@@ -34,8 +34,10 @@
 #ifndef GRPC_CORE_IOMGR_SOCKADDR_WIN32_H
 #define GRPC_CORE_IOMGR_SOCKADDR_WIN32_H
 
-#include <mswsock.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+// must be included after the above
+#include <mswsock.h>
+
 #endif /* GRPC_CORE_IOMGR_SOCKADDR_WIN32_H */
diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c
index b27bb1cfb077b9eef3d671b33a8ebe9313e40007..c1f419e2737ef979c0c023d1f0e50620c54d2ebb 100644
--- a/src/core/iomgr/socket_windows.c
+++ b/src/core/iomgr/socket_windows.c
@@ -35,9 +35,11 @@
 
 #ifdef GPR_WINSOCK_SOCKET
 
-#include <mswsock.h>
 #include <winsock2.h>
 
+// must be included after winsock2.h
+#include <mswsock.h>
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/log_win32.h>
diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c
index 51d1c42eb4c84c4b7ed40d244e0cc72775947933..8e0bbfaee8242e821ebed6fa200dbcdd6bb82bf1 100644
--- a/src/core/support/stack_lockfree.c
+++ b/src/core/support/stack_lockfree.c
@@ -64,10 +64,10 @@ typedef union lockfree_node {
   struct lockfree_node_contents contents;
 } lockfree_node;
 
-#define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */
-#define INVALID_ENTRY_INDEX                        \
-  ((1 << 16) - 1) /* reserve this entry as invalid \
-                     */
+/* make sure that entries aligned to 8-bytes */
+#define ENTRY_ALIGNMENT_BITS 3
+/* reserve this entry as invalid */
+#define INVALID_ENTRY_INDEX ((1 << 16) - 1)
 
 struct gpr_stack_lockfree {
   lockfree_node *entries;