diff --git a/lib_xua/api/xua.h b/lib_xua/api/xua.h
index 2185c08c..c6b0e265 100644
--- a/lib_xua/api/xua.h
+++ b/lib_xua/api/xua.h
@@ -10,6 +10,8 @@
 #include "xua_endpoint0.h"
 
 #include "xua_buffer.h"
+
+//#include "xua_dfu.h"
 #endif
 
 #endif
diff --git a/lib_xua/src/core/audiohub/xua_audiohub.xc b/lib_xua/src/core/audiohub/xua_audiohub.xc
index dd60ede1..aec97f95 100755
--- a/lib_xua/src/core/audiohub/xua_audiohub.xc
+++ b/lib_xua/src/core/audiohub/xua_audiohub.xc
@@ -1047,11 +1047,6 @@ void SpdifTxWrapper(chanend c_spdif_tx)
 /* This function is a dummy version of the deliver thread that does not
    connect to the codec ports. It is used during DFU reset. */
 
-#if (XUA_DFU == 1)
-[[distributable]]
-void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd);
-#endif
-
 #pragma select handler
 void testct_byref(chanend c, int &returnVal)
 {
diff --git a/lib_xua/src/core/main.xc b/lib_xua/src/core/main.xc
index 00f45f26..589e6303 100755
--- a/lib_xua/src/core/main.xc
+++ b/lib_xua/src/core/main.xc
@@ -49,7 +49,7 @@
 #include "xua_pdm_mic.h"
 #endif
 
-#ifdef DFU
+#if XUA_DFU_EN == 1
 [[distributable]]
 void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd);
 #endif
diff --git a/lib_xua/src/dfu/dfu.h b/lib_xua/src/dfu/xua_dfu.h
similarity index 100%
rename from lib_xua/src/dfu/dfu.h
rename to lib_xua/src/dfu/xua_dfu.h