diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86
index 700f3ac73..4bd4e63a3 100644
--- a/configure/os/CONFIG.Common.cygwin-x86
+++ b/configure/os/CONFIG.Common.cygwin-x86
@@ -26,14 +26,14 @@ POSIX_LDLIBS += -lpthread
 ARCH_DEP_CFLAGS += -m32
 ARCH_DEP_LDFLAGS += -m32
 
-# Compiler defines _X86_ 1
-# Compiler defines __MSVCRT__ 1
+# 32-bit compiler defines _X86_ 1
 # Compiler defines __CYGWIN__ 1
-# Compiler defines __CYGWIN32__ 1
+# 32-bit compiler defines __CYGWIN32__ 1
 # Compiler defines __unix__ 1
 # Compiler defines __unix 1
 # Compiler defines unix 1
 
+# This macro now deprecated, use __CYGWIN__ in the future
 OP_SYS_CPPFLAGS += -DCYGWIN32
 
 EXE = .exe
diff --git a/src/ioc/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c
index 456bfc76b..310cabb29 100644
--- a/src/ioc/rsrv/caservertask.c
+++ b/src/ioc/rsrv/caservertask.c
@@ -653,7 +653,7 @@ int rsrv_init (void)
             }
 #endif
 
-#if !(defined(_WIN32) || defined(__CYGWIN32__))
+#if !(defined(_WIN32) || defined(__CYGWIN__))
             /* An oddness of BSD sockets (not winsock) is that binding to
              * INADDR_ANY will receive unicast and broadcast, but binding to
              * a specific interface address receives only unicast.  The trick
@@ -693,7 +693,7 @@ int rsrv_init (void)
                 ellFree(&bcastList);
             }
 
-#endif /* !(defined(_WIN32) || defined(__CYGWIN32__)) */
+#endif /* !(defined(_WIN32) || defined(__CYGWIN__)) */
 
             ellAdd(&servers, &conf->node);
 
@@ -711,7 +711,7 @@ int rsrv_init (void)
 
             epicsEventMustWait(casudp_startStopEvent);
 
-#if !(defined(_WIN32) || defined(__CYGWIN32__))
+#if !(defined(_WIN32) || defined(__CYGWIN__))
             if(conf->udpbcast != INVALID_SOCKET) {
                 conf->startbcast = 1;
 
@@ -723,7 +723,7 @@ int rsrv_init (void)
 
                 conf->startbcast = 0;
             }
-#endif /* !(defined(_WIN32) || defined(__CYGWIN32__)) */
+#endif /* !(defined(_WIN32) || defined(__CYGWIN__)) */
 
             havesometcp = 1;
             continue;
diff --git a/src/libCom/misc/shareLib.h b/src/libCom/misc/shareLib.h
index 5a5f94e76..0d376d64a 100644
--- a/src/libCom/misc/shareLib.h
+++ b/src/libCom/misc/shareLib.h
@@ -105,7 +105,7 @@
 #undef epicsShareAPI
 #undef READONLY
 
-#if defined(_WIN32) || defined(__CYGWIN32__)
+#if defined(_WIN32) || defined(__CYGWIN__)
 /*
  * Check if EPICS_BUILD_DLL or EPICS_CALL_DLL defined and use the dllimport/
  * dllexport keywords if this is a shared library build of base under WIN32.
diff --git a/src/libCom/osi/os/posix/osdTime.cpp b/src/libCom/osi/os/posix/osdTime.cpp
index 679c6e376..7668dd3c1 100644
--- a/src/libCom/osi/os/posix/osdTime.cpp
+++ b/src/libCom/osi/os/posix/osdTime.cpp
@@ -44,7 +44,7 @@
     } // extern "C"
 #endif
 
-#ifdef CYGWIN32
+#ifdef __CYGWIN__
 int clock_settime(clockid_t clock, const timespec *tp)
 {
     return -EFAULT;