diff --git a/src/gsi/gsi/gsiSerialisation.h b/src/gsi/gsi/gsiSerialisation.h
index ee73701e6..bb022ba95 100644
--- a/src/gsi/gsi/gsiSerialisation.h
+++ b/src/gsi/gsi/gsiSerialisation.h
@@ -1649,7 +1649,7 @@ private:
  *  @brief Specialization for QVariant
  */
 template <typename T>
-class GSI_PUBLIC VariantAdaptorImpl<QPointer<T> >
+class GSI_PUBLIC_TEMPLATE VariantAdaptorImpl<QPointer<T> >
   : public VariantAdaptor
 {
 public:
@@ -1813,7 +1813,7 @@ private:
  *  @brief Specialization for std::optional
  */
 template <typename T>
-class GSI_PUBLIC VariantAdaptorImpl<std::optional<T> >
+class GSI_PUBLIC_TEMPLATE VariantAdaptorImpl<std::optional<T> >
   : public VariantAdaptor
 {
 public:
diff --git a/src/gsiqt/qt6/QtCore5Compat/QtCore5Compat.pro b/src/gsiqt/qt6/QtCore5Compat/QtCore5Compat.pro
index 1189368a9..574a9a0d6 100644
--- a/src/gsiqt/qt6/QtCore5Compat/QtCore5Compat.pro
+++ b/src/gsiqt/qt6/QtCore5Compat/QtCore5Compat.pro
@@ -5,7 +5,7 @@ TARGET = klayout_QtCore5Compat
 
 include($$PWD/../../../lib.pri)
 
-DEFINES += MAKE_GSI_QTCORE_LIBRARY
+DEFINES += MAKE_GSI_QTCORE5COMPAT_LIBRARY
 
 # NOTE: db is required since some bridges to db are provided (i.e db::Polygon)
 INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
diff --git a/src/laybasic/laybasic/layFileDialog.cc b/src/laybasic/laybasic/layFileDialog.cc
index 5f479aae2..c606c6d24 100644
--- a/src/laybasic/laybasic/layFileDialog.cc
+++ b/src/laybasic/laybasic/layFileDialog.cc
@@ -25,6 +25,9 @@
 #include <QApplication>
 #include <QDesktopServices>
 #include <QFileInfo>
+#if QT_VERSION>=0x050000
+#  include <QStandardPaths>
+#endif
 
 #include "layFileDialog.h"
 #include "tlInternational.h"
diff --git a/src/rba/rba/rbaConvert.h b/src/rba/rba/rbaConvert.h
index 66fc377a6..cbdcbab73 100644
--- a/src/rba/rba/rbaConvert.h
+++ b/src/rba/rba/rbaConvert.h
@@ -25,10 +25,9 @@
 
 #ifdef HAVE_RUBY
 
-#include "rbaUtils.h"
-
 #include "gsiTypes.h"
 
+#include "rbaUtils.h"
 #include <ruby.h>
 
 namespace rba
diff --git a/src/rba/rba/rbaMarshal.h b/src/rba/rba/rbaMarshal.h
index 10a66b574..b3fae6cb7 100644
--- a/src/rba/rba/rbaMarshal.h
+++ b/src/rba/rba/rbaMarshal.h
@@ -25,9 +25,10 @@
 
 #ifdef HAVE_RUBY
 
+#include "gsiSerialisation.h"
+
 #include <ruby.h>
 
-#include "gsiSerialisation.h"
 #include "tlHeap.h"
 
 namespace rba
diff --git a/src/rba/rba/rbaUtils.h b/src/rba/rba/rbaUtils.h
index 896183dd4..cc9841a45 100644
--- a/src/rba/rba/rbaUtils.h
+++ b/src/rba/rba/rbaUtils.h
@@ -25,9 +25,10 @@
 
 #ifdef HAVE_RUBY
 
-#include <ruby.h>
-
 #include "gsiInterpreter.h"
+#include "gsiSerialisation.h"
+
+#include <ruby.h>
 
 #include "tlScriptError.h"