diff --git a/src/as/Makefile b/src/as/Makefile
index 3a09b3b34..ef3e0ba0f 100644
--- a/src/as/Makefile
+++ b/src/as/Makefile
@@ -28,8 +28,8 @@ LIBRARY_IOC = asIoc
 asHost_LIBS  = dbStaticHost ca Com
 asIoc_LIBS  = dbIoc dbStaticIoc ca Com
 
-asHost_RCS_WIN32 = asHost.rc
-asIoc_RCS_WIN32 = asIoc.rc
+asHost_RCS = asHost.rc
+asIoc_RCS = asIoc.rc
 
 PROD_HOST = ascheck
 ascheck_SRCS = ascheck.c
diff --git a/src/ca/Makefile b/src/ca/Makefile
index 8d634b5a4..19c3ac231 100644
--- a/src/ca/Makefile
+++ b/src/ca/Makefile
@@ -74,7 +74,7 @@ LIBSRCS_vxWorks += templateInstances.cpp
 
 LIBRARY=ca
 
-ca_RCS_WIN32 = ca.rc
+ca_RCS = ca.rc
 
 # For R3.13 compatibility only
 ifeq ($(strip $(COMPAT_313)),YES)
diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile
index 9974a16dd..e5945e44e 100644
--- a/src/cas/build/Makefile
+++ b/src/cas/build/Makefile
@@ -78,7 +78,7 @@ LIBSRCS_vxWorks += templateInstances.cpp
 LIBRARY = cas
 cas_LIBS = ca gdd Com
 cas_SYS_LIBS_WIN32 = ws2_32
-cas_RCS_WIN32 = cas.rc
+cas_RCS = cas.rc
 
 include $(TOP)/configure/RULES
 
diff --git a/src/db/Makefile b/src/db/Makefile
index fa987ce27..d6520a641 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -84,7 +84,7 @@ endif
 LIBRARY_IOC = dbIoc
 dbIoc_LIBS = dbStaticIoc ca Com
 
-dbIoc_RCS_WIN32 = dbIoc.rc
+dbIoc_RCS = dbIoc.rc
 
 # For R3.13 compatibility only
 ifeq ($(strip $(COMPAT_313)),YES)
diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile
index 735e4179b..01fe4cf68 100644
--- a/src/dbStatic/Makefile
+++ b/src/dbStatic/Makefile
@@ -44,8 +44,8 @@ endif
 dbStaticHost_LIBS = Com
 dbStaticIoc_LIBS = Com
 
-dbStaticHost_RCS_WIN32 = dbStaticHost.rc
-dbStaticIoc_RCS_WIN32 = dbStaticIoc.rc
+dbStaticHost_RCS = dbStaticHost.rc
+dbStaticIoc_RCS = dbStaticIoc.rc
 
 PROD_LIBS := dbStaticHost Com
 PROD_HOST = dbReadTest dbExpand dbToMenuH dbToRecordtypeH
diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile
index 633ca6699..fde9fa4b9 100644
--- a/src/dbtools/Makefile
+++ b/src/dbtools/Makefile
@@ -21,7 +21,7 @@ LIBRARY_IOC = dbtoolsIoc
 
 dbtoolsIoc_LIBS = dbIoc dbStaticIoc Com
 
-dbtoolsIoc_RCS_WIN32 = dbtoolsIoc.rc
+dbtoolsIoc_RCS = dbtoolsIoc.rc
 
 HTMLS += dbLoadTemplate.html
 
diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile
index d3840d9ea..dea2c1972 100644
--- a/src/dev/softDev/Makefile
+++ b/src/dev/softDev/Makefile
@@ -51,7 +51,7 @@ LIBSRCS += devTimestamp.c
 
 LIBRARY_IOC += softDevIoc
 softDevIoc_LIBS += miscIoc recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
-softDevIoc_RCS_WIN32 = softDevIoc.rc
+softDevIoc_RCS = softDevIoc.rc
 
 # For R3.13 compatability
 ifeq ($(strip $(COMPAT_313)),YES)
diff --git a/src/dev/testDev/Makefile b/src/dev/testDev/Makefile
index 92d0c42d0..f7947f17a 100644
--- a/src/dev/testDev/Makefile
+++ b/src/dev/testDev/Makefile
@@ -29,7 +29,7 @@ LIBSRCS += devWfTestAsyn.c
 
 LIBRARY_IOC = testDevIoc
 testDevIoc_LIBS += recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
-testDevIoc_RCS_WIN32 = testDevIoc.rc
+testDevIoc_RCS = testDevIoc.rc
 
 # For R3.13 compatability
 ifeq ($(strip $(COMPAT_313)),YES)
diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index ccc829cb7..7036cfc28 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -53,12 +53,13 @@ LIBRARY = gdd
 
 gdd_LIBS = Com
 
-gdd_RCS_WIN32 = gdd.rc
+gdd_RCS = gdd.rc
 
 PROD_HOST = aitGen genApps
 genApps_SRCS = genApps.cc $(AITGENSRCS)
 aitGen_SRCS = aitTypes.c aitGen.c
 PROD_LIBS = Com
+genApps_SYS_LIBS_WIN32 = ws2_32
 
 # aitGen.c doesn't compile for linux-arm at -O3 when using gcc-3.4.5
 aitGen_CFLAGS_linux-arm = -O2
@@ -99,5 +100,5 @@ clean::
 
 aitConvert$(OBJ): aitConvertGenerated.cc
 
-#	EOF base/src/gdd/Makefile.Host:n
+#	EOF base/src/gdd/Makefile
 
diff --git a/src/libCom/Makefile b/src/libCom/Makefile
index 3bb8e513e..4120389c3 100644
--- a/src/libCom/Makefile
+++ b/src/libCom/Makefile
@@ -281,7 +281,7 @@ LIBRARY=Com
 
 Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 
-Com_RCS_WIN32 = Com.rc
+Com_RCS = Com.rc
 
 # For R3.13 compatibility only
 ifeq ($(strip $(COMPAT_313)),YES)
diff --git a/src/misc/Makefile b/src/misc/Makefile
index ab155ddab..776bc89c7 100644
--- a/src/misc/Makefile
+++ b/src/misc/Makefile
@@ -27,7 +27,7 @@ LIB_SRCS += iocshRegisterCommon.c
 
 LIBRARY_IOC = miscIoc
 
-miscIoc_RCS_WIN32 = miscIoc.rc
+miscIoc_RCS = miscIoc.rc
 miscIoc_LIBS  = rsrvIoc asIoc dbtoolsIoc dbIoc registryIoc dbStaticIoc ca Com
 
 # For R3.13 compatibility only
diff --git a/src/rec/Makefile b/src/rec/Makefile
index 5360906db..3e7cdfa50 100644
--- a/src/rec/Makefile
+++ b/src/rec/Makefile
@@ -71,7 +71,7 @@ LIBSRCS += waveformRecord.c
 LIBRARY_IOC += recIoc
 
 recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com
-recIoc_RCS_WIN32 = recIoc.rc
+recIoc_RCS = recIoc.rc
 
 # For R3.13 compatability
 ifeq ($(strip $(COMPAT_313)),YES)
diff --git a/src/registry/Makefile b/src/registry/Makefile
index 1eb7d26c7..bacb70471 100644
--- a/src/registry/Makefile
+++ b/src/registry/Makefile
@@ -29,7 +29,7 @@ LIB_SRCS += registryIocRegister.c
 LIBRARY_IOC = registryIoc
 registryIoc_LIBS  = dbStaticIoc Com
 
-registryIoc_RCS_WIN32 = registryIoc.rc
+registryIoc_RCS = registryIoc.rc
 
 ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks = registryIoc