diff --git a/Changelog b/Changelog
index 2ff284e28..df8129b28 100644
--- a/Changelog
+++ b/Changelog
@@ -1,9 +1,9 @@
-0.26            (xxxx-xx-xx):
+0.26            (2018-12-31):
 * Enhancement: Standalone Python modules provided
        For details see: 
        https://github.com/klayoutmatthias/klayout/wiki/klayout---Standalone-KLayout-Python-Module
 
-0.25.5          (xxxx-xx-xx):
+0.25.5          (2018-12-31):
 
 * Bugfix: https://github.com/klayoutmatthias/klayout/issues/162
        GDS2 LIBNAME was not maintained on "File/Save".
diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb
index 12cc4028d..c668c9d31 100755
--- a/scripts/mkqtdecl_common/produce.rb
+++ b/scripts/mkqtdecl_common/produce.rb
@@ -3093,7 +3093,7 @@ END
       src.puts("#   define GSI_#{modn.upcase}_LOCAL            DEF_OUTSIDE_LOCAL")
       src.puts("# endif")
       src.puts("")
-      src.puts("#define FORCE_LINK_GSI_#{modn.upcase} void force_link_gsi#{modn}_f () { GSI_#{modn.upcase}_PUBLIC int force_link_gsi#{modn}; force_link_gsi#{modn} = 0; }")
+      src.puts("#define FORCE_LINK_GSI_#{modn.upcase} GSI_#{modn.upcase}_PUBLIC int _force_link_gsi#{modn}_f (); int _force_link_gsi#{modn} = _force_link_gsi#{modn}_f ();")
       src.puts("")
       src.puts("#endif")
 
@@ -3120,7 +3120,7 @@ END
       src.puts("")
       src.puts("#include \"gsi#{modn}Common.h\"")
       src.puts("")
-      src.puts("GSI_#{modn.upcase}_PUBLIC int force_link_gsi#{modn} = 0;")
+      src.puts("GSI_#{modn.upcase}_PUBLIC int _force_link_gsi#{modn}_f () { return 0; }")
       src.puts("")
 
       puts("#{src_name} written.")
diff --git a/src/ant/ant/antForceLink.h b/src/ant/ant/antForceLink.h
index ca1e98893..147b65eb1 100644
--- a/src/ant/ant/antForceLink.h
+++ b/src/ant/ant/antForceLink.h
@@ -33,7 +33,7 @@
 namespace ant
 {
   ANT_PUBLIC int _force_link_f ();
-  static int _force_link_target = _force_link_f ();
+  int _force_link_target = _force_link_f ();
 }
 
 #endif
diff --git a/src/db/db/dbHash.h b/src/db/db/dbHash.h
index 10571e667..dca49e959 100644
--- a/src/db/db/dbHash.h
+++ b/src/db/db/dbHash.h
@@ -43,53 +43,13 @@
 
 /**
  *  This header defines some hash functions for various database objects 
- *  for use with std_ext::hash_map and std_ext::hash_set
+ *  for use with std::unordered_map and std::unordered_set
  *
  *  It also provides namespace abstraction for the std_ext namespace
  */
 
 namespace std
 {
-#if defined(_WIN64) && !defined(_MSC_VER)
-  /**
-   *  @brief Specialization missing for size_t on WIN64
-   */
-  template<>
-  struct hash<size_t>
-  {
-    size_t operator()(size_t __x) const
-    {
-      return __x;
-    }
-  };
-#endif
-
-#if (defined(_WIN64) && !defined(_MSC_VER)) || defined(__APPLE__)
-  /**
-   *  @brief Specialization missing for long long on WIN64
-   */
-  template<>
-  struct hash<long long>
-  {
-    size_t operator()(long long __x) const
-    {
-      return size_t (__x);
-    }
-  };
-#elif defined(_WIN32)
-  /**
-   *  @brief Specialization missing for long long (64 bit) on WIN32
-   */
-  template<>
-  struct hash<long long>
-  {
-    size_t operator()(long long __x) const
-    {
-      return size_t (__x ^ (__x >> 32));
-    }
-  };
-#endif
-
   template <class T>
   inline size_t hfunc (const T &t)
   {
diff --git a/src/drc/drc/drcForceLink.h b/src/drc/drc/drcForceLink.h
index 75a29b635..cb365bde0 100644
--- a/src/drc/drc/drcForceLink.h
+++ b/src/drc/drc/drcForceLink.h
@@ -33,7 +33,7 @@
 namespace drc
 {
   DRC_PUBLIC int _force_link_f ();
-  static int _force_link_target = _force_link_f ();
+  int _force_link_target = _force_link_f ();
 }
 
 #endif
diff --git a/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h b/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h
index ae3c7b7d6..d22514680 100644
--- a/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h
+++ b/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTCORE_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTCORE void force_link_gsiQtCore_f () { GSI_QTCORE_PUBLIC int force_link_gsiQtCore; force_link_gsiQtCore = 0; }
+#define FORCE_LINK_GSI_QTCORE GSI_QTCORE_PUBLIC int _force_link_gsiQtCore_f (); int _force_link_gsiQtCore = _force_link_gsiQtCore_f ();
 
 #endif
diff --git a/src/gsiqt/qt4/QtCore/gsiQtCoreMain.cc b/src/gsiqt/qt4/QtCore/gsiQtCoreMain.cc
index d1b4d6a99..4a1c04231 100644
--- a/src/gsiqt/qt4/QtCore/gsiQtCoreMain.cc
+++ b/src/gsiqt/qt4/QtCore/gsiQtCoreMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtCoreCommon.h"
 
-GSI_QTCORE_PUBLIC int force_link_gsiQtCore = 0;
+GSI_QTCORE_PUBLIC int _force_link_gsiQtCore_f () { return 0; }
 
diff --git a/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h
index a944bb01a..f2f5a3be3 100644
--- a/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h
+++ b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTDESIGNER_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTDESIGNER void force_link_gsiQtDesigner_f () { GSI_QTDESIGNER_PUBLIC int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; }
+#define FORCE_LINK_GSI_QTDESIGNER GSI_QTDESIGNER_PUBLIC int _force_link_gsiQtDesigner_f (); int _force_link_gsiQtDesigner = _force_link_gsiQtDesigner_f ();
 
 #endif
diff --git a/src/gsiqt/qt4/QtDesigner/gsiQtDesignerMain.cc b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerMain.cc
index 1b05bb59e..503b09fb0 100644
--- a/src/gsiqt/qt4/QtDesigner/gsiQtDesignerMain.cc
+++ b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtDesignerCommon.h"
 
-GSI_QTDESIGNER_PUBLIC int force_link_gsiQtDesigner = 0;
+GSI_QTDESIGNER_PUBLIC int _force_link_gsiQtDesigner_f () { return 0; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h b/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h
index 8592f485c..65c0069a0 100644
--- a/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h
+++ b/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTGUI_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTGUI void force_link_gsiQtGui_f () { GSI_QTGUI_PUBLIC int force_link_gsiQtGui; force_link_gsiQtGui = 0; }
+#define FORCE_LINK_GSI_QTGUI GSI_QTGUI_PUBLIC int _force_link_gsiQtGui_f (); int _force_link_gsiQtGui = _force_link_gsiQtGui_f ();
 
 #endif
diff --git a/src/gsiqt/qt4/QtGui/gsiQtGuiMain.cc b/src/gsiqt/qt4/QtGui/gsiQtGuiMain.cc
index 248f08a53..bd0239749 100644
--- a/src/gsiqt/qt4/QtGui/gsiQtGuiMain.cc
+++ b/src/gsiqt/qt4/QtGui/gsiQtGuiMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtGuiCommon.h"
 
-GSI_QTGUI_PUBLIC int force_link_gsiQtGui = 0;
+GSI_QTGUI_PUBLIC int _force_link_gsiQtGui_f () { return 0; }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h
index e618cad98..a684e428a 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h
+++ b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTNETWORK_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTNETWORK void force_link_gsiQtNetwork_f () { GSI_QTNETWORK_PUBLIC int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; }
+#define FORCE_LINK_GSI_QTNETWORK GSI_QTNETWORK_PUBLIC int _force_link_gsiQtNetwork_f (); int _force_link_gsiQtNetwork = _force_link_gsiQtNetwork_f ();
 
 #endif
diff --git a/src/gsiqt/qt4/QtNetwork/gsiQtNetworkMain.cc b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkMain.cc
index e6f5fa16b..f7ce6e1c3 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiQtNetworkMain.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtNetworkCommon.h"
 
-GSI_QTNETWORK_PUBLIC int force_link_gsiQtNetwork = 0;
+GSI_QTNETWORK_PUBLIC int _force_link_gsiQtNetwork_f () { return 0; }
 
diff --git a/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h b/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h
index 684ce81ec..992215633 100644
--- a/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h
+++ b/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTSQL_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTSQL void force_link_gsiQtSql_f () { GSI_QTSQL_PUBLIC int force_link_gsiQtSql; force_link_gsiQtSql = 0; }
+#define FORCE_LINK_GSI_QTSQL GSI_QTSQL_PUBLIC int _force_link_gsiQtSql_f (); int _force_link_gsiQtSql = _force_link_gsiQtSql_f ();
 
 #endif
diff --git a/src/gsiqt/qt4/QtSql/gsiQtSqlMain.cc b/src/gsiqt/qt4/QtSql/gsiQtSqlMain.cc
index e22bb8c3b..d27a243bd 100644
--- a/src/gsiqt/qt4/QtSql/gsiQtSqlMain.cc
+++ b/src/gsiqt/qt4/QtSql/gsiQtSqlMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtSqlCommon.h"
 
-GSI_QTSQL_PUBLIC int force_link_gsiQtSql = 0;
+GSI_QTSQL_PUBLIC int _force_link_gsiQtSql_f () { return 0; }
 
diff --git a/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h b/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h
index 3e1de86f4..67d88161c 100644
--- a/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h
+++ b/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTXML_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTXML void force_link_gsiQtXml_f () { GSI_QTXML_PUBLIC int force_link_gsiQtXml; force_link_gsiQtXml = 0; }
+#define FORCE_LINK_GSI_QTXML GSI_QTXML_PUBLIC int _force_link_gsiQtXml_f (); int _force_link_gsiQtXml = _force_link_gsiQtXml_f ();
 
 #endif
diff --git a/src/gsiqt/qt4/QtXml/gsiQtXmlMain.cc b/src/gsiqt/qt4/QtXml/gsiQtXmlMain.cc
index 0bfb50c04..35d32a95b 100644
--- a/src/gsiqt/qt4/QtXml/gsiQtXmlMain.cc
+++ b/src/gsiqt/qt4/QtXml/gsiQtXmlMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtXmlCommon.h"
 
-GSI_QTXML_PUBLIC int force_link_gsiQtXml = 0;
+GSI_QTXML_PUBLIC int _force_link_gsiQtXml_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h b/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h
index ae3c7b7d6..d22514680 100644
--- a/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h
+++ b/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTCORE_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTCORE void force_link_gsiQtCore_f () { GSI_QTCORE_PUBLIC int force_link_gsiQtCore; force_link_gsiQtCore = 0; }
+#define FORCE_LINK_GSI_QTCORE GSI_QTCORE_PUBLIC int _force_link_gsiQtCore_f (); int _force_link_gsiQtCore = _force_link_gsiQtCore_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtCore/gsiQtCoreMain.cc b/src/gsiqt/qt5/QtCore/gsiQtCoreMain.cc
index d1b4d6a99..4a1c04231 100644
--- a/src/gsiqt/qt5/QtCore/gsiQtCoreMain.cc
+++ b/src/gsiqt/qt5/QtCore/gsiQtCoreMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtCoreCommon.h"
 
-GSI_QTCORE_PUBLIC int force_link_gsiQtCore = 0;
+GSI_QTCORE_PUBLIC int _force_link_gsiQtCore_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h b/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h
index a944bb01a..f2f5a3be3 100644
--- a/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h
+++ b/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTDESIGNER_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTDESIGNER void force_link_gsiQtDesigner_f () { GSI_QTDESIGNER_PUBLIC int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; }
+#define FORCE_LINK_GSI_QTDESIGNER GSI_QTDESIGNER_PUBLIC int _force_link_gsiQtDesigner_f (); int _force_link_gsiQtDesigner = _force_link_gsiQtDesigner_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtDesigner/gsiQtDesignerMain.cc b/src/gsiqt/qt5/QtDesigner/gsiQtDesignerMain.cc
index 1b05bb59e..503b09fb0 100644
--- a/src/gsiqt/qt5/QtDesigner/gsiQtDesignerMain.cc
+++ b/src/gsiqt/qt5/QtDesigner/gsiQtDesignerMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtDesignerCommon.h"
 
-GSI_QTDESIGNER_PUBLIC int force_link_gsiQtDesigner = 0;
+GSI_QTDESIGNER_PUBLIC int _force_link_gsiQtDesigner_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h b/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h
index 8592f485c..65c0069a0 100644
--- a/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h
+++ b/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTGUI_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTGUI void force_link_gsiQtGui_f () { GSI_QTGUI_PUBLIC int force_link_gsiQtGui; force_link_gsiQtGui = 0; }
+#define FORCE_LINK_GSI_QTGUI GSI_QTGUI_PUBLIC int _force_link_gsiQtGui_f (); int _force_link_gsiQtGui = _force_link_gsiQtGui_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtGui/gsiQtGuiMain.cc b/src/gsiqt/qt5/QtGui/gsiQtGuiMain.cc
index 248f08a53..bd0239749 100644
--- a/src/gsiqt/qt5/QtGui/gsiQtGuiMain.cc
+++ b/src/gsiqt/qt5/QtGui/gsiQtGuiMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtGuiCommon.h"
 
-GSI_QTGUI_PUBLIC int force_link_gsiQtGui = 0;
+GSI_QTGUI_PUBLIC int _force_link_gsiQtGui_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h b/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h
index dd88fd74c..3a21d1887 100644
--- a/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h
+++ b/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTMULTIMEDIA_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTMULTIMEDIA void force_link_gsiQtMultimedia_f () { GSI_QTMULTIMEDIA_PUBLIC int force_link_gsiQtMultimedia; force_link_gsiQtMultimedia = 0; }
+#define FORCE_LINK_GSI_QTMULTIMEDIA GSI_QTMULTIMEDIA_PUBLIC int _force_link_gsiQtMultimedia_f (); int _force_link_gsiQtMultimedia = _force_link_gsiQtMultimedia_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaMain.cc b/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaMain.cc
index 23b9b1da8..ad46fe33e 100644
--- a/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaMain.cc
+++ b/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtMultimediaCommon.h"
 
-GSI_QTMULTIMEDIA_PUBLIC int force_link_gsiQtMultimedia = 0;
+GSI_QTMULTIMEDIA_PUBLIC int _force_link_gsiQtMultimedia_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h b/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h
index e618cad98..a684e428a 100644
--- a/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h
+++ b/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTNETWORK_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTNETWORK void force_link_gsiQtNetwork_f () { GSI_QTNETWORK_PUBLIC int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; }
+#define FORCE_LINK_GSI_QTNETWORK GSI_QTNETWORK_PUBLIC int _force_link_gsiQtNetwork_f (); int _force_link_gsiQtNetwork = _force_link_gsiQtNetwork_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtNetwork/gsiQtNetworkMain.cc b/src/gsiqt/qt5/QtNetwork/gsiQtNetworkMain.cc
index e6f5fa16b..f7ce6e1c3 100644
--- a/src/gsiqt/qt5/QtNetwork/gsiQtNetworkMain.cc
+++ b/src/gsiqt/qt5/QtNetwork/gsiQtNetworkMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtNetworkCommon.h"
 
-GSI_QTNETWORK_PUBLIC int force_link_gsiQtNetwork = 0;
+GSI_QTNETWORK_PUBLIC int _force_link_gsiQtNetwork_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h b/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h
index 0c5e9e588..9c95b85e2 100644
--- a/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h
+++ b/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTPRINTSUPPORT_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTPRINTSUPPORT void force_link_gsiQtPrintSupport_f () { GSI_QTPRINTSUPPORT_PUBLIC int force_link_gsiQtPrintSupport; force_link_gsiQtPrintSupport = 0; }
+#define FORCE_LINK_GSI_QTPRINTSUPPORT GSI_QTPRINTSUPPORT_PUBLIC int _force_link_gsiQtPrintSupport_f (); int _force_link_gsiQtPrintSupport = _force_link_gsiQtPrintSupport_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportMain.cc b/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportMain.cc
index d6792c3fd..464f77f35 100644
--- a/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportMain.cc
+++ b/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtPrintSupportCommon.h"
 
-GSI_QTPRINTSUPPORT_PUBLIC int force_link_gsiQtPrintSupport = 0;
+GSI_QTPRINTSUPPORT_PUBLIC int _force_link_gsiQtPrintSupport_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h b/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h
index 684ce81ec..992215633 100644
--- a/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h
+++ b/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTSQL_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTSQL void force_link_gsiQtSql_f () { GSI_QTSQL_PUBLIC int force_link_gsiQtSql; force_link_gsiQtSql = 0; }
+#define FORCE_LINK_GSI_QTSQL GSI_QTSQL_PUBLIC int _force_link_gsiQtSql_f (); int _force_link_gsiQtSql = _force_link_gsiQtSql_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtSql/gsiQtSqlMain.cc b/src/gsiqt/qt5/QtSql/gsiQtSqlMain.cc
index e22bb8c3b..d27a243bd 100644
--- a/src/gsiqt/qt5/QtSql/gsiQtSqlMain.cc
+++ b/src/gsiqt/qt5/QtSql/gsiQtSqlMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtSqlCommon.h"
 
-GSI_QTSQL_PUBLIC int force_link_gsiQtSql = 0;
+GSI_QTSQL_PUBLIC int _force_link_gsiQtSql_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h b/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h
index 1b65bdca4..0551f1156 100644
--- a/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h
+++ b/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTSVG_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTSVG void force_link_gsiQtSvg_f () { GSI_QTSVG_PUBLIC int force_link_gsiQtSvg; force_link_gsiQtSvg = 0; }
+#define FORCE_LINK_GSI_QTSVG GSI_QTSVG_PUBLIC int _force_link_gsiQtSvg_f (); int _force_link_gsiQtSvg = _force_link_gsiQtSvg_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtSvg/gsiQtSvgMain.cc b/src/gsiqt/qt5/QtSvg/gsiQtSvgMain.cc
index 2f9e338d4..13b0b9d1e 100644
--- a/src/gsiqt/qt5/QtSvg/gsiQtSvgMain.cc
+++ b/src/gsiqt/qt5/QtSvg/gsiQtSvgMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtSvgCommon.h"
 
-GSI_QTSVG_PUBLIC int force_link_gsiQtSvg = 0;
+GSI_QTSVG_PUBLIC int _force_link_gsiQtSvg_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h b/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h
index 1d3e73c40..734c2b01c 100644
--- a/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h
+++ b/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTWIDGETS_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTWIDGETS void force_link_gsiQtWidgets_f () { GSI_QTWIDGETS_PUBLIC int force_link_gsiQtWidgets; force_link_gsiQtWidgets = 0; }
+#define FORCE_LINK_GSI_QTWIDGETS GSI_QTWIDGETS_PUBLIC int _force_link_gsiQtWidgets_f (); int _force_link_gsiQtWidgets = _force_link_gsiQtWidgets_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsMain.cc b/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsMain.cc
index 28dc6ebec..fe186781a 100644
--- a/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsMain.cc
+++ b/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtWidgetsCommon.h"
 
-GSI_QTWIDGETS_PUBLIC int force_link_gsiQtWidgets = 0;
+GSI_QTWIDGETS_PUBLIC int _force_link_gsiQtWidgets_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h b/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h
index 3e1de86f4..67d88161c 100644
--- a/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h
+++ b/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTXML_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTXML void force_link_gsiQtXml_f () { GSI_QTXML_PUBLIC int force_link_gsiQtXml; force_link_gsiQtXml = 0; }
+#define FORCE_LINK_GSI_QTXML GSI_QTXML_PUBLIC int _force_link_gsiQtXml_f (); int _force_link_gsiQtXml = _force_link_gsiQtXml_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtXml/gsiQtXmlMain.cc b/src/gsiqt/qt5/QtXml/gsiQtXmlMain.cc
index 0bfb50c04..35d32a95b 100644
--- a/src/gsiqt/qt5/QtXml/gsiQtXmlMain.cc
+++ b/src/gsiqt/qt5/QtXml/gsiQtXmlMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtXmlCommon.h"
 
-GSI_QTXML_PUBLIC int force_link_gsiQtXml = 0;
+GSI_QTXML_PUBLIC int _force_link_gsiQtXml_f () { return 0; }
 
diff --git a/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h b/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h
index f8101698e..8bb29ccf1 100644
--- a/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h
+++ b/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h
@@ -20,6 +20,6 @@
 #   define GSI_QTXMLPATTERNS_LOCAL            DEF_OUTSIDE_LOCAL
 # endif
 
-#define FORCE_LINK_GSI_QTXMLPATTERNS void force_link_gsiQtXmlPatterns_f () { GSI_QTXMLPATTERNS_PUBLIC int force_link_gsiQtXmlPatterns; force_link_gsiQtXmlPatterns = 0; }
+#define FORCE_LINK_GSI_QTXMLPATTERNS GSI_QTXMLPATTERNS_PUBLIC int _force_link_gsiQtXmlPatterns_f (); int _force_link_gsiQtXmlPatterns = _force_link_gsiQtXmlPatterns_f ();
 
 #endif
diff --git a/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsMain.cc b/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsMain.cc
index 54e3081bb..f6df2e1c2 100644
--- a/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsMain.cc
+++ b/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsMain.cc
@@ -7,5 +7,5 @@
 
 #include "gsiQtXmlPatternsCommon.h"
 
-GSI_QTXMLPATTERNS_PUBLIC int force_link_gsiQtXmlPatterns = 0;
+GSI_QTXMLPATTERNS_PUBLIC int _force_link_gsiQtXmlPatterns_f () { return 0; }
 
diff --git a/src/img/img/imgForceLink.h b/src/img/img/imgForceLink.h
index e1e6f9852..b8fb49133 100644
--- a/src/img/img/imgForceLink.h
+++ b/src/img/img/imgForceLink.h
@@ -33,7 +33,7 @@
 namespace img
 {
   IMG_PUBLIC int _force_link_f ();
-  static int _force_link_target = _force_link_f ();
+  int _force_link_target = _force_link_f ();
 }
 
 #endif
diff --git a/src/lib/lib/libForceLink.h b/src/lib/lib/libForceLink.h
index ef61d375e..9db6e84c0 100644
--- a/src/lib/lib/libForceLink.h
+++ b/src/lib/lib/libForceLink.h
@@ -33,7 +33,7 @@
 namespace lib
 {
   LIB_PUBLIC int _force_link_f ();
-  static int _force_link_target = _force_link_f ();
+  int _force_link_target = _force_link_f ();
 }
 
 #endif