diff --git a/module_usb_audio/clocking/clockgen.xc b/module_usb_audio/clocking/clockgen.xc
index 63628475..3da5ea1c 100644
--- a/module_usb_audio/clocking/clockgen.xc
+++ b/module_usb_audio/clocking/clockgen.xc
@@ -5,8 +5,10 @@
 
 #include "devicedefines.h"
 #include "commands.h"
-#include "SpdifReceive.h"
 
+#if defined(SPDIF_RX)
+#include "SpdifReceive.h"
+#endif
 
 
 
diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index 78d27336..9436866c 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -29,10 +29,14 @@
     #endif
 #endif
 
-#if !defined (DSD_CHANS_DAC)
-#define DSD_CHANS_DAC   0
-#else
-#define NATIVE_DSD      1        /* Always enable Native DSD when DSD mode is enabled */
+#if defined(DSD_CHANS_DAC)
+    #if defined(NATIVE_DSD) && (NATIVE_DSD == 0)
+        #undef NATIVE_DSD
+    #else
+        #define NATIVE_DSD       1  /* Always enable Native DSD when DSD mode is enabled */
+    #endif
+#else    
+    #define DSD_CHANS_DAC        0
 #endif
 
 /* Max supported sample freq for device */