diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
index 1b7d17a06..b8a961dc2 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
+++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
@@ -30,7 +30,6 @@
 #include <nanomsg/pair.h>
 
 #include "ui_sdrdaemongui.h"
-#include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
 #include "gui/colormapper.h"
 #include "gui/glspectrum.h"
@@ -42,10 +41,9 @@
 
 #include "sdrdaemongui.h"
 
-SDRdaemonGui::SDRdaemonGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
+SDRdaemonGui::SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::SDRdaemonGui),
-	m_pluginAPI(pluginAPI),
 	m_deviceAPI(deviceAPI),
 	m_sampleSource(NULL),
 	m_acquisition(false),
@@ -88,9 +86,9 @@ SDRdaemonGui::SDRdaemonGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget*
 	connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
 	connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
 	m_statusTimer.start(500);
-	connect(&(m_pluginAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
+	connect(&(deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
 
-	m_sampleSource = new SDRdaemonInput(m_pluginAPI->getMainWindow()->getMasterTimer(), m_deviceAPI);
+	m_sampleSource = new SDRdaemonInput(deviceAPI->getMainWindow()->getMasterTimer(), m_deviceAPI);
 	connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
 	m_deviceAPI->setSource(m_sampleSource);
 
diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.h b/plugins/samplesource/sdrdaemon/sdrdaemongui.h
index 3c5ffc06b..02c83a8b9 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemongui.h
+++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.h
@@ -23,7 +23,6 @@
 
 #include "sdrdaemoninput.h"
 
-class PluginAPI;
 class DeviceAPI;
 class FileSink;
 
@@ -35,7 +34,7 @@ class SDRdaemonGui : public QWidget, public PluginGUI {
 	Q_OBJECT
 
 public:
-	explicit SDRdaemonGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
+	explicit SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
 	virtual ~SDRdaemonGui();
 	void destroy();
 
@@ -52,7 +51,6 @@ public:
 private:
 	Ui::SDRdaemonGui* ui;
 
-	PluginAPI* m_pluginAPI;
 	DeviceAPI* m_deviceAPI;
 	QTimer m_updateTimer;
 	QTimer m_statusTimer;
diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
index 4316fa7d6..016c681ac 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
+++ b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
@@ -46,8 +46,7 @@ const PluginDescriptor& SDRdaemonPlugin::getPluginDescriptor() const
 
 void SDRdaemonPlugin::initPlugin(PluginAPI* pluginAPI)
 {
-	m_pluginAPI = pluginAPI;
-	m_pluginAPI->registerSampleSource(m_deviceTypeID, this);
+	pluginAPI->registerSampleSource(m_deviceTypeID, this);
 }
 
 PluginInterface::SampleSourceDevices SDRdaemonPlugin::enumSampleSources()
@@ -72,7 +71,7 @@ PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId,
 {
 	if(sourceId == m_deviceTypeID)
 	{
-		SDRdaemonGui* gui = new SDRdaemonGui(m_pluginAPI, deviceAPI);
+		SDRdaemonGui* gui = new SDRdaemonGui(deviceAPI);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
index d3ed52f74..8f2b74845 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
+++ b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
@@ -22,6 +22,8 @@
 
 #define SDRDAEMON_DEVICE_TYPE_ID "sdrangel.samplesource.sdrdaemon"
 
+class PluginAPI;
+
 class SDRdaemonPlugin : public QObject, public PluginInterface {
 	Q_OBJECT
 	Q_INTERFACES(PluginInterface)
@@ -40,8 +42,6 @@ public:
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;
-
-	PluginAPI* m_pluginAPI;
 };
 
 #endif // INCLUDE_SDRDAEMONPLUGIN_H
diff --git a/sdrbase/device/deviceapi.h b/sdrbase/device/deviceapi.h
index 64acc16bd..a389b015e 100644
--- a/sdrbase/device/deviceapi.h
+++ b/sdrbase/device/deviceapi.h
@@ -80,6 +80,8 @@ public:
     void loadChannelSettings(const Preset* preset, PluginAPI *pluginAPI);
     void saveChannelSettings(Preset* preset);
 
+    MainWindow *getMainWindow() { return m_mainWindow; }
+
 protected:
     struct ChannelInstanceRegistration
     {