diff --git a/examples/jkqtplot_test/TestWidgetBarcharts.h b/examples/jkqtplot_test/TestWidgetBarcharts.h
index 213ca98c69..24512de86a 100644
--- a/examples/jkqtplot_test/TestWidgetBarcharts.h
+++ b/examples/jkqtplot_test/TestWidgetBarcharts.h
@@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetContourPlots.h b/examples/jkqtplot_test/TestWidgetContourPlots.h
index 59ff8f8d67..a600ed1993 100644
--- a/examples/jkqtplot_test/TestWidgetContourPlots.h
+++ b/examples/jkqtplot_test/TestWidgetContourPlots.h
@@ -18,7 +18,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetEmptyPlot.h b/examples/jkqtplot_test/TestWidgetEmptyPlot.h
index 4cee898042..a586646564 100644
--- a/examples/jkqtplot_test/TestWidgetEmptyPlot.h
+++ b/examples/jkqtplot_test/TestWidgetEmptyPlot.h
@@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetFunctionPlots.h b/examples/jkqtplot_test/TestWidgetFunctionPlots.h
index 9f2f0a320d..fe7174f29d 100644
--- a/examples/jkqtplot_test/TestWidgetFunctionPlots.h
+++ b/examples/jkqtplot_test/TestWidgetFunctionPlots.h
@@ -18,7 +18,7 @@
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
 #include "jkqtplottergui/jkqtpcomboboxes.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetGeometry.h b/examples/jkqtplot_test/TestWidgetGeometry.h
index 20475b5bed..76497db22c 100644
--- a/examples/jkqtplot_test/TestWidgetGeometry.h
+++ b/examples/jkqtplot_test/TestWidgetGeometry.h
@@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetGraphs.h b/examples/jkqtplot_test/TestWidgetGraphs.h
index 17ea60849e..a17776d35d 100644
--- a/examples/jkqtplot_test/TestWidgetGraphs.h
+++ b/examples/jkqtplot_test/TestWidgetGraphs.h
@@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetImages.h b/examples/jkqtplot_test/TestWidgetImages.h
index 07ebe81059..98b89898d0 100644
--- a/examples/jkqtplot_test/TestWidgetImages.h
+++ b/examples/jkqtplot_test/TestWidgetImages.h
@@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetLogGraphs.h b/examples/jkqtplot_test/TestWidgetLogGraphs.h
index e462b30dd6..59f377c0f2 100644
--- a/examples/jkqtplot_test/TestWidgetLogGraphs.h
+++ b/examples/jkqtplot_test/TestWidgetLogGraphs.h
@@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 
 
diff --git a/examples/jkqtplot_test/TestWidgetParamScatterPlots.h b/examples/jkqtplot_test/TestWidgetParamScatterPlots.h
index 2d636be0ab..97eed9f545 100644
--- a/examples/jkqtplot_test/TestWidgetParamScatterPlots.h
+++ b/examples/jkqtplot_test/TestWidgetParamScatterPlots.h
@@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/jkqtplot_test/TestWidgetRGBImages.h b/examples/jkqtplot_test/TestWidgetRGBImages.h
index 5bfb2ec8f0..436b31efba 100644
--- a/examples/jkqtplot_test/TestWidgetRGBImages.h
+++ b/examples/jkqtplot_test/TestWidgetRGBImages.h
@@ -18,7 +18,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define N1 200
 #define N2 50
diff --git a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp
index 21d3b9c5f8..0f1abb6c46 100644
--- a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp
+++ b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp
@@ -12,7 +12,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsgeometric.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsfilledcurve.h"
 
 void drawWithDateAxis(JKQTPlotter& plot) {
diff --git a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp
index 63d263c911..63dfe92786 100644
--- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp
+++ b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp
@@ -7,7 +7,7 @@
 #include <QApplication>
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 
 int main(int argc, char* argv[])
diff --git a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp
index 8d6926154a..546494fdd2 100644
--- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp
+++ b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp
@@ -8,7 +8,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsgeometric.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #define sqr(x) ((x)*(x))
 
diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp
index 0c75145adb..2041059990 100644
--- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp
+++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp
@@ -8,7 +8,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsspecialline.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp
index 4d96f444e0..5d37c033ce 100644
--- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp
+++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp
@@ -8,7 +8,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsspecialline.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp
index d456f10836..dee36e61e8 100644
--- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp
+++ b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp
@@ -7,7 +7,7 @@
 #include <QApplication>
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 
 int main(int argc, char* argv[])
diff --git a/lib/common.pri b/lib/common.pri
index dc7ac801c0..a4d551354b 100644
--- a/lib/common.pri
+++ b/lib/common.pri
@@ -11,11 +11,11 @@
     DEFINES += _CRT_NO_VA_START_VALIDATION
 }
 
-HEADERS += $$PWD/jkqtplottertools/jkqtp_imexport.h \
-           $$PWD/jkqtplottertools/jkqtptools.h
+HEADERS += $$PWD/jkqtcommon/jkqtp_imexport.h \
+           $$PWD/jkqtcommon/jkqtptools.h
 
 
-SOURCES += $$PWD/jkqtplottertools/jkqtptools.cpp
+SOURCES += $$PWD/jkqtcommon/jkqtptools.cpp
 
 INCLUDEPATH += $$PWD 
 
diff --git a/lib/jkqtplottertools/jkqtp_imexport.h b/lib/jkqtcommon/jkqtp_imexport.h
similarity index 94%
rename from lib/jkqtplottertools/jkqtp_imexport.h
rename to lib/jkqtcommon/jkqtp_imexport.h
index d93bcb2b1b..6d19cae7a4 100644
--- a/lib/jkqtplottertools/jkqtp_imexport.h
+++ b/lib/jkqtcommon/jkqtp_imexport.h
@@ -30,7 +30,7 @@
     This file allows to export functions and classes from this directory in a dynamic/shared lib and to append the
     correct __declspec() declaration on windows. If you want to export one, make sure you have set
     \code
-    #include "jkqtplottertools/jkqtp_imexport.h"
+    #include "jkqtcommon/jkqtp_imexport.h"
 
     class JKQTP_LIB_EXPORT exportedClassName {
        ...
diff --git a/lib/jkqtplottertools/jkqtptools.cpp b/lib/jkqtcommon/jkqtptools.cpp
similarity index 97%
rename from lib/jkqtplottertools/jkqtptools.cpp
rename to lib/jkqtcommon/jkqtptools.cpp
index 6f43d58583..1ba11d5130 100644
--- a/lib/jkqtplottertools/jkqtptools.cpp
+++ b/lib/jkqtcommon/jkqtptools.cpp
@@ -21,7 +21,7 @@ Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
 
 
 
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include <cmath>
 #include <QDebug>
diff --git a/lib/jkqtplottertools/jkqtptools.h b/lib/jkqtcommon/jkqtptools.h
similarity index 97%
rename from lib/jkqtplottertools/jkqtptools.h
rename to lib/jkqtcommon/jkqtptools.h
index 1e0a532a1f..7a301b9db6 100644
--- a/lib/jkqtplottertools/jkqtptools.h
+++ b/lib/jkqtcommon/jkqtptools.h
@@ -21,7 +21,7 @@
 
 #ifndef JKQTPTOOLS_H_INCLUDED
 #define JKQTPTOOLS_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QString>
 #include <QElapsedTimer>
 #include <QLocale>
diff --git a/lib/jkqtfastplotter/jkqtfastplotter.cpp b/lib/jkqtfastplotter/jkqtfastplotter.cpp
index fba0070650..970e076dda 100644
--- a/lib/jkqtfastplotter/jkqtfastplotter.cpp
+++ b/lib/jkqtfastplotter/jkqtfastplotter.cpp
@@ -20,7 +20,7 @@
 
 
 #include "jkqtfastplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QLocale>
 #include <QPainter>
 #include <QPaintEvent>
diff --git a/lib/jkqtfastplotter/jkqtfastplotter.h b/lib/jkqtfastplotter/jkqtfastplotter.h
index 463259a962..48f0211962 100644
--- a/lib/jkqtfastplotter/jkqtfastplotter.h
+++ b/lib/jkqtfastplotter/jkqtfastplotter.h
@@ -28,7 +28,7 @@
 #ifndef JKQTFASTPLOTTER_H
 #define JKQTFASTPLOTTER_H
 
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QWidget>
 #include <QVector>
 #include <QSettings>
@@ -42,7 +42,7 @@
 #include <QMutex>
 #include <QGLWidget>
 
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #ifdef DEBUG_TIMING
 #  include "jkqtplottertools/jkqtphighrestimer.h"
 #endif
diff --git a/lib/jkqtmathtext/jkqtmathtext.cpp b/lib/jkqtmathtext/jkqtmathtext.cpp
index 08caf0ff02..01d24111cb 100644
--- a/lib/jkqtmathtext/jkqtmathtext.cpp
+++ b/lib/jkqtmathtext/jkqtmathtext.cpp
@@ -20,7 +20,7 @@
 
 
 #include "jkqtmathtext/jkqtmathtext.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QFontMetricsF>
 #include <QDebug>
 #include <QFontDatabase>
diff --git a/lib/jkqtmathtext/jkqtmathtext.h b/lib/jkqtmathtext/jkqtmathtext.h
index 9224e394c0..f28ffa76d5 100644
--- a/lib/jkqtmathtext/jkqtmathtext.h
+++ b/lib/jkqtmathtext/jkqtmathtext.h
@@ -36,8 +36,8 @@
 #include <QString>
 #include <QSet>
 #include <QFile>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QWidget>
 #include <QLabel>
 #include <QHash>
diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h
index fd86dcdd10..7bdb4c8a03 100644
--- a/lib/jkqtplotter/jkqtpbaseplotter.h
+++ b/lib/jkqtplotter/jkqtpbaseplotter.h
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpdatastorage.h"
 #include "jkqtplotter/jkqtpbaseplotterstyle.h"
 #include "jkqtmathtext/jkqtmathtext.h"
@@ -45,7 +45,7 @@
 #include <vector>
 #include <cmath>
 #include <iostream>
- #include "jkqtplottertools/jkqtp_imexport.h"
+ #include "jkqtcommon/jkqtp_imexport.h"
 
 
 #ifndef JKQTPBASEPLOTTER_H
diff --git a/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp b/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
index eb7a68ef6d..0dc2c42589 100644
--- a/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
+++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
@@ -1,7 +1,7 @@
 #include "jkqtpbaseplotterstyle.h"
 #include <QPalette>
 #include <QApplication>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 JKQTBasePlotterStyle::JKQTBasePlotterStyle():
     debugShowRegionBoxes(false),
diff --git a/lib/jkqtplotter/jkqtpbaseplotterstyle.h b/lib/jkqtplotter/jkqtpbaseplotterstyle.h
index 73a17d4b64..b67c572f43 100644
--- a/lib/jkqtplotter/jkqtpbaseplotterstyle.h
+++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.h
@@ -20,11 +20,11 @@
 #ifndef JKQTBASEPLOTTERSTYLE_H
 #define JKQTBASEPLOTTERSTYLE_H
 
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpcoordinateaxesstyle.h"
 #include "jkqtplotter/jkqtpkeystyle.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QColor>
 #include <QPainter>
 #include <QString>
diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.h b/lib/jkqtplotter/jkqtpcoordinateaxes.h
index 152b7dc9dc..c3b7046ca6 100644
--- a/lib/jkqtplotter/jkqtpcoordinateaxes.h
+++ b/lib/jkqtplotter/jkqtpcoordinateaxes.h
@@ -28,9 +28,9 @@
 #include <QPainter>
 #include <QPair>
 #include <QSettings>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtmathtext/jkqtmathtext.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpcoordinateaxesstyle.h"
 
 // forward declarations
diff --git a/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h b/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h
index 272fae16c2..a54abf2e32 100644
--- a/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h
+++ b/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h
@@ -23,8 +23,8 @@
 #include <QSettings>
 #include <QString>
 #include <QColor>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 
 class JKQTBasePlotterStyle; // forward
 
diff --git a/lib/jkqtplotter/jkqtpdatastorage.h b/lib/jkqtplotter/jkqtpdatastorage.h
index cbd1f05d72..7b20508f1e 100644
--- a/lib/jkqtplotter/jkqtpdatastorage.h
+++ b/lib/jkqtplotter/jkqtpdatastorage.h
@@ -19,8 +19,8 @@
 
 
 
-#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <vector>
 #include <cmath>
 #include <iostream>
diff --git a/lib/jkqtplotter/jkqtpelementsoverlay.cpp b/lib/jkqtplotter/jkqtpelementsoverlay.cpp
index 7d1a5d94d6..ae42fea915 100644
--- a/lib/jkqtplotter/jkqtpelementsoverlay.cpp
+++ b/lib/jkqtplotter/jkqtpelementsoverlay.cpp
@@ -21,7 +21,7 @@
 
 #include "jkqtplotter/jkqtpelementsoverlay.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include <stdlib.h>
 #include <QDebug>
diff --git a/lib/jkqtplotter/jkqtpelementsoverlay.h b/lib/jkqtplotter/jkqtpelementsoverlay.h
index da2e3b6501..639bf01f3d 100644
--- a/lib/jkqtplotter/jkqtpelementsoverlay.h
+++ b/lib/jkqtplotter/jkqtpelementsoverlay.h
@@ -22,8 +22,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
 #ifndef jkqtpelementsoverlay_H
diff --git a/lib/jkqtplotter/jkqtpgraphsbarchart.cpp b/lib/jkqtplotter/jkqtpgraphsbarchart.cpp
index ca590d140d..1363733538 100644
--- a/lib/jkqtplotter/jkqtpgraphsbarchart.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsbarchart.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsbarchart.h b/lib/jkqtplotter/jkqtpgraphsbarchart.h
index 5451adacdc..556727bf74 100644
--- a/lib/jkqtplotter/jkqtpgraphsbarchart.h
+++ b/lib/jkqtplotter/jkqtpgraphsbarchart.h
@@ -20,8 +20,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsbase.cpp b/lib/jkqtplotter/jkqtpgraphsbase.cpp
index 014ad46a77..e7e796f352 100644
--- a/lib/jkqtplotter/jkqtpgraphsbase.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsbase.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsbase.h b/lib/jkqtplotter/jkqtpgraphsbase.h
index 497ffcb163..bcd1a3be62 100644
--- a/lib/jkqtplotter/jkqtpgraphsbase.h
+++ b/lib/jkqtplotter/jkqtpgraphsbase.h
@@ -23,8 +23,8 @@
 #include <QPair>
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 
 #ifndef JKQTPGRAPHSBASE_H
diff --git a/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp b/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp
index c96eb7aff9..c08bb2b4e1 100644
--- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsbaseerrors.h b/lib/jkqtplotter/jkqtpgraphsbaseerrors.h
index b59322384a..34a32391f5 100644
--- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.h
+++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.h
@@ -24,8 +24,8 @@
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 
 #ifndef JKQTPGRAPHSBASEERROR_H
diff --git a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h
index 5e7ba0dbc7..e2fd696b94 100644
--- a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h
+++ b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h
@@ -22,8 +22,8 @@
 #include <QPainter>
 #include <QPen>
 #include <QBrush>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 
 
diff --git a/lib/jkqtplotter/jkqtpgraphsboxplot.cpp b/lib/jkqtplotter/jkqtpgraphsboxplot.cpp
index 2602ea4401..e8c089b817 100644
--- a/lib/jkqtplotter/jkqtpgraphsboxplot.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsboxplot.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsboxplot.h b/lib/jkqtplotter/jkqtpgraphsboxplot.h
index 265b772059..baeb72fa3d 100644
--- a/lib/jkqtplotter/jkqtpgraphsboxplot.h
+++ b/lib/jkqtplotter/jkqtpgraphsboxplot.h
@@ -21,8 +21,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsboxplotstylingmixins.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp b/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp
index 944fabd731..68c84b5ce1 100644
--- a/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h b/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h
index f4ed8edcd9..864eb49c28 100644
--- a/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h
+++ b/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h
@@ -20,8 +20,8 @@
 
 #include <QString>
 #include <QPainter>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
diff --git a/lib/jkqtplotter/jkqtpgraphscontour.cpp b/lib/jkqtplotter/jkqtpgraphscontour.cpp
index 33585e02e3..966bd21414 100644
--- a/lib/jkqtplotter/jkqtpgraphscontour.cpp
+++ b/lib/jkqtplotter/jkqtpgraphscontour.cpp
@@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphscontour.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
diff --git a/lib/jkqtplotter/jkqtpgraphscontour.h b/lib/jkqtplotter/jkqtpgraphscontour.h
index ac7096e4f9..ff2fe65f42 100644
--- a/lib/jkqtplotter/jkqtpgraphscontour.h
+++ b/lib/jkqtplotter/jkqtpgraphscontour.h
@@ -27,11 +27,11 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 
 
diff --git a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp b/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp
index 56250db3f2..b31c6adc6f 100644
--- a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h b/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h
index 3b90e202d3..4684187b7a 100644
--- a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h
+++ b/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h
@@ -24,7 +24,7 @@
 #include <QPair>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <functional>
 
 #ifndef jkqtpgraphsevaluatedfunction_H
diff --git a/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp b/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp
index c0f0bff33e..d95fb3346d 100644
--- a/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsfilledcurve.h b/lib/jkqtplotter/jkqtpgraphsfilledcurve.h
index 806b604e6e..ed30a12707 100644
--- a/lib/jkqtplotter/jkqtpgraphsfilledcurve.h
+++ b/lib/jkqtplotter/jkqtpgraphsfilledcurve.h
@@ -18,7 +18,7 @@
 */
 
 
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsspecialline.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsgeometric.h b/lib/jkqtplotter/jkqtpgraphsgeometric.h
index 21c014bf96..b93c336bd9 100644
--- a/lib/jkqtplotter/jkqtpgraphsgeometric.h
+++ b/lib/jkqtplotter/jkqtpgraphsgeometric.h
@@ -23,8 +23,8 @@
 #include <QPair>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtmathtext/jkqtmathtext.h"
 
 #ifndef jkqtpgraphsgeometric_H_INCLUDED
diff --git a/lib/jkqtplotter/jkqtpgraphsimage.cpp b/lib/jkqtplotter/jkqtpgraphsimage.cpp
index 9d79f04876..2361c58ecb 100644
--- a/lib/jkqtplotter/jkqtpgraphsimage.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimage.cpp
@@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
diff --git a/lib/jkqtplotter/jkqtpgraphsimage.h b/lib/jkqtplotter/jkqtpgraphsimage.h
index ff796b09a8..81436178e6 100644
--- a/lib/jkqtplotter/jkqtpgraphsimage.h
+++ b/lib/jkqtplotter/jkqtpgraphsimage.h
@@ -27,9 +27,9 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 
 
diff --git a/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp b/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp
index 9dcef93b81..137c84391c 100644
--- a/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp
@@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsimageoverlays.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
diff --git a/lib/jkqtplotter/jkqtpgraphsimageoverlays.h b/lib/jkqtplotter/jkqtpgraphsimageoverlays.h
index a7d42d7f41..18dbd97c8d 100644
--- a/lib/jkqtplotter/jkqtpgraphsimageoverlays.h
+++ b/lib/jkqtplotter/jkqtpgraphsimageoverlays.h
@@ -27,10 +27,10 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 
 
diff --git a/lib/jkqtplotter/jkqtpgraphsimagergb.cpp b/lib/jkqtplotter/jkqtpgraphsimagergb.cpp
index d901198565..2d07e571b6 100644
--- a/lib/jkqtplotter/jkqtpgraphsimagergb.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimagergb.cpp
@@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsimagergb.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
diff --git a/lib/jkqtplotter/jkqtpgraphsimagergb.h b/lib/jkqtplotter/jkqtpgraphsimagergb.h
index 089bf53faf..e26762941e 100644
--- a/lib/jkqtplotter/jkqtpgraphsimagergb.h
+++ b/lib/jkqtplotter/jkqtpgraphsimagergb.h
@@ -27,9 +27,9 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsimage.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 
 
diff --git a/lib/jkqtplotter/jkqtpgraphsimpulses.cpp b/lib/jkqtplotter/jkqtpgraphsimpulses.cpp
index eac8dc2c7c..96204f0b79 100644
--- a/lib/jkqtplotter/jkqtpgraphsimpulses.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimpulses.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsimpulses.h b/lib/jkqtplotter/jkqtpgraphsimpulses.h
index 9cea593a1e..d7bd5ec7f6 100644
--- a/lib/jkqtplotter/jkqtpgraphsimpulses.h
+++ b/lib/jkqtplotter/jkqtpgraphsimpulses.h
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp b/lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp
index f88268c904..85cc4d1c40 100644
--- a/lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp
@@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplotter/jkqtplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <QElapsedTimer>
diff --git a/lib/jkqtplotter/jkqtpgraphsparsedfunction.h b/lib/jkqtplotter/jkqtpgraphsparsedfunction.h
index 7d2f02e28a..ef2e8a6f5b 100644
--- a/lib/jkqtplotter/jkqtpgraphsparsedfunction.h
+++ b/lib/jkqtplotter/jkqtpgraphsparsedfunction.h
@@ -24,9 +24,9 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpmathparser.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsevaluatedfunction.h"
 
 // forward declarations
diff --git a/lib/jkqtplotter/jkqtpgraphspeakstream.cpp b/lib/jkqtplotter/jkqtpgraphspeakstream.cpp
index d56a3fc4a1..d6c36c1432 100644
--- a/lib/jkqtplotter/jkqtpgraphspeakstream.cpp
+++ b/lib/jkqtplotter/jkqtpgraphspeakstream.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsrange.cpp b/lib/jkqtplotter/jkqtpgraphsrange.cpp
index fdbfb713f6..644d239ad0 100644
--- a/lib/jkqtplotter/jkqtpgraphsrange.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsrange.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsrange.h b/lib/jkqtplotter/jkqtpgraphsrange.h
index 2a89484c82..19884efc20 100644
--- a/lib/jkqtplotter/jkqtpgraphsrange.h
+++ b/lib/jkqtplotter/jkqtpgraphsrange.h
@@ -21,8 +21,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsscatter.cpp b/lib/jkqtplotter/jkqtpgraphsscatter.cpp
index a5629dffbb..6d621bfc5d 100644
--- a/lib/jkqtplotter/jkqtpgraphsscatter.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsscatter.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsscatter.h b/lib/jkqtplotter/jkqtpgraphsscatter.h
index 2162197862..fbbe642e33 100644
--- a/lib/jkqtplotter/jkqtpgraphsscatter.h
+++ b/lib/jkqtplotter/jkqtpgraphsscatter.h
@@ -22,8 +22,8 @@
 #include <QPainter>
 #include <QPair>
 #include <functional>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
diff --git a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp b/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
index df022a3bb4..4a120bc1ac 100644
--- a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
+++ b/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsspecialline.cpp b/lib/jkqtplotter/jkqtpgraphsspecialline.cpp
index 6126052a63..5f33758bc0 100644
--- a/lib/jkqtplotter/jkqtpgraphsspecialline.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsspecialline.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
diff --git a/lib/jkqtplotter/jkqtpgraphsspecialline.h b/lib/jkqtplotter/jkqtpgraphsspecialline.h
index 08e53fc153..1cd8819fdf 100644
--- a/lib/jkqtplotter/jkqtpgraphsspecialline.h
+++ b/lib/jkqtplotter/jkqtpgraphsspecialline.h
@@ -21,8 +21,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
diff --git a/lib/jkqtplotter/jkqtpkeystyle.h b/lib/jkqtplotter/jkqtpkeystyle.h
index 201f0e1e89..2c4bd9a9cd 100644
--- a/lib/jkqtplotter/jkqtpkeystyle.h
+++ b/lib/jkqtplotter/jkqtpkeystyle.h
@@ -20,8 +20,8 @@
 #ifndef JKQTPSTYLE_H
 #define JKQTPSTYLE_H
 
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QColor>
 #include <QString>
 #include <QSettings>
diff --git a/lib/jkqtplotter/jkqtplotter.h b/lib/jkqtplotter/jkqtplotter.h
index 8f7ddb65ee..0cc48a101d 100644
--- a/lib/jkqtplotter/jkqtplotter.h
+++ b/lib/jkqtplotter/jkqtplotter.h
@@ -41,8 +41,8 @@
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplotter/jkqtplotterstyle.h"
 #include "jkqtplotter/jkqtpbaseplotterstyle.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottergui/jkvanishqtoolbar.h"
 #include <QKeyEvent>
 
diff --git a/lib/jkqtplotter/jkqtplotterstyle.cpp b/lib/jkqtplotter/jkqtplotterstyle.cpp
index 68fc9395a6..b664aeb401 100644
--- a/lib/jkqtplotter/jkqtplotterstyle.cpp
+++ b/lib/jkqtplotter/jkqtplotterstyle.cpp
@@ -1,7 +1,7 @@
 #include "jkqtplotterstyle.h"
 #include <QApplication>
 #include "jkqtplottertools/jkqttools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 JKQTPlotterStyle::JKQTPlotterStyle():
     maxTooltipDistance(16),
diff --git a/lib/jkqtplotter/jkqtplotterstyle.h b/lib/jkqtplotter/jkqtplotterstyle.h
index 636e6d31d1..9067ab2f99 100644
--- a/lib/jkqtplotter/jkqtplotterstyle.h
+++ b/lib/jkqtplotter/jkqtplotterstyle.h
@@ -20,8 +20,8 @@
 #ifndef JKQTPLOTTERSTYLE_H
 #define JKQTPLOTTERSTYLE_H
 
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QColor>
 #include <QPainter>
 #include <QString>
diff --git a/lib/jkqtplotter/jkqtpopencvinterface.h b/lib/jkqtplotter/jkqtpopencvinterface.h
index f9b43bfb57..6edf581591 100644
--- a/lib/jkqtplotter/jkqtpopencvinterface.h
+++ b/lib/jkqtplotter/jkqtpopencvinterface.h
@@ -19,7 +19,7 @@
 
 
 
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpdatastorage.h"
 #include <opencv2/core.hpp>
 
diff --git a/lib/jkqtplottergui/jkqtpcomboboxes.cpp b/lib/jkqtplottergui/jkqtpcomboboxes.cpp
index c5af20cc97..17b2a8668e 100644
--- a/lib/jkqtplottergui/jkqtpcomboboxes.cpp
+++ b/lib/jkqtplottergui/jkqtpcomboboxes.cpp
@@ -21,7 +21,7 @@
 
 #include "jkqtplottergui/jkqtpcomboboxes.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QImage>
 
 
diff --git a/lib/jkqtplottergui/jkqtpcomboboxes.h b/lib/jkqtplottergui/jkqtpcomboboxes.h
index 74c6e6912e..fc8b9521e6 100644
--- a/lib/jkqtplottergui/jkqtpcomboboxes.h
+++ b/lib/jkqtplottergui/jkqtpcomboboxes.h
@@ -23,11 +23,11 @@
 #define JKQTPCOMBOBOXES_H
 
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include <QComboBox>
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 
 
diff --git a/lib/jkqtplottergui/jkqtpenhancedspinboxes.h b/lib/jkqtplottergui/jkqtpenhancedspinboxes.h
index ff2fd55235..f90e086747 100644
--- a/lib/jkqtplottergui/jkqtpenhancedspinboxes.h
+++ b/lib/jkqtplottergui/jkqtpenhancedspinboxes.h
@@ -20,7 +20,7 @@
 
 #ifndef jkqtpenhancedspinboxes_H_INCLUDED
 #define jkqtpenhancedspinboxes_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 
 #include <QSpinBox>
 #include <QDoubleSpinBox>
diff --git a/lib/jkqtplottergui/jkqtpenhancedtableview.cpp b/lib/jkqtplottergui/jkqtpenhancedtableview.cpp
index 40dfd1fa58..ec604ab463 100644
--- a/lib/jkqtplottergui/jkqtpenhancedtableview.cpp
+++ b/lib/jkqtplottergui/jkqtpenhancedtableview.cpp
@@ -34,7 +34,7 @@ Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
 #include <QHeaderView>
 #include <QPrintDialog>
 #include <QLabel>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 
 
diff --git a/lib/jkqtplottergui/jkqtpenhancedtableview.h b/lib/jkqtplottergui/jkqtpenhancedtableview.h
index 5d608f456c..fac736e2ea 100644
--- a/lib/jkqtplottergui/jkqtpenhancedtableview.h
+++ b/lib/jkqtplottergui/jkqtpenhancedtableview.h
@@ -20,7 +20,7 @@
 
 #ifndef JKQTPEnhancedTableView_H_INCLUDED
 #define JKQTPEnhancedTableView_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QTableView>
 #include <QPrinter>
 
diff --git a/lib/jkqtplottergui/jkqtpgraphsmodel.cpp b/lib/jkqtplottergui/jkqtpgraphsmodel.cpp
index 854238cc2c..14c75ad747 100644
--- a/lib/jkqtplottergui/jkqtpgraphsmodel.cpp
+++ b/lib/jkqtplottergui/jkqtpgraphsmodel.cpp
@@ -21,7 +21,7 @@
 
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include <QImage>
 
diff --git a/lib/jkqtplottergui/jkqtpgraphsmodel.h b/lib/jkqtplottergui/jkqtpgraphsmodel.h
index 4e6270c598..0f88dab5a8 100644
--- a/lib/jkqtplottergui/jkqtpgraphsmodel.h
+++ b/lib/jkqtplottergui/jkqtpgraphsmodel.h
@@ -23,7 +23,7 @@
 #define jkqtpgraphsmodel_H
 
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 
 #include <QAbstractTableModel>
 
diff --git a/lib/jkqtplottergui/jkvanishqtoolbar.h b/lib/jkqtplottergui/jkvanishqtoolbar.h
index 49288d1c90..26ed31732b 100644
--- a/lib/jkqtplottergui/jkvanishqtoolbar.h
+++ b/lib/jkqtplottergui/jkvanishqtoolbar.h
@@ -21,8 +21,8 @@
 
 #ifndef jkvanishqtoolbar_H
 #define jkvanishqtoolbar_H
-#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QToolBar>
 
 /** \brief a modified <a href="http://doc.qt.io/qt-5/qtoolbar.html">QToolBar</a> which vanishes when the mouse leaves the toolbar.
diff --git a/lib/jkqtplottertools/jkqtpdrawingtools.h b/lib/jkqtplottertools/jkqtpdrawingtools.h
index 0e0d466168..0736eaf741 100644
--- a/lib/jkqtplottertools/jkqtpdrawingtools.h
+++ b/lib/jkqtplottertools/jkqtpdrawingtools.h
@@ -20,8 +20,8 @@
 
 #ifndef JKQTPDRAWINGTOOLS_H_INCLUDED
 #define JKQTPDRAWINGTOOLS_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QPaintDevice>
 
 class JKQTPEnhancedPainter; // forward
diff --git a/lib/jkqtplottertools/jkqtpenhancedpainter.h b/lib/jkqtplottertools/jkqtpenhancedpainter.h
index 164a30f831..55d7cbb1ef 100644
--- a/lib/jkqtplottertools/jkqtpenhancedpainter.h
+++ b/lib/jkqtplottertools/jkqtpenhancedpainter.h
@@ -20,7 +20,7 @@
 
 #ifndef JKQTPENHANCED_PAINTERS_H
 #define JKQTPENHANCED_PAINTERS_H
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QPainter>
 
 
diff --git a/lib/jkqtplottertools/jkqtpimagetools.h b/lib/jkqtplottertools/jkqtpimagetools.h
index 492e9949e3..17e20342f7 100644
--- a/lib/jkqtplottertools/jkqtpimagetools.h
+++ b/lib/jkqtplottertools/jkqtpimagetools.h
@@ -24,15 +24,15 @@
 #include <QDebug>
 #include <QImage>
 #include <QStringList>
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <cmath>
 #include <cfloat>
 #include <stdint.h>
 #include <QColor>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 #ifndef NO_JKQTPLOTTER
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 class JKQTPVerticalIndependentAxis; // forward
 class JKQTPHorizontalIndependentAxis; // forward
diff --git a/lib/jkqtplottertools/jkqtpmathparser.h b/lib/jkqtplottertools/jkqtpmathparser.h
index f1244709f0..ffb3c192f9 100644
--- a/lib/jkqtplottertools/jkqtpmathparser.h
+++ b/lib/jkqtplottertools/jkqtpmathparser.h
@@ -54,7 +54,7 @@
 #include <ctype.h>
 #include <list>
 #include <utility>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 
 
 #ifndef JKQTPMATHPARSER_H
diff --git a/lib/jkqtplottertools/jkqttools.h b/lib/jkqtplottertools/jkqttools.h
index 0651e6f1a8..d69c629244 100644
--- a/lib/jkqtplottertools/jkqttools.h
+++ b/lib/jkqtplottertools/jkqttools.h
@@ -24,7 +24,7 @@
 #ifndef JKQTTOOLS_H
 #define JKQTTOOLS_H
 
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QSettings>
 #include <QWidget>
 #include <QSplitter>