Fix _USB2_* refernces in the header protection defines.

32 files changed, 96 insertions, 96 deletions

diff --git a/sys/dev/usb/net/usb_ethernet.h b/sys/dev/usb/net/usb_ethernet.h
index ad57a85..51a8107 100644
--- a/sys/dev/usb/net/usb_ethernet.h
+++ b/sys/dev/usb/net/usb_ethernet.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_ETHERNET_H_
-#define	_USB2_ETHERNET_H_
+#ifndef _USB_ETHERNET_H_
+#define	_USB_ETHERNET_H_
 
 #include "opt_inet.h"
 
@@ -119,4 +119,4 @@ int		uether_rxbuf(struct usb_ether *,
 		    unsigned int, unsigned int);
 void		uether_rxflush(struct usb_ether *);
 uint8_t		uether_is_gone(struct usb_ether *);
-#endif					/* _USB2_ETHERNET_H_ */
+#endif					/* _USB_ETHERNET_H_ */
diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h
index c9223e8..4912440 100644
--- a/sys/dev/usb/quirk/usb_quirk.h
+++ b/sys/dev/usb/quirk/usb_quirk.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_QUIRK_H_
-#define	_USB2_QUIRK_H_
+#ifndef _USB_QUIRK_H_
+#define	_USB_QUIRK_H_
 
 /* NOTE: UQ_NONE is not a valid quirk */
 enum {	/* keep in sync with usb_quirk_str table */
@@ -56,4 +56,4 @@ enum {	/* keep in sync with usb_quirk_str table */
 	USB_QUIRK_MAX
 };
 
-#endif					/* _USB2_QUIRK_H_ */
+#endif					/* _USB_QUIRK_H_ */
diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h
index 66a65da..94f82f1 100644
--- a/sys/dev/usb/serial/usb_serial.h
+++ b/sys/dev/usb/serial/usb_serial.h
@@ -64,8 +64,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _USB2_SERIAL_H_
-#define	_USB2_SERIAL_H_
+#ifndef _USB_SERIAL_H_
+#define	_USB_SERIAL_H_
 
 #include <sys/tty.h>
 #include <sys/serial.h>
@@ -196,4 +196,4 @@ uint8_t	ucom_get_data(struct ucom_softc *, struct usb_page_cache *,
 void	ucom_put_data(struct ucom_softc *, struct usb_page_cache *,
 	    uint32_t, uint32_t);
 uint8_t	ucom_cfg_is_gone(struct ucom_softc *);
-#endif					/* _USB2_SERIAL_H_ */
+#endif					/* _USB_SERIAL_H_ */
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index aba4d0a..e9fc6a5 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -36,8 +36,8 @@
  * USB v3.0
  */
 
-#ifndef _USB2_STANDARD_H_
-#define	_USB2_STANDARD_H_
+#ifndef _USB_STANDARD_H_
+#define	_USB_STANDARD_H_
 
 #include <dev/usb/usb_endian.h>
 
@@ -642,4 +642,4 @@ struct usb_port_status {
 } __packed;
 typedef struct usb_port_status usb_port_status_t;
 
-#endif					/* _USB2_STANDARD_H_ */
+#endif					/* _USB_STANDARD_H_ */
diff --git a/sys/dev/usb/usb_bus.h b/sys/dev/usb/usb_bus.h
index 942d919..8d64199 100644
--- a/sys/dev/usb/usb_bus.h
+++ b/sys/dev/usb/usb_bus.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_BUS_H_
-#define	_USB2_BUS_H_
+#ifndef _USB_BUS_H_
+#define	_USB_BUS_H_
 
 /*
  * The following structure defines the USB explore message sent to the USB
@@ -105,4 +105,4 @@ struct usb_bus {
 	}	scratch[1];
 };
 
-#endif					/* _USB2_BUS_H_ */
+#endif					/* _USB_BUS_H_ */
diff --git a/sys/dev/usb/usb_busdma.h b/sys/dev/usb/usb_busdma.h
index 9d7c2d6..86cb65c 100644
--- a/sys/dev/usb/usb_busdma.h
+++ b/sys/dev/usb/usb_busdma.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_BUSDMA_H_
-#define	_USB2_BUSDMA_H_
+#ifndef _USB_BUSDMA_H_
+#define	_USB_BUSDMA_H_
 
 #include <sys/uio.h>
 #include <sys/mbuf.h>
@@ -172,4 +172,4 @@ void	usb_pc_cpu_invalidate(struct usb_page_cache *pc);
 void	usb_pc_dmamap_destroy(struct usb_page_cache *pc);
 void	usb_pc_free_mem(struct usb_page_cache *pc);
 
-#endif					/* _USB2_BUSDMA_H_ */
+#endif					/* _USB_BUSDMA_H_ */
diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h
index 1b5a391..623c0f5 100644
--- a/sys/dev/usb/usb_controller.h
+++ b/sys/dev/usb/usb_controller.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_CONTROLLER_H_
-#define	_USB2_CONTROLLER_H_
+#ifndef _USB_CONTROLLER_H_
+#define	_USB_CONTROLLER_H_
 
 /* defines */
 
@@ -190,4 +190,4 @@ uint16_t usb_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr);
 uint16_t usbd_fs_isoc_schedule_isoc_time_expand(struct usb_device *udev, struct usb_fs_isoc_schedule **pp_start, struct usb_fs_isoc_schedule **pp_end, uint16_t isoc_time);
 uint8_t	usbd_fs_isoc_schedule_alloc(struct usb_fs_isoc_schedule *fss, uint8_t *pstart, uint16_t len);
 
-#endif					/* _USB2_CONTROLLER_H_ */
+#endif					/* _USB_CONTROLLER_H_ */
diff --git a/sys/dev/usb/usb_core.h b/sys/dev/usb/usb_core.h
index c7018af..ad302bc 100644
--- a/sys/dev/usb/usb_core.h
+++ b/sys/dev/usb/usb_core.h
@@ -28,8 +28,8 @@
  * Including this file is mandatory for all USB related c-files in the kernel.
  */
 
-#ifndef _USB2_CORE_H_
-#define	_USB2_CORE_H_
+#ifndef _USB_CORE_H_
+#define	_USB_CORE_H_
 
 #define	USB_STACK_VERSION 2000		/* 2.0 */
 
@@ -542,4 +542,4 @@ uint8_t	usbd_get_device_index(struct usb_device *udev);
 void	usbd_set_power_mode(struct usb_device *udev, uint8_t power_mode);
 uint8_t	usbd_device_attached(struct usb_device *udev);
 
-#endif					/* _USB2_CORE_H_ */
+#endif					/* _USB_CORE_H_ */
diff --git a/sys/dev/usb/usb_debug.h b/sys/dev/usb/usb_debug.h
index d0b5846..f49f24f 100644
--- a/sys/dev/usb/usb_debug.h
+++ b/sys/dev/usb/usb_debug.h
@@ -26,8 +26,8 @@
 
 /* This file contains various factored out debug macros. */
 
-#ifndef _USB2_DEBUG_H_
-#define	_USB2_DEBUG_H_
+#ifndef _USB_DEBUG_H_
+#define	_USB_DEBUG_H_
 
 /* Declare parent SYSCTL USB node. */
 SYSCTL_DECL(_hw_usb);
@@ -62,4 +62,4 @@ void	usb_dump_queue(struct usb_endpoint *ep);
 void	usb_dump_endpoint(struct usb_endpoint *ep);
 void	usb_dump_xfer(struct usb_xfer *xfer);
 
-#endif					/* _USB2_DEBUG_H_ */
+#endif					/* _USB_DEBUG_H_ */
diff --git a/sys/dev/usb/usb_defs.h b/sys/dev/usb/usb_defs.h
index 4f72ea5..a303ca9 100644
--- a/sys/dev/usb/usb_defs.h
+++ b/sys/dev/usb/usb_defs.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_DEFS_H_
-#define	_USB2_DEFS_H_
+#ifndef _USB_DEFS_H_
+#define	_USB_DEFS_H_
 
 /* Definition of some hardcoded USB constants. */
 
@@ -58,4 +58,4 @@
 #if (USB_ROOT_HUB_ADDR >= USB_MIN_DEVICES)
 #error "The root hub address must be less than USB_MIN_DEVICES."
 #endif
-#endif					/* _USB2_DEFS_H_ */
+#endif					/* _USB_DEFS_H_ */
diff --git a/sys/dev/usb/usb_dev.h b/sys/dev/usb/usb_dev.h
index 0af1c79..71ee064 100644
--- a/sys/dev/usb/usb_dev.h
+++ b/sys/dev/usb/usb_dev.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_DEV_H_
-#define	_USB2_DEV_H_
+#ifndef _USB_DEV_H_
+#define	_USB_DEV_H_
 
 #include <sys/file.h>
 #include <sys/vnode.h>
@@ -204,4 +204,4 @@ int	usb_read_symlink(uint8_t *user_ptr, uint32_t startentry,
 	    uint32_t user_len);
 void	usb_fifo_set_close_zlp(struct usb_fifo *, uint8_t);
 
-#endif					/* _USB2_DEV_H_ */
+#endif					/* _USB_DEV_H_ */
diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h
index 32af2e2..f3ca334 100644
--- a/sys/dev/usb/usb_device.h
+++ b/sys/dev/usb/usb_device.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_DEVICE_H_
-#define	_USB2_DEVICE_H_
+#ifndef _USB_DEVICE_H_
+#define	_USB_DEVICE_H_
 
 struct usb_symlink;		/* UGEN */
 struct usb_device;		/* linux compat */
@@ -256,4 +256,4 @@ struct usb_endpoint *usb_endpoint_foreach(struct usb_device *udev, struct usb_en
 void	usb_set_device_state(struct usb_device *udev,
 	    enum usb_dev_state state);
 
-#endif					/* _USB2_DEVICE_H_ */
+#endif					/* _USB_DEVICE_H_ */
diff --git a/sys/dev/usb/usb_dynamic.h b/sys/dev/usb/usb_dynamic.h
index 1c47c52..14dde20 100644
--- a/sys/dev/usb/usb_dynamic.h
+++ b/sys/dev/usb/usb_dynamic.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_DYNAMIC_H_
-#define	_USB2_DYNAMIC_H_
+#ifndef _USB_DYNAMIC_H_
+#define	_USB_DYNAMIC_H_
 
 /* prototypes */
 
@@ -64,4 +64,4 @@ void	usb_bus_unload(void *);
 
 uint8_t	usb_test_quirk(const struct usb_attach_arg *uaa, uint16_t quirk);
 
-#endif					/* _USB2_DYNAMIC_H_ */
+#endif					/* _USB_DYNAMIC_H_ */
diff --git a/sys/dev/usb/usb_endian.h b/sys/dev/usb/usb_endian.h
index f7d2244..29479f1 100644
--- a/sys/dev/usb/usb_endian.h
+++ b/sys/dev/usb/usb_endian.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_ENDIAN_H_
-#define	_USB2_ENDIAN_H_
+#ifndef _USB_ENDIAN_H_
+#define	_USB_ENDIAN_H_
 
 #include <sys/stdint.h>
 #include <sys/endian.h>
@@ -116,4 +116,4 @@ typedef uint8_t uQWord[8];
   (w)[7] = (uint8_t)(b7);		\
 } while (0)
 
-#endif					/* _USB2_ENDIAN_H_ */
+#endif					/* _USB_ENDIAN_H_ */
diff --git a/sys/dev/usb/usb_error.h b/sys/dev/usb/usb_error.h
index 91f0245..48d217a 100644
--- a/sys/dev/usb/usb_error.h
+++ b/sys/dev/usb/usb_error.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_ERROR_H_
-#define	_USB2_ERROR_H_
+#ifndef _USB_ERROR_H_
+#define	_USB_ERROR_H_
 
 enum {	/* keep in sync with usb_errstr_table */
 	USB_ERR_NORMAL_COMPLETION = 0,
@@ -60,4 +60,4 @@ enum {	/* keep in sync with usb_errstr_table */
 	USB_ERR_MAX
 };
 
-#endif					/* _USB2_ERROR_H_ */
+#endif					/* _USB_ERROR_H_ */
diff --git a/sys/dev/usb/usb_generic.h b/sys/dev/usb/usb_generic.h
index 1b6ea12..835ec72 100644
--- a/sys/dev/usb/usb_generic.h
+++ b/sys/dev/usb/usb_generic.h
@@ -24,10 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_GENERIC_H_
-#define	_USB2_GENERIC_H_
+#ifndef _USB_GENERIC_H_
+#define	_USB_GENERIC_H_
 
 extern struct usb_fifo_methods usb_ugen_methods;
 int	ugen_do_request(struct usb_fifo *f, struct usb_ctl_request *ur);
 
-#endif					/* _USB2_GENERIC_H_ */
+#endif					/* _USB_GENERIC_H_ */
diff --git a/sys/dev/usb/usb_handle_request.h b/sys/dev/usb/usb_handle_request.h
index 6cc0503..120f210 100644
--- a/sys/dev/usb/usb_handle_request.h
+++ b/sys/dev/usb/usb_handle_request.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_HANDLE_REQUEST_H_
-#define	_USB2_HANDLE_REQUEST_H_
+#ifndef _USB_HANDLE_REQUEST_H_
+#define	_USB_HANDLE_REQUEST_H_
 
-#endif					/* _USB2_HANDLE_REQUEST_H_ */
+#endif					/* _USB_HANDLE_REQUEST_H_ */
diff --git a/sys/dev/usb/usb_hid.h b/sys/dev/usb/usb_hid.h
index a0f4cfc..f9de2a9 100644
--- a/sys/dev/usb/usb_hid.h
+++ b/sys/dev/usb/usb_hid.h
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_CORE_HID_H_
-#define	_USB2_CORE_HID_H_
+#ifndef _USB_CORE_HID_H_
+#define	_USB_CORE_HID_H_
 
 struct usb_hid_descriptor;
 struct usb_config_descriptor;
@@ -92,4 +92,4 @@ usb_error_t usbd_req_get_hid_desc(struct usb_device *udev, struct mtx *mtx,
 	    void **descp, uint16_t *sizep, struct malloc_type *mem,
 	    uint8_t iface_index);
 
-#endif					/* _USB2_CORE_HID_H_ */
+#endif					/* _USB_CORE_HID_H_ */
diff --git a/sys/dev/usb/usb_hub.h b/sys/dev/usb/usb_hub.h
index 0d69ba6..ceb0cc2 100644
--- a/sys/dev/usb/usb_hub.h
+++ b/sys/dev/usb/usb_hub.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_HUB_H_
-#define	_USB2_HUB_H_
+#ifndef _USB_HUB_H_
+#define	_USB_HUB_H_
 
 /*
  * The following structure defines an USB port. 
@@ -79,4 +79,4 @@ void	usb_bus_power_update(struct usb_bus *bus);
 void	usb_bus_powerd(struct usb_bus *bus);
 void	uhub_root_intr(struct usb_bus *, const uint8_t *, uint8_t);
 
-#endif					/* _USB2_HUB_H_ */
+#endif					/* _USB_HUB_H_ */
diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h
index a59cb12..7043c55 100644
--- a/sys/dev/usb/usb_ioctl.h
+++ b/sys/dev/usb/usb_ioctl.h
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_IOCTL_H_
-#define	_USB2_IOCTL_H_
+#ifndef _USB_IOCTL_H_
+#define	_USB_IOCTL_H_
 
 #include <sys/ioccom.h>
 
@@ -272,4 +272,4 @@ struct usb_gen_quirk {
 #define	USB_DEV_QUIRK_ADD	_IOW ('Q', 2, struct usb_gen_quirk)
 #define	USB_DEV_QUIRK_REMOVE	_IOW ('Q', 3, struct usb_gen_quirk)
 
-#endif					/* _USB2_IOCTL_H_ */
+#endif					/* _USB_IOCTL_H_ */
diff --git a/sys/dev/usb/usb_lookup.h b/sys/dev/usb/usb_lookup.h
index 63c3fbd..375ca06 100644
--- a/sys/dev/usb/usb_lookup.h
+++ b/sys/dev/usb/usb_lookup.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_LOOKUP_H_
-#define	_USB2_LOOKUP_H_
+#ifndef _USB_LOOKUP_H_
+#define	_USB_LOOKUP_H_
 
 struct usb_attach_arg;
 
@@ -119,4 +119,4 @@ const struct usb_device_id *usbd_lookup_id_by_info(
 int	usbd_lookup_id_by_uaa(const struct usb_device_id *id,
 	    usb_size_t sizeof_id, struct usb_attach_arg *uaa);
 
-#endif					/* _USB2_LOOKUP_H_ */
+#endif					/* _USB_LOOKUP_H_ */
diff --git a/sys/dev/usb/usb_mbuf.h b/sys/dev/usb/usb_mbuf.h
index 8b44519..e959fce 100644
--- a/sys/dev/usb/usb_mbuf.h
+++ b/sys/dev/usb/usb_mbuf.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_MBUF_H_
-#define	_USB2_MBUF_H_
+#ifndef _USB_MBUF_H_
+#define	_USB_MBUF_H_
 
 /*
  * The following structure defines a minimum re-implementation of the
@@ -99,4 +99,4 @@ struct usb_ifqueue {
 void   *usb_alloc_mbufs(struct malloc_type *type, struct usb_ifqueue *ifq,
 	    usb_size_t block_size, uint16_t nblocks);
 
-#endif					/* _USB2_MBUF_H_ */
+#endif					/* _USB_MBUF_H_ */
diff --git a/sys/dev/usb/usb_mfunc.h b/sys/dev/usb/usb_mfunc.h
index 0fad203..cc9df35 100644
--- a/sys/dev/usb/usb_mfunc.h
+++ b/sys/dev/usb/usb_mfunc.h
@@ -26,8 +26,8 @@
 
 /* This file contains various macro functions. */
 
-#ifndef _USB2_MFUNC_H_
-#define	_USB2_MFUNC_H_
+#ifndef _USB_MFUNC_H_
+#define	_USB_MFUNC_H_
 
 #define	USB_LOG2(n) (	    \
 ((x) <= (1<<0x00)) ? 0x00 : \
@@ -75,4 +75,4 @@
 /* debug macro */
 #define	USB_ASSERT KASSERT
 
-#endif					/* _USB2_MFUNC_H_ */
+#endif					/* _USB_MFUNC_H_ */
diff --git a/sys/dev/usb/usb_msctest.h b/sys/dev/usb/usb_msctest.h
index 9fca458..44fa20d 100644
--- a/sys/dev/usb/usb_msctest.h
+++ b/sys/dev/usb/usb_msctest.h
@@ -24,10 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_MSCTEST_H_
-#define	_USB2_MSCTEST_H_
+#ifndef _USB_MSCTEST_H_
+#define	_USB_MSCTEST_H_
 
 usb_error_t usb_test_autoinstall(struct usb_device *udev,
 	    uint8_t iface_index, uint8_t do_eject);
 
-#endif					/* _USB2_MSCTEST_H_ */
+#endif					/* _USB_MSCTEST_H_ */
diff --git a/sys/dev/usb/usb_parse.h b/sys/dev/usb/usb_parse.h
index fc5f683..2ed1329 100644
--- a/sys/dev/usb/usb_parse.h
+++ b/sys/dev/usb/usb_parse.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_PARSE_H_
-#define	_USB2_PARSE_H_
+#ifndef _USB_PARSE_H_
+#define	_USB_PARSE_H_
 
 /* structures */
 
@@ -51,4 +51,4 @@ uint8_t usbd_get_no_descriptors(struct usb_config_descriptor *cd,
 uint8_t usbd_get_no_alts(struct usb_config_descriptor *cd,
 	    struct usb_interface_descriptor *id);
 
-#endif					/* _USB2_PARSE_H_ */
+#endif					/* _USB_PARSE_H_ */
diff --git a/sys/dev/usb/usb_pci.h b/sys/dev/usb/usb_pci.h
index 9297c29..071dfc3 100644
--- a/sys/dev/usb/usb_pci.h
+++ b/sys/dev/usb/usb_pci.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_PCI_H_
-#define	_USB2_PCI_H_
+#ifndef _USB_PCI_H_
+#define	_USB_PCI_H_
 
 /*
  * We don't want the following files included everywhere, that's why
@@ -36,4 +36,4 @@
 
 #include <sys/rman.h>
 
-#endif					/* _USB2_PCI_H_ */
+#endif					/* _USB_PCI_H_ */
diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h
index 86f1536..d3cdd33 100644
--- a/sys/dev/usb/usb_process.h
+++ b/sys/dev/usb/usb_process.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_PROCESS_H_
-#define	_USB2_PROCESS_H_
+#ifndef _USB_PROCESS_H_
+#define	_USB_PROCESS_H_
 
 #include <sys/priority.h>
 
@@ -85,4 +85,4 @@ void	usb_proc_mwait(struct usb_process *up, void *pm0, void *pm1);
 void	usb_proc_free(struct usb_process *up);
 void   *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1);
 
-#endif					/* _USB2_PROCESS_H_ */
+#endif					/* _USB_PROCESS_H_ */
diff --git a/sys/dev/usb/usb_request.h b/sys/dev/usb/usb_request.h
index b02f345..f4021e5 100644
--- a/sys/dev/usb/usb_request.h
+++ b/sys/dev/usb/usb_request.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_REQUEST_H_
-#define	_USB2_REQUEST_H_
+#ifndef _USB_REQUEST_H_
+#define	_USB_REQUEST_H_
 
 struct usb_process;
 
@@ -103,4 +103,4 @@ usb_error_t usbd_req_set_device_feature(struct usb_device *udev, struct mtx *mtx
 #define	usbd_do_request(u,m,r,d) \
   usbd_do_request_flags(u,m,r,d,0,NULL,USB_DEFAULT_TIMEOUT)
 
-#endif					/* _USB2_REQUEST_H_ */
+#endif					/* _USB_REQUEST_H_ */
diff --git a/sys/dev/usb/usb_revision.h b/sys/dev/usb/usb_revision.h
index d367e6c..6e6914e 100644
--- a/sys/dev/usb/usb_revision.h
+++ b/sys/dev/usb/usb_revision.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_REVISION_H_
-#define	_USB2_REVISION_H_
+#ifndef _USB_REVISION_H_
+#define	_USB_REVISION_H_
 
 /*
  * The "USB_SPEED" macros defines all the supported USB speeds.
@@ -74,4 +74,4 @@ enum usb_dev_state {
 	USB_STATE_CONFIGURED,
 };
 #define	USB_STATE_MAX	(USB_STATE_CONFIGURED+1)
-#endif					/* _USB2_REVISION_H_ */
+#endif					/* _USB_REVISION_H_ */
diff --git a/sys/dev/usb/usb_transfer.h b/sys/dev/usb/usb_transfer.h
index 9b5a33c..89ca8c1 100644
--- a/sys/dev/usb/usb_transfer.h
+++ b/sys/dev/usb/usb_transfer.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_TRANSFER_H_
-#define	_USB2_TRANSFER_H_
+#ifndef _USB_TRANSFER_H_
+#define	_USB_TRANSFER_H_
 
 /*
  * The following structure defines the messages that is used to signal
@@ -135,4 +135,4 @@ void	usbd_transfer_timeout_ms(struct usb_xfer *xfer,
 usb_timeout_t usbd_get_dma_delay(struct usb_bus *bus);
 void	usbd_transfer_power_ref(struct usb_xfer *xfer, int val);
 
-#endif					/* _USB2_TRANSFER_H_ */
+#endif					/* _USB_TRANSFER_H_ */
diff --git a/sys/dev/usb/usb_util.h b/sys/dev/usb/usb_util.h
index 6b8f027..b4fdd60 100644
--- a/sys/dev/usb/usb_util.h
+++ b/sys/dev/usb/usb_util.h
@@ -24,8 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_UTIL_H_
-#define	_USB2_UTIL_H_
+#ifndef _USB_UTIL_H_
+#define	_USB_UTIL_H_
 
 int	device_delete_all_children(device_t dev);
 uint8_t	usb_make_str_desc(void *ptr, uint16_t max_len, const char *s);
@@ -34,4 +34,4 @@ void	usb_pause_mtx(struct mtx *mtx, int _ticks);
 void	usb_printbcd(char *p, uint16_t p_len, uint16_t bcd);
 void	usb_trim_spaces(char *p);
 
-#endif					/* _USB2_UTIL_H_ */
+#endif					/* _USB_UTIL_H_ */
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 1cffe3c..591a3b2 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _USB2_HID_H_
-#define	_USB2_HID_H_
+#ifndef _USB_HID_H_
+#define	_USB_HID_H_
 
 #include <dev/usb/usb_endian.h>
 
@@ -173,4 +173,4 @@ struct usb_hid_descriptor {
 #define	HIO_VOLATILE	0x080
 #define	HIO_BUFBYTES	0x100
 
-#endif					/* _USB2_HID_H_ */
+#endif					/* _USB_HID_H_ */