diff --git a/libairspyhf/libairspyhf.pro b/libairspyhf/libairspyhf.pro
index 9e1ec479a..af7592912 100644
--- a/libairspyhf/libairspyhf.pro
+++ b/libairspyhf/libairspyhf.pro
@@ -9,19 +9,21 @@ QT += core
 TEMPLATE = lib
 TARGET = libairspyhf
 
-CONFIG(MINGW32):LIBAIRSPYHFSRC = "D:\softs\libairspyhf\libairspyhf"
-CONFIG(MINGW64):LIBAIRSPYHFSRC = "D:\softs\libairspyhf\libairspyhf"
+CONFIG(MINGW32):LIBAIRSPYHFSRC = "D:\softs\airspyhf\libairspyhf"
+CONFIG(MINGW64):LIBAIRSPYHFSRC = "D:\softs\airspyhf\libairspyhf"
 INCLUDEPATH += $$LIBAIRSPYHFSRC/src
 
 CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
 CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
 
-SOURCES = $$LIBAIRSPYSRC/src/airspyhf.c\
-  $$LIBAIRSPYSRC/src/iqbalancer.c
+SOURCES = $$LIBAIRSPYHFSRC/src/airspyhf.c\
+  $$LIBAIRSPYHFSRC/src/iqbalancer.c\
+  $$LIBAIRSPYHFSRC/src/iqconverter_int16.c
 
-HEADERS = $$LIBAIRSPYSRC/src/airspyhf.h\
-  $$LIBAIRSPYSRC/src/airspyhf_commands.h\
-  $$LIBAIRSPYSRC/src/iqbalancer.h
+HEADERS = $$LIBAIRSPYHFSRC/src/airspyhf.h\
+  $$LIBAIRSPYHFSRC/src/airspyhf_commands.h\
+  $$LIBAIRSPYHFSRC/src/iqbalancer.h\
+  $$LIBAIRSPYHFSRC/src/iqconverter_int16.h
 
 CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
 CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
diff --git a/plugins/samplesource/airspyhf/airspyhf.pro b/plugins/samplesource/airspyhf/airspyhf.pro
new file mode 100644
index 000000000..c31ae2e71
--- /dev/null
+++ b/plugins/samplesource/airspyhf/airspyhf.pro
@@ -0,0 +1,50 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += core gui widgets multimedia opengl
+
+TARGET = inputairspyhf
+
+CONFIG(MINGW32):LIBAIRSPYHFSRC = "D:\softs\airspyhf"
+CONFIG(MINGW64):LIBAIRSPYHFSRC = "D:\softs\airspyhf"
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
+INCLUDEPATH += $$LIBAIRSPYHFSRC
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+QMAKE_CXXFLAGS += -std=c++11
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+SOURCES += airspyhfgui.cpp\
+  airspyhfinput.cpp\
+  airspyhfplugin.cpp\
+  airspyhfsettings.cpp\
+  airspyhfthread.cpp
+
+HEADERS += airspyhfgui.h\
+  airspyhfinput.h\
+  airspyhfplugin.h\
+  airspyhfsettings.h\
+  airspyhfthread.h
+
+FORMS += airspyhfgui.ui
+
+LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
+LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
+LIBS += -L../../../libairspyhf/$${build_subdir} -llibairspyhf
+
+RESOURCES = ../../../sdrgui/resources/res.qrc
diff --git a/plugins/samplesource/testsource/testsourcegui.h b/plugins/samplesource/testsource/testsourcegui.h
index b738ca119..4208c9484 100644
--- a/plugins/samplesource/testsource/testsourcegui.h
+++ b/plugins/samplesource/testsource/testsourcegui.h
@@ -97,7 +97,6 @@ private slots:
     void on_record_toggled(bool checked);
     void updateStatus();
     void updateHardware();
-	void tick();
 };
 
 #endif // _TESTSOURCE_TESTSOURCEGUI_H_
diff --git a/windows.install.bat b/windows.install.bat
index 156747d66..4c69491f0 100644
--- a/windows.install.bat
+++ b/windows.install.bat
@@ -17,6 +17,7 @@ copy logging\%1\logging.dll %2
 copy libhackrf\%1\libhackrf.dll %2
 copy librtlsdr\%1\librtlsdr.dll %2
 copy libairspy\%1\libairspy.dll %2
+copy libairspyhf\%1\libairspyhf.dll %2
 copy libbladerf\%1\libbladerf.dll %2
 copy libsqlite3\%1\libsqlite3.dll %2
 copy liblimesuite\%1\liblimesuite.dll %2
@@ -53,9 +54,11 @@ copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx
 copy plugins\channeltx\modwfm\%1\modwfm.dll %2\plugins\channeltx
 REM copy plugins\channeltx\udpsink\%1\udpsink.dll %2\plugins\channeltx
 copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
+copy plugins\samplesource\testsource\%1\inputtestsource.dll %2\plugins\samplesource
 copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
 copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource
 copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource
+copy plugins\samplesource\airspyhf\%1\inputairspyhf.dll %2\plugins\samplesource
 copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource
 copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource
 copy plugins\samplesource\plutosdrinput\%1\inputplutosdr.dll %2\plugins\samplesource
diff --git a/windows64.install.bat b/windows64.install.bat
index b06926c7d..ba3e5d0bf 100644
--- a/windows64.install.bat
+++ b/windows64.install.bat
@@ -37,6 +37,7 @@ copy swagger\%1\swagger.dll %2
 copy libhackrf\%1\libhackrf.dll %2
 copy librtlsdr\%1\librtlsdr.dll %2
 copy libairspy\%1\libairspy.dll %2
+copy libairspyhf\%1\libairspyhf.dll %2
 copy libbladerf\%1\libbladerf.dll %2
 copy libsqlite3\%1\libsqlite3.dll %2
 copy liblimesuite\%1\liblimesuite.dll %2
@@ -71,10 +72,12 @@ copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx
 copy plugins\channeltx\modwfm\%1\modwfm.dll %2\plugins\channeltx
 copy plugins\channeltx\udpsink\%1\udpsink.dll %2\plugins\channeltx
 copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
+copy plugins\samplesource\testsource\%1\inputtestsource.dll %2\plugins\samplesource
 copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource
 copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
 copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource
 copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource
+copy plugins\samplesource\airspyhf\%1\inputairspyhf.dll %2\plugins\samplesource
 copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource
 copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource
 copy plugins\samplesource\plutosdrinput\%1\inputplutosdr.dll %2\plugins\samplesource