diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h
index 0849a11e6c1b..fbc11bc7239a 100644
--- a/lib/libc/i386/DEFS.h
+++ b/lib/libc/i386/DEFS.h
@@ -35,87 +35,7 @@
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
  *
- *	$Id$
+ *	$Id: DEFS.h,v 1.6 1997/02/22 14:58:29 peter Exp $
  */
 
-#include <sys/cdefs.h>
-
-#ifdef PIC
-#define	PIC_PROLOGUE	\
-	pushl	%ebx;	\
-	call	1f;	\
-1:			\
-	popl	%ebx;	\
-	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b],%ebx
-#define	PIC_EPILOGUE	\
-	popl	%ebx
-#define	PIC_PLT(x)	x@PLT
-#define	PIC_GOT(x)	x@GOT(%ebx)
-#define	PIC_GOTOFF(x)	x@GOTOFF(%ebx)
-#else
-#define	PIC_PROLOGUE
-#define	PIC_EPILOGUE
-#define	PIC_PLT(x)	x
-#define	PIC_GOT(x)	x
-#define	PIC_GOTOFF(x)	x
-#endif
-
-/*
- * CNAME and HIDENAME manage the relationship between symbol names in C
- * and the equivalent assembly language names.  CNAME is given a name as
- * it would be used in a C program.  It expands to the equivalent assembly
- * language name.  HIDENAME is given an assembly-language name, and expands
- * to a possibly-modified form that will be invisible to C programs.
- */
-#if defined(__ELF__) /* { */
-#define CNAME(csym)		csym
-#define HIDENAME(asmsym)	__CONCAT(.,asmsym)
-#else /* } { */
-#define CNAME(csym)		__CONCAT(_,csym)
-#define HIDENAME(asmsym)	asmsym
-#endif /* } */
-
-
-/* XXX should use align 4,0x90 for -m486. */
-#define _START_ENTRY	.text; .align 2,0x90;
-#if 0
-/* Data is not used, except perhaps by non-g prof, which we don't support. */
-#define _MID_ENTRY	.data; .align 2; 8:; .long 0;		\
-			.text; lea 8b,%eax;
-#else
-#define _MID_ENTRY
-#endif
-
-#ifdef PROF
-
-#define ALTENTRY(x)	_START_ENTRY	\
-			.globl CNAME(x); .type CNAME(x),@function; CNAME(x):; \
-			_MID_ENTRY	\
-			call HIDENAME(mcount); jmp 9f
-
-#define ENTRY(x)	_START_ENTRY	\
-			.globl CNAME(x); .type CNAME(x),@function; CNAME(x):; \
-			_MID_ENTRY	\
-			call HIDENAME(mcount); 9:
-
-
-#define	ALTASENTRY(x)	_START_ENTRY	\
-			.globl x; .type x,@function; x:;	\
-			_MID_ENTRY	\
-			call HIDENAME(mcount); jmp 9f
-
-#define	ASENTRY(x)	_START_ENTRY	\
-			.globl x; .type x,@function; x:;	\
-			_MID_ENTRY	\
-			call HIDENAME(mcount); 9:
-
-#else	/* !PROF */
-
-#define	ENTRY(x)	_START_ENTRY .globl CNAME(x); .type CNAME(x),@function; \
-			CNAME(x):
-#define	ALTENTRY(x)	ENTRY(x)
-
-#define	ASENTRY(x)	_START_ENTRY .globl x; .type x,@function; x:
-#define	ALTASENTRY(x)	ASENTRY(x)
-
-#endif
+#include <machine/asm.h>