24 files changed, 16 insertions, 16 deletions
diff --git a/include/usb/cdc.h b/include/linux/usb/cdc.h
index e29429d783..e29429d783 100644
--- a/include/usb/cdc.h
+++ b/include/linux/usb/cdc.h
diff --git a/include/usb/ch9.h b/include/linux/usb/ch9.h
index 4c1e765326..4c1e765326 100644
--- a/include/usb/ch9.h
+++ b/include/linux/usb/ch9.h
diff --git a/include/usb/chipidea-imx.h b/include/linux/usb/chipidea-imx.h
index b0b75d3bcb..99dbd407e5 100644
--- a/include/usb/chipidea-imx.h
+++ b/include/linux/usb/chipidea-imx.h
@@ -3,7 +3,7 @@
 #ifndef __USB_CHIPIDEA_IMX_H
 #define __USB_CHIPIDEA_IMX_H
 
-#include <usb/phy.h>
+#include <linux/usb/phy.h>
 
 /*
  * POTSC flags
diff --git a/include/usb/composite.h b/include/linux/usb/composite.h
index ec9abe7447..26e6fe5c47 100644
--- a/include/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -34,8 +34,8 @@
  * the composite model the host can use both functions at the same time.
  */
 #include <init.h>
-#include <usb/ch9.h>
-#include <usb/gadget.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 #include <linux/spinlock.h>
diff --git a/include/usb/dfu.h b/include/linux/usb/dfu.h
index 81425f7c62..3bc4204500 100644
--- a/include/usb/dfu.h
+++ b/include/linux/usb/dfu.h
@@ -22,7 +22,7 @@
 
 #include <linux/types.h>
 #include <file-list.h>
-#include <usb/composite.h>
+#include <linux/usb/composite.h>
 
 struct f_dfu_opts {
 	struct usb_function_instance func_inst;
diff --git a/include/usb/ehci.h b/include/linux/usb/ehci.h
index 9ce6c98ace..9ce6c98ace 100644
--- a/include/usb/ehci.h
+++ b/include/linux/usb/ehci.h
diff --git a/include/usb/fastboot.h b/include/linux/usb/fastboot.h
index 7dc445455a..d0dbd0b7b7 100644
--- a/include/usb/fastboot.h
+++ b/include/linux/usb/fastboot.h
@@ -3,7 +3,7 @@
 #ifndef _USB_FASTBOOT_H
 #define _USB_FASTBOOT_H
 
-#include <usb/composite.h>
+#include <linux/usb/composite.h>
 #include <fastboot.h>
 
 /**
diff --git a/include/usb/fsl_usb2.h b/include/linux/usb/fsl_usb2.h
index 1d5effb0d6..1d5effb0d6 100644
--- a/include/usb/fsl_usb2.h
+++ b/include/linux/usb/fsl_usb2.h
diff --git a/include/usb/gadget-multi.h b/include/linux/usb/gadget-multi.h
index e67ca165c1..1027a10082 100644
--- a/include/usb/gadget-multi.h
+++ b/include/linux/usb/gadget-multi.h
@@ -4,10 +4,10 @@
 #define __USB_GADGET_MULTI_H
 
 #include <linux/types.h>
-#include <usb/fastboot.h>
-#include <usb/dfu.h>
-#include <usb/usbserial.h>
-#include <usb/mass_storage.h>
+#include <linux/usb/fastboot.h>
+#include <linux/usb/dfu.h>
+#include <linux/usb/usbserial.h>
+#include <linux/usb/mass_storage.h>
 
 struct f_multi_opts {
 	struct fastboot_opts fastboot_opts;
diff --git a/include/usb/gadget.h b/include/linux/usb/gadget.h
index 830e3dfe83..746311fddd 100644
--- a/include/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -19,7 +19,7 @@
 #include <malloc.h>
 #include <driver.h>
 #include <linux/list.h>
-#include <usb/ch9.h>
+#include <linux/usb/ch9.h>
 
 struct usb_ep;
 
diff --git a/include/usb/mass_storage.h b/include/linux/usb/mass_storage.h
index 7be665ee47..5bf7fea2f3 100644
--- a/include/usb/mass_storage.h
+++ b/include/linux/usb/mass_storage.h
@@ -7,7 +7,7 @@
 #ifndef __USB_MASS_STORAGE_H__
 #define __USB_MASS_STORAGE_H__
 
-#include <usb/composite.h>
+#include <linux/usb/composite.h>
 
 /* Wait at maximum 60 seconds for cable connection */
 #define UMS_CABLE_READY_TIMEOUT	60
diff --git a/include/usb/musb.h b/include/linux/usb/musb.h
index fb846dd30b..fb846dd30b 100644
--- a/include/usb/musb.h
+++ b/include/linux/usb/musb.h
diff --git a/include/usb/phy.h b/include/linux/usb/phy.h
index 98a4ce087f..651a8824f3 100644
--- a/include/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -12,7 +12,7 @@
 #define __LINUX_USB_PHY_H
 
 #include <notifier.h>
-#include <usb/usb.h>
+#include <linux/usb/usb.h>
 #include <linux/err.h>
 
 enum usb_phy_interface {
diff --git a/include/usb/storage.h b/include/linux/usb/storage.h
index e0240f8645..e0240f8645 100644
--- a/include/usb/storage.h
+++ b/include/linux/usb/storage.h
diff --git a/include/usb/twl4030.h b/include/linux/usb/twl4030.h
index 66f5156f9e..66f5156f9e 100644
--- a/include/usb/twl4030.h
+++ b/include/linux/usb/twl4030.h
diff --git a/include/usb/ulpi.h b/include/linux/usb/ulpi.h
index efbfc63208..efbfc63208 100644
--- a/include/usb/ulpi.h
+++ b/include/linux/usb/ulpi.h
diff --git a/include/usb/usb.h b/include/linux/usb/usb.h
index 717bcf935a..ffeceec88f 100644
--- a/include/usb/usb.h
+++ b/include/linux/usb/usb.h
@@ -21,9 +21,9 @@
 
 #include <driver.h>
 #include <slice.h>
-#include <usb/ch9.h>
-#include <usb/ch11.h>
-#include <usb/usb_defs.h>
+#include <linux/usb/ch9.h>
+#include <uapi/linux/usb/ch11.h>
+#include <linux/usb/usb_defs.h>
 #include <asm/byteorder.h>
 
 /* Everything is aribtrary */
diff --git a/include/usb/usb_defs.h b/include/linux/usb/usb_defs.h
index 731bc51c76..731bc51c76 100644
--- a/include/usb/usb_defs.h
+++ b/include/linux/usb/usb_defs.h
diff --git a/include/usb/usbnet.h b/include/linux/usb/usbnet.h
index 450db47b40..450db47b40 100644
--- a/include/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
diff --git a/include/usb/usbroothubdes.h b/include/linux/usb/usbroothubdes.h
index e743555d8e..e743555d8e 100644
--- a/include/usb/usbroothubdes.h
+++ b/include/linux/usb/usbroothubdes.h
diff --git a/include/usb/usbserial.h b/include/linux/usb/usbserial.h
index e1375c489a..e1375c489a 100644
--- a/include/usb/usbserial.h
+++ b/include/linux/usb/usbserial.h
diff --git a/include/usb/xhci.h b/include/linux/usb/xhci.h
index b1ad0185b9..b1ad0185b9 100644
--- a/include/usb/xhci.h
+++ b/include/linux/usb/xhci.h
diff --git a/include/mach/imx/devices.h b/include/mach/imx/devices.h
index 3d1f8eb237..ace2962fc3 100644
--- a/include/mach/imx/devices.h
+++ b/include/mach/imx/devices.h
@@ -8,7 +8,7 @@
 #include <platform_data/imxfb.h>
 #include <mach/imx/imx-ipu-fb.h>
 #include <platform_data/mmc-esdhc-imx.h>
-#include <usb/chipidea-imx.h>
+#include <linux/usb/chipidea-imx.h>
 
 struct device *imx_add_fec_imx27(void *base, struct fec_platform_data *pdata);
 struct device *imx_add_fec_imx6(void *base, struct fec_platform_data *pdata);
diff --git a/include/usb/ch11.h b/include/uapi/linux/usb/ch11.h
index c712d80275..c712d80275 100644
--- a/include/usb/ch11.h
+++ b/include/uapi/linux/usb/ch11.h