diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cc3f1339..5d2f96726 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ set(sdrbase_SOURCES
 	sdrbase/gui/scaleengine.cpp
 	sdrbase/gui/valuedial.cpp
 
-	sdrbase/dsp/samplesource/samplesource.cpp
+	sdrbase/dsp/samplesource.cpp
 
 	sdrbase/plugin/pluginapi.cpp
 	sdrbase/plugin/plugingui.cpp
@@ -172,7 +172,7 @@ set(sdrbase_HEADERS
 	include-gpl/gui/scaleengine.h
 	include-gpl/gui/valuedial.h
 
-	include/dsp/samplesource/samplesource.h
+	include/dsp/samplesource.h
 
 	include/plugin/pluginapi.h
 	include/plugin/plugingui.h
diff --git a/include/dsp/samplesource/samplesource.h b/include/dsp/samplesource.h
similarity index 100%
rename from include/dsp/samplesource/samplesource.h
rename to include/dsp/samplesource.h
diff --git a/plugins/samplesource/bladerf/bladerfinput.h b/plugins/samplesource/bladerf/bladerfinput.h
index 56f7ad69e..58fa6f53c 100644
--- a/plugins/samplesource/bladerf/bladerfinput.h
+++ b/plugins/samplesource/bladerf/bladerfinput.h
@@ -17,7 +17,7 @@
 #ifndef INCLUDE_BLADERFINPUT_H
 #define INCLUDE_BLADERFINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <libbladeRF.h>
 #include <QString>
 
diff --git a/plugins/samplesource/fcd/fcdinput.h b/plugins/samplesource/fcd/fcdinput.h
index 4ba1d9d2c..6a8b40449 100644
--- a/plugins/samplesource/fcd/fcdinput.h
+++ b/plugins/samplesource/fcd/fcdinput.h
@@ -18,7 +18,7 @@
 #ifndef INCLUDE_FCDINPUT_H
 #define INCLUDE_FCDINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <QString>
 
 struct fcd_buffer {
diff --git a/plugins/samplesource/filesource/filesourceinput.h b/plugins/samplesource/filesource/filesourceinput.h
index 7113bea38..936035192 100644
--- a/plugins/samplesource/filesource/filesourceinput.h
+++ b/plugins/samplesource/filesource/filesourceinput.h
@@ -17,7 +17,7 @@
 #ifndef INCLUDE_FILESOURCEINPUT_H
 #define INCLUDE_FILESOURCEINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <QString>
 #include <QTimer>
 #include <ctime>
diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.h b/plugins/samplesource/rtlsdr/rtlsdrinput.h
index 3e173ceb8..db135da3d 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.h
@@ -18,7 +18,7 @@
 #ifndef INCLUDE_RTLSDRINPUT_H
 #define INCLUDE_RTLSDRINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <rtl-sdr.h>
 #include <QString>
 
diff --git a/sdrbase/dsp/dspengine.cpp b/sdrbase/dsp/dspengine.cpp
index 36f165ae6..11da2d18e 100644
--- a/sdrbase/dsp/dspengine.cpp
+++ b/sdrbase/dsp/dspengine.cpp
@@ -23,7 +23,7 @@
 #include "dsp/samplesink.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/dspcommands.h"
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 
 DSPEngine::DSPEngine(QObject* parent) :
 	QThread(parent),
diff --git a/sdrbase/dsp/samplesource/samplesource.cpp b/sdrbase/dsp/samplesource.cpp
similarity index 97%
rename from sdrbase/dsp/samplesource/samplesource.cpp
rename to sdrbase/dsp/samplesource.cpp
index 747134bbd..be4958178 100644
--- a/sdrbase/dsp/samplesource/samplesource.cpp
+++ b/sdrbase/dsp/samplesource.cpp
@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 
 SampleSource::SampleSource()
 {
diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp
index f7bc13a91..3ec6a52ab 100644
--- a/sdrbase/plugin/pluginmanager.cpp
+++ b/sdrbase/plugin/pluginmanager.cpp
@@ -6,7 +6,7 @@
 #include "settings/preset.h"
 #include "mainwindow.h"
 #include "dsp/dspengine.h"
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 
 #include <QDebug>
 #include "util/stacktrace.h"