diff --git a/lib/Makefile b/lib/Makefile
index 49e6364..1da3f99 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,20 +2,10 @@ TOPSRC          = $(shell cd ..; pwd)
 SUBDIR		= startup libc libcurses libtermlib libwiznet
 PROG		= ar as aout ld nm ranlib size strip
 
-# Build a list of the host include directories.
-CPP             = $(shell gcc -print-prog-name=cc1)
-HOSTINC         = $(addprefix -I,$(shell echo | $(CPP) -v 2>&1 | grep '^ /.*include'))
-
-# Add system include path
-ifeq (,$(wildcard /usr/include/i386-linux-gnu))
-    HOSTINC     += -I/usr/include
-else
-    HOSTINC     += -I/usr/include/i386-linux-gnu
-endif
-
-CFLAGS		+= -nostdinc -fno-builtin -g -Werror -Wall -DCROSS -I. $(HOSTINC) \
-                   -I$(TOPSRC)/include -I$(TOPSRC)/src/cmd/ar \
-                   -I$(TOPSRC)/src/cmd/as
+CFLAGS          += -std=gnu89 -fno-builtin -g -Werror -Wall -DCROSS -I. \
+                   -idirafter $(TOPSRC)/include \
+                   -idirafter $(TOPSRC)/src/cmd/ar \
+                   -idirafter $(TOPSRC)/src/cmd/as
 LDFLAGS         += -g
 
 AR_OBJS         = ar.o append.o archive.o contents.o delete.o extract.o \
diff --git a/src/cmd/awk/Makefile b/src/cmd/awk/Makefile
index 2bcfc2e..ae15286 100644
--- a/src/cmd/awk/Makefile
+++ b/src/cmd/awk/Makefile
@@ -37,7 +37,7 @@ lint:
 			egrep -v '^(error|free|malloc)'
 
 proctab.c:	proc.c token.h awk.h
-		cc -Wall -Werror -o proc proc.c
+		cc -std=gnu89 -Wall -Werror -o proc proc.c
 		./proc > proctab.c
 
 clean: