From 18a33edd39e98a84c03fdba7dacf23fc85348162 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 12 Sep 2017 16:27:08 -0400
Subject: [PATCH] usb: fix local includes and add usb namespace

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 samples/bluetooth/hci_usb/src/main.c          | 4 ++--
 samples/subsys/usb/webusb/src/webusb_serial.c | 4 ++--
 samples/subsys/usb/webusb/src/webusb_serial.h | 2 +-
 subsys/usb/class/mass_storage.c               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/samples/bluetooth/hci_usb/src/main.c b/samples/bluetooth/hci_usb/src/main.c
index 23d8b19942..965e9ba345 100644
--- a/samples/bluetooth/hci_usb/src/main.c
+++ b/samples/bluetooth/hci_usb/src/main.c
@@ -17,8 +17,8 @@
 #include <bluetooth/hci_raw.h>
 #include <bluetooth/l2cap.h>
 
-#include "usb_device.h"
-#include "usb_common.h"
+#include <usb/usb_device.h>
+#include <usb/usb_common.h>
 
 #define BTUSB_BUFFER_SIZE 64
 
diff --git a/samples/subsys/usb/webusb/src/webusb_serial.c b/samples/subsys/usb/webusb/src/webusb_serial.c
index 67b962cee1..69fd6a5406 100644
--- a/samples/subsys/usb/webusb/src/webusb_serial.c
+++ b/samples/subsys/usb/webusb/src/webusb_serial.c
@@ -45,8 +45,8 @@
 #include <misc/byteorder.h>
 #include <logging/sys_log.h>
 #include "cdc_acm.h"
-#include "usb_device.h"
-#include "usb_common.h"
+#include <usb/usb_device.h>
+#include <usb/usb_common.h>
 #include "webusb_serial.h"
 
 #ifndef CONFIG_UART_INTERRUPT_DRIVEN
diff --git a/samples/subsys/usb/webusb/src/webusb_serial.h b/samples/subsys/usb/webusb/src/webusb_serial.h
index 76507d3b1c..1a497363c9 100644
--- a/samples/subsys/usb/webusb/src/webusb_serial.h
+++ b/samples/subsys/usb/webusb/src/webusb_serial.h
@@ -41,7 +41,7 @@
 #define __WEBUSB_SERIAL_H__
 
 #include <device.h>
-#include "usb_device.h"
+#include <usb/usb_device.h>
 
 /* BOS descriptor type */
 #define DESCRIPTOR_TYPE_BOS     0x0f
diff --git a/subsys/usb/class/mass_storage.c b/subsys/usb/class/mass_storage.c
index 3467064698..b0d3a3273e 100644
--- a/subsys/usb/class/mass_storage.c
+++ b/subsys/usb/class/mass_storage.c
@@ -39,8 +39,8 @@
 #include <misc/__assert.h>
 #include <disk_access.h>
 #include "mass_storage.h"
-#include "usb_device.h"
-#include "usb_common.h"
+#include <usb/usb_device.h>
+#include <usb/usb_common.h>
 
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_USB_MASS_STORAGE_LEVEL
 #include <logging/sys_log.h>