Index: head/usr.bin/ipcs/ipc.c
===================================================================
--- head/usr.bin/ipcs/ipc.c
+++ head/usr.bin/ipcs/ipc.c
@@ -35,11 +35,12 @@
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
-#define _KERNEL
+#define	_WANT_SYSVMSG_INTERNALS
+#include <sys/msg.h>
+#define	_WANT_SYSVSEM_INTERNALS
 #include <sys/sem.h>
+#define	_WANT_SYSVSHM_INTERNALS
 #include <sys/shm.h>
-#include <sys/msg.h>
-#undef _KERNEL
 
 #include <assert.h>
 #include <err.h>
Index: head/usr.bin/ipcs/ipcs.c
===================================================================
--- head/usr.bin/ipcs/ipcs.c
+++ head/usr.bin/ipcs/ipcs.c
@@ -32,11 +32,12 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
-#define _KERNEL
+#define	_WANT_SYSVMSG_INTERNALS
+#include <sys/msg.h>
+#define	_WANT_SYSVSEM_INTERNALS
 #include <sys/sem.h>
+#define	_WANT_SYSVSHM_INTERNALS
 #include <sys/shm.h>
-#include <sys/msg.h>
-#undef _KERNEL
 
 #include <err.h>
 #include <fcntl.h>