diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
index 723aa8ba7..065f65986 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "../../channelrx/demodbfm/bfmdemodgui.h"
+#include "bfmdemodgui.h"
 
 #include <device/devicesourceapi.h>
 #include <dsp/downchannelizer.h>
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include "../../../sdrbase/dsp/threadedbasebandsamplesink.h"
+#include "dsp/threadedbasebandsamplesink.h"
 #include "dsp/dspengine.h"
 #include "dsp/spectrumvis.h"
 #include "gui/glspectrum.h"
@@ -37,8 +37,8 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "mainwindow.h"
 
-#include "../../channelrx/demodbfm/bfmdemod.h"
-#include "../../channelrx/demodbfm/rdstmc.h"
+#include "bfmdemod.h"
+#include "rdstmc.h"
 #include "ui_bfmdemodgui.h"
 
 const QString BFMDemodGUI::m_channelID = "sdrangel.channel.bfm";
@@ -47,15 +47,15 @@ const int BFMDemodGUI::m_rfBW[] = {
 	80000, 100000, 120000, 140000, 160000, 180000, 200000, 220000, 250000
 };
 
-int requiredBW(int rfBW)
-{
-	if (rfBW <= 48000)
-		return 48000;
-	else if (rfBW < 100000)
-		return 96000;
-	else
-		return 384000;
-}
+//int requiredBW(int rfBW)
+//{
+//	if (rfBW <= 48000)
+//		return 48000;
+//	else if (rfBW < 100000)
+//		return 96000;
+//	else
+//		return 384000;
+//}
 
 BFMDemodGUI* BFMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
 {
diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h
index 3b6298666..d01c64649 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.h
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.h
@@ -23,7 +23,7 @@
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
 
-#include "../../channelrx/demodbfm/rdsparser.h"
+#include "rdsparser.h"
 
 class PluginAPI;
 class DeviceSourceAPI;
@@ -112,6 +112,15 @@ private:
 	void enterEvent(QEvent*);
 
 	void changeFrequency(qint64 f);
+
+    static int requiredBW(int rfBW)
+    {
+        if (rfBW <= 48000) {
+            return 48000;
+        } else {
+            return (3*rfBW)/2;
+        }
+    }
 };
 
 #endif // INCLUDE_BFMDEMODGUI_H
diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp
index 5a84c0fab..fe5d5e021 100644
--- a/plugins/channelrx/demodbfm/bfmplugin.cpp
+++ b/plugins/channelrx/demodbfm/bfmplugin.cpp
@@ -15,16 +15,16 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "../../channelrx/demodbfm/bfmplugin.h"
+#include "bfmplugin.h"
 
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 
-#include "../../channelrx/demodbfm/bfmdemodgui.h"
+#include "bfmdemodgui.h"
 
 const PluginDescriptor BFMPlugin::m_pluginDescriptor = {
 	QString("Broadcast FM Demodulator"),
-	QString("2.0.0"),
+	QString("3.1.0"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,