From cc548bd9fb701ffc601cd2e4665170e681603706 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Thu, 16 Mar 2006 11:19:36 +0000
Subject: [PATCH] Remove nested includes of <sys/_lock.h> and <sys/_mutex.h>
 which spill into userland.  The comment indicated that something in userland
 needed them, but make universe can't seem to find any traces of it.

Move <sys/queue.h> include up.
---
 sys/sys/event.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sys/sys/event.h b/sys/sys/event.h
index 4395cbbaee0..34794b4db99 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -29,6 +29,8 @@
 #ifndef _SYS_EVENT_H_
 #define _SYS_EVENT_H_
 
+#include <sys/queue.h> 
+
 #define EVFILT_READ		(-1)
 #define EVFILT_WRITE		(-2)
 #define EVFILT_AIO		(-3)	/* attached to aio requests */
@@ -114,13 +116,6 @@ struct kevent {
 #define NOTE_LINKDOWN	0x0002			/* link is down */
 #define NOTE_LINKINV	0x0004			/* link state is invalid */
 
-/*
- * This is currently visible to userland to work around broken
- * programs which pull in <sys/proc.h>.
- */
-#include <sys/queue.h> 
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
 struct knote;
 SLIST_HEAD(klist, knote);
 struct kqueue;