diff --git a/sdrgui/device/devicesinkapi.cpp b/sdrgui/device/devicesinkapi.cpp
index 9754eb841..6b47ed3fe 100644
--- a/sdrgui/device/devicesinkapi.cpp
+++ b/sdrgui/device/devicesinkapi.cpp
@@ -22,12 +22,11 @@
 #include "plugin/plugininterface.h"
 #include "gui/glspectrum.h"
 #include "gui/channelwindow.h"
-#include "mainwindow.h"
 #include "settings/preset.h"
+#include "dsp/dspengine.h"
 
 // TODO: extract GUI dependencies in a separate object
-DeviceSinkAPI::DeviceSinkAPI(MainWindow *mainWindow,
-        int deviceTabIndex,
+DeviceSinkAPI::DeviceSinkAPI(int deviceTabIndex,
         DSPDeviceSinkEngine *deviceSinkEngine,
         GLSpectrum *glSpectrum,
         ChannelWindow *channelWindow) :
@@ -40,7 +39,7 @@ DeviceSinkAPI::DeviceSinkAPI(MainWindow *mainWindow,
     m_sampleSinkPluginInstanceUI(0),
     m_buddySharedPtr(0),
     m_isBuddyLeader(false),
-    m_masterTimer(mainWindow->getMasterTimer()) // TODO: get master timer directly not from main window
+    m_masterTimer(DSPEngine::instance()->getMasterTimer())
 {
 }
 
diff --git a/sdrgui/device/devicesinkapi.h b/sdrgui/device/devicesinkapi.h
index fcc97ff49..d586e6fb4 100644
--- a/sdrgui/device/devicesinkapi.h
+++ b/sdrgui/device/devicesinkapi.h
@@ -23,7 +23,6 @@
 #include "dsp/dspdevicesinkengine.h"
 #include "util/export.h"
 
-class MainWindow;
 class GLSpectrum;
 class ChannelWindow;
 class BasebandSampleSource;
@@ -130,8 +129,7 @@ protected:
 
     typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations;
 
-    DeviceSinkAPI(MainWindow *mainWindow,
-            int deviceTabIndex,
+    DeviceSinkAPI(int deviceTabIndex,
             DSPDeviceSinkEngine *deviceEngine,
             GLSpectrum *glSpectrum,
             ChannelWindow *channelWindow);
diff --git a/sdrgui/device/devicesourceapi.cpp b/sdrgui/device/devicesourceapi.cpp
index 6af3f9ac7..138937ab4 100644
--- a/sdrgui/device/devicesourceapi.cpp
+++ b/sdrgui/device/devicesourceapi.cpp
@@ -39,7 +39,7 @@ DeviceSourceAPI::DeviceSourceAPI(int deviceTabIndex,
     m_sampleSourcePluginInstanceUI(0),
     m_buddySharedPtr(0),
     m_isBuddyLeader(false),
-    m_masterTimer(DSPEngine::instance()->getMasterTimer()) // TODO: get master timer directly not from main window
+    m_masterTimer(DSPEngine::instance()->getMasterTimer())
 {
 }
 
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 1625064db..d65e81453 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -258,7 +258,7 @@ void MainWindow::addSinkDevice()
     char tabNameCStr[16];
     sprintf(tabNameCStr, "T%d", deviceTabIndex);
 
-    DeviceSinkAPI *deviceSinkAPI = new DeviceSinkAPI(this, deviceTabIndex, dspDeviceSinkEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow);
+    DeviceSinkAPI *deviceSinkAPI = new DeviceSinkAPI(deviceTabIndex, dspDeviceSinkEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow);
 
     m_deviceUIs.back()->m_deviceSourceAPI = 0;
     m_deviceUIs.back()->m_deviceSinkAPI = deviceSinkAPI;