diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc
index 76158011..73809216 100755
--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -17,7 +17,7 @@
 #include "audioports.h"
 #include "audiohw.h"
 #include "SpdifTransmit.h"
-#include "clockcmds.h"
+#include "commands.h"
 #include "xc_ptr.h"
 
 unsigned testsamples[100];
@@ -54,14 +54,11 @@ extern in port p_lrclk;
 extern in port p_bclk;
 #endif
 
-unsigned dsdMode = 0;
 #if (DSD_CHANS_DAC != 0)
-/* DoP defines */
-#define DSD_MARKER_1       0xFA
-#define DSD_MARKER_2       0x05
-#define DSD_MARKER_XOR     0xFF
-#define DSD_EN_THRESH      32          /* Number of consecutive DSD markers before switching to DSD mode */
-#define DSD_MASK(x)        ((x >> 24) & 0xff)
+
+unsigned dsdMode = 0;
+
+
 #endif
 
 
diff --git a/module_usb_audio/clocking/clockgen.xc b/module_usb_audio/clocking/clockgen.xc
index 09804af1..63628475 100644
--- a/module_usb_audio/clocking/clockgen.xc
+++ b/module_usb_audio/clocking/clockgen.xc
@@ -4,7 +4,7 @@
 #include <print.h>
 
 #include "devicedefines.h"
-#include "clockcmds.h"
+#include "commands.h"
 #include "SpdifReceive.h"
 
 
@@ -537,9 +537,6 @@ void clockGen (streaming chanend c_spdif_rx, chanend c_adat_rx, out port p, chan
                             break;
                     }
 
-
-                
-
                 spdifCounters.samples += 1;
 
                 if(clkMode == CLOCK_SPDIF && clockValid[CLOCK_SPDIF_INDEX])
diff --git a/module_usb_audio/clockcmds.h b/module_usb_audio/commands.h
similarity index 89%
rename from module_usb_audio/clockcmds.h
rename to module_usb_audio/commands.h
index a8c7b9e0..8eeca362 100644
--- a/module_usb_audio/clockcmds.h
+++ b/module_usb_audio/commands.h
@@ -25,11 +25,9 @@
 #define SET_SAMPLE_FREQ         4
 #define SET_CHAN_COUNT_IN       5
 #define SET_CHAN_COUNT_OUT      6
-
 #define SET_DSD_MODE            7
-#define DSD_MODE_OFF            0
-#define DSD_MODE_DOP            1
-#define DSD_MODE_NATIVE         2
+
+#include "dsd.h"
 
 
 
diff --git a/module_usb_audio/endpoint0/audiorequests.xc b/module_usb_audio/endpoint0/audiorequests.xc
index 23ee2265..57ae892a 100644
--- a/module_usb_audio/endpoint0/audiorequests.xc
+++ b/module_usb_audio/endpoint0/audiorequests.xc
@@ -10,7 +10,7 @@
 #include "usbaudio10.h"
 #include "dbcalc.h"
 #include "devicedefines.h"
-#include "clockcmds.h"
+#include "commands.h"
 #include "xc_ptr.h"
 #ifdef MIXER
 #include "mixer.h"
diff --git a/module_usb_audio/endpoint0/endpoint0.xc b/module_usb_audio/endpoint0/endpoint0.xc
index 89119da9..2d477086 100755
--- a/module_usb_audio/endpoint0/endpoint0.xc
+++ b/module_usb_audio/endpoint0/endpoint0.xc
@@ -14,7 +14,7 @@
 #include "devicedefines.h"
 #include "usb_device.h"          /* Standard descriptor requests */
 #include "descriptors.h"       /* This devices descriptors */
-#include "clockcmds.h"
+#include "commands.h"
 #include "audiostream.h"
 #include "hostactive.h"
 #include "vendorrequests.h"
diff --git a/module_usb_audio/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc
index ad7edfd3..5f545ae4 100644
--- a/module_usb_audio/usb_buffer/decouple.xc
+++ b/module_usb_audio/usb_buffer/decouple.xc
@@ -2,7 +2,7 @@
 #include "xc_ptr.h"
 #include "devicedefines.h"
 #include "interrupt.h"
-#include "clockcmds.h"
+#include "commands.h"
 #include "xud.h"
 #include "usb.h"
 #ifdef HID_CONTROLS
diff --git a/module_usb_audio/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc
index b1fd03d0..2950cdf9 100644
--- a/module_usb_audio/usb_buffer/usb_buffer.xc
+++ b/module_usb_audio/usb_buffer/usb_buffer.xc
@@ -9,7 +9,7 @@
 #include "iAP.h"
 #endif
 #include "xc_ptr.h"
-#include "clockcmds.h"
+#include "commands.h"
 #include "xud.h"
 #include "testct_byref.h"