diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in
index 4b0741705..5f10f1d8e 100644
--- a/appl/kx/Makefile.in
+++ b/appl/kx/Makefile.in
@@ -46,7 +46,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in
index 06e759e50..1fb03eace 100644
--- a/appl/otp/Makefile.in
+++ b/appl/otp/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../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in
index 36b0224f3..34a121666 100644
--- a/appl/popper/Makefile.in
+++ b/appl/popper/Makefile.in
@@ -45,7 +45,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index 61d39ccc9..03c79cd1d 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -43,7 +43,7 @@ Wall:
 	make CFLAGS="$(XINCS) -g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in
index 6a636b41c..c4cd70113 100644
--- a/lib/des/Makefile.in
+++ b/lib/des/Makefile.in
@@ -44,19 +44,19 @@ Wall:
 	make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
 
 destest.o: destest.c
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 des.o: des.c
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 rpw.o: rpw.c
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 speed.o: speed.c
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index ff6eca343..42af89f16 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/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../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index 7902d3aa8..b8e4b983a 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -41,7 +41,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(libdir)
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index e5b7517e0..dd8023704 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -41,7 +41,7 @@ Wall:
 		make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
 
 install: all