diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 9a9386dfbe31..b3f42cccf38c 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -129,9 +129,9 @@
 
 #ifndef LOCORE
 
+#include <sys/queue.h>
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
-#include <sys/queue.h>
 
 typedef u_int64_t pd_entry_t;
 typedef u_int64_t pt_entry_t;
diff --git a/sys/net/pfil.h b/sys/net/pfil.h
index b1f29aecc268..5400a720afeb 100644
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -33,10 +33,10 @@
 #define _NET_PFIL_H_
 
 #include <sys/systm.h>
+#include <sys/queue.h>
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 #include <sys/condvar.h>	/* XXX */
-#include <sys/queue.h>
 
 struct mbuf;
 struct ifnet;
diff --git a/sys/sys/_lock.h b/sys/sys/_lock.h
index 0dcde9751609..1770487d709f 100644
--- a/sys/sys/_lock.h
+++ b/sys/sys/_lock.h
@@ -31,8 +31,6 @@
 #ifndef _SYS__LOCK_H_
 #define	_SYS__LOCK_H_
 
-#include <sys/queue.h>
-
 struct lock_object {
 	struct	lock_class *lo_class;
 	const	char *lo_name;		/* Individual lock name. */
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index a7499d61830f..aaa71ab7e981 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -43,9 +43,9 @@
 #ifndef _KERNEL
 #include <sys/filedesc.h>
 #endif
+#include <sys/queue.h>
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
-#include <sys/queue.h>
 #include <sys/priority.h>
 #include <sys/rtprio.h>			/* XXX. */
 #include <sys/runq.h>