diff --git a/3rdparty/libossia b/3rdparty/libossia
index 4d869c7d86..52362c89ea 160000
--- a/3rdparty/libossia
+++ b/3rdparty/libossia
@@ -1 +1 @@
-Subproject commit 4d869c7d86dafa97076250b7199b403cd36de056
+Subproject commit 52362c89eaf3fcacfb44f40619e04fcbe4b9db1a
diff --git a/src/lib/score/gfx/QRhiGles2.hpp b/src/lib/score/gfx/QRhiGles2.hpp
new file mode 100644
index 0000000000..0b47dad1e6
--- /dev/null
+++ b/src/lib/score/gfx/QRhiGles2.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#if __has_include(<QtGui/rhi/qrhi_platform.h>)
+#include <QtGui/rhi/qrhi_platform.h>
+#include <QtGui/private/qrhigles2_p.h>
+#else
+#include <QtGui/private/qrhigles2_p_p.h>
+#endif
diff --git a/src/plugins/score-plugin-gfx/Gfx/Shmdata/ShmdataOutputDevice.cpp b/src/plugins/score-plugin-gfx/Gfx/Shmdata/ShmdataOutputDevice.cpp
index 9d577ec6ce..ef4dac9747 100644
--- a/src/plugins/score-plugin-gfx/Gfx/Shmdata/ShmdataOutputDevice.cpp
+++ b/src/plugins/score-plugin-gfx/Gfx/Shmdata/ShmdataOutputDevice.cpp
@@ -19,13 +19,7 @@
 #include <QLineEdit>
 #include <QOffscreenSurface>
 #include <QSpinBox>
-
-#if __has_include(<QtGui/rhi/qrhi_platform.h>)
-#include <QtGui/rhi/qrhi_platform.h>
-#else
-#include <QtGui/private/qrhigles2_p_p.h>
-#endif
-
+#include <score/gfx/QRhiGles2.hpp>
 #include <shmdata/writer.hpp>
 
 #include <wobjectimpl.h>
diff --git a/src/plugins/score-plugin-gfx/Gfx/Spout/SpoutOutput.cpp b/src/plugins/score-plugin-gfx/Gfx/Spout/SpoutOutput.cpp
index 3dbe4c2b19..d52fa7033c 100644
--- a/src/plugins/score-plugin-gfx/Gfx/Spout/SpoutOutput.cpp
+++ b/src/plugins/score-plugin-gfx/Gfx/Spout/SpoutOutput.cpp
@@ -12,8 +12,7 @@
 #include <QLabel>
 #include <QOffscreenSurface>
 #include <Spout/SpoutSender.h>
-
-#include <QtGui/private/qrhigles2_p_p.h>
+#include <score/gfx/QRhiGles2.hpp>
 
 #include <wobjectimpl.h>
 
diff --git a/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonInput.mm b/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonInput.mm
index 6e4fa7df34..750c0c572f 100644
--- a/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonInput.mm
+++ b/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonInput.mm
@@ -14,7 +14,7 @@
 #include <QLabel>
 
 #include <wobjectimpl.h>
-#include <QtGui/private/qrhigles2_p_p.h>
+#include <score/gfx/QRhiGles2.hpp>
 
 namespace Gfx::Syphon
 {
diff --git a/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonOutput.mm b/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonOutput.mm
index 2b2ff9e4bc..201919dae5 100644
--- a/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonOutput.mm
+++ b/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonOutput.mm
@@ -7,7 +7,7 @@
 #include <Gfx/GfxApplicationPlugin.hpp>
 
 #include <Gfx/Syphon/SyphonHelpers.hpp>
-#include <QtGui/private/qrhigles2_p_p.h>
+#include <score/gfx/QRhiGles2.hpp>
 #include <QOpenGLContext>
 #include <QOffscreenSurface>
 #include <QFormLayout>