diff --git a/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro b/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro
index 42d2535..bd5b944 100644
--- a/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro
+++ b/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro
@@ -181,7 +181,7 @@ unix: {
 }
 win32: {
 SOURCES += \
-        nativeeventfilter-win.cpp
+        nativeeventfilter-win.cpp \
         windowctrl-win.cpp
 }
 
diff --git a/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.cpp b/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.cpp
index 320f1b1..babb8be 100644
--- a/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.cpp
+++ b/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.cpp
@@ -90,7 +90,11 @@ const QMap< Qt::Key, int > NativeEventFilterWin::m_virtual_key_map {
 /*
  *  Catch the key press
  */
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 bool NativeEventFilterWin::nativeEventFilter( const QByteArray& eventType, void* message, long* result )
+#else
+bool NativeEventFilterWin::nativeEventFilter( const QByteArray& eventType, void* message, qintptr* result )
+#endif
 {
     Q_UNUSED( eventType )
     Q_UNUSED( result )
@@ -114,9 +118,13 @@ bool NativeEventFilterWin::nativeEventFilter( const QByteArray& eventType, void*
  */
 bool NativeEventFilterWin::connectShortcut( QKeySequence key_seq )
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     Qt::Key key_code = Qt::Key( key_seq[ 0 ] & static_cast< int >( ~Qt::KeyboardModifierMask ) );
     Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ] & static_cast<int>( Qt::KeyboardModifierMask ) );
-
+#else
+    Qt::Key key_code = Qt::Key( key_seq[ 0 ].toCombined() & static_cast< int >( ~Qt::KeyboardModifierMask ) );
+    Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ].toCombined() & static_cast<int>( Qt::KeyboardModifierMask ) );
+#endif
     return connectShortcut( key_code, key_modifiers );
 }
 
diff --git a/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.h b/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.h
index ff16f44..71c51ee 100644
--- a/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.h
+++ b/app/SysTray-X/SysTray-X-app/nativeeventfilter-win.h
@@ -38,7 +38,11 @@ class NativeEventFilterWin : public NativeEventFilterBase
          *
          * @return Result
          */
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         bool nativeEventFilter( const QByteArray& eventType, void* message, long* result ) override;
+#else
+        bool nativeEventFilter( const QByteArray& eventType, void* message, qintptr* result ) override;
+#endif
 
     protected:
 
diff --git a/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp b/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp
index 95383be..4efeae9 100644
--- a/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp
+++ b/app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp
@@ -24,7 +24,6 @@ const int NativeEventFilterX11::m_valid_mods_mask = ShiftMask | ControlMask | Mo
 /*
  *  Catch the key press
  */
-
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 bool NativeEventFilterX11::nativeEventFilter( const QByteArray& eventType, void* message, long* result )
 #else
diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.h b/app/SysTray-X/SysTray-X-app/windowctrl.h
index 6aeda44..f5549ab 100644
--- a/app/SysTray-X/SysTray-X-app/windowctrl.h
+++ b/app/SysTray-X/SysTray-X-app/windowctrl.h
@@ -5,7 +5,8 @@
  *	Qt includes
  */
 #include <QtGlobal>
-
+#include <QObject>
+#include <QPoint>
 
 /*
  *	Local includes
@@ -23,7 +24,7 @@
  *  Predefines
  */
 class QWindow;
-class Preferences;
+//class Preferences;
 
 /**
  * @brief The WindowCtrl class.