diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h
index 5e66cfd01..e81019461 100644
--- a/plugins/channelrx/chanalyzer/chanalyzergui.h
+++ b/plugins/channelrx/chanalyzer/chanalyzergui.h
@@ -18,7 +18,6 @@
 #ifndef INCLUDE_CHANNELANALYZERNGGUI_H
 #define INCLUDE_CHANNELANALYZERNGGUI_H
 
-#include "plugin/plugininstancegui.h"
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/dsptypes.h"
diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h
index 29050d5db..fed8a4b57 100644
--- a/plugins/channelrx/demodam/amdemodgui.h
+++ b/plugins/channelrx/demodam/amdemodgui.h
@@ -3,7 +3,6 @@
 
 #include <QIcon>
 
-#include "plugin/plugininstancegui.h"
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
diff --git a/plugins/channelrx/demodatv/atvdemodgui.h b/plugins/channelrx/demodatv/atvdemodgui.h
index 362616331..ed3846ab5 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.h
+++ b/plugins/channelrx/demodatv/atvdemodgui.h
@@ -19,7 +19,6 @@
 #ifndef INCLUDE_ATVDEMODGUI_H
 #define INCLUDE_ATVDEMODGUI_H
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/movingaverage.h"
diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h
index a12a4622f..c49e7a5a6 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.h
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.h
@@ -19,7 +19,6 @@
 #ifndef INCLUDE_BFMDEMODGUI_H
 #define INCLUDE_BFMDEMODGUI_H
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h
index f7e51d2c6..4f3f29c13 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.h
+++ b/plugins/channelrx/demoddatv/datvdemodgui.h
@@ -21,7 +21,6 @@
 #define INCLUDE_DATVDEMODGUI_H
 
 #include "channel/channelgui.h"
-#include "plugin/plugininstancegui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
 
diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h
index 34395d29e..0bb115aa5 100644
--- a/plugins/channelrx/demoddsd/dsddemodgui.h
+++ b/plugins/channelrx/demoddsd/dsddemodgui.h
@@ -19,7 +19,6 @@
 #ifndef INCLUDE_DSDDEMODGUI_H
 #define INCLUDE_DSDDEMODGUI_H
 
-#include <plugin/plugininstancegui.h>
 #include <QMenu>
 
 #include "channel/channelgui.h"
diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.h b/plugins/channelrx/demodfreedv/freedvdemodgui.h
index 8f2d2e1b9..c53aaa955 100644
--- a/plugins/channelrx/demodfreedv/freedvdemodgui.h
+++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h
@@ -20,7 +20,6 @@
 
 #include <QIcon>
 
-#include "plugin/plugininstancegui.h"
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h
index 0cc143733..8a75fd5d1 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.h
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.h
@@ -1,7 +1,6 @@
 #ifndef INCLUDE_NFMDEMODGUI_H
 #define INCLUDE_NFMDEMODGUI_H
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/dsptypes.h"
 #include "dsp/channelmarker.h"
diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h
index e2f6d32e2..6ec6fa40a 100644
--- a/plugins/channelrx/demodssb/ssbdemodgui.h
+++ b/plugins/channelrx/demodssb/ssbdemodgui.h
@@ -3,7 +3,6 @@
 
 #include <QIcon>
 
-#include "plugin/plugininstancegui.h"
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h
index 1da0d8b61..4a4b044f1 100644
--- a/plugins/channelrx/demodwfm/wfmdemodgui.h
+++ b/plugins/channelrx/demodwfm/wfmdemodgui.h
@@ -1,7 +1,6 @@
 #ifndef INCLUDE_WFMDEMODGUI_H
 #define INCLUDE_WFMDEMODGUI_H
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channelrx/filesink/filesinkgui.h b/plugins/channelrx/filesink/filesinkgui.h
index c77a59592..e248eb4d4 100644
--- a/plugins/channelrx/filesink/filesinkgui.h
+++ b/plugins/channelrx/filesink/filesinkgui.h
@@ -22,7 +22,6 @@
 
 #include <QObject>
 
-#include "plugin/plugininstancegui.h"
 #include "dsp/channelmarker.h"
 #include "channel/channelgui.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channelrx/freqtracker/freqtrackergui.h b/plugins/channelrx/freqtracker/freqtrackergui.h
index de6100782..a0fa5b636 100644
--- a/plugins/channelrx/freqtracker/freqtrackergui.h
+++ b/plugins/channelrx/freqtracker/freqtrackergui.h
@@ -20,7 +20,6 @@
 
 #include <QIcon>
 
-#include "plugin/plugininstancegui.h"
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
diff --git a/plugins/channelrx/localsink/localsinkgui.h b/plugins/channelrx/localsink/localsinkgui.h
index c9e32c4ee..be5363245 100644
--- a/plugins/channelrx/localsink/localsinkgui.h
+++ b/plugins/channelrx/localsink/localsinkgui.h
@@ -22,7 +22,6 @@
 
 #include <QObject>
 
-#include "plugin/plugininstancegui.h"
 #include "dsp/channelmarker.h"
 #include "channel/channelgui.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channelrx/remotesink/remotesinkgui.h b/plugins/channelrx/remotesink/remotesinkgui.h
index 7eb29204a..bedfd2b3c 100644
--- a/plugins/channelrx/remotesink/remotesinkgui.h
+++ b/plugins/channelrx/remotesink/remotesinkgui.h
@@ -22,7 +22,6 @@
 
 #include <QObject>
 
-#include "plugin/plugininstancegui.h"
 #include "dsp/channelmarker.h"
 #include "channel/channelgui.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channelrx/udpsink/udpsinkgui.h b/plugins/channelrx/udpsink/udpsinkgui.h
index 023cf552b..d1d961fb8 100644
--- a/plugins/channelrx/udpsink/udpsinkgui.h
+++ b/plugins/channelrx/udpsink/udpsinkgui.h
@@ -19,7 +19,6 @@
 #ifndef INCLUDE_UDPSRCGUI_H
 #define INCLUDE_UDPSRCGUI_H
 
-#include <plugin/plugininstancegui.h>
 #include <QHostAddress>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
diff --git a/plugins/channeltx/filesource/filesourcegui.h b/plugins/channeltx/filesource/filesourcegui.h
index 36a8858dd..99196d2ad 100644
--- a/plugins/channeltx/filesource/filesourcegui.h
+++ b/plugins/channeltx/filesource/filesourcegui.h
@@ -18,7 +18,6 @@
 #ifndef PLUGINS_CHANNELTX_FILESOURCE_FILESOURCEGUI_H_
 #define PLUGINS_CHANNELTX_FILESOURCE_FILESOURCEGUI_H_
 
-#include "plugin/plugininstancegui.h"
 #include "dsp/channelmarker.h"
 #include "channel/channelgui.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channeltx/localsource/localsourcegui.h b/plugins/channeltx/localsource/localsourcegui.h
index 0b5fccd35..8eae13632 100644
--- a/plugins/channeltx/localsource/localsourcegui.h
+++ b/plugins/channeltx/localsource/localsourcegui.h
@@ -22,7 +22,6 @@
 
 #include <QObject>
 
-#include "plugin/plugininstancegui.h"
 #include "dsp/channelmarker.h"
 #include "channel/channelgui.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h
index c6f63016e..de0a16714 100644
--- a/plugins/channeltx/modatv/atvmodgui.h
+++ b/plugins/channeltx/modatv/atvmodgui.h
@@ -18,7 +18,6 @@
 #ifndef PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_
 #define PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/movingaverage.h"
diff --git a/plugins/channeltx/modfreedv/freedvmodgui.h b/plugins/channeltx/modfreedv/freedvmodgui.h
index 986fc7cff..d4d38a55a 100644
--- a/plugins/channeltx/modfreedv/freedvmodgui.h
+++ b/plugins/channeltx/modfreedv/freedvmodgui.h
@@ -20,7 +20,6 @@
 
 #include <QIcon>
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/movingaverage.h"
diff --git a/plugins/channeltx/modnfm/nfmmodgui.h b/plugins/channeltx/modnfm/nfmmodgui.h
index 0984cdc0e..7606ba076 100644
--- a/plugins/channeltx/modnfm/nfmmodgui.h
+++ b/plugins/channeltx/modnfm/nfmmodgui.h
@@ -18,7 +18,6 @@
 #ifndef PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
 #define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/movingaverage.h"
diff --git a/plugins/channeltx/modpacket/packetmodgui.h b/plugins/channeltx/modpacket/packetmodgui.h
index a7f1fa199..34f30d673 100644
--- a/plugins/channeltx/modpacket/packetmodgui.h
+++ b/plugins/channeltx/modpacket/packetmodgui.h
@@ -19,7 +19,6 @@
 #ifndef PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_
 #define PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/movingaverage.h"
diff --git a/plugins/channeltx/modssb/ssbmodgui.h b/plugins/channeltx/modssb/ssbmodgui.h
index c612558d2..39a4f62cc 100644
--- a/plugins/channeltx/modssb/ssbmodgui.h
+++ b/plugins/channeltx/modssb/ssbmodgui.h
@@ -20,7 +20,6 @@
 
 #include <QIcon>
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/movingaverage.h"
diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h
index 7d5294b19..327ef99a7 100644
--- a/plugins/channeltx/modwfm/wfmmodgui.h
+++ b/plugins/channeltx/modwfm/wfmmodgui.h
@@ -18,7 +18,6 @@
 #ifndef PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_
 #define PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_
 
-#include <plugin/plugininstancegui.h>
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/movingaverage.h"
diff --git a/plugins/channeltx/remotesource/remotesourcegui.h b/plugins/channeltx/remotesource/remotesourcegui.h
index 41c4c81df..1a4faf9b1 100644
--- a/plugins/channeltx/remotesource/remotesourcegui.h
+++ b/plugins/channeltx/remotesource/remotesourcegui.h
@@ -20,7 +20,6 @@
 
 #include <QTime>
 
-#include "plugin/plugininstancegui.h"
 #include "dsp/channelmarker.h"
 #include "channel/channelgui.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channeltx/udpsource/udpsourcegui.h b/plugins/channeltx/udpsource/udpsourcegui.h
index 2f4a3f069..f4bd9e946 100644
--- a/plugins/channeltx/udpsource/udpsourcegui.h
+++ b/plugins/channeltx/udpsource/udpsourcegui.h
@@ -18,7 +18,6 @@
 #ifndef PLUGINS_CHANNELTX_UDPSINK_UDPSOURCEGUI_H_
 #define PLUGINS_CHANNELTX_UDPSINK_UDPSOURCEGUI_H_
 
-#include <plugin/plugininstancegui.h>
 #include <QObject>
 
 #include "channel/channelgui.h"
diff --git a/plugins/feature/rigctlserver/rigctlserverplugin.h b/plugins/feature/rigctlserver/rigctlserverplugin.h
index d48131f84..6da78a70d 100644
--- a/plugins/feature/rigctlserver/rigctlserverplugin.h
+++ b/plugins/feature/rigctlserver/rigctlserverplugin.h
@@ -22,7 +22,6 @@
 #include <QObject>
 #include "plugin/plugininterface.h"
 
-class PluginInstanceGUI;
 class FeatureGUI;
 class WebAPIAdapterInterface;
 
diff --git a/plugins/feature/simpleptt/simplepttplugin.h b/plugins/feature/simpleptt/simplepttplugin.h
index 2e1f1274c..b8a3d3ec0 100644
--- a/plugins/feature/simpleptt/simplepttplugin.h
+++ b/plugins/feature/simpleptt/simplepttplugin.h
@@ -21,7 +21,6 @@
 #include <QObject>
 #include "plugin/plugininterface.h"
 
-class PluginInstanceGUI;
 class FeatureGUI;
 class WebAPIAdapterInterface;
 
diff --git a/sdrbase/channel/channelapi.h b/sdrbase/channel/channelapi.h
index c474609de..f1b5479fc 100644
--- a/sdrbase/channel/channelapi.h
+++ b/sdrbase/channel/channelapi.h
@@ -126,7 +126,7 @@ public:
 private:
     StreamType m_streamType;
     /** Unique identifier in a device set used for sorting. Used when there is no GUI.
-     * In GUI version it is supported by GUI object name accessed through PluginInstanceGUI.
+     * In GUI version it is supported by GUI object name accessed through ChannelGUI.
      */
     QString m_name;
 
diff --git a/sdrbase/plugin/pluginapi.h b/sdrbase/plugin/pluginapi.h
index cd903a08d..949de31c5 100644
--- a/sdrbase/plugin/pluginapi.h
+++ b/sdrbase/plugin/pluginapi.h
@@ -11,7 +11,6 @@ class QString;
 
 class PluginManager;
 class MessageQueue;
-class PluginInstanceGUI;
 
 class SDRBASE_API PluginAPI : public QObject {
 	Q_OBJECT
diff --git a/sdrgui/feature/featureuiset.cpp b/sdrgui/feature/featureuiset.cpp
index 148f33e9d..78b9f31e7 100644
--- a/sdrgui/feature/featureuiset.cpp
+++ b/sdrgui/feature/featureuiset.cpp
@@ -16,7 +16,6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include "gui/featurewindow.h"
-#include "plugin/plugininstancegui.h"
 #include "plugin/pluginapi.h"
 #include "settings/featuresetpreset.h"
 #include "feature/featureutils.h"
@@ -127,7 +126,7 @@ void FeatureUISet::loadFeatureSetSettings(const FeatureSetPreset *preset, Plugin
     for (int i = 0; i < preset->getFeatureCount(); i++)
     {
         const FeatureSetPreset::FeatureConfig& featureConfig = preset->getFeatureConfig(i);
-        PluginInstanceGUI *featureGUI = nullptr;
+        FeatureGUI *featureGUI = nullptr;
 
         // create feature instance
 
@@ -140,7 +139,7 @@ void FeatureUISet::loadFeatureSetSettings(const FeatureSetPreset *preset, Plugin
                         qPrintable(featureConfig.m_featureIdURI));
                 Feature *feature =
                         (*featureRegistrations)[i].m_plugin->createFeature(apiAdapter);
-                FeatureGUI *featureGUI =
+                featureGUI =
                         (*featureRegistrations)[i].m_plugin->createFeatureGUI(this, feature);
                 registerFeatureInstance(feature->getURI(), featureGUI, feature);
                 break;
diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h
index 0b24cf96f..a53d7ed21 100644
--- a/sdrgui/mainwindow.h
+++ b/sdrgui/mainwindow.h
@@ -39,7 +39,6 @@ class DSPDeviceSinkEngine;
 class Indicator;
 class GLSpectrumGUI;
 class PluginAPI;
-class PluginInstanceGUI;
 class ChannelGUI;
 class ChannelMarker;
 class PluginManager;