diff --git a/lib_xua/api/xua.h b/lib_xua/api/xua.h
index 69865f7c..1215e926 100644
--- a/lib_xua/api/xua.h
+++ b/lib_xua/api/xua.h
@@ -7,14 +7,14 @@
 
 #include "xua_conf_full.h"
 
-#if __XC__ || __STDC__
+#ifndef __ASSEMBLER__
     #include "xua_audiohub.h"
     #include "xua_endpoint0.h"
     #include "xua_buffer.h"
     #include "xua_mixer.h"
 #endif
 
-#if __XC__
+#ifdef __XC__
     #include "xua_clocking.h"
     #include "xua_midi.h"
     #if XUA_NUM_PDM_MICS > 0
diff --git a/lib_xua/api/xua_conf_full.h b/lib_xua/api/xua_conf_full.h
index 6b78bb55..14c93bf2 100644
--- a/lib_xua/api/xua_conf_full.h
+++ b/lib_xua/api/xua_conf_full.h
@@ -1,7 +1,7 @@
-// Copyright 2017-2022 XMOS LIMITED.
+// Copyright 2017-2023 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
-#ifndef __XUA_CONF_FULL_H__
-#define __XUA_CONF_FULL_H__
+#ifndef _XUA_CONF_FULL_H_
+#define _XUA_CONF_FULL_H_
 
 #ifdef __xua_conf_h_exists__
     #include "xua_conf.h"