diff --git a/sys/lib/libkern/Makefile b/sys/lib/libkern/Makefile
index cc181abcda58..fcca26032178 100644
--- a/sys/lib/libkern/Makefile
+++ b/sys/lib/libkern/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.85 2007/11/20 13:49:01 yamt Exp $
+#	$NetBSD: Makefile,v 1.86 2007/11/22 22:56:17 plunky Exp $
 
 LIB=		kern
 NOPIC=		# defined
@@ -47,7 +47,7 @@ SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 # Other stuff
 SRCS+=	__cmsg_alignbytes.c inet_addr.c intoa.c
 SRCS+=	md4c.c md5c.c rmd160.c sha1.c sha2.c
-SRCS+=	pmatch.c _que.c arc4random.c bcd.c mcount.c
+SRCS+=	pmatch.c arc4random.c bcd.c mcount.c
 
 SRCS+=	strsep.c strstr.c strlcpy.c strlcat.c
 
diff --git a/sys/lib/libkern/_que.c b/sys/lib/libkern/_que.c
deleted file mode 100644
index af69044c97c1..000000000000
--- a/sys/lib/libkern/_que.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: _que.c,v 1.3 2005/12/11 12:24:37 christos Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*
- * Use <sys/queue.h> macros for new code, queue functions provided here
- * are obsolete. Once the remaining code using this would be converted
- * to use <sys/queue.h>, this would be removed.
- */
-
-#include <sys/types.h>
-#include <sys/systm.h>
-
-struct queue {
-	struct queue *q_next, *q_prev;
-};
-
-/*
- * insert an element into a queue
- */
-
-void
-_insque(v1, v2)
-	void *v1;
-	void *v2;
-{
-	struct queue *elem = v1, *head = v2;
-	struct queue *next;
-
-	next = head->q_next;
-	elem->q_next = next;
-	head->q_next = elem;
-	elem->q_prev = head;
-	next->q_prev = elem;
-}
-
-/*
- * remove an element from a queue
- */
-
-void
-_remque(v)
-	void *v;
-{
-	struct queue *elem = v;
-	struct queue *next, *prev;
-
-	next = elem->q_next;
-	prev = elem->q_prev;
-	next->q_prev = prev;
-	prev->q_next = next;
-	elem->q_prev = 0;
-}
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index c00050dee432..cd1841c92f3d 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: systm.h,v 1.202 2007/11/13 22:14:34 ad Exp $	*/
+/*	$NetBSD: systm.h,v 1.203 2007/11/22 22:56:16 plunky Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
@@ -133,13 +133,6 @@ extern int boothowto;		/* reboot flags, from console subsystem */
 
 extern void (*v_putc)(int); /* Virtual console putc routine */
 
-extern	void	_insque(void *, void *);
-extern	void	_remque(void *);
-
-/* casts to keep lint happy, but it should be happy with void **/
-#define	insque(q,p)	_insque(q, p)
-#define	remque(q)	_remque(q)
-
 /*
  * General function declarations.
  */