Index: sys/conf/files
===================================================================
RCS file: /cvsroot/src/sys/conf/files,v
retrieving revision 1.1159
diff -u -p -r1.1159 files
--- sys/conf/files	27 May 2016 20:01:49 -0000	1.1159
+++ sys/conf/files	23 Jun 2016 06:24:12 -0000
@@ -193,6 +193,10 @@ defflag opt_kernhist.h			KERNHIST KERNHI
 defparam opt_kernhist.h			KERNHIST_DELAY
 file	kern/kern_history.c		kernhist
 
+# top level usb debug defines
+defflag	opt_usb.h			USB_DEBUG: KERNHIST
+defparam opt_usb.h			USBHIST_SIZE
+
 #
 # System monitoring framework
 #
Index: sys/dev/usb/files.usb
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/files.usb,v
retrieving revision 1.139
diff -u -p -r1.139 files.usb
--- sys/dev/usb/files.usb	26 Apr 2016 10:38:43 -0000	1.139
+++ sys/dev/usb/files.usb	23 Jun 2016 06:24:12 -0000
@@ -5,12 +5,8 @@
 # their own "major" declarations for the appropriate devices.
 
 defflag	USBVERBOSE
-defparam opt_usb.h	USBHIST_SIZE
 defflag	opt_usb.h	USB_FRAG_DMA_WORKAROUND
 
-# top level usb debug defines
-defflag	opt_usb.h	USB_DEBUG: KERNHIST
-
 # HC controllers
 defflag	opt_usb.h	EHCI_DEBUG: USB_DEBUG
 defflag	opt_usb.h	OHCI_DEBUG: USB_DEBUG
Index: sys/kern/kern_history.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_history.c,v
retrieving revision 1.5
diff -u -p -r1.5 kern_history.c
--- sys/kern/kern_history.c	22 Jun 2016 07:44:02 -0000	1.5
+++ sys/kern/kern_history.c	23 Jun 2016 06:24:12 -0000
@@ -46,11 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_history
 #include <sys/cpu.h>
 #include <sys/kernhist.h>
 
-#include "usb.h"
-#if NUSB == 0
-#undef USB_DEBUG
-#endif
-
 #ifdef UVMHIST
 #include <uvm/uvm.h>
 #endif