diff --git a/lib_xua/src/core/buffer/decouple/decouple.xc b/lib_xua/src/core/buffer/decouple/decouple.xc
index f96bc061..e503ab71 100644
--- a/lib_xua/src/core/buffer/decouple/decouple.xc
+++ b/lib_xua/src/core/buffer/decouple/decouple.xc
@@ -1,7 +1,8 @@
 // Copyright (c) 2011-2018, XMOS Ltd, All rights reserved
+#include "xua.h"
+
 #if XUA_USB_EN
 #include <xs1.h>
-#include "xua.h"
 #include "xc_ptr.h"
 #include "interrupt.h"
 #include "xua_commands.h"
diff --git a/lib_xua/src/core/buffer/decouple/decouple_interrupt.c b/lib_xua/src/core/buffer/decouple/decouple_interrupt.c
index c6d8ff80..e91351dc 100644
--- a/lib_xua/src/core/buffer/decouple/decouple_interrupt.c
+++ b/lib_xua/src/core/buffer/decouple/decouple_interrupt.c
@@ -1,5 +1,6 @@
 // Copyright (c) 2015-2018, XMOS Ltd, All rights reserved
-#ifndef NO_USB
+#include "xua.h"
+#if XUA_USB_EN
 #include "interrupt.h"
 
 register_interrupt_handler(handle_audio_request, 1, 200)
diff --git a/lib_xua/src/core/buffer/decouple/get_adc_counts.c b/lib_xua/src/core/buffer/decouple/get_adc_counts.c
index e4a6eaef..96680b43 100644
--- a/lib_xua/src/core/buffer/decouple/get_adc_counts.c
+++ b/lib_xua/src/core/buffer/decouple/get_adc_counts.c
@@ -1,4 +1,5 @@
 // Copyright (c) 2011-2018, XMOS Ltd, All rights reserved
+#include "xua.h"
 #if XUA_USB_EN
 #include "xud.h"
 
diff --git a/lib_xua/src/core/buffer/ep/ep_buffer.xc b/lib_xua/src/core/buffer/ep/ep_buffer.xc
index 82923d2e..e510d37a 100644
--- a/lib_xua/src/core/buffer/ep/ep_buffer.xc
+++ b/lib_xua/src/core/buffer/ep/ep_buffer.xc
@@ -1,9 +1,9 @@
 // Copyright (c) 2011-2018, XMOS Ltd, All rights reserved
+#include "xua.h"
 #if XUA_USB_EN
 #include <xs1.h>
 #include <print.h>
 
-#include "xua.h"
 
 #ifdef MIDI
 #include "usb_midi.h"
@@ -24,7 +24,6 @@
 unsigned char g_hidData[1] = {0};
 #endif
 
-
 void GetADCCounts(unsigned samFreq, int &min, int &mid, int &max);
 #define BUFFER_SIZE_OUT       (1028 >> 2)
 #define BUFFER_SIZE_IN        (1028 >> 2)
diff --git a/lib_xua/src/core/endpoint0/vendorrequests.c b/lib_xua/src/core/endpoint0/vendorrequests.c
index d3e1132d..0eae49a1 100644
--- a/lib_xua/src/core/endpoint0/vendorrequests.c
+++ b/lib_xua/src/core/endpoint0/vendorrequests.c
@@ -1,4 +1,5 @@
 // Copyright (c) 2016-2018, XMOS Ltd, All rights reserved
+#include "xua.h"
 #if XUA_USB_EN
 
 #include "xud.h"
diff --git a/lib_xua/src/core/endpoint0/vendorrequests.h b/lib_xua/src/core/endpoint0/vendorrequests.h
index 7a52a71d..396ceef3 100644
--- a/lib_xua/src/core/endpoint0/vendorrequests.h
+++ b/lib_xua/src/core/endpoint0/vendorrequests.h
@@ -6,7 +6,7 @@
 #include "xua.h"
 #include "xud_device.h"
 
-/* Functions that handle vustomer vendor requests.
+/* Functions that handle customer vendor requests.
  *
  * THESE NEED IMPLEMENTING FOR A SPECIFIC DESIGN
  *