Index: sys/sys/device.h
===================================================================
RCS file: /cvsroot/src/sys/sys/device.h,v
retrieving revision 1.151
diff -u -r1.151 device.h
--- sys/sys/device.h	4 Mar 2018 07:13:11 -0000	1.151
+++ sys/sys/device.h	18 Apr 2018 05:46:39 -0000
@@ -84,9 +84,18 @@
 #if defined(_KERNEL) || defined(_KMEMUSER)
 #include <sys/mutex.h>
 #include <sys/condvar.h>
+#endif
+
+#if defined(_KERNEL)
 #include <sys/pmf.h>
 #endif
 
+#ifndef _PMF_QUAL_T_DECLARED
+struct pmf_qual;
+typedef struct pmf_qual pmf_qual_t;
+#define _PMF_QUAL_T_DECLARED
+#endif
+
 #include <prop/proplib.h>
 
 /*
Index: sys/sys/pmf.h
===================================================================
RCS file: /cvsroot/src/sys/sys/pmf.h,v
retrieving revision 1.23
diff -u -r1.23 pmf.h
--- sys/sys/pmf.h	4 Mar 2018 19:23:33 -0000	1.23
+++ sys/sys/pmf.h	18 Apr 2018 05:46:39 -0000
@@ -61,7 +61,11 @@
 	devact_level_t			pq_actlvl;
 };
 
+#ifndef _PMF_QUAL_T_DECLARED
 typedef struct pmf_qual pmf_qual_t;
+#define _PMF_QUAL_T_DECLARED
+#endif
+
 #endif
 
 #if defined(_KERNEL)