diff --git a/sources/base/AccessManager.cpp b/sources/base/AccessManager.cpp
index 34488255..022ad939 100644
--- a/sources/base/AccessManager.cpp
+++ b/sources/base/AccessManager.cpp
@@ -6,6 +6,7 @@
 #include <base/AccessManager.h>
 #include <db/AuthTable.h>
 #include <db/MetaTable.h>
+#include <QUuid>
 
 using namespace hyperhdr;
 
diff --git a/sources/db/AuthTable.cpp b/sources/db/AuthTable.cpp
index 8fe5281a..77fd7278 100644
--- a/sources/db/AuthTable.cpp
+++ b/sources/db/AuthTable.cpp
@@ -1,4 +1,5 @@
 #include <QCryptographicHash>
+#include <QUuid>
 
 #include <db/AuthTable.h>
 using namespace hyperhdr;
diff --git a/sources/db/MetaTable.cpp b/sources/db/MetaTable.cpp
index 4be49be1..ba7259ea 100644
--- a/sources/db/MetaTable.cpp
+++ b/sources/db/MetaTable.cpp
@@ -1,5 +1,6 @@
 #include <QCryptographicHash>
 #include <QNetworkInterface>
+#include <QUuid>
 
 #include <db/MetaTable.h>
 
diff --git a/sources/led-drivers/net/DriverNetUdpE131.cpp b/sources/led-drivers/net/DriverNetUdpE131.cpp
index 3c3e9fa4..6b77b0e3 100644
--- a/sources/led-drivers/net/DriverNetUdpE131.cpp
+++ b/sources/led-drivers/net/DriverNetUdpE131.cpp
@@ -5,6 +5,7 @@
 #endif
 
 #include <QHostInfo>
+#include <QUuid>
 
 // hyperhdr local includes
 #include <led-drivers/net/DriverNetUdpE131.h>
diff --git a/sources/suspend-handler/SuspendHandlerWindows.cpp b/sources/suspend-handler/SuspendHandlerWindows.cpp
index c7c27b4f..d886c638 100644
--- a/sources/suspend-handler/SuspendHandlerWindows.cpp
+++ b/sources/suspend-handler/SuspendHandlerWindows.cpp
@@ -107,6 +107,7 @@ SuspendHandler::SuspendHandler(bool sessionLocker):
 
 SuspendHandler::~SuspendHandler()
 {
+	SystrayAssignQueueHandler(nullptr);
 	instance = nullptr;
 
 	if (_notifyHandle != NULL)