--- Libc/Libc-583/Makefile.inc
+++ Libc/Libc-262.3.2/Makefile.inc
@@ -6,79 +6,33 @@
 # errors if the included makefiles don't change these:
 MDSRCS=
 MISRCS=
-
-# SUPPRESSSRCS is used to prevent machine-independent files from being
-# built, when a machine-dependent file defines multiple symbols.
-# Use MDSRCS to block one file, and SUPPRESSSRCS to block the others.
-SUPPRESSSRCS=
-
-# Auto-patching variables
-AUTOPATCHHDRS=
-AUTOPATCHMAN=
-AUTOPATCHSRCS=
-
-# Auto-patch (or symlink)
-_AUTOPATCH: .USE
-	@if [ -f ${.ALLSRC}.patch ]; then \
-	    ${ECHO} ${CP} ${.ALLSRC} ${.TARGET}; \
-	    ${CP} ${.ALLSRC} ${.TARGET}; \
-	    ${ECHO} ${PATCH} ${.TARGET} ${.ALLSRC}.patch; \
-	    ${PATCH} ${.TARGET} ${.ALLSRC}.patch; \
-	else \
-	    t=`${BASENAME} ${.ALLSRC}` && x=`${DIRNAME} ${.ALLSRC}` && d=`${BASENAME} $$x`; \
-	    ${ECHO} ${LN} -fs $$d/$$t ${.TARGET}; \
-	    ${LN} -fs $$d/$$t ${.TARGET}; \
-	fi
-# Standard compilation for the various forms
-_STANDARD_STATIC: .USE
-	${MYCC} -static \
-	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
-	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
-	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
-	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-_STANDARD_PROFILE: .USE
-	${MYCC} -pg -DPROFILE \
-	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
-	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
-	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
-	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-_STANDARD_DYNAMIC: .USE
-	${MYCC} \
-	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
-	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
-	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
-	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-_STANDARD_DEBUG: .USE
-	${MYCC} -g -DDEBUG \
-	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
-	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
-	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
-	    -c ${.IMPSRC} -o ${.TARGET}
+MDASM=
+MIASM=
+NOASM=
 
 #
 # If there is a machine dependent makefile, use it:
 #
-.sinclude "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.endif
 
-.include "${.CURDIR}/darwin/Makefile.inc"
 .include "${.CURDIR}/db/Makefile.inc"
 .include "${.CURDIR}/compat-43/Makefile.inc"
-.include "${.CURDIR}/emulated/Makefile.inc"
-.include "${.CURDIR}/gdtoa/Makefile.inc"
 .include "${.CURDIR}/gen/Makefile.inc"
 .include "${.CURDIR}/gmon/Makefile.inc"
 .include "${.CURDIR}/include/Makefile.inc"
-.ifdef FEATURE_LEGACY_NX_INTERNAT_APIS
 .include "${.CURDIR}/internat/Makefile.inc"
+.include "${.CURDIR}/locale/Makefile.inc"
+.include "${.CURDIR}/mach/Makefile.inc"
+.include "${.CURDIR}/net/Makefile.inc"
+#.include "${.CURDIR}/nls/Makefile.inc"
+#.include "${.CURDIR}/posix1e/Makefile.inc"
+.include "${.CURDIR}/pthreads/Makefile.inc"
+.if !defined(NO_QUAD)
+#.include "${.CURDIR}/quad/Makefile.inc"
 .endif
-.include "${.CURDIR}/locale/Makefile.inc"
-.include "${.CURDIR}/man/Makefile.inc"
-.include "${.CURDIR}/net/Makefile.inc"
-.include "${.CURDIR}/nls/Makefile.inc"
-.include "${.CURDIR}/posix1e/Makefile.inc"
-.include "${.CURDIR}/pthreads/Makefile.inc"
 .include "${.CURDIR}/regex/Makefile.inc"
-.include "${.CURDIR}/secure/Makefile.inc"
 .include "${.CURDIR}/stdio/Makefile.inc"
 .include "${.CURDIR}/stdlib/Makefile.inc"
 .include "${.CURDIR}/stdtime/Makefile.inc"
@@ -86,7 +40,15 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/threads/Makefile.inc"
 .include "${.CURDIR}/util/Makefile.inc"
-.include "${.CURDIR}/uuid/Makefile.inc"
+#.include "${.CURDIR}/rpc/Makefile.inc"
+#.include "${.CURDIR}/xdr/Makefile.inc"
+.if !defined(NO_YP_LIBC)
+CFLAGS+= -DYP
+#.include "${.CURDIR}/yp/Makefile.inc"
+.endif
+.if !defined(NO_HESIOD_LIBC)
+CFLAGS+= -DHESIOD
+.endif
 
 # If there are no machine dependent sources, append all the
 # machine-independent sources:
@@ -94,11 +56,10 @@
 SRCS+=	${MISRCS}
 .else
 # Append machine-dependent sources, then append machine-independent sources
-# for which there is no machine-dependent variant, and not being suppressed.
+# for which there is no machine-dependent variant.
 SRCS+=	${MDSRCS}
-_SUPPRESS= ${MDSRCS} ${SUPPRESSSRCS}
 .for _src in ${MISRCS}
-.if ${_SUPPRESS:R:M${_src:R}} == ""
+.if ${MDSRCS:R:M${_src:R}} == ""
 SRCS+=	${_src}
 .endif
 .endfor