diff --git a/lib/jkqtcommon/jkqtcommon_imexport.h b/lib/jkqtcommon/jkqtcommon_imexport.h
index 018782fc62..34139a523d 100644
--- a/lib/jkqtcommon/jkqtcommon_imexport.h
+++ b/lib/jkqtcommon/jkqtcommon_imexport.h
@@ -1,7 +1,6 @@
 #ifndef jkqtcommon_IMPORT_H
 #define jkqtcommon_IMPORT_H
 
-
 /*
     Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
@@ -39,7 +38,7 @@
         JKQTCOMMON_LIB_EXPORT void exportedFunctionName();
     \endcode
     
-    These macros append the appropriate \c __declspec(dllexport) and \c __declspec(dllimport)
+    These macros append the appropriate \c Q_DECL_EXPORT and \c Q_DECL_IMPORT
     to the function/class body and thus tell windows compilers to export these sysmbols from
     the shared library, or import them from a shared library.
     
@@ -72,21 +71,15 @@
            compiling an application), the symbols are imported
 */
 
-#  ifndef __WINDOWS__
-#    if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)
-#      define __WINDOWS__
-#    endif
-#  endif
-
-#ifdef __WINDOWS__
+#include <QtCore/QtGlobal>
 #  ifdef JKQTCOMMON_LIB_IN_DLL
 #    ifndef JKQTCOMMON_LIB_EXPORT
 #      ifdef JKQTCOMMON_LIB_EXPORT_LIBRARY
           /* We are building this library */
-#        define JKQTCOMMON_LIB_EXPORT __declspec(dllexport)
+#        define JKQTCOMMON_LIB_EXPORT Q_DECL_EXPORT
 #      else
           /* We are using this library */
-#        define JKQTCOMMON_LIB_EXPORT __declspec(dllimport)
+#        define JKQTCOMMON_LIB_EXPORT Q_DECL_IMPORT
 #      endif
 #    endif
 #  else
@@ -94,13 +87,6 @@
 #      define JKQTCOMMON_LIB_EXPORT
 #    endif
 #  endif
-#else
-#  define JKQTCOMMON_LIB_EXPORT
-#endif
-
-
-
-
 
 
 
diff --git a/lib/jkqtfastplotter/jkqtfastplotter_imexport.h b/lib/jkqtfastplotter/jkqtfastplotter_imexport.h
index 431afb7389..94991fd8eb 100644
--- a/lib/jkqtfastplotter/jkqtfastplotter_imexport.h
+++ b/lib/jkqtfastplotter/jkqtfastplotter_imexport.h
@@ -39,7 +39,7 @@
         JKQTFASTPLOTTER_LIB_EXPORT void exportedFunctionName();
     \endcode
     
-    These macros append the appropriate \c __declspec(dllexport) and \c __declspec(dllimport)
+    These macros append the appropriate \c Q_DECL_EXPORT and \c Q_DECL_IMPORT
     to the function/class body and thus tell windows compilers to export these sysmbols from
     the shared library, or import them from a shared library.
     
@@ -72,6 +72,8 @@
            compiling an application), the symbols are imported
 */
 
+#include <QtCore/QtGlobal>
+
 #  ifndef __WINDOWS__
 #    if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)
 #      define __WINDOWS__
@@ -83,10 +85,10 @@
 #    ifndef JKQTFASTPLOTTER_LIB_EXPORT
 #      ifdef JKQTFASTPLOTTER_LIB_EXPORT_LIBRARY
           /* We are building this library */
-#        define JKQTFASTPLOTTER_LIB_EXPORT __declspec(dllexport)
+#        define JKQTFASTPLOTTER_LIB_EXPORT Q_DECL_EXPORT
 #      else
           /* We are using this library */
-#        define JKQTFASTPLOTTER_LIB_EXPORT __declspec(dllimport)
+#        define JKQTFASTPLOTTER_LIB_EXPORT Q_DECL_IMPORT
 #      endif
 #    endif
 #  else
diff --git a/lib/jkqtmathtext/jkqtmathtext_imexport.h b/lib/jkqtmathtext/jkqtmathtext_imexport.h
index e1e2354996..5bd6b318b2 100644
--- a/lib/jkqtmathtext/jkqtmathtext_imexport.h
+++ b/lib/jkqtmathtext/jkqtmathtext_imexport.h
@@ -39,7 +39,7 @@
         JKQTMATHTEXT_LIB_EXPORT void exportedFunctionName();
     \endcode
     
-    These macros append the appropriate \c __declspec(dllexport) and \c __declspec(dllimport)
+    These macros append the appropriate \c Q_DECL_EXPORT and \c Q_DECL_IMPORT
     to the function/class body and thus tell windows compilers to export these sysmbols from
     the shared library, or import them from a shared library.
     
@@ -72,6 +72,8 @@
            compiling an application), the symbols are imported
 */
 
+#include <QtCore/QtGlobal>
+
 #  ifndef __WINDOWS__
 #    if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)
 #      define __WINDOWS__
@@ -83,10 +85,10 @@
 #    ifndef JKQTMATHTEXT_LIB_EXPORT
 #      ifdef JKQTMATHTEXT_LIB_EXPORT_LIBRARY
           /* We are building this library */
-#        define JKQTMATHTEXT_LIB_EXPORT __declspec(dllexport)
+#        define JKQTMATHTEXT_LIB_EXPORT Q_DECL_EXPORT
 #      else
           /* We are using this library */
-#        define JKQTMATHTEXT_LIB_EXPORT __declspec(dllimport)
+#        define JKQTMATHTEXT_LIB_EXPORT Q_DECL_IMPORT
 #      endif
 #    endif
 #  else
diff --git a/lib/jkqtplotter/jkqtplotter_imexport.h b/lib/jkqtplotter/jkqtplotter_imexport.h
index 31a0c1c33b..c22fbbb47b 100644
--- a/lib/jkqtplotter/jkqtplotter_imexport.h
+++ b/lib/jkqtplotter/jkqtplotter_imexport.h
@@ -39,7 +39,7 @@
         JKQTPLOTTER_LIB_EXPORT void exportedFunctionName();
     \endcode
     
-    These macros append the appropriate \c __declspec(dllexport) and \c __declspec(dllimport)
+    These macros append the appropriate \c Q_DECL_EXPORT and \c Q_DECL_IMPORT
     to the function/class body and thus tell windows compilers to export these sysmbols from
     the shared library, or import them from a shared library.
     
@@ -72,21 +72,16 @@
            compiling an application), the symbols are imported
 */
 
-#  ifndef __WINDOWS__
-#    if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)
-#      define __WINDOWS__
-#    endif
-#  endif
+#include <QtCore/QtGlobal>
 
-#ifdef __WINDOWS__
 #  ifdef JKQTPLOTTER_LIB_IN_DLL
 #    ifndef JKQTPLOTTER_LIB_EXPORT
 #      ifdef JKQTPLOTTER_LIB_EXPORT_LIBRARY
           /* We are building this library */
-#        define JKQTPLOTTER_LIB_EXPORT __declspec(dllexport)
+#        define JKQTPLOTTER_LIB_EXPORT Q_DECL_EXPORT
 #      else
           /* We are using this library */
-#        define JKQTPLOTTER_LIB_EXPORT __declspec(dllimport)
+#        define JKQTPLOTTER_LIB_EXPORT Q_DECL_IMPORT
 #      endif
 #    endif
 #  else
@@ -94,10 +89,6 @@
 #      define JKQTPLOTTER_LIB_EXPORT
 #    endif
 #  endif
-#else
-#  define JKQTPLOTTER_LIB_EXPORT
-#endif
-