diff --git a/lib_xua/api/xua.h b/lib_xua/api/xua.h
index 9ce3bb37..92cdbe6f 100644
--- a/lib_xua/api/xua.h
+++ b/lib_xua/api/xua.h
@@ -6,16 +6,17 @@
 #include "xua_conf_full.h"
 
 #if __XC__ || __STDC__
-#include "xua_audiohub.h"
+    #include "xua_audiohub.h"
 
-#include "xua_endpoint0.h"
+    #include "xua_endpoint0.h"
 
-#include "xua_buffer.h"
+    #include "xua_buffer.h"
+#endif
 
 #if __XC__
-#include "xua_pdm_mic.h"
-#endif
-
+    #if XUA_NUM_PDM_MICS > 0
+        #include "xua_pdm_mic.h"
+    #endif
 #endif
 
 #endif
diff --git a/lib_xua/api/xua_pdm_mic.h b/lib_xua/api/xua_pdm_mic.h
index 0f8271dd..80ab5c25 100644
--- a/lib_xua/api/xua_pdm_mic.h
+++ b/lib_xua/api/xua_pdm_mic.h
@@ -1,5 +1,8 @@
 // Copyright (c) 2015-2018, XMOS Ltd, All rights reserved
 
+#ifndef XUA_PDM_MIC_H
+#define XUA_PDM_MIC_H
+
 /* Included from lib_mic_array */
 #include "mic_array.h"
 
@@ -44,4 +47,5 @@ void XUA_PdmBuffer(streaming chanend c_ds_output[2], chanend c_audio);
 void xua_pdm_mic(streaming chanend c_ds_output[2]);
 
 #endif
+#endif
 
diff --git a/lib_xua/src/core/main.xc b/lib_xua/src/core/main.xc
index 922fa5e2..ab3a7950 100755
--- a/lib_xua/src/core/main.xc
+++ b/lib_xua/src/core/main.xc
@@ -760,9 +760,9 @@ int main()
 #endif
 
 #ifdef MIC_PROCESSING_USE_INTERFACE
-        on stdcore[PDM_TILE].core[0]: xua_pdm_buffer(c_ds_output, c_pdm_pcm, i_mic_process);
+        on stdcore[PDM_TILE].core[0]: XUA_PdmBuffer(c_ds_output, c_pdm_pcm, i_mic_process);
 #else
-        on stdcore[PDM_TILE].core[0]: xua_pdm_buffer(c_ds_output, c_pdm_pcm);
+        on stdcore[PDM_TILE].core[0]: XUA_PdmBuffer(c_ds_output, c_pdm_pcm);
 #endif /*MIC_PROCESSING_USE_INTERFACE*/
 #endif /*XUA_NUM_PDM_MICS > 0*/
 #endif /*PDM_RECORD*/