3 files changed, 4 insertions, 60 deletions

diff --git a/include/Makefile b/include/Makefile
index a7759c338ecc..56b26187ab5e 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -9,7 +9,7 @@
 CLEANFILES= osreldate.h version vers.c
 SUBDIR= rpcsvc rpc
 FILES=	a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
-	dlfcn.h elf.h err.h fnmatch.h fstab.h \
+	dlfcn.h elf-hints.h err.h fnmatch.h fstab.h \
 	fts.h glob.h grp.h strhash.h \
 	hesiod.h histedit.h ieeefp.h ifaddrs.h iso646.h langinfo.h \
 	libgen.h limits.h link.h locale.h malloc.h memory.h mpool.h \
diff --git a/include/elf-hints.h b/include/elf-hints.h
index 963308378330..e009074a98e7 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -26,11 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_ELF_H_
-#define	_ELF_H_
-
-#include <sys/types.h>
-#include <machine/elf.h>
+#ifndef	_ELF_HINTS_H_
+#define	_ELF_HINTS_H_
 
 /*
  * Hints file produced by ldconfig.
@@ -50,4 +47,4 @@ struct elfhints_hdr {
 
 #define _PATH_ELF_HINTS	"/var/run/ld-elf.so.hints"
 
-#endif /* !_ELF_H_ */
+#endif /* !_ELF_HINTS_H_ */
diff --git a/include/elf.h b/include/elf.h
deleted file mode 100644
index 963308378330..000000000000
--- a/include/elf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1997 John D. Polstra.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef	_ELF_H_
-#define	_ELF_H_
-
-#include <sys/types.h>
-#include <machine/elf.h>
-
-/*
- * Hints file produced by ldconfig.
- */
-struct elfhints_hdr {
-	u_int32_t	magic;		/* Magic number */
-	u_int32_t	version;	/* File version (1) */
-	u_int32_t	strtab;		/* Offset of string table in file */
-	u_int32_t	strsize;	/* Size of string table */
-	u_int32_t	dirlist;	/* Offset of directory list in
-					   string table */
-	u_int32_t	dirlistlen;	/* strlen(dirlist) */
-	u_int32_t	spare[26];	/* Room for expansion */
-};
-
-#define ELFHINTS_MAGIC	0x746e6845
-
-#define _PATH_ELF_HINTS	"/var/run/ld-elf.so.hints"
-
-#endif /* !_ELF_H_ */