diff --git a/app/scantool/form_deviceconfig.cpp b/app/scantool/form_deviceconfig.cpp
index 70af0f7a..51629eec 100644
--- a/app/scantool/form_deviceconfig.cpp
+++ b/app/scantool/form_deviceconfig.cpp
@@ -12,6 +12,8 @@
 #include <QSpacerItem>
 #include <QPushButton>
 #include <QEvent>
+#include <assert.h>
+#include <typeinfo>
 
 #if !defined(HG_CMP_MSC)
 #include <math.h>
diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp
index 98aeafcd..4dba7f03 100644
--- a/app/scantool/mainwindow.cpp
+++ b/app/scantool/mainwindow.cpp
@@ -16,6 +16,7 @@
 #include "sqlite3.h"
 #include "cJSON.h"
 #include "HGString.h"
+#include <assert.h>
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
diff --git a/build.sh b/build.sh
index f32e23ed..8e8cceef 100755
--- a/build.sh
+++ b/build.sh
@@ -35,6 +35,7 @@ rm -f HGUpgrade/Makefile
 rm -f HGUpload/Makefile
 rm -f HGVersion/Makefile
 rm -f HGWebService/Makefile
+rm -f HGScanTool/Makefile
 
 if [ "${1}" == "hwall" ] || [ "${1}" == "hw"  ]|| [ "${1}" == "hwweb" ] || [ "${1}" == "hwso" ] || [ "${1}" == "hwtwain" ]; then
 
@@ -511,7 +512,7 @@ elif [ "${1}" == "dlall" ] || [ "${1}" == "dl" ] || [ "${1}" == "dlweb" ] || [ "
 
 else
 
-	if [ "${1}" == "hg" ] || [ "${1}" == "hgweb" ] || [ "${1}" == "hgso" ] || [ "${1}" == "hgtwain" ]; then
+	if [ "${1}" == "hg" ] || [ "${1}" == "hgweb" ] || [ "${1}" == "hgso" ] || [ "${1}" == "hgtwain" ] || [ "${1}" == "hgtool" ]; then
 
 		cd HGBase
 		qmake -qt=qt5 -makefile HGBase.pro
@@ -576,6 +577,13 @@ else
 			make -j8
 			cd ../
 
+		elif [ "${1}" == "hgtool" ]; then
+
+			cd HGScanTool
+			qmake -qt=qt5 -makefile HGScanTool.pro
+			make -j8
+			cd ../
+
 		else
 
 			cd HGScannerLib