diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in
index 1c91e8480..2e6143097 100644
--- a/appl/ftp/common/Makefile.in
+++ b/appl/ftp/common/Makefile.in
@@ -29,7 +29,7 @@ LIB = $(LIBNAME).$(LIBEXT)
 all: $(LIB)
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(srcdir) -I../../../include $(DEFS) $<
+	$(CC) -c -I$(srcdir) -I../../../include $(DEFS) $(CFLAGS) $(CPPFLAGS) $<
 
 $(LIB): $(libcommon_OBJS)
 	rm -f $@
diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in
index 994f28efb..49a466faa 100644
--- a/appl/ftp/ftp/Makefile.in
+++ b/appl/ftp/ftp/Makefile.in
@@ -48,7 +48,7 @@ SOURCES = $(ftp_SOURCES)
 all: $(PROGS)
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) $<
+	$(CC) -c -I$(srcdir) -I../../../include $(DEFS) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in
index ce6cf86ba..c1d6c48f8 100644
--- a/appl/ftp/ftpd/Makefile.in
+++ b/appl/ftp/ftpd/Makefile.in
@@ -53,7 +53,7 @@ OBJECTS = $(ftpd_OBJS)
 all: $(PROGS)
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(srcdir) -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $<
+	$(CC) -c -I$(srcdir) -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libexecdir)
diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in
index b0a107b92..4b1d7c4d2 100644
--- a/appl/kx/Makefile.in
+++ b/appl/kx/Makefile.in
@@ -51,7 +51,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../kauth $(CFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../kauth $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in
index b438ba2dd..e870ef177 100644
--- a/appl/otp/Makefile.in
+++ b/appl/otp/Makefile.in
@@ -41,7 +41,7 @@ SOURCES = $(SOURCES_OTP) $(SOURCES_OTPPRINT)
 all: $(PROGS)
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in
index 4b564c516..8fba49cb7 100644
--- a/appl/popper/Makefile.in
+++ b/appl/popper/Makefile.in
@@ -62,7 +62,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in
index 8d8beb178..b1e34f13a 100644
--- a/appl/telnet/libtelnet/Makefile.in
+++ b/appl/telnet/libtelnet/Makefile.in
@@ -27,7 +27,7 @@ all: $(LIB)
 libtop = @libtop@
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I$(srcdir)/.. $<
+	$(CC) -c $(DEFS) -I../../../include -I$(srcdir)/.. $(CFLAGS) $(CPPFLAGS) $<
 
 $(LIB): $(OBJECTS)
 	rm -f $@
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index 44fed2e5b..1c62c12c8 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -45,7 +45,7 @@ KLIB=$(LIBKRB) $(LIBDES)
 all: $(PROGS)
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I$(srcdir)/.. $<
+	$(CC) -c $(DEFS) -I../../../include -I.. -I$(srcdir)/.. $(CFLAGS) $(CPPFLAGS) $<
 
 telnet$(EXECSUFFIX): $(OBJECTS)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index f249e6b14..cf1d59c4c 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -48,7 +48,7 @@ KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES)
 all: $(PROGS)
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I$(srcdir)/.. -I. -I$(srcdir) $<
+	$(CC) -c $(DEFS) -I../../../include -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 telnetd$(EXECSUFFIX): $(OBJECTS)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index d49fbc0e5..482902681 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -47,7 +47,7 @@ Wall:
 	make CFLAGS="$(XINCS) -g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in
index 37a9ea7a2..6d4daa2be 100644
--- a/lib/auth/afskauthlib/Makefile.in
+++ b/lib/auth/afskauthlib/Makefile.in
@@ -39,7 +39,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in
index af5121567..0c2be7f3f 100644
--- a/lib/auth/pam/Makefile.in
+++ b/lib/auth/pam/Makefile.in
@@ -38,7 +38,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in
index 52bfab9d8..14f40db24 100644
--- a/lib/auth/sia/Makefile.in
+++ b/lib/auth/sia/Makefile.in
@@ -39,7 +39,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/com_err/Makefile.in b/lib/com_err/Makefile.in
index 5670b5936..b1efac565 100644
--- a/lib/com_err/Makefile.in
+++ b/lib/com_err/Makefile.in
@@ -46,7 +46,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index 478196bf8..c8700c708 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -40,7 +40,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index d1d6eaa2a..832b8047e 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -41,7 +41,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index aed67b849..358bcd78d 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -55,7 +55,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index ac4456758..e04b7777c 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -112,7 +112,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I. -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 
diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in
index dfd34cf28..fcaba41cd 100644
--- a/lib/sl/Makefile.in
+++ b/lib/sl/Makefile.in
@@ -45,7 +45,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)