diff --git a/sdrgui/plugin/pluginapi.cpp b/sdrgui/plugin/pluginapi.cpp
index ae0f1f9d1..1e2f55039 100644
--- a/sdrgui/plugin/pluginapi.cpp
+++ b/sdrgui/plugin/pluginapi.cpp
@@ -1,12 +1,6 @@
 #include <QDockWidget>
 #include "plugin/pluginapi.h"
 #include "plugin/pluginmanager.h"
-#include "mainwindow.h"
-
-MessageQueue* PluginAPI::getMainWindowMessageQueue()
-{
-	return m_mainWindow->getInputMessageQueue();
-}
 
 void PluginAPI::registerRxChannel(const QString& channelName, PluginInterface* plugin)
 {
@@ -39,10 +33,8 @@ PluginAPI::ChannelRegistrations *PluginAPI::getTxChannelRegistrations()
 }
 
 
-PluginAPI::PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow) :
-	QObject(mainWindow),
-	m_pluginManager(pluginManager),
-	m_mainWindow(mainWindow)
+PluginAPI::PluginAPI(PluginManager* pluginManager) :
+	m_pluginManager(pluginManager)
 {
 }
 
diff --git a/sdrgui/plugin/pluginapi.h b/sdrgui/plugin/pluginapi.h
index b0b5d4bcb..76af7e80f 100644
--- a/sdrgui/plugin/pluginapi.h
+++ b/sdrgui/plugin/pluginapi.h
@@ -10,7 +10,6 @@ class QString;
 
 class PluginManager;
 class PluginInterface;
-class MainWindow;
 class MessageQueue;
 class PluginInstanceGUI;
 
@@ -30,9 +29,6 @@ public:
 
     typedef QList<ChannelRegistration> ChannelRegistrations;
 
-	// MainWindow access
-	MessageQueue* getMainWindowMessageQueue();
-
 	// Rx Channel stuff
 	void registerRxChannel(const QString& channelName, PluginInterface* plugin);
 	ChannelRegistrations *getRxChannelRegistrations();
@@ -47,14 +43,10 @@ public:
 	// Sample Sink stuff
 	void registerSampleSink(const QString& sinkName, PluginInterface* plugin);
 
-	// R/O access to main window
-	const MainWindow* getMainWindow() const { return m_mainWindow; }
-
 protected:
 	PluginManager* m_pluginManager;
-	MainWindow* m_mainWindow;
 
-	PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow);
+	PluginAPI(PluginManager* pluginManager);
 	~PluginAPI();
 
 	friend class PluginManager;
diff --git a/sdrgui/plugin/pluginmanager.cpp b/sdrgui/plugin/pluginmanager.cpp
index a318152a2..1051122e9 100644
--- a/sdrgui/plugin/pluginmanager.cpp
+++ b/sdrgui/plugin/pluginmanager.cpp
@@ -40,7 +40,7 @@ const QString PluginManager::m_fileSinkDeviceTypeID = "sdrangel.samplesink.files
 
 PluginManager::PluginManager(MainWindow* mainWindow, QObject* parent) :
 	QObject(parent),
-	m_pluginAPI(this, mainWindow)
+    m_pluginAPI(this)
 {
 }