diff --git a/src/app/core/core.pri b/src/app/core/core.pri
index 5b7e0e14d..e977232d8 100644
--- a/src/app/core/core.pri
+++ b/src/app/core/core.pri
@@ -3,16 +3,10 @@
 
 HEADERS += \
     $$PWD/vapplication.h \
-    $$PWD/undoevent.h \
     $$PWD/vsettings.h \
-    $$PWD/backport/qcommandlineoption.h \
-    $$PWD/backport/qcommandlineparser.h \
     $$PWD/vformula.h
 
 SOURCES += \
     $$PWD/vapplication.cpp \
-    $$PWD/undoevent.cpp \
     $$PWD/vsettings.cpp \
-    $$PWD/backport/qcommandlineoption.cpp \
-    $$PWD/backport/qcommandlineparser.cpp \
     $$PWD/vformula.cpp
diff --git a/src/app/core/vsettings.cpp b/src/app/core/vsettings.cpp
index 02033aef4..0feb75525 100644
--- a/src/app/core/vsettings.cpp
+++ b/src/app/core/vsettings.cpp
@@ -36,7 +36,7 @@
 #include "../xml/vabstractmeasurements.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../utils/vmath.h"
+#   include "../../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/app/dialogs/app/dialoglayoutsettings.cpp b/src/app/dialogs/app/dialoglayoutsettings.cpp
index ab6ae314b..c72b7f2ca 100644
--- a/src/app/dialogs/app/dialoglayoutsettings.cpp
+++ b/src/app/dialogs/app/dialoglayoutsettings.cpp
@@ -34,7 +34,7 @@
 #include "../../libs/vlayout/vlayoutgenerator.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../../utils/vmath.h"
+#   include "../../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 6a35142bf..51dd03a98 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -30,7 +30,7 @@
 #include "core/vapplication.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-#   include "../core/backport/qcommandlineparser.h"
+#   include "../libs/vmisc/backport/qcommandlineparser.h"
 #else
 #   include <QCommandLineParser>
 #endif
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 385ff8712..1d04256f7 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -38,7 +38,7 @@
 #include "xml/vstandardmeasurements.h"
 #include "xml/vindividualmeasurements.h"
 #include "core/vapplication.h"
-#include "core/undoevent.h"
+#include "../libs/vmisc/undoevent.h"
 #include "core/vsettings.h"
 #include "undocommands/renamepp.h"
 #include "vtooloptionspropertybrowser.h"
diff --git a/src/app/tools/drawTools/vtoolspline.cpp b/src/app/tools/drawTools/vtoolspline.cpp
index 5ab843269..26aa02006 100644
--- a/src/app/tools/drawTools/vtoolspline.cpp
+++ b/src/app/tools/drawTools/vtoolspline.cpp
@@ -34,7 +34,7 @@
 #include "../../options.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../../utils/vmath.h"
+#   include "../../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/app/tools/drawTools/vtoolsplinepath.cpp b/src/app/tools/drawTools/vtoolsplinepath.cpp
index 45c0a6fa1..68b6eb81f 100644
--- a/src/app/tools/drawTools/vtoolsplinepath.cpp
+++ b/src/app/tools/drawTools/vtoolsplinepath.cpp
@@ -32,7 +32,7 @@
 #include "../../visualization/vistoolsplinepath.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../../utils/vmath.h"
+#   include "../../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp
index 70f39d9a0..b0333bdd4 100644
--- a/src/app/xml/vpattern.cpp
+++ b/src/app/xml/vpattern.cpp
@@ -38,7 +38,7 @@
 #include "../libs/ifc/exception/vexceptionemptyparameter.h"
 #include "../libs/ifc/exception/vexceptionundo.h"
 #include "../libs/ifc/xml/vpatternconverter.h"
-#include "../core/undoevent.h"
+#include "../libs/vmisc/undoevent.h"
 #include "../core/vsettings.h"
 #include "vstandardmeasurements.h"
 #include "vindividualmeasurements.h"
diff --git a/src/libs/vgeometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp
index 4c16e0d46..437f177af 100644
--- a/src/libs/vgeometry/vsplinepath.cpp
+++ b/src/libs/vgeometry/vsplinepath.cpp
@@ -31,7 +31,7 @@
 #include "../ifc/exception/vexception.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../utils/vmath.h"
+#   include "../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/libs/vlayout/vcontour.cpp b/src/libs/vlayout/vcontour.cpp
index c2069e723..bf223b767 100644
--- a/src/libs/vlayout/vcontour.cpp
+++ b/src/libs/vlayout/vcontour.cpp
@@ -33,7 +33,7 @@
 #include <QPointF>
 #include <QLineF>
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../utils/vmath.h"
+#   include "../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/libs/vlayout/vlayoutdetail.cpp b/src/libs/vlayout/vlayoutdetail.cpp
index 09e921aa2..e6730fb61 100644
--- a/src/libs/vlayout/vlayoutdetail.cpp
+++ b/src/libs/vlayout/vlayoutdetail.cpp
@@ -32,7 +32,7 @@
 #include <QGraphicsItem>
 #include <QPainterPath>
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../utils/vmath.h"
+#   include "../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp
index 80a06df4e..a98ba64ef 100644
--- a/src/libs/vlayout/vposition.cpp
+++ b/src/libs/vlayout/vposition.cpp
@@ -40,7 +40,7 @@
 #include <QDir>
 #include <QtWidgets>
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../utils/vmath.h"
+#   include "../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp
index 212e5dd1c..f7f1f4b43 100644
--- a/src/libs/vlayout/vposter.cpp
+++ b/src/libs/vlayout/vposter.cpp
@@ -30,7 +30,7 @@
 #include <QPainter>
 #include <QPrinter>
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../utils/vmath.h"
+#   include "../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif
diff --git a/src/app/core/backport/qcommandlineoption.cpp b/src/libs/vmisc/backport/qcommandlineoption.cpp
similarity index 100%
rename from src/app/core/backport/qcommandlineoption.cpp
rename to src/libs/vmisc/backport/qcommandlineoption.cpp
diff --git a/src/app/core/backport/qcommandlineoption.h b/src/libs/vmisc/backport/qcommandlineoption.h
similarity index 100%
rename from src/app/core/backport/qcommandlineoption.h
rename to src/libs/vmisc/backport/qcommandlineoption.h
diff --git a/src/app/core/backport/qcommandlineparser.cpp b/src/libs/vmisc/backport/qcommandlineparser.cpp
similarity index 100%
rename from src/app/core/backport/qcommandlineparser.cpp
rename to src/libs/vmisc/backport/qcommandlineparser.cpp
diff --git a/src/app/core/backport/qcommandlineparser.h b/src/libs/vmisc/backport/qcommandlineparser.h
similarity index 100%
rename from src/app/core/backport/qcommandlineparser.h
rename to src/libs/vmisc/backport/qcommandlineparser.h
diff --git a/src/app/core/undoevent.cpp b/src/libs/vmisc/undoevent.cpp
similarity index 100%
rename from src/app/core/undoevent.cpp
rename to src/libs/vmisc/undoevent.cpp
diff --git a/src/app/core/undoevent.h b/src/libs/vmisc/undoevent.h
similarity index 100%
rename from src/app/core/undoevent.h
rename to src/libs/vmisc/undoevent.h
diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri
index b098d9842..f75d3197a 100644
--- a/src/libs/vmisc/vmisc.pri
+++ b/src/libs/vmisc/vmisc.pri
@@ -3,10 +3,16 @@
 
 SOURCES += \
     $$PWD/stable.cpp \
-    $$PWD/def.cpp
+    $$PWD/def.cpp \
+    $$PWD/undoevent.cpp \
+    $$PWD/backport/qcommandlineoption.cpp \
+    $$PWD/backport/qcommandlineparser.cpp
 
 HEADERS += \
     $$PWD/stable.h \
     $$PWD/def.h \
     $$PWD/logging.h \
-    $$PWD/vmath.h
+    $$PWD/vmath.h \
+    $$PWD/undoevent.h \
+    $$PWD/backport/qcommandlineoption.h \
+    $$PWD/backport/qcommandlineparser.h
diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp
index bd02afe0a..e979de63a 100644
--- a/src/libs/vobj/vobjengine.cpp
+++ b/src/libs/vobj/vobjengine.cpp
@@ -31,7 +31,7 @@
 #include <QTextStream>
 #include <QDebug>
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../../utils/vmath.h"
+#   include "../libs/vmisc/vmath.h"
 #else
 #   include <QtMath>
 #endif