diff --git a/Heart/AbstractSpace/Private/bigdatamanager.cpp b/Heart/AbstractSpace/Private/bigdatamanager.cpp
index f5cda84..3790cb2 100644
--- a/Heart/AbstractSpace/Private/bigdatamanager.cpp
+++ b/Heart/AbstractSpace/Private/bigdatamanager.cpp
@@ -13,6 +13,7 @@
 #include <bigdatapart.h>
 #include <bigdatarequest.h>
 #include <cmath>
+#include <qaglobalutils.h>
 
 #define TIMEOUT_INTERVAL 30000
 
diff --git a/Heart/AbstractSpace/async.cpp b/Heart/AbstractSpace/async.cpp
index c0ef87b..fc3b85b 100644
--- a/Heart/AbstractSpace/async.cpp
+++ b/Heart/AbstractSpace/async.cpp
@@ -15,6 +15,7 @@
 #include <quasarapp.h>
 #include <thread>
 #include <chrono>
+#include <qaglobalutils.h>
 
 // Private implementation of waitFor functions.
 #define waitPrivate(CONDITION, TIMEOUT) \
diff --git a/Heart/AbstractSpace/packages/abstractdata.cpp b/Heart/AbstractSpace/packages/abstractdata.cpp
index cfaa440..6fd96b7 100644
--- a/Heart/AbstractSpace/packages/abstractdata.cpp
+++ b/Heart/AbstractSpace/packages/abstractdata.cpp
@@ -13,6 +13,7 @@
 #include <limits>
 #include <quasarapp.h>
 #include <QCryptographicHash>
+#include <qaglobalutils.h>
 
 namespace QH {
 namespace PKG {
diff --git a/Heart/AbstractSpace/packages/abstractdata.h b/Heart/AbstractSpace/packages/abstractdata.h
index 8d0bb70..12f2ecb 100644
--- a/Heart/AbstractSpace/packages/abstractdata.h
+++ b/Heart/AbstractSpace/packages/abstractdata.h
@@ -9,7 +9,6 @@
 #define ABSTRACTDATA_H
 #include "package.h"
 #include <streambase.h>
-#include <global.h>
 
 
 /**
diff --git a/Heart/DataBaseSpace/isqldbcache.cpp b/Heart/DataBaseSpace/isqldbcache.cpp
index be2ad20..25f91d9 100644
--- a/Heart/DataBaseSpace/isqldbcache.cpp
+++ b/Heart/DataBaseSpace/isqldbcache.cpp
@@ -16,7 +16,7 @@
 
 #include <QDateTime>
 #include <QtConcurrent/QtConcurrent>
-
+#include <qaglobalutils.h>
 
 namespace QH {
 
diff --git a/Heart/DataBaseSpace/packages/dbobject.cpp b/Heart/DataBaseSpace/packages/dbobject.cpp
index dea9f40..4ed3829 100644
--- a/Heart/DataBaseSpace/packages/dbobject.cpp
+++ b/Heart/DataBaseSpace/packages/dbobject.cpp
@@ -16,6 +16,7 @@
 #include <QVariantMap>
 #include <QSharedPointer>
 #include <quasarapp.h>
+#include <qaglobalutils.h>
 
 namespace QH {
 namespace PKG {
diff --git a/Heart/DataBaseSpace/singleclient.cpp b/Heart/DataBaseSpace/singleclient.cpp
index 14c6353..5567f03 100644
--- a/Heart/DataBaseSpace/singleclient.cpp
+++ b/Heart/DataBaseSpace/singleclient.cpp
@@ -13,6 +13,7 @@
 #include <deleteobject.h>
 #include <websocket.h>
 #include <websocketsubscriptions.h>
+#include <qaglobalutils.h>
 
 namespace QH {
 
diff --git a/QuasarAppLib b/QuasarAppLib
index fe224bd..12582fc 160000
--- a/QuasarAppLib
+++ b/QuasarAppLib
@@ -1 +1 @@
-Subproject commit fe224bdc99cc1718eff795ebf603c982a5a67512
+Subproject commit 12582fc2eb1aeb61918277be7bcb2ee8358f9661