With the recent changes to the implementation of page coloring, the

the option PQ_NOOPT is used exclusively by vm_pageq.c.  Thus, the
include of opt_vmpage.h can be removed from vm_page.h.

sys/vm/vm_page.h

@@ -67,10 +67,6 @@
 #ifndef	_VM_PAGE_
 #define	_VM_PAGE_
 
-#if !defined(KLD_MODULE) && !defined(LIBMEMSTAT)
-#include "opt_vmpage.h"
-#endif
-
 #include <vm/pmap.h>
 
 /*

sys/vm/vm_pageq.c

@@ -28,6 +28,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_vmpage.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/linker_set.h>