diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
index decde4d..ad26222 100644
--- a/.github/workflows/cmake-multi-platform.yml
+++ b/.github/workflows/cmake-multi-platform.yml
@@ -55,6 +55,11 @@ jobs:
       run: |
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
+    - name:  Install dependencies on ubuntu
+      # Install thirdparty dependiencies on ubuntu
+      if: matrix.os == 'ubuntu-latest'
+      run: sudo apt install -y libgl1-mesa-dev libxrandr-dev libxinerama-dev libxkbfile-dev libxcursor-dev libxi-dev libgtk-3-dev
+
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
diff --git a/DasherCore b/DasherCore
index b79ce05..8997ff0 160000
--- a/DasherCore
+++ b/DasherCore
@@ -1 +1 @@
-Subproject commit b79ce0574a2e95ae0700c79f904786d92d72d9b8
+Subproject commit 8997ff026852bd4d880726a935d0953c9b0304b5
diff --git a/src/DasherController.cpp b/src/DasherController.cpp
index 9ae55b8..7526088 100644
--- a/src/DasherController.cpp
+++ b/src/DasherController.cpp
@@ -1,4 +1,5 @@
 #include "DasherController.h"
+#include <iostream>
 
 class XmlServerStore;
 
diff --git a/src/DasherUIScreen.cpp b/src/DasherUIScreen.cpp
index e915ff1..233680f 100644
--- a/src/DasherUIScreen.cpp
+++ b/src/DasherUIScreen.cpp
@@ -60,7 +60,7 @@ void DasherUIScreen::Polyline(point* Points, int Number, int iWidth, const Dashe
 
 	std::vector<ImVec2> points;
 
-	for(unsigned int i = 0; i < Number; i++)
+	for(int i = 0; i < Number; i++)
 	{
 		points.push_back(CanvasPos + ImVec2(static_cast<float>(Points[i].x), static_cast<float>(Points[i].y)));
 	}
@@ -74,7 +74,7 @@ void DasherUIScreen::Polygon(point* Points, int Number, const Dasher::ColorPalet
 
 	std::vector<ImVec2> points;
 
-	for (unsigned int i = 0; i < Number; i++)
+	for (int i = 0; i < Number; i++)
 	{
 		points.push_back(CanvasPos + ImVec2(static_cast<float>(Points[i].x), static_cast<float>(Points[i].y)));
 	}
diff --git a/src/SocketInput.cpp b/src/SocketInput.cpp
index 75a5319..3340942 100644
--- a/src/SocketInput.cpp
+++ b/src/SocketInput.cpp
@@ -1,7 +1,10 @@
 #include "SocketInput.h"
 
 #include <I18n.h>
+#include <cmath>
 #include <thread>
+#include <algorithm>
+#include <iostream>
 
 #include "DasherInterfaceBase.h"
 #include "DasherModel.h"
diff --git a/src/SocketInput.h b/src/SocketInput.h
index b334245..c582731 100644
--- a/src/SocketInput.h
+++ b/src/SocketInput.h
@@ -1,9 +1,12 @@
 #pragma once
 
 #include "DasherInput.h"
+#include "DefaultFilter.h"
+
+#ifdef _WIN32
+    #include <SDKDDKVer.h> //Selects version for ASIO on Windows
+#endif
 #include "asio.hpp"
-#include "DashIntfSettings.h"
-#include "PressFilter.h"
 
 class SocketInput : public Dasher::CScreenCoordInput, public Dasher::CDefaultFilter
 {