diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index b4157b61a227..e8273f08a59c 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 1999/02/13 02:54:23 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 1999/02/24 17:18:26 drochner Exp $
 
 LIB=		g2c
 
@@ -64,7 +64,13 @@ DPSRCS+=	g2c.h
 
 MKLINT=		no
 
-CPPFLAGS+=	-I. -I${.CURDIR} -I${ARCH} -I${ARCH}/${MACHINE_ARCH} \
+.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
+ARCHSUBDIR= mips
+.else
+ARCHSUBDIR= ${MACHINE_ARCH}
+.endif
+
+CPPFLAGS+=	-I. -I${.CURDIR} -I${ARCH} -I${ARCH}/${ARCHSUBDIR} \
 		-I${DIST}/libf2c -I${DIST}/libf2c/libF77 \
 		-I${DIST}/libf2c/libI77 -I${DIST}/libf2c/libU77 \
 		-I${DIST}/gcc/config -I${DIST}/gcc/f -I${DIST}/gcc \
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 3691dd3c47f3..f1ce58a7acf3 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 1999/02/13 02:54:23 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 1999/02/24 17:18:26 drochner Exp $
 
 HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
@@ -9,7 +9,13 @@ MKPIC=		no
 DIST=		${.CURDIR}/../../dist/gcc
 ARCH=		${.CURDIR}/../../usr.bin/egcs/arch
 
-CPPFLAGS+=	-I${ARCH}/${MACHINE_ARCH} -I${ARCH} \
+.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
+ARCHSUBDIR= mips
+.else
+ARCHSUBDIR= ${MACHINE_ARCH}
+.endif
+
+CPPFLAGS+=	-I${ARCH}/${ARCHSUBDIR} -I${ARCH} \
 		-I${DIST}/config -I${DIST}/cp -I${DIST}
 
 LIB2OBJS=	__gcc_bcmp.o _varargs.o __dummy.o _eprintf.o _bb.o _shtab.o \
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index d5004b3a9b56..669cb06abad4 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 1999/02/13 02:54:23 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 1999/02/24 17:18:26 drochner Exp $
 
 HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
@@ -15,7 +15,13 @@ INCS=		hash.h objc-list.h sarray.h objc.h objc-api.h NXConstStr.h \
 		Object.h Protocol.h encoding.h typedstream.h thr.h
 INCSDIR=	/usr/include/objc
 
-CPPFLAGS+=	-I. -I${ARCH}/${MACHINE_ARCH} -I${ARCH} \
+.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
+ARCHSUBDIR= mips
+.else
+ARCHSUBDIR= ${MACHINE_ARCH}
+.endif
+
+CPPFLAGS+=	-I. -I${ARCH}/${ARCHSUBDIR} -I${ARCH} \
 		-I${DIST}/config -I${DIST}
 
 MKLINT=		no