diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp
index 80a3af7db..09ed50f86 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.cpp
+++ b/plugins/channelrx/demodatv/atvdemodgui.cpp
@@ -25,7 +25,7 @@
 #include "dsp/downchannelizer.h"
 
 #include "dsp/threadedbasebandsamplesink.h"
-#include "dsp/scopevisng.h"
+#include "dsp/scopevis.h"
 #include "ui_atvdemodgui.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index 1cc1e0cd8..6c999002a 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -103,7 +103,7 @@ set(sdrgui_HEADERS
     gui/valuedial.h
     gui/valuedialz.h
     
-    dsp/scopevisng.h
+    dsp/scopevis.h
     dsp/scopevismulti.h
     dsp/scopevisxy.h    
     dsp/spectrumvis.h
diff --git a/sdrgui/dsp/scopevisng.h b/sdrgui/dsp/scopevis.h
similarity index 100%
rename from sdrgui/dsp/scopevisng.h
rename to sdrgui/dsp/scopevis.h
diff --git a/sdrgui/dsp/scopevisng.cpp b/sdrgui/dsp/scopevisng.cpp
index 75bb58f54..3e6883bdf 100644
--- a/sdrgui/dsp/scopevisng.cpp
+++ b/sdrgui/dsp/scopevisng.cpp
@@ -18,7 +18,7 @@
 #include <QDebug>
 #include <QMutexLocker>
 
-#include "scopevisng.h"
+#include "scopevis.h"
 #include "dsp/dspcommands.h"
 #include "gui/glscope.h"
 
diff --git a/sdrgui/dsp/spectrumscopecombovis.cpp b/sdrgui/dsp/spectrumscopecombovis.cpp
index feb482022..970ef82ca 100644
--- a/sdrgui/dsp/spectrumscopecombovis.cpp
+++ b/sdrgui/dsp/spectrumscopecombovis.cpp
@@ -1,5 +1,6 @@
 #include "dsp/spectrumscopecombovis.h"
 #include "dsp/dspcommands.h"
+#include "dsp/scopevis.h"
 #include "util/messagequeue.h"
 
 SpectrumScopeComboVis::SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVis* scopeVis) :
diff --git a/sdrgui/dsp/spectrumscopecombovis.h b/sdrgui/dsp/spectrumscopecombovis.h
index 39cb10db6..d2b0194d2 100644
--- a/sdrgui/dsp/spectrumscopecombovis.h
+++ b/sdrgui/dsp/spectrumscopecombovis.h
@@ -3,10 +3,10 @@
 
 #include <dsp/basebandsamplesink.h>
 #include "dsp/spectrumvis.h"
-#include "dsp/scopevisng.h"
 #include "export.h"
 
 class Message;
+class ScopeVis;
 
 class SDRGUI_API SpectrumScopeComboVis : public BasebandSampleSink {
 public:
diff --git a/sdrgui/gui/glscope.h b/sdrgui/gui/glscope.h
index 1fbdd1317..9d7acf152 100644
--- a/sdrgui/gui/glscope.h
+++ b/sdrgui/gui/glscope.h
@@ -25,7 +25,7 @@
 #include <QFont>
 #include <QMatrix4x4>
 #include "dsp/dsptypes.h"
-#include "dsp/scopevisng.h"
+#include "dsp/scopevis.h"
 #include "gui/scaleengine.h"
 #include "gui/glshadersimple.h"
 #include "gui/glshadertextured.h"
diff --git a/sdrgui/gui/glscopegui.h b/sdrgui/gui/glscopegui.h
index b6b545e4f..77584c471 100644
--- a/sdrgui/gui/glscopegui.h
+++ b/sdrgui/gui/glscopegui.h
@@ -24,7 +24,7 @@
 #include "dsp/dsptypes.h"
 #include "export.h"
 #include "util/message.h"
-#include "dsp/scopevisng.h"
+#include "dsp/scopevis.h"
 #include "settings/serializable.h"
 
 namespace Ui {