diff --git a/lib_xua/src/core/audiohub/xua_audiohub.xc b/lib_xua/src/core/audiohub/xua_audiohub.xc
index 05403057..af66f2a7 100755
--- a/lib_xua/src/core/audiohub/xua_audiohub.xc
+++ b/lib_xua/src/core/audiohub/xua_audiohub.xc
@@ -282,7 +282,6 @@ static inline void DoDsdDop(int &everyOther, unsigned samplesOut[], unsigned &ds
         asm volatile("out res[%0], %1"::"r"(p_dsd_dac[1]),"r"(bitrev(dsdSample_r)));
     }
 }
-#endif
 
 /* When DSD is enabled and streaming is standard PCM, this function checks for a series of DoP markers in the upper byte.
    If found it will exit deliver() with the command to restart in DoP mode.
@@ -337,6 +336,7 @@ static inline int DoDsdDopCheck(unsigned &dsdMode, int &dsdCount, unsigned curSa
 #endif
     return 1;
 }
+#endif
 
 #if !CODEC_MASTER
 static inline void InitPorts_master(unsigned divide)
@@ -406,7 +406,7 @@ static inline void InitPorts_slave(unsigned divide)
     p_lrclk when pinseq(1) :> void;
     p_lrclk when pinseq(0) :> void;
     p_lrclk when pinseq(1) :> void;
-#ifdef I2S_MODE_TDM
+#if I2S_MODE_TDM
     p_lrclk when pinseq(0) :> void;
     p_lrclk when pinseq(1) :> void @ tmp;
 #else
@@ -609,7 +609,7 @@ unsigned static deliver_master(chanend ?c_out, chanend ?c_spd_out
                 /* LR clock delayed by one clock, This is so MSB is output on the falling edge of BCLK
                  * after the falling edge on which LRCLK was toggled. (see I2S spec) */
                 /* Generate clocks LR Clock low - LEFT */
-#ifdef I2S_MODE_TDM
+#if I2S_MODE_TDM
                 p_lrclk <: 0x00000000;
 #else
                 p_lrclk <: 0x80000000;
@@ -736,7 +736,7 @@ unsigned static deliver_master(chanend ?c_out, chanend ?c_spd_out
                 }
 #endif
 
-#ifdef I2S_MODE_TDM
+#if I2S_MODE_TDM
                 if(frameCount == (I2S_CHANS_PER_FRAME-2))
                     p_lrclk <: 0x80000000;
                 else
@@ -772,13 +772,12 @@ unsigned static deliver_master(chanend ?c_out, chanend ?c_spd_out
             }  // !dsdMode
 
 
-            if((DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0))
-            {
-                if(DoDsdDopCheck(dsdMode, dsdCount, curSamFreq, samplesOut, dsdMarker) == 0)
-                    return 0;
-            }
+#if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)
+            if(DoDsdDopCheck(dsdMode, dsdCount, curSamFreq, samplesOut, dsdMarker) == 0)
+                return 0;
+#endif
 
-#ifdef I2S_MODE_TDM
+#if I2S_MODE_TDM
             /* Increase frameCount by 2 since we have output two channels (per data line) */
             frameCount+=2;
             if(frameCount == I2S_CHANS_PER_FRAME)
@@ -1145,7 +1144,7 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
 #endif // (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
 
 
-#ifdef I2S_MODE_TDM
+#if I2S_MODE_TDM
             /* Increase frameCount by 2 since we have output two channels (per data line) */
             frameCount+=2;
             if(frameCount == I2S_CHANS_PER_FRAME)