diff --git a/src/ca/netdb_depen.c b/src/ca/netdb_depen.c
index a69898c40..40671f0eb 100644
--- a/src/ca/netdb_depen.c
+++ b/src/ca/netdb_depen.c
@@ -39,7 +39,7 @@ static char	*sccsId = "@(#) $Id$";
 #include <string.h>
 
 #ifdef _WIN32
-#	include <windows.h>
+#	include <winsock2.h>
 #else
 #	include <sys/types.h>
 #	include <sys/socket.h>
diff --git a/src/include/os/WIN32/osiSock.h b/src/include/os/WIN32/osiSock.h
index 8c2af4f75..95fe01de9 100644
--- a/src/include/os/WIN32/osiSock.h
+++ b/src/include/os/WIN32/osiSock.h
@@ -8,7 +8,7 @@ extern "C" {
 #pragma warning (disable:4237)
 #include <time.h>
 #include <errno.h>
-#include <windows.h>
+#include <winsock2.h>
 
 #ifdef __cplusplus
 }
diff --git a/src/libCom/os/WIN32/dllmain.cc b/src/libCom/os/WIN32/dllmain.cc
index ff294bdad..005fd8bbf 100644
--- a/src/libCom/os/WIN32/dllmain.cc
+++ b/src/libCom/os/WIN32/dllmain.cc
@@ -35,7 +35,7 @@
  *      -----------------
  */
 
-#include <windows.h>
+#include <winsock2.h>
 #include <stdio.h>
 
 #include "epicsVersion.h"
diff --git a/src/libCom/os/WIN32/osdTime.cc b/src/libCom/os/WIN32/osdTime.cc
index c1ef840b1..0129802ca 100644
--- a/src/libCom/os/WIN32/osdTime.cc
+++ b/src/libCom/os/WIN32/osdTime.cc
@@ -1,6 +1,6 @@
 
 #include <time.h>
-#include <windows.h>
+#include <winsock2.h>
 #include <mmsystem.h>
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/osi/os/WIN32/dllmain.cpp b/src/libCom/osi/os/WIN32/dllmain.cpp
index ff294bdad..005fd8bbf 100644
--- a/src/libCom/osi/os/WIN32/dllmain.cpp
+++ b/src/libCom/osi/os/WIN32/dllmain.cpp
@@ -35,7 +35,7 @@
  *      -----------------
  */
 
-#include <windows.h>
+#include <winsock2.h>
 #include <stdio.h>
 
 #include "epicsVersion.h"
diff --git a/src/libCom/osi/os/WIN32/osdSock.h b/src/libCom/osi/os/WIN32/osdSock.h
index 8c2af4f75..95fe01de9 100644
--- a/src/libCom/osi/os/WIN32/osdSock.h
+++ b/src/libCom/osi/os/WIN32/osdSock.h
@@ -8,7 +8,7 @@ extern "C" {
 #pragma warning (disable:4237)
 #include <time.h>
 #include <errno.h>
-#include <windows.h>
+#include <winsock2.h>
 
 #ifdef __cplusplus
 }
diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp
index c1ef840b1..0129802ca 100644
--- a/src/libCom/osi/os/WIN32/osdTime.cpp
+++ b/src/libCom/osi/os/WIN32/osdTime.cpp
@@ -1,6 +1,6 @@
 
 #include <time.h>
-#include <windows.h>
+#include <winsock2.h>
 #include <mmsystem.h>
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/tsSubr.c b/src/libCom/tsSubr.c
index 76ca3d1b3..e8cd635b2 100644
--- a/src/libCom/tsSubr.c
+++ b/src/libCom/tsSubr.c
@@ -127,7 +127,7 @@
 #   include <sys/time.h>
 #   include <sys/socket.h>
 #elif defined(_WIN32)
-#   include <windows.h>
+#   include <winsock2.h>
 #   include <time.h>
 #   include <mmsystem.h>
 #else