--- imap/src/dmail/Makefile
+++ imap/src/dmail/Makefile
@@ -24,7 +24,7 @@
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS`
+CFLAGS = $(EXTRACFLAGS) -I$C `cat $C/CFLAGS`
 LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 
 dmail: $(CCLIENTLIB) dmail.o
--- imap/src/imapd/Makefile
+++ imap/src/imapd/Makefile
@@ -47,7 +47,7 @@
 C = ../c-client
 CCLIENTLIB = $C/c-client.a
 CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
+CFLAGS = $(EXTRACFLAGS) -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
 	-DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
 	-DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
 LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
--- imap/src/ipopd/Makefile
+++ imap/src/ipopd/Makefile
@@ -25,7 +25,7 @@
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS`
+CFLAGS = $(EXTRACFLAGS) -I$C `cat $C/CFLAGS`
 LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 
 ipopd: ipop2d ipop3d
--- imap/src/mailutil/Makefile
+++ imap/src/mailutil/Makefile
@@ -25,7 +25,7 @@
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS`
+CFLAGS = $(EXTRACFLAGS) -I$C `cat $C/CFLAGS`
 LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 
 mailutil: $(CCLIENTLIB) mailutil.o
--- imap/src/mlock/Makefile
+++ imap/src/mlock/Makefile
@@ -23,7 +23,7 @@
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
-CFLAGS = `cat $C/CFLAGS`
+CFLAGS = $(EXTRACFLAGS) `cat $C/CFLAGS`
 
 all:	mlock
 
--- imap/src/mtest/Makefile
+++ imap/src/mtest/Makefile
@@ -25,7 +25,7 @@
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS`
+CFLAGS = $(EXTRACFLAGS) -I$C `cat $C/CFLAGS`
 LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 
 all:	mtest
--- imap/src/tmail/Makefile
+++ imap/src/tmail/Makefile
@@ -24,7 +24,7 @@
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS`
+CFLAGS = $(EXTRACFLAGS) -I$C `cat $C/CFLAGS`
 LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 
 tmail: $(CCLIENTLIB) tmail.o
--- pico/osdep/makefile
+++ pico/osdep/makefile
@@ -21,7 +21,7 @@
 all:		includer $(ALL)
 
 includer:	includer.c
-		$(CC) -o includer includer.c
+		$(CC) $(EXTRACFLAGS) -o includer includer.c
 
 clean:
 		$(RM) $(ALL) includer
--- pico/osdep/makefile.bas
+++ pico/osdep/makefile.bas
@@ -21,7 +21,7 @@
 all:		includer $(ALL)
 
 includer:	includer.c
-		$(CC) -o includer includer.c
+		$(CC) $(EXTRACFLAGS) -o includer includer.c
 
 clean:
 		$(RM) $(ALL) includer
--- pine/osdep/makefile
+++ pine/osdep/makefile
@@ -20,7 +20,7 @@
 all:		includer $(ALL)
 
 includer:	includer.c
-		$(CC) -o includer includer.c
+		$(CC) $(EXTRACFLAGS) -o includer includer.c
 
 clean:
 		$(RM) $(ALL) includer