diff --git a/src/ca/Makefile.Unix b/src/ca/Makefile.Unix
index a61a6095a..5f7044dde 100644
--- a/src/ca/Makefile.Unix
+++ b/src/ca/Makefile.Unix
@@ -5,8 +5,6 @@ USR_LDLIBS = -lm -s
 USR_LDLIBS =
 USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO
 
-CC = acc -Xt
-
 SRCS = \
 	iocinf.c access.c test_event.c service.c flow_control.c \
 	repeater.c conn.c acctst.c syncgrp.c if_depen.c \
diff --git a/src/db/Makefile.Unix b/src/db/Makefile.Unix
index 602908adf..3a9d990ea 100644
--- a/src/db/Makefile.Unix
+++ b/src/db/Makefile.Unix
@@ -1,8 +1,6 @@
 EPICS = ../../..
 include $(EPICS)/config/CONFIG
 
-CC = acc -Xt 
-
 SRCS = \
 	dbStaticLib.c \
 	atdb_lex.c \
diff --git a/src/dbtools/Makefile.Unix b/src/dbtools/Makefile.Unix
index ebb1624b7..aa4a6be32 100644
--- a/src/dbtools/Makefile.Unix
+++ b/src/dbtools/Makefile.Unix
@@ -1,8 +1,6 @@
 EPICS = ../../..
 include $(EPICS)/config/CONFIG
 
-CC = acc -Xt 
-
 LEX = $(ELEX)
 YACC = $(EYACC)
 
diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix
index ee804e1d1..810b30ffc 100644
--- a/src/libCom/Makefile.Unix
+++ b/src/libCom/Makefile.Unix
@@ -3,9 +3,6 @@ include $(EPICS)/config/CONFIG
 
 USR_CFLAGS = -D_NO_PROTO
 
-
-CC = acc -Xt
-
 SRCS = \
 	arAccessLib.c arCSCheck.c arChanIO.c bfSubr.c bucketLib.c \
 	calcPerform.c cmdSubr.c cvtFast.c cvtNumbers.c ellLib.c \
diff --git a/src/toolsComm/antelope/Makefile.Unix b/src/toolsComm/antelope/Makefile.Unix
index 9ebdd3ac7..1f7121b73 100644
--- a/src/toolsComm/antelope/Makefile.Unix
+++ b/src/toolsComm/antelope/Makefile.Unix
@@ -5,7 +5,7 @@ include $(EPICS)/config/CONFIG
 LDLIBS = -lm -s
 USR_CFLAGS = -D_NO_PROTO
 
-CC = cc
+CC = $(oldCC)
 
 SRCS = \
 	closure.c error.c lalr.c lr0.c main.c \
diff --git a/src/toolsComm/flex/Makefile.Unix b/src/toolsComm/flex/Makefile.Unix
index 241bbab65..dd663aa36 100644
--- a/src/toolsComm/flex/Makefile.Unix
+++ b/src/toolsComm/flex/Makefile.Unix
@@ -8,7 +8,7 @@ USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\"
 
 LDLIBS = -s
 
-CC = cc
+CC = $(oldCC)
 
 SRCS = \
 	ccl.c dfa.c ecs.c gen.c main.c \
diff --git a/src/util/Makefile.Unix b/src/util/Makefile.Unix
index 5ca9443c9..61d583469 100644
--- a/src/util/Makefile.Unix
+++ b/src/util/Makefile.Unix
@@ -8,8 +8,7 @@ USR_LDLIBS = -lm -s
 
 USR_CFLAGS = -UvxWorks
 
-CC = acc -Xs
-#CC = cc
+CC = $(oldCC)
 
 SRCS = \
 	apCreateShadow.c apStatusSync.c bfRing.c ca_test.c calcTest.c \