diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp
index 6792ab260..69792dd99 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.cpp
+++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp
@@ -32,6 +32,7 @@
 #include <QPushButton>
 #include <QFileDialog>
 #include <QMenu>
+#include <QDate>
 #include "../xml/vpattern.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../core/vapplication.h"
diff --git a/src/libs/fervor/fvavailableupdate.h b/src/libs/fervor/fvavailableupdate.h
index 7192df064..6217ba401 100644
--- a/src/libs/fervor/fvavailableupdate.h
+++ b/src/libs/fervor/fvavailableupdate.h
@@ -22,8 +22,11 @@
 #ifndef FVAVAILABLEUPDATE_H
 #define FVAVAILABLEUPDATE_H
 
+#include <QMetaObject>
 #include <QObject>
+#include <QString>
 #include <QUrl>
+#include <QtGlobal>
 
 class FvAvailableUpdate : public QObject
 {
diff --git a/src/libs/fervor/fvupdater.cpp b/src/libs/fervor/fvupdater.cpp
index b8646397b..3ae81b1bb 100644
--- a/src/libs/fervor/fvupdater.cpp
+++ b/src/libs/fervor/fvupdater.cpp
@@ -20,15 +20,36 @@
  ******************************************************************************************************/
 
 #include "fvupdater.h"
+
+#include <qsystemdetection.h>
+#include <qxmlstream.h>
+#include <QApplication>
+#include <QByteArray>
+#include <QDate>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QLatin1String>
+#include <QMessageBox>
+#include <QMessageLogger>
+#include <QMutex>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QStringList>
+#include <QStringRef>
+#include <QVariant>
+#include <QXmlStreamAttributes>
+#include <QtDebug>
+
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vabstractconverter.h"
 #include "../vmisc/projectversion.h"
 #include "../vmisc/vabstractapplication.h"
-#include "../ifc/xml/vabstractconverter.h"
-#include "../ifc/exception/vexception.h"
-
-#include <QtNetwork>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QDebug>
+#include "../vmisc/vcommonsettings.h"
+#include "fvavailableupdate.h"
+#include "fvupdatewindow.h"
 
 const QString defaultFeedURL = QStringLiteral("http://valentinaproject.bitbucket.org/Appcast.xml");
 
diff --git a/src/libs/fervor/fvupdater.h b/src/libs/fervor/fvupdater.h
index 47879dc13..c8a4ae477 100644
--- a/src/libs/fervor/fvupdater.h
+++ b/src/libs/fervor/fvupdater.h
@@ -22,15 +22,22 @@
 #ifndef FVUPDATER_H
 #define FVUPDATER_H
 
-#include <QObject>
+#include <QMetaObject>
 #include <QMutex>
 #include <QNetworkAccessManager>
+#include <QObject>
+#include <QPointer>
+#include <QString>
 #include <QUrl>
 #include <QXmlStreamReader>
-#include <QPointer>
+#include <QtGlobal>
 
-#include "fvupdatewindow.h"
 #include "fvavailableupdate.h"
+#include "fvupdatewindow.h"
+
+class FvAvailableUpdate;
+class FvUpdateWindow;
+class QNetworkReply;
 
 extern const QString defaultFeedURL;
 
diff --git a/src/libs/fervor/fvupdatewindow.cpp b/src/libs/fervor/fvupdatewindow.cpp
index 16525e05e..d02c43c3c 100644
--- a/src/libs/fervor/fvupdatewindow.cpp
+++ b/src/libs/fervor/fvupdatewindow.cpp
@@ -20,13 +20,18 @@
  ******************************************************************************************************/
 
 #include "fvupdatewindow.h"
-#include "ui_fvupdatewindow.h"
-#include "fvupdater.h"
-#include "fvavailableupdate.h"
 
 #include <QApplication>
-#include <QCloseEvent>
-#include <QDebug>
+#include <QLabel>
+#include <QPointer>
+#include <QPushButton>
+#include <Qt>
+
+#include "fvavailableupdate.h"
+#include "fvupdater.h"
+#include "ui_fvupdatewindow.h"
+
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 FvUpdateWindow::FvUpdateWindow(QWidget *parent)
diff --git a/src/libs/fervor/fvupdatewindow.h b/src/libs/fervor/fvupdatewindow.h
index 37cbacd4c..64926f9d3 100644
--- a/src/libs/fervor/fvupdatewindow.h
+++ b/src/libs/fervor/fvupdatewindow.h
@@ -23,8 +23,13 @@
 #define FVUPDATEWINDOW_H
 
 #include <QDialog>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
 
 class QGraphicsScene;
+class QWidget;
 
 namespace Ui
 {
diff --git a/src/libs/ifc/exception/vexception.cpp b/src/libs/ifc/exception/vexception.cpp
index f449591b2..b7d5f74d5 100644
--- a/src/libs/ifc/exception/vexception.cpp
+++ b/src/libs/ifc/exception/vexception.cpp
@@ -27,13 +27,11 @@
  *************************************************************************/
 
 #include "vexception.h"
-#include "../vmisc/logging.h"
-#include "../vmisc/def.h"
 
-#include <QGridLayout>
-#include <QMessageBox>
-#include <QSpacerItem>
-#include <QApplication>
+#include <QByteArray>
+#include <QtGlobal>
+
+#include "exception/../ifcdef.h"
 
 //Q_LOGGING_CATEGORY(vExcep, "v.excep") //Commented because don't use now
 
diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h
index 20e79217a..cd18497d9 100644
--- a/src/libs/ifc/exception/vexception.h
+++ b/src/libs/ifc/exception/vexception.h
@@ -29,9 +29,11 @@
 #ifndef VEXCEPTION_H
 #define VEXCEPTION_H
 
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
 #include <QException>
 #include <QString>
-#include <QCoreApplication>
+
 #include "../ifcdef.h"
 
 /**
diff --git a/src/libs/ifc/exception/vexceptionbadid.cpp b/src/libs/ifc/exception/vexceptionbadid.cpp
index 80cad96fd..6ffc4f111 100644
--- a/src/libs/ifc/exception/vexceptionbadid.cpp
+++ b/src/libs/ifc/exception/vexceptionbadid.cpp
@@ -28,6 +28,8 @@
 
 #include "vexceptionbadid.h"
 
+#include "exception/vexception.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VExceptionBadId exception bad id
diff --git a/src/libs/ifc/exception/vexceptionbadid.h b/src/libs/ifc/exception/vexceptionbadid.h
index 4e98f958e..57ad59c5d 100644
--- a/src/libs/ifc/exception/vexceptionbadid.h
+++ b/src/libs/ifc/exception/vexceptionbadid.h
@@ -29,6 +29,11 @@
 #ifndef VEXCEPTIONBADID_H
 #define VEXCEPTIONBADID_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifcdef.h"
 #include "vexception.h"
 
 /**
diff --git a/src/libs/ifc/exception/vexceptionconversionerror.cpp b/src/libs/ifc/exception/vexceptionconversionerror.cpp
index af1cd66c9..cda1b1d6f 100644
--- a/src/libs/ifc/exception/vexceptionconversionerror.cpp
+++ b/src/libs/ifc/exception/vexceptionconversionerror.cpp
@@ -28,6 +28,10 @@
 
 #include "vexceptionconversionerror.h"
 
+#include <QtGlobal>
+
+#include "exception/vexception.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VExceptionConversionError exception conversion error
diff --git a/src/libs/ifc/exception/vexceptionconversionerror.h b/src/libs/ifc/exception/vexceptionconversionerror.h
index 99af2e6f3..a1808f1c4 100644
--- a/src/libs/ifc/exception/vexceptionconversionerror.h
+++ b/src/libs/ifc/exception/vexceptionconversionerror.h
@@ -29,6 +29,10 @@
 #ifndef VEXCEPTIONCONVERSIONERROR_H
 #define VEXCEPTIONCONVERSIONERROR_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+
+#include "exception/../ifcdef.h"
 #include "vexception.h"
 
 /**
diff --git a/src/libs/ifc/exception/vexceptionemptyparameter.cpp b/src/libs/ifc/exception/vexceptionemptyparameter.cpp
index 04a3232f2..03853f994 100644
--- a/src/libs/ifc/exception/vexceptionemptyparameter.cpp
+++ b/src/libs/ifc/exception/vexceptionemptyparameter.cpp
@@ -27,9 +27,12 @@
  *************************************************************************/
 
 #include "vexceptionemptyparameter.h"
+
 #include <QDomElement>
 #include <QTextStream>
 
+#include "exception/vexception.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VExceptionEmptyParameter exception empty parameter
diff --git a/src/libs/ifc/exception/vexceptionemptyparameter.h b/src/libs/ifc/exception/vexceptionemptyparameter.h
index 8dfade909..773b12637 100644
--- a/src/libs/ifc/exception/vexceptionemptyparameter.h
+++ b/src/libs/ifc/exception/vexceptionemptyparameter.h
@@ -29,6 +29,11 @@
 #ifndef VEXCEPTIONEMPTYPARAMETER_H
 #define VEXCEPTIONEMPTYPARAMETER_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifcdef.h"
 #include "vexception.h"
 
 class QDomElement;
diff --git a/src/libs/ifc/exception/vexceptionobjecterror.cpp b/src/libs/ifc/exception/vexceptionobjecterror.cpp
index 7396f5675..bceb126d2 100644
--- a/src/libs/ifc/exception/vexceptionobjecterror.cpp
+++ b/src/libs/ifc/exception/vexceptionobjecterror.cpp
@@ -27,8 +27,11 @@
  *************************************************************************/
 
 #include "vexceptionobjecterror.h"
-#include <QDebug>
+
 #include <QDomElement>
+#include <QTextStream>
+
+#include "exception/vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/ifc/exception/vexceptionobjecterror.h b/src/libs/ifc/exception/vexceptionobjecterror.h
index d7f9b77aa..10c2e0d2d 100644
--- a/src/libs/ifc/exception/vexceptionobjecterror.h
+++ b/src/libs/ifc/exception/vexceptionobjecterror.h
@@ -29,6 +29,11 @@
 #ifndef VEXCEPTIONOBJECTERROR_H
 #define VEXCEPTIONOBJECTERROR_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
+#include "exception/../ifcdef.h"
 #include "vexception.h"
 
 class QDomElement;
diff --git a/src/libs/ifc/exception/vexceptionundo.cpp b/src/libs/ifc/exception/vexceptionundo.cpp
index 2fd6a622f..487e349e6 100644
--- a/src/libs/ifc/exception/vexceptionundo.cpp
+++ b/src/libs/ifc/exception/vexceptionundo.cpp
@@ -28,6 +28,8 @@
 
 #include "vexceptionundo.h"
 
+#include "exception/vexception.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 VExceptionUndo::VExceptionUndo(const QString &what)
     :VException(what)
diff --git a/src/libs/ifc/exception/vexceptionundo.h b/src/libs/ifc/exception/vexceptionundo.h
index 423e3e310..a67e0f560 100644
--- a/src/libs/ifc/exception/vexceptionundo.h
+++ b/src/libs/ifc/exception/vexceptionundo.h
@@ -29,6 +29,10 @@
 #ifndef VEXCEPTIONUNDO_H
 #define VEXCEPTIONUNDO_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+
+#include "../ifcdef.h"
 #include "vexception.h"
 
 class VExceptionUndo : public VException
diff --git a/src/libs/ifc/exception/vexceptionwrongid.cpp b/src/libs/ifc/exception/vexceptionwrongid.cpp
index 316e35b4e..5373df287 100644
--- a/src/libs/ifc/exception/vexceptionwrongid.cpp
+++ b/src/libs/ifc/exception/vexceptionwrongid.cpp
@@ -27,8 +27,11 @@
  *************************************************************************/
 
 #include "vexceptionwrongid.h"
-#include <QDebug>
+
 #include <QDomElement>
+#include <QTextStream>
+
+#include "exception/vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/ifc/exception/vexceptionwrongid.h b/src/libs/ifc/exception/vexceptionwrongid.h
index a4993845b..ab01e8a66 100644
--- a/src/libs/ifc/exception/vexceptionwrongid.h
+++ b/src/libs/ifc/exception/vexceptionwrongid.h
@@ -29,6 +29,11 @@
 #ifndef VEXCEPTIONWRONGID_H
 #define VEXCEPTIONWRONGID_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
+#include "exception/../ifcdef.h"
 #include "vexception.h"
 
 class QDomElement;
diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp
index 1228e41e4..59ef40b5d 100644
--- a/src/libs/ifc/ifcdef.cpp
+++ b/src/libs/ifc/ifcdef.cpp
@@ -28,6 +28,10 @@
 
 #include "ifcdef.h"
 
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
 const QString CustomMSign    = QStringLiteral("@");
 const QString CustomIncrSign = QStringLiteral("#");
 
diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h
index 39edb97c1..750372b2e 100644
--- a/src/libs/ifc/ifcdef.h
+++ b/src/libs/ifc/ifcdef.h
@@ -29,7 +29,10 @@
 #ifndef IFCDEF_H
 #define IFCDEF_H
 
+#include <QString>
+#include <QStringList>
 #include <QtGlobal>
+
 #include "../vmisc/def.h"
 
 extern const QString CustomMSign;
diff --git a/src/libs/ifc/xml/vabstractconverter.cpp b/src/libs/ifc/xml/vabstractconverter.cpp
index 4f9d255bf..892fafeab 100644
--- a/src/libs/ifc/xml/vabstractconverter.cpp
+++ b/src/libs/ifc/xml/vabstractconverter.cpp
@@ -27,13 +27,25 @@
  *************************************************************************/
 
 #include "vabstractconverter.h"
-#include "../exception/vexception.h"
-#include "../exception/vexceptionwrongid.h"
 
+#include <QDir>
+#include <QDomElement>
+#include <QDomNode>
+#include <QDomNodeList>
 #include <QFile>
 #include <QFileInfo>
-#include <QDir>
+#include <QLatin1String>
+#include <QMap>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QStringList>
+
+#include "../exception/vexception.h"
+#include "../exception/vexceptionwrongid.h"
+#include "xml/vdomdocument.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractConverter::VAbstractConverter(const QString &fileName)
diff --git a/src/libs/ifc/xml/vabstractconverter.h b/src/libs/ifc/xml/vabstractconverter.h
index 6a7a28992..8f6b16423 100644
--- a/src/libs/ifc/xml/vabstractconverter.h
+++ b/src/libs/ifc/xml/vabstractconverter.h
@@ -29,8 +29,16 @@
 #ifndef VABSTRACTCONVERTER_H
 #define VABSTRACTCONVERTER_H
 
+#include <qcompilerdetection.h>
+#include <sys/sysmacros.h>
+#include <QCoreApplication>
+#include <QString>
+#include <QtGlobal>
+
 #include "vdomdocument.h"
 
+template <class Key, class T> class QMap;
+
 #define CONVERTER_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
 class VAbstractConverter :public VDomDocument
diff --git a/src/libs/ifc/xml/vabstractmconverter.cpp b/src/libs/ifc/xml/vabstractmconverter.cpp
index 268e4b2d4..334353459 100644
--- a/src/libs/ifc/xml/vabstractmconverter.cpp
+++ b/src/libs/ifc/xml/vabstractmconverter.cpp
@@ -28,6 +28,13 @@
 
 #include "vabstractmconverter.h"
 
+#include <QDomElement>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
+#include "xml/vabstractconverter.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractMConverter::VAbstractMConverter(const QString &fileName)
     :VAbstractConverter(fileName)
diff --git a/src/libs/ifc/xml/vabstractmconverter.h b/src/libs/ifc/xml/vabstractmconverter.h
index 24335f863..85f3525dc 100644
--- a/src/libs/ifc/xml/vabstractmconverter.h
+++ b/src/libs/ifc/xml/vabstractmconverter.h
@@ -29,6 +29,12 @@
 #ifndef VABSTRACTMCONVERTER_H
 #define VABSTRACTMCONVERTER_H
 
+#include <qcompilerdetection.h>
+#include <QMap>
+#include <QMultiMap>
+#include <QString>
+#include <QtGlobal>
+
 #include "vabstractconverter.h"
 
 class VAbstractMConverter : public VAbstractConverter
diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp
index ac116e2e7..ea87d53bd 100644
--- a/src/libs/ifc/xml/vabstractpattern.cpp
+++ b/src/libs/ifc/xml/vabstractpattern.cpp
@@ -27,12 +27,31 @@
  *************************************************************************/
 
 #include "vabstractpattern.h"
-#include "../exception/vexceptionbadid.h"
+
+#include <QDebug>
+#include <QDomNode>
+#include <QDomNodeList>
+#include <QLatin1String>
+#include <QList>
+#include <QMessageLogger>
+#include <QSet>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QtDebug>
+
 #include "../exception/vexceptionemptyparameter.h"
-#include "vpatternconverter.h"
-#include "../qmuparser/qmutokenparser.h"
 #include "../exception/vexceptionobjecterror.h"
+#include "../qmuparser/qmutokenparser.h"
+#include "../vpatterndb/../ifc/exception/vexceptionbadid.h"
+#include "../vpatterndb/../vgeometry/../ifc/ifcdef.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vtools/tools/vdatatool.h"
+#include "vpatternconverter.h"
+#include "xml/vdomdocument.h"
+#include "xml/vtoolrecord.h"
+
+class QDomElement;
 
 const QString VAbstractPattern::TagPattern          = QStringLiteral("pattern");
 const QString VAbstractPattern::TagCalculation      = QStringLiteral("calculation");
diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h
index 873b6d1b9..467eb6da5 100644
--- a/src/libs/ifc/xml/vabstractpattern.h
+++ b/src/libs/ifc/xml/vabstractpattern.h
@@ -29,11 +29,22 @@
 #ifndef VABSTRACTPATTERN_H
 #define VABSTRACTPATTERN_H
 
+#include <qcompilerdetection.h>
+#include <QHash>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QPair>
+#include <QString>
+#include <QStringList>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vdomdocument.h"
 #include "vtoolrecord.h"
 
-#include <QObject>
-#include <QDate>
+class QDomElement;
 
 enum class Document : char { LiteParse, LitePPParse, FullParse };
 enum class LabelType : char {NewPatternPiece, NewLabel};
@@ -43,8 +54,8 @@ enum class CrossCirclesPoint : char {FirstPoint = 1, SecondPoint = 2};
 enum class VCrossCurvesPoint : char {HighestPoint = 1, LowestPoint = 2};
 enum class HCrossCurvesPoint : char {LeftmostPoint = 1, RightmostPoint = 2};
 
-class VDataTool;
 class VContainer;
+class VDataTool;
 
 class VAbstractPattern : public QObject, public VDomDocument
 {
diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp
index 470ba3ec0..e9fd75bce 100644
--- a/src/libs/ifc/xml/vdomdocument.cpp
+++ b/src/libs/ifc/xml/vdomdocument.cpp
@@ -27,10 +27,17 @@
  *************************************************************************/
 
 #include "vdomdocument.h"
+
+#include <qcompilerdetection.h>
+#include <qdom.h>
+
+#include "../exception/vexceptionbadid.h"
 #include "../exception/vexceptionconversionerror.h"
 #include "../exception/vexceptionemptyparameter.h"
-#include "../exception/vexceptionbadid.h"
 #include "../exception/vexceptionwrongid.h"
+#include "../vmisc/logging.h"
+#include "xml/../exception/../ifcdef.h"
+#include "xml/../exception/vexception.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/backport/qsavefile.h"
@@ -39,11 +46,23 @@
 #endif
 
 #include <QAbstractMessageHandler>
+#include <QByteArray>
+#include <QDebug>
+#include <QDomNodeList>
+#include <QDomText>
+#include <QFile>
+#include <QIODevice>
+#include <QMessageLogger>
+#include <QObject>
+#include <QSourceLocation>
+#include <QStringList>
+#include <QTemporaryFile>
+#include <QTextStream>
+#include <QUrl>
+#include <QVector>
 #include <QXmlSchema>
 #include <QXmlSchemaValidator>
-#include <QFile>
-#include <QFileInfo>
-#include <QTemporaryFile>
+#include <QtDebug>
 
 //This class need for validation pattern file using XSD shema
 class MessageHandler : public QAbstractMessageHandler
diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h
index 73dc83660..85bec67a9 100644
--- a/src/libs/ifc/xml/vdomdocument.h
+++ b/src/libs/ifc/xml/vdomdocument.h
@@ -29,14 +29,28 @@
 #ifndef VDOMDOCUMENT_H
 #define VDOMDOCUMENT_H
 
-#include <QDomDocument>
-#include <QDebug>
 #include <QCoreApplication>
+#include <QDebug>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNode>
+#include <QHash>
+#include <QLatin1String>
+#include <QLoggingCategory>
+#include <QStaticStringData>
+#include <QString>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QtGlobal>
 
 #include "../ifc/ifcdef.h"
 #include "../vmisc/def.h"
-#include "../vmisc/logging.h"
 #include "../vmisc/diagnostic.h"
+#include "../vmisc/logging.h"
+
+class QDomElement;
+class QDomNode;
+template <typename T> class QVector;
 
 Q_DECLARE_LOGGING_CATEGORY(vXML)
 
diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp
index 7000b4bd9..a23a5b909 100644
--- a/src/libs/ifc/xml/vpatternconverter.cpp
+++ b/src/libs/ifc/xml/vpatternconverter.cpp
@@ -27,12 +27,27 @@
  *************************************************************************/
 
 #include "vpatternconverter.h"
+
+#include <QDir>
+#include <QDomNode>
+#include <QDomNodeList>
+#include <QDomText>
+#include <QFile>
+#include <QFileInfo>
+#include <QLatin1String>
+#include <QList>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <algorithm>
+
 #include "../exception/vexception.h"
 #include "../exception/vexceptionemptyparameter.h"
 #include "../qmuparser/qmutokenparser.h"
+#include "../vmisc/def.h"
+#include "xml/vabstractconverter.h"
 
-#include <QDir>
-#include <QFile>
+class QDomElement;
 
 /*
  * Version rules:
diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h
index 509cbf963..243c9a39e 100644
--- a/src/libs/ifc/xml/vpatternconverter.h
+++ b/src/libs/ifc/xml/vpatternconverter.h
@@ -29,8 +29,20 @@
 #ifndef VPATTERNCONVERTER_H
 #define VPATTERNCONVERTER_H
 
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
+#include <QDomElement>
+#include <QMap>
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <QVector>
+#include <QtGlobal>
+
 #include "vabstractconverter.h"
 
+class QDomElement;
+
 class VPatternConverter : public VAbstractConverter
 {
     Q_DECLARE_TR_FUNCTIONS(VPatternConverter)
diff --git a/src/libs/ifc/xml/vtoolrecord.h b/src/libs/ifc/xml/vtoolrecord.h
index f1823fc3f..6ac60be6d 100644
--- a/src/libs/ifc/xml/vtoolrecord.h
+++ b/src/libs/ifc/xml/vtoolrecord.h
@@ -29,9 +29,10 @@
 #ifndef VTOOLRECORD_H
 #define VTOOLRECORD_H
 
-#include "../vmisc/def.h"
-
 #include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 
 /**
  * @brief The VToolRecord class record about tool in history.
diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp
index 7b3236a25..a39578b74 100644
--- a/src/libs/ifc/xml/vvitconverter.cpp
+++ b/src/libs/ifc/xml/vvitconverter.cpp
@@ -27,9 +27,23 @@
  *************************************************************************/
 
 #include "vvitconverter.h"
-#include "../exception/vexception.h"
 
+#include <QDomNode>
+#include <QDomNodeList>
+#include <QDomText>
 #include <QFile>
+#include <QForeachContainer>
+#include <QLatin1String>
+#include <QList>
+#include <QMap>
+#include <QMultiMap>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
+#include "../exception/vexception.h"
+#include "../vmisc/def.h"
+#include "xml/vabstractmconverter.h"
 
 /*
  * Version rules:
diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h
index 9466f8848..974a4fb4f 100644
--- a/src/libs/ifc/xml/vvitconverter.h
+++ b/src/libs/ifc/xml/vvitconverter.h
@@ -29,7 +29,15 @@
 #ifndef VVITCONVERTER_H
 #define VVITCONVERTER_H
 
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
+#include <QString>
+#include <QtGlobal>
+
 #include "vabstractmconverter.h"
+#include "vabstractconverter.h"
+
+class QDomElement;
 
 class VVITConverter : public VAbstractMConverter
 {
diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp
index 5233bd7a0..a904d05fa 100644
--- a/src/libs/ifc/xml/vvstconverter.cpp
+++ b/src/libs/ifc/xml/vvstconverter.cpp
@@ -27,9 +27,23 @@
  *************************************************************************/
 
 #include "vvstconverter.h"
-#include "../exception/vexception.h"
 
+#include <QDomNode>
+#include <QDomNodeList>
+#include <QDomText>
 #include <QFile>
+#include <QForeachContainer>
+#include <QLatin1String>
+#include <QList>
+#include <QMap>
+#include <QMultiMap>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
+#include "../exception/vexception.h"
+#include "../vmisc/def.h"
+#include "xml/vabstractmconverter.h"
 
 /*
  * Version rules:
diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h
index 8fafd553c..72e03a84a 100644
--- a/src/libs/ifc/xml/vvstconverter.h
+++ b/src/libs/ifc/xml/vvstconverter.h
@@ -29,7 +29,15 @@
 #ifndef VMEASUREMENTCONVERTER_H
 #define VMEASUREMENTCONVERTER_H
 
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
+#include <QString>
+#include <QtGlobal>
+
 #include "vabstractmconverter.h"
+#include "vabstractconverter.h"
+
+class QDomElement;
 
 class VVSTConverter : public VAbstractMConverter
 {
diff --git a/src/libs/qmuparser/qmuformulabase.cpp b/src/libs/qmuparser/qmuformulabase.cpp
index 28ec9ef66..24f341e4d 100644
--- a/src/libs/qmuparser/qmuformulabase.cpp
+++ b/src/libs/qmuparser/qmuformulabase.cpp
@@ -21,7 +21,14 @@
 
 #include "qmuformulabase.h"
 
+#include <QChar>
+#include <QList>
 #include <QLocale>
+#include <QMap>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QStringList>
 
 namespace qmu
 {
diff --git a/src/libs/qmuparser/qmuformulabase.h b/src/libs/qmuparser/qmuformulabase.h
index b1785c17e..0ff10d950 100644
--- a/src/libs/qmuparser/qmuformulabase.h
+++ b/src/libs/qmuparser/qmuformulabase.h
@@ -22,8 +22,15 @@
 #ifndef QMUFORMULABASE_H
 #define QMUFORMULABASE_H
 
-#include "qmuparser_global.h"
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
+#include "../qmuparser/qmuparser_global.h"
 #include "qmuparser.h"
+#include "qmuparser_global.h"
+
+template <class Key, class T> class QMap;
 
 namespace qmu
 {
diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp
index bbfee78d9..4d7164c87 100644
--- a/src/libs/qmuparser/qmuparser.cpp
+++ b/src/libs/qmuparser/qmuparser.cpp
@@ -21,9 +21,18 @@
 
 #include "qmuparser.h"
 
-#include <QtGlobal>
 #include <QtCore/qmath.h>
+#include <math.h>
 #include <QCoreApplication>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QtGlobal>
+#include <sstream>
+#include <string>
+
+#include "qmuparserdef.h"
+#include "qmuparsererror.h"
 
 using namespace std;
 
diff --git a/src/libs/qmuparser/qmuparser.h b/src/libs/qmuparser/qmuparser.h
index ad9b699cf..2a25d9be2 100644
--- a/src/libs/qmuparser/qmuparser.h
+++ b/src/libs/qmuparser/qmuparser.h
@@ -22,6 +22,12 @@
 #ifndef QMUPARSER_H
 #define QMUPARSER_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+#include <locale>
+
+#include "../qmuparser/qmuparser_global.h"
 #include "qmuparser_global.h"
 #include "qmuparserbase.h"
 
diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp
index 0c1e28ece..9c3ce6603 100644
--- a/src/libs/qmuparser/qmuparserbase.cpp
+++ b/src/libs/qmuparser/qmuparserbase.cpp
@@ -20,13 +20,22 @@
  ******************************************************************************************************/
 
 #include "qmuparserbase.h"
-#include "qmudef.h"
 
 #include <QDebug>
+#include <QList>
+#include <QMessageLogger>
+#include <QStack>
+#include <QStringList>
+#include <QTextStream>
+#include <QtDebug>
+#include <map>
+
+#include "qmudef.h"
 #ifdef QMUP_USE_OPENMP
     #include <omp.h>
 #endif
 #include <QtCore/qmath.h>
+#include <assert.h>
 
 using namespace std;
 
diff --git a/src/libs/qmuparser/qmuparserbase.h b/src/libs/qmuparser/qmuparserbase.h
index 544301ca1..6c1e86b24 100644
--- a/src/libs/qmuparser/qmuparserbase.h
+++ b/src/libs/qmuparser/qmuparserbase.h
@@ -22,14 +22,30 @@
 #ifndef QMUQPARSERBASE_H
 #define QMUQPARSERBASE_H
 
-#include "qmuparser_global.h"
+#include <limits.h>
+#include <qcompilerdetection.h>
+#include <QChar>
+#include <QMap>
 #include <QStack>
 #include <QString>
 #include <QStringList>
+#include <QVector>
+#include <QtGlobal>
+#include <locale>
+#include <memory>
+#include <string>
 
-#include "qmuparserdef.h"
-#include "qmuparsertokenreader.h"
+#include "../qmuparser/qmuparser_global.h"
+#include "qmuparser_global.h"
 #include "qmuparserbytecode.h"
+#include "qmuparsercallback.h"
+#include "qmuparserdef.h"
+#include "qmuparsererror.h"
+#include "qmuparsertoken.h"
+#include "qmuparsertokenreader.h"
+
+class QStringList;
+template <class T> class QStack;
 
 namespace qmu
 {
diff --git a/src/libs/qmuparser/qmuparserbytecode.cpp b/src/libs/qmuparser/qmuparserbytecode.cpp
index c3774a7b7..53d408a2a 100644
--- a/src/libs/qmuparser/qmuparserbytecode.cpp
+++ b/src/libs/qmuparser/qmuparserbytecode.cpp
@@ -20,13 +20,17 @@
  ******************************************************************************************************/
 
 #include "qmuparserbytecode.h"
-#include "qmuparsertoken.h"
-#include "qmudef.h"
 
+#include <QtCore/qmath.h>
+#include <assert.h>
+#include <QDebug>
+#include <QMessageLogger>
 #include <QStack>
 #include <QString>
-#include <QDebug>
-#include <QtCore/qmath.h>
+#include <QtDebug>
+
+#include "qmudef.h"
+#include "qmuparsererror.h"
 
 namespace qmu
 {
diff --git a/src/libs/qmuparser/qmuparserbytecode.h b/src/libs/qmuparser/qmuparserbytecode.h
index bbbf352ce..8a3d9a8e6 100644
--- a/src/libs/qmuparser/qmuparserbytecode.h
+++ b/src/libs/qmuparser/qmuparserbytecode.h
@@ -22,9 +22,12 @@
 #ifndef QMUPARSERBYTECODE_H
 #define QMUPARSERBYTECODE_H
 
+#include <QVector>
+#include <QtGlobal>
+
+#include "qmudef.h"
 #include "qmuparserdef.h"
 #include "qmuparsertoken.h"
-#include "qmudef.h"
 
 /**
  * @file
diff --git a/src/libs/qmuparser/qmuparsercallback.h b/src/libs/qmuparser/qmuparsercallback.h
index 001a3ce9b..8f55fe7e9 100644
--- a/src/libs/qmuparser/qmuparsercallback.h
+++ b/src/libs/qmuparser/qmuparsercallback.h
@@ -22,6 +22,10 @@
 #ifndef QMUPARSERCALLBACK_H
 #define QMUPARSERCALLBACK_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+#include <map>
+
 #include "qmuparserdef.h"
 
 /**
diff --git a/src/libs/qmuparser/qmuparsererror.cpp b/src/libs/qmuparser/qmuparsererror.cpp
index 391462f41..7e75c402a 100644
--- a/src/libs/qmuparser/qmuparsererror.cpp
+++ b/src/libs/qmuparser/qmuparsererror.cpp
@@ -21,9 +21,6 @@
 
 #include "qmuparsererror.h"
 
-#include <QTextStream>
-#include <QDebug>
-
 #ifdef Q_OS_WIN
 #include <assert.h>
 #endif
diff --git a/src/libs/qmuparser/qmuparsererror.h b/src/libs/qmuparser/qmuparsererror.h
index f0dfb1a38..98e4f22fa 100644
--- a/src/libs/qmuparser/qmuparsererror.h
+++ b/src/libs/qmuparser/qmuparsererror.h
@@ -22,12 +22,17 @@
 #ifndef QMUPARSERERROR_H
 #define QMUPARSERERROR_H
 
-#include "qmuparser_global.h"
-#include <sstream>
-#include <QException>
-#include <QVector>
+#include <qcompilerdetection.h>
 #include <QCoreApplication>
+#include <QException>
+#include <QMap>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+#include <sstream>
 
+#include "../qmuparser/qmuparser_global.h"
+#include "qmuparser_global.h"
 #include "qmuparserdef.h"
 #include "qmutranslation.h"
 
diff --git a/src/libs/qmuparser/qmuparsertest.cpp b/src/libs/qmuparser/qmuparsertest.cpp
index 12a036e42..5426ee9d2 100644
--- a/src/libs/qmuparser/qmuparsertest.cpp
+++ b/src/libs/qmuparser/qmuparsertest.cpp
@@ -20,14 +20,27 @@
  ******************************************************************************************************/
 
 #include "qmuparsertest.h"
-#include "qmudef.h"
 
-#include <QString>
-#include <QDebug>
+#include <math.h>
+#include <stdio.h>
+#include <QChar>
 #include <QCoreApplication>
-#include "qmuparsererror.h"
-#include <QtCore/qmath.h>
+#include <QDebug>
+#include <QMessageLogger>
+#include <QString>
+#include <QtDebug>
+#include <exception>
+#include <limits>
+#include <map>
+#include <memory>
+#include <sstream>
 #include <stdexcept>
+#include <string>
+#include <utility>
+
+#include "qmudef.h"
+#include "qmuparser.h"
+#include "qmuparsererror.h"
 
 using namespace std;
 
diff --git a/src/libs/qmuparser/qmuparsertest.h b/src/libs/qmuparser/qmuparsertest.h
index ae756c2f0..6ed2ae9f0 100644
--- a/src/libs/qmuparser/qmuparsertest.h
+++ b/src/libs/qmuparser/qmuparsertest.h
@@ -22,9 +22,19 @@
 #ifndef QMUPARSERTEST_H
 #define QMUPARSERTEST_H
 
-#include "qmuparser_global.h"
-#include "qmuparser.h"
+#include <stdlib.h>
+#include <QMetaObject>
+#include <QObject>
 #include <QString>
+#include <QVector>
+#include <QtGlobal>
+#include <locale>
+
+#include "../qmuparser/qmuparser_global.h"
+#include "qmuparser.h"
+#include "qmuparser_global.h"
+#include "qmuparserdef.h"
+#include "qmuparsererror.h"
 
 /**
  * @file
diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp
index 33b67586a..06ff024b0 100644
--- a/src/libs/qmuparser/qmuparsertokenreader.cpp
+++ b/src/libs/qmuparser/qmuparsertokenreader.cpp
@@ -20,9 +20,23 @@
  ******************************************************************************************************/
 
 #include "qmuparsertokenreader.h"
-#include "qmuparserbase.h"
-#include <QStringList>
+
+#include <assert.h>
+#include <QCharRef>
 #include <QDebug>
+#include <QList>
+#include <QMessageLogger>
+#include <QStringList>
+#include <QtDebug>
+#include <fstream>
+#include <iterator>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "qmudef.h"
+#include "qmuparserbase.h"
 
 /**
  * @file
@@ -32,9 +46,6 @@
 namespace qmu
 {
 
-// Forward declaration
-class QmuParserBase;
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief Copy constructor.
diff --git a/src/libs/qmuparser/qmuparsertokenreader.h b/src/libs/qmuparser/qmuparsertokenreader.h
index 7c57d1b54..fc04776e3 100644
--- a/src/libs/qmuparser/qmuparsertokenreader.h
+++ b/src/libs/qmuparser/qmuparsertokenreader.h
@@ -22,7 +22,16 @@
 #ifndef QMUPARSERTOKENREADER_H
 #define QMUPARSERTOKENREADER_H
 
+#include <qcompilerdetection.h>
+#include <QChar>
+#include <QString>
+#include <QtGlobal>
+#include <list>
+#include <locale>
+
+#include "qmuparsercallback.h"
 #include "qmuparserdef.h"
+#include "qmuparsererror.h"
 #include "qmuparsertoken.h"
 
 /**
diff --git a/src/libs/qmuparser/qmutokenparser.cpp b/src/libs/qmuparser/qmutokenparser.cpp
index 85fa0fb79..85f03c520 100644
--- a/src/libs/qmuparser/qmutokenparser.cpp
+++ b/src/libs/qmuparser/qmutokenparser.cpp
@@ -21,6 +21,13 @@
 
 #include "qmutokenparser.h"
 
+#include <QMap>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
+#include "qmuparsererror.h"
+
 namespace qmu
 {
 
diff --git a/src/libs/qmuparser/qmutokenparser.h b/src/libs/qmuparser/qmutokenparser.h
index eddda2eca..326e03502 100644
--- a/src/libs/qmuparser/qmutokenparser.h
+++ b/src/libs/qmuparser/qmutokenparser.h
@@ -22,8 +22,13 @@
 #ifndef QMUTOKENPARSER_H
 #define QMUTOKENPARSER_H
 
-#include "qmuparser_global.h"
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
+#include "../qmuparser/qmuparser_global.h"
 #include "qmuformulabase.h"
+#include "qmuparser_global.h"
 
 namespace qmu
 {
diff --git a/src/libs/qmuparser/qmutranslation.cpp b/src/libs/qmuparser/qmutranslation.cpp
index b558f1345..7efa1fc83 100644
--- a/src/libs/qmuparser/qmutranslation.cpp
+++ b/src/libs/qmuparser/qmutranslation.cpp
@@ -20,6 +20,8 @@
  ******************************************************************************************************/
 
 #include "qmutranslation.h"
+
+#include <QByteArray>
 #include <QCoreApplication>
 
 namespace qmu
diff --git a/src/libs/vdxf/dxflib/dl_dxf.cpp b/src/libs/vdxf/dxflib/dl_dxf.cpp
index 82f038cb9..f6262c907 100644
--- a/src/libs/vdxf/dxflib/dl_dxf.cpp
+++ b/src/libs/vdxf/dxflib/dl_dxf.cpp
@@ -24,21 +24,27 @@
 
 #include "dl_dxf.h"
 
+#include <ctype.h>
+#include <ext/alloc_traits.h>
+#include <qcompilerdetection.h>
+#include <string.h>
+#include <QString>
+#include <QStringList>
 #include <algorithm>
-#include <string>
-#include <cstdio>
 #include <cassert>
 #include <cmath>
-#include <QStringList>
-
-#include "dl_attributes.h"
-#include "dl_codes.h"
-#include "dl_creationadapter.h"
-#include "dl_writer_ascii.h"
-
-#include "iostream"
+#include <memory>
+#include <string>
+#include <utility>
 
 #include "../vmisc/diagnostic.h"
+#include "dl_attributes.h"
+#include "dl_codes.h"
+#include "dl_writer_ascii.h"
+#include "dxflib/../dxfdef.h"
+#include "dxflib/dl_creationinterface.h"
+#include "dxflib/dl_entities.h"
+#include "iostream"
 
 /**
  * Default constructor.
diff --git a/src/libs/vdxf/dxflib/dl_dxf.h b/src/libs/vdxf/dxflib/dl_dxf.h
index 66d941c6d..2197513e2 100644
--- a/src/libs/vdxf/dxflib/dl_dxf.h
+++ b/src/libs/vdxf/dxflib/dl_dxf.h
@@ -25,18 +25,20 @@
 #ifndef DL_DXF_H
 #define DL_DXF_H
 
-#include "dl_global.h"
-
-#include <limits>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string>
-#include <sstream>
+#include <QtGlobal>
+#include <algorithm>
+#include <limits>
 #include <map>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #include "dl_attributes.h"
 #include "dl_codes.h"
 #include "dl_entities.h"
+#include "dl_global.h"
 #include "dl_writer_ascii.h"
 
 #ifndef DL_NANDOUBLE
diff --git a/src/libs/vdxf/dxflib/dl_writer.cpp b/src/libs/vdxf/dxflib/dl_writer.cpp
index bf7199d1b..5ff70bf8b 100644
--- a/src/libs/vdxf/dxflib/dl_writer.cpp
+++ b/src/libs/vdxf/dxflib/dl_writer.cpp
@@ -24,6 +24,12 @@
 
 #include "dl_writer.h"
 
+#include <ctype.h>
+#include <algorithm>
+
+#include "dxflib/dl_attributes.h"
+#include "dxflib/dl_codes.h"
+
 /**
  * @param version DXF version. Defaults to DL_VERSION_2002.
  */
diff --git a/src/libs/vdxf/dxflib/dl_writer.h b/src/libs/vdxf/dxflib/dl_writer.h
index 536f0ae0e..b6243cb9c 100644
--- a/src/libs/vdxf/dxflib/dl_writer.h
+++ b/src/libs/vdxf/dxflib/dl_writer.h
@@ -39,12 +39,15 @@
     #endif // _MSC_VER > 1000
 #endif // Q_CC_MSVC
 
-#include <iostream>
 #include <algorithm>
+#include <iostream>
+#include <string>
 
 #include "dl_attributes.h"
 #include "dl_codes.h"
 
+class DL_Attributes;
+
 
 
 /**
diff --git a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp
index 5891c1b36..06a3d465e 100644
--- a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp
+++ b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <QtGlobal>
 
+#include "../vmisc/diagnostic.h"
 #include "dl_writer_ascii.h"
 
 /**
diff --git a/src/libs/vdxf/dxflib/dl_writer_ascii.h b/src/libs/vdxf/dxflib/dl_writer_ascii.h
index 3d3b399ca..3b3555661 100644
--- a/src/libs/vdxf/dxflib/dl_writer_ascii.h
+++ b/src/libs/vdxf/dxflib/dl_writer_ascii.h
@@ -27,6 +27,7 @@
 #define DL_WRITER_ASCII_H
 
 #include "dl_global.h"
+#include "dxflib/dl_codes.h"
 
 #if defined(Q_CC_MSVC)
     #if (_MSC_VER > 1000)
@@ -34,10 +35,11 @@
     #endif // _MSC_VER > 1000
 #endif // Q_CC_MSVC
 
-#include "dl_writer.h"
 #include <fstream>
 #include <string>
 
+#include "dl_writer.h"
+
 /**
  * Implements functions defined in DL_Writer for writing low
  *   level DXF constructs to an ASCII format DXF file.
diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp
index 1c9f7d201..ea570f5ea 100644
--- a/src/libs/vdxf/vdxfengine.cpp
+++ b/src/libs/vdxf/vdxfengine.cpp
@@ -27,13 +27,47 @@
  *************************************************************************/
 
 #include "vdxfengine.h"
-#include <QDebug>
+
+#include <math.h>
+#include <QByteArray>
+#include <QColor>
 #include <QDateTime>
+#include <QDebug>
+#include <QFlag>
+#include <QFlags>
+#include <QFont>
+#include <QLineF>
+#include <QList>
+#include <QMessageLogger>
+#include <QPaintEngineState>
+#include <QPainterPath>
+#include <QPen>
+#include <QPolygonF>
+#include <QTextItem>
+#include <Qt>
+#include <QtDebug>
+
+#include "../vmisc/def.h"
+#include "../vmisc/diagnostic.h"
+#include "dxflib/dl_attributes.h"
+#include "dxflib/dl_codes.h"
+#include "dxflib/dl_dxf.h"
+#include "dxflib/dl_entities.h"
+#include "dxflib/dl_writer_ascii.h"
+
+class QLine;
+class QLineF;
+class QPaintDevice;
+class QPixmap;
+class QPoint;
+class QPointF;
+class QPolygonF;
+class QRect;
+class QRectF;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vdxf/vdxfengine.h b/src/libs/vdxf/vdxfengine.h
index 2b51485a3..68e6ee3f6 100644
--- a/src/libs/vdxf/vdxfengine.h
+++ b/src/libs/vdxf/vdxfengine.h
@@ -29,11 +29,31 @@
 #ifndef VDXFENGINE_H
 #define VDXFENGINE_H
 
+#include <qcompilerdetection.h>
+#include <QMatrix>
 #include <QPaintEngine>
-#include "dxflib/dl_dxf.h"
+#include <QPointF>
+#include <QRectF>
+#include <QSize>
+#include <QString>
+#include <QtGlobal>
+#include <string>
+
 #include "../vmisc/def.h"
 #include "dxfdef.h"
+#include "dxflib/dl_dxf.h"
 
+class DL_Dxf;
+class DL_WriterA;
+class QLine;
+class QLineF;
+class QPaintDevice;
+class QPainterPath;
+class QPixmap;
+class QPoint;
+class QPointF;
+class QRect;
+class QRectF;
 class QTextStream;
 
 class VDxfEngine : public QPaintEngine
diff --git a/src/libs/vdxf/vdxfpaintdevice.cpp b/src/libs/vdxf/vdxfpaintdevice.cpp
index 476072001..f62e71153 100644
--- a/src/libs/vdxf/vdxfpaintdevice.cpp
+++ b/src/libs/vdxf/vdxfpaintdevice.cpp
@@ -27,9 +27,13 @@
  *************************************************************************/
 
 #include "vdxfpaintdevice.h"
+
+#include <QMessageLogger>
+#include <QtDebug>
+
 #include "vdxfengine.h"
 
-#include <QFile>
+class QPaintEngine;
 
  //---------------------------------------------------------------------------------------------------------------------
 VDxfPaintDevice::VDxfPaintDevice()
diff --git a/src/libs/vdxf/vdxfpaintdevice.h b/src/libs/vdxf/vdxfpaintdevice.h
index dd9d13b18..04bce5647 100644
--- a/src/libs/vdxf/vdxfpaintdevice.h
+++ b/src/libs/vdxf/vdxfpaintdevice.h
@@ -29,10 +29,16 @@
 #ifndef VDXFPAINTDEVICE_H
 #define VDXFPAINTDEVICE_H
 
+#include <qcompilerdetection.h>
 #include <QPaintDevice>
+#include <QSize>
 #include <QString>
-#include "dxfdef.h"
+#include <QtGlobal>
 
+#include "dxfdef.h"
+#include "dxflib/../dxfdef.h"
+
+class QPaintEngine;
 class VDxfEngine;
 
 class VDxfPaintDevice : public QPaintDevice
diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp
index 346931428..53522f867 100644
--- a/src/libs/vformat/vmeasurements.cpp
+++ b/src/libs/vformat/vmeasurements.cpp
@@ -27,14 +27,34 @@
  *************************************************************************/
 
 #include "vmeasurements.h"
-#include "../ifc/xml/vvstconverter.h"
-#include "../ifc/xml/vvitconverter.h"
-#include "../ifc/exception/vexceptionemptyparameter.h"
-#include "../vpatterndb/calculator.h"
-#include "../qmuparser/qmutokenparser.h"
 
+#include <qnumeric.h>
 #include <QDate>
-#include <QtNumeric>
+#include <QDebug>
+#include <QDomNode>
+#include <QDomNodeList>
+#include <QDomText>
+#include <QForeachContainer>
+#include <QLatin1Char>
+#include <QMessageLogger>
+#include <QScopedPointer>
+#include <QSet>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QtDebug>
+
+#include "../ifc/exception/vexceptionemptyparameter.h"
+#include "../ifc/xml/vvitconverter.h"
+#include "../ifc/xml/vvstconverter.h"
+#include "../qmuparser/qmutokenparser.h"
+#include "../vpatterndb/../qmuparser/qmuparsererror.h"
+#include "../vpatterndb/../vgeometry/../ifc/ifcdef.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/variables/vmeasurement.h"
+#include "../vpatterndb/vcontainer.h"
+
+class QDate;
 
 const QString VMeasurements::TagVST              = QStringLiteral("vst");
 const QString VMeasurements::TagVIT              = QStringLiteral("vit");
diff --git a/src/libs/vformat/vmeasurements.h b/src/libs/vformat/vmeasurements.h
index ae1d10c90..4c90b5db0 100644
--- a/src/libs/vformat/vmeasurements.h
+++ b/src/libs/vformat/vmeasurements.h
@@ -29,9 +29,21 @@
 #ifndef VMEASUREMENTS_H
 #define VMEASUREMENTS_H
 
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
+#include <QDomElement>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
 #include "../ifc/xml/vdomdocument.h"
+#include "../vpatterndb/../vmisc/def.h"
 #include "../vpatterndb/vcontainer.h"
 
+class QDate;
+class QDomElement;
+class VContainer;
+
 enum class GenderType : char { Male, Female, Unknown };
 
 class VMeasurements : public VDomDocument
diff --git a/src/libs/vgeometry/vabstractarc.cpp b/src/libs/vgeometry/vabstractarc.cpp
index 3de722e4f..048a88d05 100644
--- a/src/libs/vgeometry/vabstractarc.cpp
+++ b/src/libs/vgeometry/vabstractarc.cpp
@@ -27,7 +27,12 @@
  *************************************************************************/
 
 #include "vabstractarc.h"
+
+#include <QLineF>
+
+#include "../ifc/../vmisc/def.h"
 #include "vabstractarc_p.h"
+#include "vpointf.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractArc::VAbstractArc(const GOType &type, const quint32 &idObject, const Draw &mode)
diff --git a/src/libs/vgeometry/vabstractarc.h b/src/libs/vgeometry/vabstractarc.h
index b57665540..aaf229f69 100644
--- a/src/libs/vgeometry/vabstractarc.h
+++ b/src/libs/vgeometry/vabstractarc.h
@@ -29,7 +29,14 @@
 #ifndef VABSTRACTARC_H
 #define VABSTRACTARC_H
 
+#include <qcompilerdetection.h>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/ifcdef.h"
 #include "vabstractcurve.h"
+#include "vgeometrydef.h"
 
 class VAbstractArcData;
 class VPointF;
diff --git a/src/libs/vgeometry/vabstractcubicbezier.cpp b/src/libs/vgeometry/vabstractcubicbezier.cpp
index 34a8d66e5..64dd9b2a5 100644
--- a/src/libs/vgeometry/vabstractcubicbezier.cpp
+++ b/src/libs/vgeometry/vabstractcubicbezier.cpp
@@ -27,11 +27,16 @@
  *************************************************************************/
 
 #include "vabstractcubicbezier.h"
-#include "../vgeometry/vpointf.h"
 
-#include <QPainterPath>
+#include <math.h>
 #include <QDebug>
-#include <QtCore/qmath.h>
+#include <QLineF>
+#include <QMessageLogger>
+#include <QPoint>
+#include <QtDebug>
+
+#include "../ifc/../vmisc/def.h"
+#include "../vgeometry/vpointf.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractCubicBezier::VAbstractCubicBezier(const GOType &type, const quint32 &idObject, const Draw &mode)
diff --git a/src/libs/vgeometry/vabstractcubicbezier.h b/src/libs/vgeometry/vabstractcubicbezier.h
index abf75dc1e..3cf0d2769 100644
--- a/src/libs/vgeometry/vabstractcubicbezier.h
+++ b/src/libs/vgeometry/vabstractcubicbezier.h
@@ -29,8 +29,17 @@
 #ifndef VABSTRACTCUBICBEZIER_H
 #define VABSTRACTCUBICBEZIER_H
 
-#include "vabstractcurve.h"
+#include <qcompilerdetection.h>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
 
+#include "../ifc/ifcdef.h"
+#include "vabstractcurve.h"
+#include "vgeometrydef.h"
+
+class QPointF;
 class VPointF;
 
 class VAbstractCubicBezier : public VAbstractCurve
diff --git a/src/libs/vgeometry/vabstractcubicbezierpath.cpp b/src/libs/vgeometry/vabstractcubicbezierpath.cpp
index 96d26b543..991d15499 100644
--- a/src/libs/vgeometry/vabstractcubicbezierpath.cpp
+++ b/src/libs/vgeometry/vabstractcubicbezierpath.cpp
@@ -27,11 +27,17 @@
  *************************************************************************/
 
 #include "vabstractcubicbezierpath.h"
-#include "../ifc/exception/vexception.h"
-#include "vspline.h"
 
 #include <QPainterPath>
 
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/exception/../ifcdef.h"
+#include "../ifc/exception/vexception.h"
+#include "vpointf.h"
+#include "vspline.h"
+
+class QPointF;
+
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractCubicBezierPath::VAbstractCubicBezierPath(const GOType &type, const quint32 &idObject, const Draw &mode)
     : VAbstractCurve(type, idObject, mode)
diff --git a/src/libs/vgeometry/vabstractcubicbezierpath.h b/src/libs/vgeometry/vabstractcubicbezierpath.h
index bc2f6554f..79ff14f92 100644
--- a/src/libs/vgeometry/vabstractcubicbezierpath.h
+++ b/src/libs/vgeometry/vabstractcubicbezierpath.h
@@ -29,10 +29,18 @@
 #ifndef VABSTRACTCUBICBEZIERPATH_H
 #define VABSTRACTCUBICBEZIERPATH_H
 
-#include "vabstractcurve.h"
-
+#include <qcompilerdetection.h>
 #include <QCoreApplication>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
 
+#include "vabstractcurve.h"
+#include "vgeometrydef.h"
+
+class QPainterPath;
+class QPointF;
 class VPointF;
 class VSpline;
 class VSplinePoint;
diff --git a/src/libs/vgeometry/vabstractcurve.cpp b/src/libs/vgeometry/vabstractcurve.cpp
index cca2f7a61..6e05af017 100644
--- a/src/libs/vgeometry/vabstractcurve.cpp
+++ b/src/libs/vgeometry/vabstractcurve.cpp
@@ -27,10 +27,16 @@
  *************************************************************************/
 
 #include "vabstractcurve.h"
-#include "vabstractcurve_p.h"
 
-#include <QPainterPath>
 #include <QDebug>
+#include <QLine>
+#include <QLineF>
+#include <QMessageLogger>
+#include <QPainterPath>
+#include <QPoint>
+#include <QtDebug>
+
+#include "vabstractcurve_p.h"
 
 VAbstractCurve::VAbstractCurve(const GOType &type, const quint32 &idObject, const Draw &mode)
     :VGObject(type, idObject, mode), d (new VAbstractCurveData())
diff --git a/src/libs/vgeometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h
index 19ad0331b..f8546885b 100644
--- a/src/libs/vgeometry/vabstractcurve.h
+++ b/src/libs/vgeometry/vabstractcurve.h
@@ -29,9 +29,19 @@
 #ifndef VABSTRACTCURVE_H
 #define VABSTRACTCURVE_H
 
-#include "vgobject.h"
-#include "../ifc/ifcdef.h"
+#include <qcompilerdetection.h>
 #include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../ifc/ifcdef.h"
+#include "vgeometrydef.h"
+#include "vgobject.h"
+
+class QPointF;
 
 #ifndef M_2PI
 #define M_2PI 6.28318530717958647692528676655900576
@@ -39,8 +49,8 @@
 
 enum class PathDirection : char { Hide, Show };
 
-class QPainterPath;
 class QLineF;
+class QPainterPath;
 class VAbstractCurveData;
 
 class VAbstractCurve :public VGObject
diff --git a/src/libs/vgeometry/varc.cpp b/src/libs/vgeometry/varc.cpp
index 3c710f4b5..62752bbca 100644
--- a/src/libs/vgeometry/varc.cpp
+++ b/src/libs/vgeometry/varc.cpp
@@ -27,15 +27,18 @@
  *************************************************************************/
 
 #include "varc.h"
-#include "varc_p.h"
+
+#include <QtCore/qmath.h>
+#include <QLineF>
+#include <QPointF>
+
+#include "../ifc/../vmisc/def.h"
 #include "../ifc/ifcdef.h"
+#include "vabstractcurve.h"
+#include "varc_p.h"
 #include "vspline.h"
 
-#include <QDebug>
-#include <QLineF>
-#include <QPainterPath>
-#include <QPointF>
-#include <QtCore/qmath.h>
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vgeometry/varc.h b/src/libs/vgeometry/varc.h
index 6b485c7ba..67caef6e4 100644
--- a/src/libs/vgeometry/varc.h
+++ b/src/libs/vgeometry/varc.h
@@ -29,11 +29,21 @@
 #ifndef VARC_H
 #define VARC_H
 
-#include "vabstractarc.h"
-#include "vpointf.h"
+#include <qcompilerdetection.h>
 #include <QCoreApplication>
+#include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
+
+#include "vabstractarc.h"
+#include "vgeometrydef.h"
+#include "vpointf.h"
 
 class QPainterPath;
+class QPointF;
 class VArcData;
 
 /**
diff --git a/src/libs/vgeometry/vcubicbezier.cpp b/src/libs/vgeometry/vcubicbezier.cpp
index 12489c5aa..cfa3b071d 100644
--- a/src/libs/vgeometry/vcubicbezier.cpp
+++ b/src/libs/vgeometry/vcubicbezier.cpp
@@ -27,8 +27,13 @@
  *************************************************************************/
 
 #include "vcubicbezier.h"
+
+#include <QLineF>
+
 #include "vcubicbezier_p.h"
 
+class QPointF;
+
 //---------------------------------------------------------------------------------------------------------------------
 VCubicBezier::VCubicBezier()
     : VAbstractCubicBezier(GOType::CubicBezier), d(new VCubicBezierData)
diff --git a/src/libs/vgeometry/vcubicbezier.h b/src/libs/vgeometry/vcubicbezier.h
index 40a3ccfd4..8b6c1f338 100644
--- a/src/libs/vgeometry/vcubicbezier.h
+++ b/src/libs/vgeometry/vcubicbezier.h
@@ -29,9 +29,19 @@
 #ifndef VCUBICBEZIER_H
 #define VCUBICBEZIER_H
 
+#include <qcompilerdetection.h>
+#include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
+
 #include "vabstractcubicbezier.h"
+#include "vgeometrydef.h"
 #include "vpointf.h"
 
+class QPointF;
 class VCubicBezierData;
 
 class VCubicBezier : public VAbstractCubicBezier
diff --git a/src/libs/vgeometry/vcubicbezierpath.cpp b/src/libs/vgeometry/vcubicbezierpath.cpp
index 2f427616e..3ec8acbd2 100644
--- a/src/libs/vgeometry/vcubicbezierpath.cpp
+++ b/src/libs/vgeometry/vcubicbezierpath.cpp
@@ -27,16 +27,20 @@
  *************************************************************************/
 
 #include "vcubicbezierpath.h"
+
+#include <qmath.h>
+#include <QLineF>
+#include <QPoint>
+
+#include "../ifc/exception/vexception.h"
+#include "vabstractcurve.h"
 #include "vcubicbezierpath_p.h"
 #include "vspline.h"
-#include "../ifc/exception/vexception.h"
 #include "vsplinepoint.h"
-#include "../vmisc/vabstractapplication.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vgeometry/vcubicbezierpath.h b/src/libs/vgeometry/vcubicbezierpath.h
index d17008049..b232a7567 100644
--- a/src/libs/vgeometry/vcubicbezierpath.h
+++ b/src/libs/vgeometry/vcubicbezierpath.h
@@ -29,13 +29,23 @@
 #ifndef VCUBICBEZIERPATH_H
 #define VCUBICBEZIERPATH_H
 
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
+#include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
+
 #include "vabstractcubicbezierpath.h"
+#include "vgeometrydef.h"
 #include "vpointf.h"
 
-#include <QCoreApplication>
-
+class QPointF;
 class VCubicBezierPathData;
 class VSpline;
+class VSplinePoint;
 
 class VCubicBezierPath : public VAbstractCubicBezierPath
 {
diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp
index 49ef67d6a..2b0eefd7d 100644
--- a/src/libs/vgeometry/vellipticalarc.cpp
+++ b/src/libs/vgeometry/vellipticalarc.cpp
@@ -27,12 +27,18 @@
  *************************************************************************/
 
 #include "vellipticalarc.h"
+
+#include <QtCore/qmath.h>
+#include <math.h>
+#include <QLineF>
+#include <QPoint>
+
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/ifcdef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "vabstractcurve.h"
 #include "vellipticalarc_p.h"
 #include "vspline.h"
-#include "../ifc/ifcdef.h"
-#include <QtCore/qmath.h>
-#include <QLineF>
-#include <QPainterPath>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vgeometry/vellipticalarc.h b/src/libs/vgeometry/vellipticalarc.h
index b9f0ff545..79393a70f 100644
--- a/src/libs/vgeometry/vellipticalarc.h
+++ b/src/libs/vgeometry/vellipticalarc.h
@@ -29,10 +29,20 @@
 #ifndef VELLIPTICALARC_H
 #define VELLIPTICALARC_H
 
-#include "vabstractarc.h"
-#include "vpointf.h"
+#include <qcompilerdetection.h>
 #include <QCoreApplication>
+#include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
 
+#include "vabstractarc.h"
+#include "vgeometrydef.h"
+#include "vpointf.h"
+
+class QPointF;
 class VEllipticalArcData;
 
 class VEllipticalArc : public VAbstractArc
diff --git a/src/libs/vgeometry/vgobject.cpp b/src/libs/vgeometry/vgobject.cpp
index 9355610d2..b690c23e0 100644
--- a/src/libs/vgeometry/vgobject.cpp
+++ b/src/libs/vgeometry/vgobject.cpp
@@ -27,13 +27,18 @@
  *************************************************************************/
 
 #include "vgobject.h"
-#include "vgobject_p.h"
 
+#include <QtCore/qmath.h>
+#include <math.h>
+#include <QLine>
 #include <QLineF>
+#include <QPoint>
 #include <QPointF>
 #include <QRectF>
-#include <QtCore/qmath.h>
-#include <climits>
+
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/ifcdef.h"
+#include "vgobject_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vgeometry/vgobject.h b/src/libs/vgeometry/vgobject.h
index 99ea48418..ba8f8625a 100644
--- a/src/libs/vgeometry/vgobject.h
+++ b/src/libs/vgeometry/vgobject.h
@@ -29,17 +29,19 @@
 #ifndef VGOBJECT_H
 #define VGOBJECT_H
 
-#include "vgeometrydef.h"
-#include <QString>
-#include <QtGlobal>
 #include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
 #include <QVector>
+#include <QtGlobal>
+
+#include "vgeometrydef.h"
 
-class VGObjectData;
 class QLineF;
 class QPoint;
 class QPointF;
 class QRectF;
+class VGObjectData;
 
 /**
  * @brief The VGObject class keep information graphical objects.
diff --git a/src/libs/vgeometry/vpointf.h b/src/libs/vgeometry/vpointf.h
index e947b482b..450b3fe1b 100644
--- a/src/libs/vgeometry/vpointf.h
+++ b/src/libs/vgeometry/vpointf.h
@@ -29,11 +29,17 @@
 #ifndef VPOINTF_H
 #define VPOINTF_H
 
-#include "vgobject.h"
-
+#include <qcompilerdetection.h>
 #include <QMetaType>
+#include <QMetaTypeId>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QtGlobal>
 
 #include "../vmisc/diagnostic.h"
+#include "vgeometrydef.h"
+#include "vgobject.h"
 
 class QPointF;
 class QString;
diff --git a/src/libs/vgeometry/vspline.cpp b/src/libs/vgeometry/vspline.cpp
index ca30af63d..4ad845f8f 100644
--- a/src/libs/vgeometry/vspline.cpp
+++ b/src/libs/vgeometry/vspline.cpp
@@ -27,10 +27,14 @@
  *************************************************************************/
 
 #include "vspline.h"
+
+#include <math.h>
+#include <QLineF>
+
+#include "vabstractcurve.h"
 #include "vspline_p.h"
-#include <QDebug>
-#include <QPainterPath>
-#include <QtCore/qmath.h>
+
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vgeometry/vspline.h b/src/libs/vgeometry/vspline.h
index 3666f0c66..f45d77b8b 100644
--- a/src/libs/vgeometry/vspline.h
+++ b/src/libs/vgeometry/vspline.h
@@ -29,12 +29,23 @@
 #ifndef VSPLINE_H
 #define VSPLINE_H
 
-#include "vabstractcubicbezier.h"
-#include "vpointf.h"
+#include <qcompilerdetection.h>
 #include <QLineF>
+#include <QMetaType>
+#include <QMetaTypeId>
 #include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
+
+#include "vabstractcubicbezier.h"
+#include "vgeometrydef.h"
+#include "vpointf.h"
 
 class QPainterPath;
+class QPointF;
 class VSplineData;
 
 /**
diff --git a/src/libs/vgeometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp
index f210ccbe4..99bdffc71 100644
--- a/src/libs/vgeometry/vsplinepath.cpp
+++ b/src/libs/vgeometry/vsplinepath.cpp
@@ -27,13 +27,16 @@
  *************************************************************************/
 
 #include "vsplinepath.h"
-#include "vsplinepath_p.h"
+
+#include <QPoint>
+
 #include "../ifc/exception/vexception.h"
+#include "vabstractcurve.h"
+#include "vsplinepath_p.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vgeometry/vsplinepath.h b/src/libs/vgeometry/vsplinepath.h
index 2b0b7608b..e0dea14d9 100644
--- a/src/libs/vgeometry/vsplinepath.h
+++ b/src/libs/vgeometry/vsplinepath.h
@@ -29,13 +29,23 @@
 #ifndef VSPLINEPATH_H
 #define VSPLINEPATH_H
 
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
+
 #include "vabstractcubicbezierpath.h"
+#include "vgeometrydef.h"
+#include "vpointf.h"
 #include "vspline.h"
 #include "vsplinepoint.h"
-#include <QCoreApplication>
-#include <QVector>
-#include <QPainterPath>
 
+class QPointF;
 class VSplinePathData;
 
 /**
diff --git a/src/libs/vgeometry/vsplinepoint.cpp b/src/libs/vgeometry/vsplinepoint.cpp
index 1c90ae014..21b09c5ae 100644
--- a/src/libs/vgeometry/vsplinepoint.cpp
+++ b/src/libs/vgeometry/vsplinepoint.cpp
@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vsplinepoint.h"
-#include "vsplinepoint_p.h"
-#include "../qmuparser/qmutokenparser.h"
 
-#include <QDebug>
 #include <QLineF>
 
+#include "../qmuparser/qmutokenparser.h"
+#include "vsplinepoint_p.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VFSplinePoint default constructor.
diff --git a/src/libs/vgeometry/vsplinepoint.h b/src/libs/vgeometry/vsplinepoint.h
index 0aef7ff7a..3f7d924e9 100644
--- a/src/libs/vgeometry/vsplinepoint.h
+++ b/src/libs/vgeometry/vsplinepoint.h
@@ -29,8 +29,14 @@
 #ifndef VSPLINEPOINT_H
 #define VSPLINEPOINT_H
 
-#include "vpointf.h"
 #include <QMetaType>
+#include <QMetaTypeId>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QtGlobal>
+
+#include "vpointf.h"
 
 class VFSplinePointData;
 
diff --git a/src/libs/vlayout/vabstractdetail.cpp b/src/libs/vlayout/vabstractdetail.cpp
index 0734f2f10..9f8f55f77 100644
--- a/src/libs/vlayout/vabstractdetail.cpp
+++ b/src/libs/vlayout/vabstractdetail.cpp
@@ -27,14 +27,19 @@
  *************************************************************************/
 
 #include "vabstractdetail.h"
-#include "vabstractdetail_p.h"
+
+#include <QDebug>
+#include <QLine>
+#include <QLineF>
+#include <QMessageLogger>
+#include <QPoint>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtDebug>
 
 #include "../vgeometry/vgobject.h"
-
-#include <QVector>
-#include <QPointF>
-#include <QLineF>
-#include <QDebug>
+#include "vabstractdetail_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vlayout/vabstractdetail.h b/src/libs/vlayout/vabstractdetail.h
index 9ec07e7fb..8ac902518 100644
--- a/src/libs/vlayout/vabstractdetail.h
+++ b/src/libs/vlayout/vabstractdetail.h
@@ -30,13 +30,16 @@
 #define VABSTRACTDETAIL_H
 
 #include <QSharedDataPointer>
+#include <QTypeInfo>
+#include <QtGlobal>
 
 #include "vlayoutdef.h"
 
+class QLineF;
+class QPointF;
 class QString;
 class VAbstractDetailData;
-class QPointF;
-class QLineF;
+template <typename T> class QVector;
 
 /**
  * @brief The VAbstractDetail class abstract class for all details.
diff --git a/src/libs/vlayout/vbank.cpp b/src/libs/vlayout/vbank.cpp
index 8bb37c5d4..0e29b5a4c 100644
--- a/src/libs/vlayout/vbank.cpp
+++ b/src/libs/vlayout/vbank.cpp
@@ -27,12 +27,13 @@
  *************************************************************************/
 
 #include "vbank.h"
-#include "vlayoutdetail.h"
-#include "../vmisc/logging.h"
 
-#include <QPointF>
+#include <QLoggingCategory>
 #include <climits>
-#include <QRectF>
+
+#include "../vmisc/diagnostic.h"
+#include "../vmisc/logging.h"
+#include "vlayoutdetail.h"
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
diff --git a/src/libs/vlayout/vbank.h b/src/libs/vlayout/vbank.h
index 232d93790..51cd7e312 100644
--- a/src/libs/vlayout/vbank.h
+++ b/src/libs/vlayout/vbank.h
@@ -29,9 +29,10 @@
 #ifndef VBANK_H
 #define VBANK_H
 
-#include <QVector>
 #include <QHash>
 #include <QRectF>
+#include <QVector>
+#include <QtGlobal>
 
 // An annoying char define, from the Windows team in <rpcndr.h>
 // #define small char
diff --git a/src/libs/vlayout/vbestsquare.cpp b/src/libs/vlayout/vbestsquare.cpp
index 54401ea40..84c960a85 100644
--- a/src/libs/vlayout/vbestsquare.cpp
+++ b/src/libs/vlayout/vbestsquare.cpp
@@ -28,6 +28,10 @@
 
 #include "vbestsquare.h"
 
+#include <QMatrix>
+
+class QSizeF;
+
 //---------------------------------------------------------------------------------------------------------------------
 VBestSquare::VBestSquare(const QSizeF &sheetSize, bool saveLength)
     :resI(0), resJ(0), resMatrix(QMatrix()), bestSize(QSizeF(sheetSize.width()+10, sheetSize.height()+10)),
diff --git a/src/libs/vlayout/vbestsquare.h b/src/libs/vlayout/vbestsquare.h
index bc134c4c1..c5778bd9e 100644
--- a/src/libs/vlayout/vbestsquare.h
+++ b/src/libs/vlayout/vbestsquare.h
@@ -29,9 +29,13 @@
 #ifndef VBESTSQUARE_H
 #define VBESTSQUARE_H
 
+#include <QSizeF>
+#include <QTransform>
+#include <QtGlobal>
+
 #include "vlayoutdef.h"
 
-#include <QTransform>
+class QSizeF;
 
 class VBestSquare
 {
diff --git a/src/libs/vlayout/vcontour.cpp b/src/libs/vlayout/vcontour.cpp
index 5591ae836..b5ccd2b80 100644
--- a/src/libs/vlayout/vcontour.cpp
+++ b/src/libs/vlayout/vcontour.cpp
@@ -27,17 +27,22 @@
  *************************************************************************/
 
 #include "vcontour.h"
-#include "vcontour_p.h"
-#include "vlayoutdetail.h"
 
-#include <QPointF>
+#include <qmath.h>
 #include <QLineF>
 #include <QPainterPath>
+#include <QPoint>
+#include <QPointF>
+#include <QPolygonF>
+#include <QRectF>
+#include <Qt>
+
+#include "vcontour_p.h"
+#include "vlayoutdetail.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vlayout/vcontour.h b/src/libs/vlayout/vcontour.h
index 5bd5e8d0f..baa64f963 100644
--- a/src/libs/vlayout/vcontour.h
+++ b/src/libs/vlayout/vcontour.h
@@ -29,18 +29,21 @@
 #ifndef VCONTOUR_H
 #define VCONTOUR_H
 
-#include "vlayoutdef.h"
-
-#include <QVector>
 #include <QSharedDataPointer>
 #include <QSizeF>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
+
+#include "vlayoutdef.h"
 
-class VContourData;
-class QPointF;
-class VLayoutDetail;
 class QLineF;
-class QRectF;
 class QPainterPath;
+class QPointF;
+class QRectF;
+class QSizeF;
+class VContourData;
+class VLayoutDetail;
 
 class VContour
 {
diff --git a/src/libs/vlayout/vlayoutdetail.cpp b/src/libs/vlayout/vlayoutdetail.cpp
index eb7b33ccc..17ef791b7 100644
--- a/src/libs/vlayout/vlayoutdetail.cpp
+++ b/src/libs/vlayout/vlayoutdetail.cpp
@@ -27,18 +27,37 @@
  *************************************************************************/
 
 #include "vlayoutdetail.h"
-#include "vlayoutdetail_p.h"
 
-#include <QGraphicsItem>
-#include <QPainterPath>
+#include <math.h>
+#include <qmath.h>
+#include <QBrush>
+#include <QFlags>
 #include <QFont>
 #include <QFontMetrics>
-#include <QBrush>
+#include <QGraphicsPathItem>
+#include <QList>
+#include <QMatrix>
+#include <QMessageLogger>
+#include <QPainterPath>
+#include <QPoint>
+#include <QPolygonF>
+#include <QTransform>
+#include <Qt>
+#include <QtDebug>
+
+#include "../vpatterndb/vpatterninfogeometry.h"
+#include "../vpatterndb/vpatternpiecedata.h"
+#include "vlayoutdef.h"
+#include "vlayoutdetail_p.h"
+#include "vtextmanager.h"
+
+class QGraphicsPathItem;
+class QLineF;
+class VAbstractPattern;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 #include <QDebug>
diff --git a/src/libs/vlayout/vlayoutdetail.h b/src/libs/vlayout/vlayoutdetail.h
index 602d84cd1..34b4e31e3 100644
--- a/src/libs/vlayout/vlayoutdetail.h
+++ b/src/libs/vlayout/vlayoutdetail.h
@@ -29,18 +29,34 @@
 #ifndef VLAYOUTDETAIL_H
 #define VLAYOUTDETAIL_H
 
-#include "vabstractdetail.h"
-#include "../vpatterndb/vpatternpiecedata.h"
-#include "../vpatterndb/vpatterninfogeometry.h"
-#include "../ifc/xml/vabstractpattern.h"
-
-
+#include <qcompilerdetection.h>
+#include <QDate>
+#include <QLineF>
 #include <QMatrix>
 #include <QPointF>
-#include <QDate>
+#include <QRectF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QVector>
+#include <QtGlobal>
 
-class VLayoutDetailData;
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vpatterndb/vpatterninfogeometry.h"
+#include "../vpatterndb/vpatternpiecedata.h"
+#include "vabstractdetail.h"
+
+class QFont;
 class QGraphicsItem;
+class QLineF;
+class QPainterPath;
+class QPointF;
+class QRectF;
+class QTransform;
+class VAbstractPattern;
+class VLayoutDetailData;
+class VPatternInfoGeometry;
+class VPatternPieceData;
 
 class VLayoutDetail :public VAbstractDetail
 {
diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp
index c914057ee..5b5201403 100644
--- a/src/libs/vlayout/vlayoutgenerator.cpp
+++ b/src/libs/vlayout/vlayoutgenerator.cpp
@@ -27,16 +27,17 @@
  *************************************************************************/
 
 #include "vlayoutgenerator.h"
-#include "vlayoutpaper.h"
-#include "vlayoutdetail.h"
-#include "../vmisc/def.h"
 
-#include <QRectF>
-#include <QImage>
-#include <QDir>
-#include <QGraphicsItem>
-#include <QThreadPool>
 #include <QtCore/qmath.h>
+#include <QGraphicsRectItem>
+#include <QRectF>
+#include <QThreadPool>
+
+#include "../vmisc/def.h"
+#include "vlayoutdetail.h"
+#include "vlayoutpaper.h"
+
+class QMarginsF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VLayoutGenerator::VLayoutGenerator(QObject *parent)
diff --git a/src/libs/vlayout/vlayoutgenerator.h b/src/libs/vlayout/vlayoutgenerator.h
index e0fa20d82..2a9d57c8c 100644
--- a/src/libs/vlayout/vlayoutgenerator.h
+++ b/src/libs/vlayout/vlayoutgenerator.h
@@ -29,12 +29,19 @@
 #ifndef VLAYOUTGENERATOR_H
 #define VLAYOUTGENERATOR_H
 
-#include <QObject>
+#include <qcompilerdetection.h>
 #include <QList>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
 #include <memory>
 
-#include "vlayoutdef.h"
 #include "vbank.h"
+#include "vlayoutdef.h"
+
+class QMarginsF;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #   include "../vmisc/backport/qmarginsf.h"
@@ -42,9 +49,9 @@
 #   include <QMargins>
 #endif
 
-class VLayoutPaper;
-class VLayoutDetail;
 class QGraphicsItem;
+class VLayoutDetail;
+class VLayoutPaper;
 
 class VLayoutGenerator :public QObject
 {
diff --git a/src/libs/vlayout/vlayoutpaper.cpp b/src/libs/vlayout/vlayoutpaper.cpp
index 21710bcc5..8895a1beb 100644
--- a/src/libs/vlayout/vlayoutpaper.cpp
+++ b/src/libs/vlayout/vlayoutpaper.cpp
@@ -27,15 +27,29 @@
  *************************************************************************/
 
 #include "vlayoutpaper.h"
-#include "vlayoutpaper_p.h"
+
+#include <QBrush>
+#include <QCoreApplication>
+#include <QGraphicsRectItem>
+#include <QGraphicsScene>
+#include <QList>
+#include <QPen>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+#include <QThread>
+#include <QThreadPool>
+#include <QVector>
+#include <Qt>
+#include <QtAlgorithms>
+
 #include "vbestsquare.h"
+#include "vcontour.h"
+#include "vlayoutdetail.h"
+#include "vlayoutpaper_p.h"
 #include "vposition.h"
 
-#include <QGraphicsItem>
-#include <QCoreApplication>
-#include <QThreadPool>
-#include <QPen>
-#include <QGraphicsScene>
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VLayoutPaper::VLayoutPaper()
diff --git a/src/libs/vlayout/vlayoutpaper.h b/src/libs/vlayout/vlayoutpaper.h
index 1a51186d5..d194ddda2 100644
--- a/src/libs/vlayout/vlayoutpaper.h
+++ b/src/libs/vlayout/vlayoutpaper.h
@@ -29,15 +29,21 @@
 #ifndef VLAYOUTPAPER_H
 #define VLAYOUTPAPER_H
 
+#include <qcompilerdetection.h>
 #include <QSharedDataPointer>
+#include <QTypeInfo>
+#include <QtGlobal>
+
 #include "vlayoutdef.h"
 
-class VLayoutPaperData;
-class VLayoutDetail;
 class QGraphicsItem;
-class VBestSquare;
 class QGraphicsRectItem;
 class QRectF;
+class VBestSquare;
+class VLayoutDetail;
+class VLayoutPaperData;
+template <typename T> class QList;
+template <typename T> class QVector;
 
 class VLayoutPaper
 {
diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp
index a7c02bc7a..0cabd0e84 100644
--- a/src/libs/vlayout/vposition.cpp
+++ b/src/libs/vlayout/vposition.cpp
@@ -27,23 +27,31 @@
  *************************************************************************/
 
 #include "vposition.h"
-#include "../vmisc/def.h"
 
-#include <QPointF>
-#include <QRectF>
-#include <QLineF>
-#include <QPolygonF>
-#include <QPainterPath>
-#include <QImage>
-#include <QPainter>
-#include <QCoreApplication>
+#include <qmath.h>
 #include <QDir>
-#include <QtWidgets>
+#include <QImage>
+#include <QLineF>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPen>
+#include <QPicture>
+#include <QPointF>
+#include <QPolygonF>
+#include <QRect>
+#include <QRectF>
+#include <QSizeF>
+#include <QStaticStringData>
+#include <QString>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <Qt>
+
+#include "../vmisc/def.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vlayout/vposition.h b/src/libs/vlayout/vposition.h
index 9d828f9a6..4d3580642 100644
--- a/src/libs/vlayout/vposition.h
+++ b/src/libs/vlayout/vposition.h
@@ -29,19 +29,21 @@
 #ifndef VPOSITION_H
 #define VPOSITION_H
 
+#include <qcompilerdetection.h>
 #include <QRunnable>
 #include <QVector>
+#include <QtGlobal>
 
-#include "vlayoutdef.h"
 #include "vbestsquare.h"
 #include "vcontour.h"
+#include "vlayoutdef.h"
 #include "vlayoutdetail.h"
 
-class QPointF;
-class QRectF;
 class QLineF;
-class QPolygonF;
 class QPainterPath;
+class QPointF;
+class QPolygonF;
+class QRectF;
 
 class VPosition : public QRunnable
 {
diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp
index fab73e12a..7378add1d 100644
--- a/src/libs/vlayout/vposter.cpp
+++ b/src/libs/vlayout/vposter.cpp
@@ -27,14 +27,22 @@
  *************************************************************************/
 
 #include "vposter.h"
-#include <QPrinter>
+
+#include <qmath.h>
 #include <QGraphicsLineItem>
+#include <QGraphicsPixmapItem>
+#include <QGraphicsTextItem>
 #include <QPen>
+#include <QPixmap>
+#include <QPrinter>
+#include <QRectF>
+#include <QString>
+#include <QVector>
+#include <Qt>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 #include "../vmisc/def.h"
diff --git a/src/libs/vlayout/vposter.h b/src/libs/vlayout/vposter.h
index 965f830bb..58047a176 100644
--- a/src/libs/vlayout/vposter.h
+++ b/src/libs/vlayout/vposter.h
@@ -29,11 +29,13 @@
 #ifndef VPOSTER_H
 #define VPOSTER_H
 
-#include <QRect>
 #include <QCoreApplication>
+#include <QRect>
+#include <QtGlobal>
 
-class QPrinter;
 class QGraphicsItem;
+class QPrinter;
+template <class T> class QVector;
 
 struct PosterData
 {
diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp
index 06c986db6..57ef1fe0d 100644
--- a/src/libs/vlayout/vtextmanager.cpp
+++ b/src/libs/vlayout/vtextmanager.cpp
@@ -1,7 +1,11 @@
-#include <QRegularExpression>
+#include <QDate>
+#include <QFileInfo>
 #include <QFontMetrics>
-#include <QDir>
+#include <QLatin1String>
+#include <QRegularExpression>
 
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vpatterndb/vpatternpiecedata.h"
 #include "vtextmanager.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vlayout/vtextmanager.h b/src/libs/vlayout/vtextmanager.h
index e36287899..243e81a6c 100644
--- a/src/libs/vlayout/vtextmanager.h
+++ b/src/libs/vlayout/vtextmanager.h
@@ -1,12 +1,20 @@
 #ifndef VTEXTMANAGER_H
 #define VTEXTMANAGER_H
 
-#include <QString>
-#include <QFont>
 #include <QDate>
+#include <QFont>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <Qt>
+#include <QtGlobal>
 
-#include "../vpatterndb/vpatternpiecedata.h"
 #include "../ifc/xml/vabstractpattern.h"
+#include "../vpatterndb/vpatternpiecedata.h"
+
+class QFontMetrics;
+class VAbstractPattern;
+class VPatternPieceData;
 
 #define MIN_FONT_SIZE               12
 #define MAX_FONT_SIZE               128
diff --git a/src/libs/vmisc/abstracttest.cpp b/src/libs/vmisc/abstracttest.cpp
index 5cd46307e..934e5f40c 100644
--- a/src/libs/vmisc/abstracttest.cpp
+++ b/src/libs/vmisc/abstracttest.cpp
@@ -27,10 +27,30 @@
  *************************************************************************/
 
 #include "abstracttest.h"
+
+#include <qtestcase.h>
+#include <QApplication>
+#include <QByteArray>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFlags>
+#include <QForeachContainer>
+#include <QIODevice>
+#include <QPointF>
+#include <QProcess>
+#include <QScopedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QStringList>
+#include <QVector>
+#include <QtGlobal>
+
 #include "logging.h"
 #include "vsysexits.h"
 
-#include <QtTest>
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 AbstractTest::AbstractTest(QObject *parent) :
diff --git a/src/libs/vmisc/abstracttest.h b/src/libs/vmisc/abstracttest.h
index 750e8a153..35d3566c5 100644
--- a/src/libs/vmisc/abstracttest.h
+++ b/src/libs/vmisc/abstracttest.h
@@ -29,7 +29,13 @@
 #ifndef ABSTRACTTEST_H
 #define ABSTRACTTEST_H
 
+#include <QMetaObject>
 #include <QObject>
+#include <QString>
+
+class QPointF;
+class QStringList;
+template <class T> class QVector;
 
 #ifdef Q_CC_MSVC
 #include <ciso646>
diff --git a/src/libs/vmisc/backport/qmarginsf.cpp b/src/libs/vmisc/backport/qmarginsf.cpp
index b5597111e..9569b016f 100644
--- a/src/libs/vmisc/backport/qmarginsf.cpp
+++ b/src/libs/vmisc/backport/qmarginsf.cpp
@@ -32,6 +32,8 @@
 ****************************************************************************/
 
 #include "qmarginsf.h"
+
+#include <QDebugStateSaver>
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #include <QDataStream>
 #include <QDebug>
diff --git a/src/libs/vmisc/backport/qmarginsf.h b/src/libs/vmisc/backport/qmarginsf.h
index cf27ba8a6..75b2f3125 100644
--- a/src/libs/vmisc/backport/qmarginsf.h
+++ b/src/libs/vmisc/backport/qmarginsf.h
@@ -34,8 +34,13 @@
 #ifndef QMARGINSF_H
 #define QMARGINSF_H
 
+#include <qcompilerdetection.h>
+#include <QTypeInfo>
 #include <QtGlobal>
 
+class QDataStream;
+class QDebug;
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #include <QMargins>
 
diff --git a/src/libs/vmisc/commandoptions.cpp b/src/libs/vmisc/commandoptions.cpp
index 058f59588..945c944c9 100644
--- a/src/libs/vmisc/commandoptions.cpp
+++ b/src/libs/vmisc/commandoptions.cpp
@@ -28,6 +28,9 @@
 
 #include "commandoptions.h"
 
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
 #include <QStringList>
 
 const QString LONG_OPTION_BASENAME          = QStringLiteral("basename");
diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp
index 02785f3d2..e5c7c22b9 100644
--- a/src/libs/vmisc/def.cpp
+++ b/src/libs/vmisc/def.cpp
@@ -27,14 +27,33 @@
  *************************************************************************/
 
 #include "def.h"
-#include "vabstractapplication.h"
-#include "../vpatterndb/vtranslatevars.h"
 
+#include <QApplication>
+#include <QChar>
+#include <QColor>
 #include <QComboBox>
-#include <QDir>
-#include <QPrinterInfo>
+#include <QCursor>
 #include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QGuiApplication>
+#include <QImage>
+#include <QLatin1Char>
+#include <QList>
+#include <QMap>
+#include <QMessageLogger>
+#include <QObject>
+#include <QPixmap>
+#include <QPrinterInfo>
 #include <QProcess>
+#include <QRgb>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QtDebug>
+
+#include "../vpatterndb/vtranslatevars.h"
+#include "vabstractapplication.h"
 
 // Keep synchronize all names with initialization in VTranslateVars class!!!!!
 //measurements
diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index 9e5be5209..1d3003616 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -29,17 +29,22 @@
 #ifndef DEF_H
 #define DEF_H
 
-#include <csignal>
-#include <QtGlobal>
+#include <qcompilerdetection.h>
+#include <QPrinter>
+#include <QString>
 #include <QStringList>
-#include <QSharedPointer>
-#include <QtPrintSupport/QPrinter>
+#include <Qt>
+#include <QtGlobal>
+#include <csignal>
 #ifdef Q_OS_WIN
     #include <windows.h>
 #endif /* Q_OS_WIN */
 
 #include "debugbreak.h"
 
+class QPixmap;
+template <class T> class QSharedPointer;
+
 #ifdef Q_CC_MSVC
     #include <ciso646>
 #endif /* Q_CC_MSVC */
diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp
index 033aa8571..84efbfdbb 100644
--- a/src/libs/vmisc/projectversion.cpp
+++ b/src/libs/vmisc/projectversion.cpp
@@ -27,9 +27,18 @@
  *************************************************************************/
 
 #include "projectversion.h"
+
+#include <qcompilerdetection.h>
+#include <QCoreApplication>
+#include <QLatin1Char>
+#include <QLatin1String>
+#include <QObject>
+#include <QStaticStringData>
 #include <QString>
-#include <QApplication>
+#include <QStringData>
+#include <QStringDataPtr>
 #include <QSysInfo>
+#include <QtGlobal>
 
 extern const int MAJOR_VERSION = 0;
 extern const int MINOR_VERSION = 5;
diff --git a/src/libs/vmisc/qxtcsvmodel.cpp b/src/libs/vmisc/qxtcsvmodel.cpp
index 049e6bd65..8739614fa 100644
--- a/src/libs/vmisc/qxtcsvmodel.cpp
+++ b/src/libs/vmisc/qxtcsvmodel.cpp
@@ -36,11 +36,14 @@
 #include "qxtcsvmodel.h"
 
 #include <QFile>
+#include <QIODevice>
+#include <QList>
 #include <QTextStream>
-#include <QDebug>
 
 #include "../vmisc/diagnostic.h"
 
+class QModelIndex;
+
 class QxtCsvModelPrivate : public QxtPrivate<QxtCsvModel>
 {
 public:
diff --git a/src/libs/vmisc/qxtcsvmodel.h b/src/libs/vmisc/qxtcsvmodel.h
index 413ef18b7..916d0b8af 100644
--- a/src/libs/vmisc/qxtcsvmodel.h
+++ b/src/libs/vmisc/qxtcsvmodel.h
@@ -31,19 +31,28 @@
 #ifndef QXTCSVMODEL_H
 #define QXTCSVMODEL_H
 
+#include <qcompilerdetection.h>
 #include <QAbstractTableModel>
-#include <QVariant>
-#include <QIODevice>
 #include <QChar>
+#include <QFlags>
+#include <QIODevice>
+#include <QIncompatibleFlag>
+#include <QMetaObject>
+#include <QModelIndex>
+#include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QModelIndex>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
 
 #include "def.h"
 
+class QIODevice;
+class QModelIndex;
 class QTextCodec;
-
 class QxtCsvModelPrivate;
+
 class QxtCsvModel : public QAbstractTableModel
 {
     Q_OBJECT
diff --git a/src/libs/vmisc/undoevent.h b/src/libs/vmisc/undoevent.h
index abb2c4d12..dd6068af6 100644
--- a/src/libs/vmisc/undoevent.h
+++ b/src/libs/vmisc/undoevent.h
@@ -29,6 +29,7 @@
 #ifndef UNDOEVENT_H
 #define UNDOEVENT_H
 
+#include <qcompilerdetection.h>
 #include <QEvent>
 
 // Define undo event identifier
diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp
index 1137c2ef0..071ebb3fd 100644
--- a/src/libs/vmisc/vabstractapplication.cpp
+++ b/src/libs/vmisc/vabstractapplication.cpp
@@ -27,14 +27,24 @@
  *************************************************************************/
 
 #include "vabstractapplication.h"
-#include "../vmisc/def.h"
-#include "../vmisc/logging.h"
 
+#include <QDebug>
 #include <QDir>
 #include <QLibraryInfo>
+#include <QLoggingCategory>
+#include <QMessageLogger>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
 #include <QTranslator>
+#include <Qt>
 #include <QtDebug>
 
+#include "../vmisc/def.h"
+
+class QGraphicsScene;
+class QWidget;
+
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractApplication::VAbstractApplication(int &argc, char **argv)
     :QApplication(argc, argv),
diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h
index 13dbbaf05..333540d2c 100644
--- a/src/libs/vmisc/vabstractapplication.h
+++ b/src/libs/vmisc/vabstractapplication.h
@@ -29,19 +29,32 @@
 #ifndef VABSTRACTAPPLICATION_H
 #define VABSTRACTAPPLICATION_H
 
+#include <qcompilerdetection.h>
 #include <QApplication>
+#include <QCoreApplication>
 #include <QGraphicsScene>
+#include <QLocale>
+#include <QMetaObject>
+#include <QObject>
 #include <QPointer>
+#include <QString>
+#include <QtGlobal>
 
-#include "def.h"
-#include "vsettings.h"
-#include "vlockguard.h"
+#include "../vmisc/def.h"
 #include "../vpatterndb/vtranslatevars.h"
+#include "def.h"
+#include "vcommonsettings.h"
+#include "vlockguard.h"
+#include "vsettings.h"
 
+class QGraphicsScene;
+class QTranslator;
+class QUndoStack;
+class QWidget;
 class VAbstractApplication;// use in define
 class VAbstractPattern;
 class VMainGraphicsView;
-class QUndoStack;
+class VTranslateVars;
 
 #if defined(qApp)
 #undef qApp
diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp
index 179754b4e..ef41d54aa 100644
--- a/src/libs/vmisc/vcommonsettings.cpp
+++ b/src/libs/vmisc/vcommonsettings.cpp
@@ -28,18 +28,25 @@
 
 #include "vcommonsettings.h"
 
-#include <QDir>
-#include <QDebug>
-#include <QLocale>
 #include <QApplication>
 #include <QDate>
+#include <QDebug>
+#include <QDir>
+#include <QLocale>
+#include <QMessageLogger>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QVariant>
+#include <QtDebug>
 
-#include "../ifc/ifcdef.h"
+#include "../ifc/../vmisc/def.h"
+
+class QDate;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 const QString VCommonSettings::SettingPathsIndividualMeasurements     = QStringLiteral("paths/individual_measurements");
diff --git a/src/libs/vmisc/vcommonsettings.h b/src/libs/vmisc/vcommonsettings.h
index 0755b11a1..b56f926bb 100644
--- a/src/libs/vmisc/vcommonsettings.h
+++ b/src/libs/vmisc/vcommonsettings.h
@@ -29,9 +29,19 @@
 #ifndef VCOMMONSETTINGS_H
 #define VCOMMONSETTINGS_H
 
+#include <QByteArray>
+#include <QMetaObject>
+#include <QObject>
 #include <QSettings>
+#include <QSize>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
 #include "../vlayout/vbank.h"
 
+class QDate;
+
 class VCommonSettings : public QSettings
 {
     Q_OBJECT
diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp
index a2fd67848..d8f2e5431 100644
--- a/src/libs/vmisc/vsettings.cpp
+++ b/src/libs/vmisc/vsettings.cpp
@@ -29,19 +29,23 @@
 #include "vsettings.h"
 
 #include <QDir>
-#include <QDebug>
 #include <QLocale>
-#include <QApplication>
+#include <QMetaType>
+#include <QMetaTypeId>
 #include <QPrinter>
 #include <QSharedPointer>
-#include <QDataStream>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QVariant>
 
-#include "../ifc/ifcdef.h"
+#include "../ifc/../vmisc/def.h"
+
+class QMarginsF;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 Q_DECLARE_METATYPE(QMarginsF)
diff --git a/src/libs/vmisc/vsettings.h b/src/libs/vmisc/vsettings.h
index d941e0672..ec978e1db 100644
--- a/src/libs/vmisc/vsettings.h
+++ b/src/libs/vmisc/vsettings.h
@@ -29,8 +29,16 @@
 #ifndef VSETTINGS_H
 #define VSETTINGS_H
 
-#include "vcommonsettings.h"
+#include <QMetaObject>
+#include <QObject>
+#include <QSettings>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vlayout/vbank.h"
+#include "vcommonsettings.h"
+
+class QMarginsF;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #   include "../vmisc/backport/qmarginsf.h"
diff --git a/src/libs/vmisc/vtablesearch.cpp b/src/libs/vmisc/vtablesearch.cpp
index 330973824..ec7c36cb6 100644
--- a/src/libs/vmisc/vtablesearch.cpp
+++ b/src/libs/vmisc/vtablesearch.cpp
@@ -27,6 +27,13 @@
  *************************************************************************/
 
 #include "vtablesearch.h"
+
+#include <QForeachContainer>
+#include <QPalette>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <Qt>
+
 #include "../vmisc/def.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vmisc/vtablesearch.h b/src/libs/vmisc/vtablesearch.h
index 9f42a5f8e..0e8515144 100644
--- a/src/libs/vmisc/vtablesearch.h
+++ b/src/libs/vmisc/vtablesearch.h
@@ -30,7 +30,12 @@
 #define VTABLESEARCH_H
 
 #include <QList>
+#include <QString>
 #include <QTableWidget>
+#include <QtGlobal>
+
+class QTableWidget;
+class QTableWidgetItem;
 
 class VTableSearch
 {
diff --git a/src/libs/vmisc/vtapesettings.cpp b/src/libs/vmisc/vtapesettings.cpp
index 5dfc482ee..ee0f5f22d 100644
--- a/src/libs/vmisc/vtapesettings.cpp
+++ b/src/libs/vmisc/vtapesettings.cpp
@@ -28,9 +28,11 @@
 
 #include "vtapesettings.h"
 
-#include <QApplication>
-#include <QDir>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
 #include <QTextCodec>
+#include <QVariant>
 
 const QString VTapeSettings::SettingDataBaseGeometry    = QStringLiteral("database/geometry");
 
diff --git a/src/libs/vmisc/vtapesettings.h b/src/libs/vmisc/vtapesettings.h
index 51afe5cae..e756d6535 100644
--- a/src/libs/vmisc/vtapesettings.h
+++ b/src/libs/vmisc/vtapesettings.h
@@ -29,6 +29,14 @@
 #ifndef VTAPESETTINGS_H
 #define VTAPESETTINGS_H
 
+#include <QByteArray>
+#include <QChar>
+#include <QMetaObject>
+#include <QObject>
+#include <QSettings>
+#include <QString>
+#include <QtGlobal>
+
 #include "vcommonsettings.h"
 
 class VTapeSettings : public VCommonSettings
diff --git a/src/libs/vobj/delaunay.cpp b/src/libs/vobj/delaunay.cpp
index 1bfc315be..1d203225a 100644
--- a/src/libs/vobj/delaunay.cpp
+++ b/src/libs/vobj/delaunay.cpp
@@ -17,15 +17,14 @@
 **  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
-#include <assert.h>
 #include <QtGlobal>
 
-#include "delaunay.h"
 #include "../vmisc/diagnostic.h"
+#include "delaunay.h"
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Wold-style-cast")
@@ -44,10 +43,10 @@ extern real incircle(real* pa, real* pb, real* pc, real* pd);
 #define	ON_CIRCLE	0
 #define INSIDE		1
 
-struct	point2d_s;
+struct	delaunay_s;
 struct	face_s;
 struct	halfedge_s;
-struct	delaunay_s;
+struct	point2d_s;
 
 
 #ifdef USE_DOUBLE
diff --git a/src/libs/vobj/predicates.cpp b/src/libs/vobj/predicates.cpp
index 5d8fde02a..ef144ec51 100644
--- a/src/libs/vobj/predicates.cpp
+++ b/src/libs/vobj/predicates.cpp
@@ -105,9 +105,7 @@
 /*                                                                           */
 /*****************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <QtGlobal>
 
 #include "../vmisc/diagnostic.h"
 
diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp
index 84d611829..ddd1e0954 100644
--- a/src/libs/vobj/vobjengine.cpp
+++ b/src/libs/vobj/vobjengine.cpp
@@ -27,15 +27,35 @@
  *************************************************************************/
 
 #include "vobjengine.h"
+
+#include <qmath.h>
+#include <QByteArray>
+#include <QDebug>
+#include <QFlag>
+#include <QFlags>
+#include <QIODevice>
+#include <QLatin1Char>
+#include <QMessageLogger>
+#include <QPaintEngineState>
+#include <QPainterPath>
+#include <QPointF>
+#include <QString>
+#include <QTextStream>
+#include <QVector>
+#include <QtDebug>
+
 #include "../vmisc/diagnostic.h"
 
-#include <QTextStream>
-#include <QDebug>
+class QPaintDevice;
+class QPixmap;
+class QPoint;
+class QPointF;
+class QPolygonF;
+class QRectF;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 #ifdef Q_CC_MSVC
diff --git a/src/libs/vobj/vobjengine.h b/src/libs/vobj/vobjengine.h
index a6cedc275..e6169a4d0 100644
--- a/src/libs/vobj/vobjengine.h
+++ b/src/libs/vobj/vobjengine.h
@@ -29,9 +29,25 @@
 #ifndef VOBJENGINE_H
 #define VOBJENGINE_H
 
+#include <qcompilerdetection.h>
+#include <QMatrix>
 #include <QPaintEngine>
+#include <QPolygonF>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QtGlobal>
+
 #include "delaunay.h"
 
+class QIODevice;
+class QPaintDevice;
+class QPainterPath;
+class QPixmap;
+class QPoint;
+class QPointF;
+class QPolygonF;
+class QRectF;
 class QTextStream;
 
 #define MAX_POINTS      512
diff --git a/src/libs/vobj/vobjpaintdevice.cpp b/src/libs/vobj/vobjpaintdevice.cpp
index 1a0b62862..62debacde 100644
--- a/src/libs/vobj/vobjpaintdevice.cpp
+++ b/src/libs/vobj/vobjpaintdevice.cpp
@@ -27,9 +27,15 @@
  *************************************************************************/
 
 #include "vobjpaintdevice.h"
-#include "vobjengine.h"
 
 #include <QFile>
+#include <QIODevice>
+#include <QMessageLogger>
+#include <QtDebug>
+
+#include "vobjengine.h"
+
+class QPaintEngine;
 
 //---------------------------------------------------------------------------------------------------------------------
 VObjPaintDevice::VObjPaintDevice()
diff --git a/src/libs/vobj/vobjpaintdevice.h b/src/libs/vobj/vobjpaintdevice.h
index a3a95a347..d702aef7a 100644
--- a/src/libs/vobj/vobjpaintdevice.h
+++ b/src/libs/vobj/vobjpaintdevice.h
@@ -29,12 +29,16 @@
 #ifndef VOBJPAINTDEVICE_H
 #define VOBJPAINTDEVICE_H
 
+#include <qcompilerdetection.h>
 #include <QPaintDevice>
-#include <QString>
 #include <QSharedPointer>
+#include <QSize>
+#include <QString>
+#include <QtGlobal>
 
-class VObjEngine;
 class QIODevice;
+class QPaintEngine;
+class VObjEngine;
 
 class VObjPaintDevice : public QPaintDevice
 {
diff --git a/src/libs/vpatterndb/calculator.cpp b/src/libs/vpatterndb/calculator.cpp
index b00062276..a5a92f8c5 100644
--- a/src/libs/vpatterndb/calculator.cpp
+++ b/src/libs/vpatterndb/calculator.cpp
@@ -27,9 +27,14 @@
  *************************************************************************/
 
 #include "calculator.h"
-#include <QDebug>
-#include <QSettings>
-#include "vcontainer.h"
+
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QStringList>
+
+#include "../ifc/../vmisc/def.h"
+#include "../qmuparser/qmuparsererror.h"
 
 using namespace qmu;
 
diff --git a/src/libs/vpatterndb/calculator.h b/src/libs/vpatterndb/calculator.h
index 8f6030247..5bf1ea31b 100644
--- a/src/libs/vpatterndb/calculator.h
+++ b/src/libs/vpatterndb/calculator.h
@@ -29,6 +29,12 @@
 #ifndef CALCULATOR_H
 #define CALCULATOR_H
 
+#include <qcompilerdetection.h>
+#include <QHash>
+#include <QMap>
+#include <QString>
+#include <QtGlobal>
+
 #include "../qmuparser/qmuformulabase.h"
 #include "../vmisc/def.h"
 
diff --git a/src/libs/vpatterndb/variables/varcradius.cpp b/src/libs/vpatterndb/variables/varcradius.cpp
index dec68ecd9..5b7541432 100644
--- a/src/libs/vpatterndb/variables/varcradius.cpp
+++ b/src/libs/vpatterndb/variables/varcradius.cpp
@@ -27,7 +27,13 @@
  *************************************************************************/
 
 #include "varcradius.h"
+
+#include <QMessageLogger>
+#include <QString>
+
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/varc.h"
+#include "variables/vcurvevariable.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VArcRadius::VArcRadius()
diff --git a/src/libs/vpatterndb/variables/varcradius.h b/src/libs/vpatterndb/variables/varcradius.h
index 68f53de81..f40586c43 100644
--- a/src/libs/vpatterndb/variables/varcradius.h
+++ b/src/libs/vpatterndb/variables/varcradius.h
@@ -29,8 +29,12 @@
 #ifndef VARCRADIUS_H
 #define VARCRADIUS_H
 
-#include "vcurvevariable.h"
+#include <qcompilerdetection.h>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
 #include "../ifc/ifcdef.h"
+#include "vcurvevariable.h"
 
 class VArc;
 
diff --git a/src/libs/vpatterndb/variables/vcurveangle.cpp b/src/libs/vpatterndb/variables/vcurveangle.cpp
index d2ae6ac96..7ed947c57 100644
--- a/src/libs/vpatterndb/variables/vcurveangle.cpp
+++ b/src/libs/vpatterndb/variables/vcurveangle.cpp
@@ -27,8 +27,15 @@
  *************************************************************************/
 
 #include "vcurveangle.h"
+
+#include <QLatin1String>
+#include <QMessageLogger>
+
+#include "../vgeometry/../ifc/../vmisc/def.h"
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vspline.h"
+#include "variables/vcurvevariable.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VCurveAngle::VCurveAngle()
diff --git a/src/libs/vpatterndb/variables/vcurveangle.h b/src/libs/vpatterndb/variables/vcurveangle.h
index ddf440750..a625d2596 100644
--- a/src/libs/vpatterndb/variables/vcurveangle.h
+++ b/src/libs/vpatterndb/variables/vcurveangle.h
@@ -29,6 +29,10 @@
 #ifndef VCURVEANGLE_H
 #define VCURVEANGLE_H
 
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
 #include "vcurvevariable.h"
 
 class VAbstractCurve;
diff --git a/src/libs/vpatterndb/variables/vcurvelength.cpp b/src/libs/vpatterndb/variables/vcurvelength.cpp
index f382b7017..b673e60c0 100644
--- a/src/libs/vpatterndb/variables/vcurvelength.cpp
+++ b/src/libs/vpatterndb/variables/vcurvelength.cpp
@@ -27,8 +27,14 @@
  *************************************************************************/
 
 #include "vcurvelength.h"
+
+#include <QLatin1String>
+#include <QMessageLogger>
+
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vspline.h"
+#include "variables/vcurvevariable.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VCurveLength::VCurveLength()
diff --git a/src/libs/vpatterndb/variables/vcurvelength.h b/src/libs/vpatterndb/variables/vcurvelength.h
index 4df871ad2..177fac716 100644
--- a/src/libs/vpatterndb/variables/vcurvelength.h
+++ b/src/libs/vpatterndb/variables/vcurvelength.h
@@ -29,8 +29,13 @@
 #ifndef VCURVELENGTH_H
 #define VCURVELENGTH_H
 
-#include "vcurvevariable.h"
+#include <qcompilerdetection.h>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
 #include "../ifc/ifcdef.h"
+#include "vcurvevariable.h"
 
 class VAbstractCurve;
 class VSpline;
diff --git a/src/libs/vpatterndb/variables/vcurvevariable.cpp b/src/libs/vpatterndb/variables/vcurvevariable.cpp
index 904a56976..b22bc528b 100644
--- a/src/libs/vpatterndb/variables/vcurvevariable.cpp
+++ b/src/libs/vpatterndb/variables/vcurvevariable.cpp
@@ -27,8 +27,11 @@
  *************************************************************************/
 
 #include "vcurvevariable.h"
+
+#include "../ifc/../vmisc/def.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "variables/vinternalvariable.h"
 #include "vcurvevariable_p.h"
-#include "../vgeometry/vabstractcurve.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VCurveVariable::VCurveVariable()
diff --git a/src/libs/vpatterndb/variables/vcurvevariable.h b/src/libs/vpatterndb/variables/vcurvevariable.h
index de3970bf6..ef4c9875d 100644
--- a/src/libs/vpatterndb/variables/vcurvevariable.h
+++ b/src/libs/vpatterndb/variables/vcurvevariable.h
@@ -29,6 +29,11 @@
 #ifndef VCURVEVARIABLE_H
 #define VCURVEVARIABLE_H
 
+#include <qcompilerdetection.h>
+#include <QSharedDataPointer>
+#include <QTypeInfo>
+#include <QtGlobal>
+
 #include "vinternalvariable.h"
 
 class VAbstractCurve;
diff --git a/src/libs/vpatterndb/variables/vincrement.cpp b/src/libs/vpatterndb/variables/vincrement.cpp
index 3dbb4d20d..083321397 100644
--- a/src/libs/vpatterndb/variables/vincrement.cpp
+++ b/src/libs/vpatterndb/variables/vincrement.cpp
@@ -27,6 +27,9 @@
  *************************************************************************/
 
 #include "vincrement.h"
+
+#include "../ifc/../vmisc/def.h"
+#include "variables/vvariable.h"
 #include "vincrement_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vpatterndb/variables/vincrement.h b/src/libs/vpatterndb/variables/vincrement.h
index e927c9c5a..b8bea8380 100644
--- a/src/libs/vpatterndb/variables/vincrement.h
+++ b/src/libs/vpatterndb/variables/vincrement.h
@@ -29,10 +29,16 @@
 #ifndef VINCREMENTTABLEROW_H
 #define VINCREMENTTABLEROW_H
 
+#include <qcompilerdetection.h>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QtGlobal>
+
 #include "vvariable.h"
 
-class VIncrementData;
 class VContainer;
+class VIncrementData;
 
 /**
  * @brief The VIncrement class keep data row of increment table
diff --git a/src/libs/vpatterndb/variables/vinternalvariable.h b/src/libs/vpatterndb/variables/vinternalvariable.h
index 9632f6ca4..a4141a70f 100644
--- a/src/libs/vpatterndb/variables/vinternalvariable.h
+++ b/src/libs/vpatterndb/variables/vinternalvariable.h
@@ -29,8 +29,11 @@
 #ifndef VINTERNALVARIABLE_H
 #define VINTERNALVARIABLE_H
 
-#include <QString>
 #include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QtGlobal>
+
 #include "../vmisc/def.h"
 
 class VInternalVariableData;
diff --git a/src/libs/vpatterndb/variables/vlineangle.cpp b/src/libs/vpatterndb/variables/vlineangle.cpp
index 508070e01..eef1c820b 100644
--- a/src/libs/vpatterndb/variables/vlineangle.cpp
+++ b/src/libs/vpatterndb/variables/vlineangle.cpp
@@ -27,15 +27,22 @@
  *************************************************************************/
 
 #include "vlineangle.h"
-#include "vlineangle_p.h"
-#include "../vgeometry/vpointf.h"
 
+#include <qmath.h>
 #include <QLineF>
+#include <QMessageLogger>
+#include <QPointF>
+#include <QString>
+
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "variables/vinternalvariable.h"
+#include "vlineangle_p.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vpatterndb/variables/vlineangle.h b/src/libs/vpatterndb/variables/vlineangle.h
index 28a9e6ff3..506979d21 100644
--- a/src/libs/vpatterndb/variables/vlineangle.h
+++ b/src/libs/vpatterndb/variables/vlineangle.h
@@ -29,10 +29,15 @@
 #ifndef VLINEANGLE_H
 #define VLINEANGLE_H
 
+#include <qcompilerdetection.h>
+#include <QSharedDataPointer>
+#include <QTypeInfo>
+#include <QtGlobal>
+
 #include "vinternalvariable.h"
 
-class VPointF;
 class VLineAngleData;
+class VPointF;
 
 class VLineAngle :public VInternalVariable
 {
diff --git a/src/libs/vpatterndb/variables/vlinelength.cpp b/src/libs/vpatterndb/variables/vlinelength.cpp
index f2ff3634c..09c06c8d4 100644
--- a/src/libs/vpatterndb/variables/vlinelength.cpp
+++ b/src/libs/vpatterndb/variables/vlinelength.cpp
@@ -27,10 +27,16 @@
  *************************************************************************/
 
 #include "vlinelength.h"
-#include "vlinelength_p.h"
-#include "../vgeometry/vpointf.h"
 
 #include <QLineF>
+#include <QMessageLogger>
+#include <QPointF>
+#include <QString>
+
+#include "../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "variables/vinternalvariable.h"
+#include "vlinelength_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VLengthLine::VLengthLine()
diff --git a/src/libs/vpatterndb/variables/vlinelength.h b/src/libs/vpatterndb/variables/vlinelength.h
index 836eca9c0..9e9b87484 100644
--- a/src/libs/vpatterndb/variables/vlinelength.h
+++ b/src/libs/vpatterndb/variables/vlinelength.h
@@ -29,11 +29,17 @@
 #ifndef VLINELENGTH_H
 #define VLINELENGTH_H
 
-#include "vinternalvariable.h"
-#include "../ifc/ifcdef.h"
+#include <qcompilerdetection.h>
+#include <QSharedDataPointer>
+#include <QTypeInfo>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/ifcdef.h"
+#include "vinternalvariable.h"
 
-class VPointF;
 class VLengthLineData;
+class VPointF;
 
 class VLengthLine :public VInternalVariable
 {
diff --git a/src/libs/vpatterndb/variables/vmeasurement.cpp b/src/libs/vpatterndb/variables/vmeasurement.cpp
index 750729f3d..a49796249 100644
--- a/src/libs/vpatterndb/variables/vmeasurement.cpp
+++ b/src/libs/vpatterndb/variables/vmeasurement.cpp
@@ -27,11 +27,16 @@
  *************************************************************************/
 
 #include "vmeasurement.h"
-#include "vmeasurement_p.h"
 
+#include <QDebug>
 #include <QMap>
+#include <QMessageLogger>
 #include <QtDebug>
 
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "variables/vvariable.h"
+#include "vmeasurement_p.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VMeasurement create measurement for standard table
diff --git a/src/libs/vpatterndb/variables/vmeasurement.h b/src/libs/vpatterndb/variables/vmeasurement.h
index 3be732e81..e36ea2e5f 100644
--- a/src/libs/vpatterndb/variables/vmeasurement.h
+++ b/src/libs/vpatterndb/variables/vmeasurement.h
@@ -29,14 +29,20 @@
 #ifndef VSTANDARDTABLEROW_H
 #define VSTANDARDTABLEROW_H
 
-#include "vvariable.h"
-#include "../ifc/ifcdef.h"
-
-#include <QStringList>
+#include <qcompilerdetection.h>
 #include <QMap>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QStringList>
+#include <QTypeInfo>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/ifcdef.h"
+#include "vvariable.h"
 
-class VMeasurementData;
 class VContainer;
+class VMeasurementData;
 
 /**
  * @brief The VMeasurement class keep data row of standard table
diff --git a/src/libs/vpatterndb/variables/vvariable.cpp b/src/libs/vpatterndb/variables/vvariable.cpp
index 9063656c2..339329636 100644
--- a/src/libs/vpatterndb/variables/vvariable.cpp
+++ b/src/libs/vpatterndb/variables/vvariable.cpp
@@ -27,6 +27,11 @@
  *************************************************************************/
 
 #include "vvariable.h"
+
+#include <QMessageLogger>
+#include <QtDebug>
+
+#include "variables/vinternalvariable.h"
 #include "vvariable_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h
index efbe2f698..1f645f6b8 100644
--- a/src/libs/vpatterndb/variables/vvariable.h
+++ b/src/libs/vpatterndb/variables/vvariable.h
@@ -29,8 +29,15 @@
 #ifndef VVARIABLE_H
 #define VVARIABLE_H
 
-#include "vinternalvariable.h"
+#include <qcompilerdetection.h>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
 #include "../ifc/ifcdef.h"
+#include "vinternalvariable.h"
 
 class VVariableData;
 
diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp
index 5e9252d12..f711ce3fa 100644
--- a/src/libs/vpatterndb/vcontainer.cpp
+++ b/src/libs/vpatterndb/vcontainer.cpp
@@ -27,16 +27,34 @@
  *************************************************************************/
 
 #include "vcontainer.h"
+
+#include <limits.h>
+#include <QDebug>
+#include <QLoggingCategory>
+#include <QVector>
+#include <QtDebug>
+
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
 #include "../vgeometry/varc.h"
-#include "../vgeometry/vsplinepath.h"
+#include "../vmisc/../vmisc/diagnostic.h"
 #include "../vmisc/logging.h"
 #include "../vmisc/vabstractapplication.h"
+#include "variables/varcradius.h"
+#include "variables/vcurveangle.h"
+#include "variables/vcurvelength.h"
+#include "variables/vincrement.h"
+#include "variables/vlineangle.h"
+#include "variables/vlinelength.h"
+#include "variables/vmeasurement.h"
+#include "variables/vvariable.h"
 #include "vtranslatevars.h"
 
-#include <QLineF>
-#include <QtAlgorithms>
-#include <QDebug>
-
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
 QT_WARNING_DISABLE_INTEL(1418)
diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h
index bb09d0f00..3ca7bf358 100644
--- a/src/libs/vpatterndb/vcontainer.h
+++ b/src/libs/vpatterndb/vcontainer.h
@@ -29,19 +29,45 @@
 #ifndef VCONTAINER_H
 #define VCONTAINER_H
 
-#include "variables.h"
-#include "vdetail.h"
-#include "../vgeometry/vgobject.h"
-#include "../ifc/exception/vexceptionbadid.h"
-#include "../vgeometry/vabstractcurve.h"
-#include "../vgeometry/vabstractcubicbezierpath.h"
-#include "../vmisc/diagnostic.h"
-#include "vtranslatevars.h"
-
+#include <qcompilerdetection.h>
 #include <QCoreApplication>
 #include <QHash>
+#include <QMap>
+#include <QMessageLogger>
 #include <QSet>
 #include <QSharedPointer>
+#include <QSharedData>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QStringList>
+#include <QTypeInfo>
+#include <QtGlobal>
+#include <new>
+
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/exception/vexceptionbadid.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgobject.h"
+#include "../vmisc/diagnostic.h"
+#include "variables.h"
+#include "variables/vinternalvariable.h"
+#include "vdetail.h"
+#include "vtranslatevars.h"
+
+class VAbstractCubicBezierPath;
+class VAbstractCurve;
+class VArc;
+class VArcRadius;
+class VCurveAngle;
+class VCurveLength;
+class VGObject;
+class VIncrement;
+class VLengthLine;
+class VLineAngle;
+class VMeasurement;
+class VTranslateVars;
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
diff --git a/src/libs/vpatterndb/vdetail.cpp b/src/libs/vpatterndb/vdetail.cpp
index 8f0d25092..153e5f131 100644
--- a/src/libs/vpatterndb/vdetail.cpp
+++ b/src/libs/vpatterndb/vdetail.cpp
@@ -27,13 +27,29 @@
  *************************************************************************/
 
 #include "vdetail.h"
-#include "vdetail_p.h"
-#include "vcontainer.h"
-#include "../vgeometry/vpointf.h"
 
 #include <QDebug>
+#include <QList>
+#include <QMessageLogger>
 #include <QPainterPath>
+#include <QSet>
+#include <QSharedPointer>
 #include <QString>
+#include <Qt>
+#include <QtDebug>
+#include <new>
+
+#include "../ifc/../vmisc/def.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vlayout/vlayoutdef.h"
+#include "vcontainer.h"
+#include "vdetail_p.h"
+#include "vnodedetail.h"
+#include "vpatternpiecedata.h"
+
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vpatterndb/vdetail.h b/src/libs/vpatterndb/vdetail.h
index 976b885d7..626fb4a0f 100644
--- a/src/libs/vpatterndb/vdetail.h
+++ b/src/libs/vpatterndb/vdetail.h
@@ -29,16 +29,24 @@
 #ifndef VDETAIL_H
 #define VDETAIL_H
 
-#include "vnodedetail.h"
+#include <qcompilerdetection.h>
+#include <QPointF>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QTypeInfo>
 #include <QVector>
+#include <QtGlobal>
 
 #include "../vlayout/vabstractdetail.h"
+#include "vnodedetail.h"
 
-class VDetailData;
-class VContainer;
 class QPainterPath;
-class VPatternPieceData;
+class QPointF;
+class VContainer;
+class VDetailData;
+class VNodeDetail;
 class VPatternInfoGeometry;
+class VPatternPieceData;
 
 /**
  * @brief The VDetail class for path of object (points, arcs, splines).
diff --git a/src/libs/vpatterndb/vformula.cpp b/src/libs/vpatterndb/vformula.cpp
index 58a660578..464d80d46 100644
--- a/src/libs/vpatterndb/vformula.cpp
+++ b/src/libs/vpatterndb/vformula.cpp
@@ -27,15 +27,22 @@
  *************************************************************************/
 
 #include "vformula.h"
+
+#include <qnumeric.h>
+#include <QDebug>
+#include <QMessageLogger>
+#include <QScopedPointer>
+#include <QtDebug>
+
+#include "../ifc/../vmisc/def.h"
+#include "../qmuparser/qmuparsererror.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
 #include "calculator.h"
 #include "vcontainer.h"
-#include "../vmisc/vabstractapplication.h"
-#include "../vmisc/vsettings.h"
 #include "vtranslatevars.h"
 
-#include <QDebug>
-#include <QtNumeric>
-
 //VFormula
 //---------------------------------------------------------------------------------------------------------------------
 VFormula::VFormula()
diff --git a/src/libs/vpatterndb/vformula.h b/src/libs/vpatterndb/vformula.h
index fa0c42e79..3bec3e2c3 100644
--- a/src/libs/vpatterndb/vformula.h
+++ b/src/libs/vpatterndb/vformula.h
@@ -30,6 +30,10 @@
 #define VFORMULA_H
 
 #include <QCoreApplication>
+#include <QMetaType>
+#include <QMetaTypeId>
+#include <QString>
+#include <QtGlobal>
 
 enum class FormulaType : char{ToUser, FromUser};
 
diff --git a/src/libs/vpatterndb/vnodedetail.h b/src/libs/vpatterndb/vnodedetail.h
index aa662b1bb..5d9c32833 100644
--- a/src/libs/vpatterndb/vnodedetail.h
+++ b/src/libs/vpatterndb/vnodedetail.h
@@ -30,8 +30,12 @@
 #define VNODEDETAIL_H
 
 #include <QMetaType>
+#include <QMetaTypeId>
 #include <QSharedDataPointer>
+#include <QTypeInfo>
+#include <QtGlobal>
 
+#include "../ifc/../vmisc/def.h"
 #include "../vmisc/def.h"
 
 class VNodeDetailData;
diff --git a/src/libs/vpatterndb/vpatterninfogeometry.cpp b/src/libs/vpatterndb/vpatterninfogeometry.cpp
index 6de2bcc5d..a97ecf438 100644
--- a/src/libs/vpatterndb/vpatterninfogeometry.cpp
+++ b/src/libs/vpatterndb/vpatterninfogeometry.cpp
@@ -28,6 +28,8 @@
 
 #include "vpatterninfogeometry.h"
 
+class QPointF;
+
 //---------------------------------------------------------------------------------------------------------------------
 VPatternInfoGeometry::VPatternInfoGeometry()
     :m_ptPos(0, 0), m_dLabelWidth(0), m_dLabelHeight(0), m_iFontSize(MIN_FONT_SIZE),
diff --git a/src/libs/vpatterndb/vpatterninfogeometry.h b/src/libs/vpatterndb/vpatterninfogeometry.h
index 6bb562fa1..d7b7203a5 100644
--- a/src/libs/vpatterndb/vpatterninfogeometry.h
+++ b/src/libs/vpatterndb/vpatterninfogeometry.h
@@ -32,6 +32,9 @@
 #define MIN_FONT_SIZE               12
 
 #include <QPointF>
+#include <QtGlobal>
+
+class QPointF;
 
 /**
  * @brief The VPatternInfoGeometry class holds the information about pattern info label geometry
diff --git a/src/libs/vpatterndb/vpatternpiecedata.cpp b/src/libs/vpatterndb/vpatternpiecedata.cpp
index 08beb8e54..cea9802fa 100644
--- a/src/libs/vpatterndb/vpatternpiecedata.cpp
+++ b/src/libs/vpatterndb/vpatternpiecedata.cpp
@@ -28,6 +28,8 @@
 
 #include "vpatternpiecedata.h"
 
+class QPointF;
+
 //---------------------------------------------------------------------------------------------------------------------
 MaterialCutPlacement::MaterialCutPlacement()
     :m_eMaterial(MaterialType::mtFabric), m_qsMaterialUserDef(), m_iCutNumber(0), m_ePlacement(PlacementType::ptNone)
diff --git a/src/libs/vpatterndb/vpatternpiecedata.h b/src/libs/vpatterndb/vpatternpiecedata.h
index 0852b5724..961dcb22c 100644
--- a/src/libs/vpatterndb/vpatternpiecedata.h
+++ b/src/libs/vpatterndb/vpatternpiecedata.h
@@ -32,8 +32,13 @@
 #define MIN_FONT_SIZE           12
 
 #include <QList>
-#include <QString>
 #include <QPointF>
+#include <QSet>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
+class QPointF;
 
 enum class MaterialType : char
 {
diff --git a/src/libs/vpatterndb/vtranslatemeasurements.cpp b/src/libs/vpatterndb/vtranslatemeasurements.cpp
index 2f8762dd8..602940659 100644
--- a/src/libs/vpatterndb/vtranslatemeasurements.cpp
+++ b/src/libs/vpatterndb/vtranslatemeasurements.cpp
@@ -27,6 +27,8 @@
  *************************************************************************/
 
 #include "vtranslatemeasurements.h"
+
+#include "../qmuparser/qmutranslation.h"
 #include "../vmisc/def.h"
 
 using namespace qmu;
diff --git a/src/libs/vpatterndb/vtranslatemeasurements.h b/src/libs/vpatterndb/vtranslatemeasurements.h
index 7b8ea095f..bde8a369a 100644
--- a/src/libs/vpatterndb/vtranslatemeasurements.h
+++ b/src/libs/vpatterndb/vtranslatemeasurements.h
@@ -30,8 +30,15 @@
 #define VTRANSLATEMEASUREMENTS_H
 
 #include <QMap>
+#include <QString>
+#include <QtGlobal>
+
 #include "../qmuparser/qmutranslation.h"
 
+namespace qmu {
+class QmuTranslation;
+}  // namespace qmu
+
 class VTranslateMeasurements
 {
 public:
diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp
index 4c6fe32a4..9b3e5168e 100644
--- a/src/libs/vpatterndb/vtranslatevars.cpp
+++ b/src/libs/vpatterndb/vtranslatevars.cpp
@@ -27,16 +27,24 @@
  *************************************************************************/
 
 #include "vtranslatevars.h"
-#include "calculator.h"
-#include "../vmisc/def.h"
-#include "../vmisc/vabstractapplication.h"
-#include "../vgeometry/vgeometrydef.h"
-#include "../qmuparser/qmutokenparser.h"
-#include "../ifc/ifcdef.h"
 
+#include <QDebug>
+#include <QList>
 #include <QLocale>
+#include <QMap>
+#include <QMessageLogger>
+#include <QString>
 #include <QtDebug>
 
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/ifcdef.h"
+#include "../qmuparser/qmuparsererror.h"
+#include "../qmuparser/qmutokenparser.h"
+#include "../qmuparser/qmutranslation.h"
+#include "../vmisc/../vpatterndb/vtranslatevars.h"
+#include "../vmisc/vabstractapplication.h"
+#include "vtranslatemeasurements.h"
+
 using namespace qmu;
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vpatterndb/vtranslatevars.h b/src/libs/vpatterndb/vtranslatevars.h
index 9684af812..17ab3f718 100644
--- a/src/libs/vpatterndb/vtranslatevars.h
+++ b/src/libs/vpatterndb/vtranslatevars.h
@@ -29,6 +29,9 @@
 #ifndef VTRANSLATEVARS_H
 #define VTRANSLATEVARS_H
 
+#include <qcompilerdetection.h>
+#include <QtGlobal>
+
 #include "vtranslatemeasurements.h"
 
 class VTranslateVars : public VTranslateMeasurements
diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.cpp b/src/libs/vpropertyexplorer/checkablemessagebox.cpp
index 320df4bca..7a2097975 100644
--- a/src/libs/vpropertyexplorer/checkablemessagebox.cpp
+++ b/src/libs/vpropertyexplorer/checkablemessagebox.cpp
@@ -17,12 +17,26 @@
 
 #include "checkablemessagebox.h"
 
+#include <QAbstractButton>
 #include <QApplication>
 #include <QCheckBox>
+#include <QForeachContainer>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QLatin1String>
 #include <QPushButton>
 #include <QSettings>
+#include <QSize>
+#include <QSizePolicy>
+#include <QSpacerItem>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <Qt>
+
+class QHBoxLayout;
+class QSpacerItem;
+class QVBoxLayout;
+class QWidget;
 
 static const char kDoNotAskAgainKey[] = "DoNotAskAgain";
 
diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.h b/src/libs/vpropertyexplorer/checkablemessagebox.h
index d71e425f7..db8478d3c 100644
--- a/src/libs/vpropertyexplorer/checkablemessagebox.h
+++ b/src/libs/vpropertyexplorer/checkablemessagebox.h
@@ -18,11 +18,23 @@
 #ifndef CHECKABLEMESSAGEBOX_H
 #define CHECKABLEMESSAGEBOX_H
 
-#include "vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QDialog>
 #include <QDialogButtonBox>
+#include <QFlags>
 #include <QMessageBox>
+#include <QMetaObject>
+#include <QObject>
+#include <QPixmap>
+#include <QString>
+#include <QtGlobal>
 
+#include "vpropertyexplorer_global.h"
+
+class QAbstractButton;
+class QPushButton;
 class QSettings;
+class QWidget;
 
 namespace Utils
 {
diff --git a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp
index 51f6f20a0..fd24a78c3 100644
--- a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp
@@ -22,9 +22,13 @@
 
 using namespace VPE;
 
+#include <QFlags>
+#include <QForeachContainer>
+#include <QList>
+#include <QStringList>
+
 #include "../../vproperty_p.h"
 #include "../vnumberproperty.h"
-#include <QStringList>
 
 QVector3DProperty::QVector3DProperty(const QString& name)
     : VProperty(name, QVariant::String) // todo: QVariant::Vector3D??
diff --git a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h
index 5cf6813b7..ca737a0d5 100644
--- a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h
@@ -21,8 +21,19 @@
 #ifndef VVECTOR3DPROPERTY_H
 #define VVECTOR3DPROPERTY_H
 
-#include "../../vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <stddef.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+
 #include "../../vproperty.h"
+#include "../../vpropertyexplorer_global.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp b/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp
index f635c4293..6d14192c7 100644
--- a/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp
@@ -20,12 +20,8 @@
 
 #include "vboolproperty.h"
 
-#include <QCheckBox>
-#include <QApplication>
-#include <QStyle>
-#include <QSizePolicy>
+#include <QFlags>
 #include <QObject>
-#include <QSpinBox>
 
 #include "../vproperty_p.h"
 
diff --git a/src/libs/vpropertyexplorer/plugins/vboolproperty.h b/src/libs/vpropertyexplorer/plugins/vboolproperty.h
index 6e9d4b3f0..474014881 100644
--- a/src/libs/vpropertyexplorer/plugins/vboolproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.h
@@ -21,7 +21,18 @@
 #ifndef VBOOLPROPERTY_H
 #define VBOOLPROPERTY_H
 
+#include <qcompilerdetection.h>
+#include <stddef.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+
 #include "../vproperty.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp b/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp
index fc27d18f2..e0eb6fc4c 100644
--- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp
@@ -19,9 +19,17 @@
  *************************************************************************/
 
 #include "vcolorproperty.h"
-#include "vcolorpropertyeditor.h"
+
+#include <QColor>
+#include <QLocale>
+#include <QPixmap>
+#include <QWidget>
 
 #include "../vproperty_p.h"
+#include "vcolorpropertyeditor.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h
index b7f13c6a6..6520cbe20 100644
--- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h
@@ -21,9 +21,24 @@
 #ifndef VCOLORPROPERTY_H
 #define VCOLORPROPERTY_H
 
-#include "../vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <stddef.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
 
 #include "../vproperty.h"
+#include "../vpropertyexplorer_global.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp
index 2f29563e1..cc68925f0 100644
--- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp
@@ -20,14 +20,21 @@
 
 #include "vcolorpropertyeditor.h"
 
-#include <QHBoxLayout>
-#include <QFileDialog>
-#include <QKeyEvent>
-#include <QApplication>
 #include <QColorDialog>
+#include <QCoreApplication>
+#include <QEvent>
+#include <QHBoxLayout>
+#include <QImage>
+#include <QLabel>
+#include <QRgb>
+#include <QSizePolicy>
+#include <QSpacerItem>
+#include <QToolButton>
 
 #include "../vproperty.h"
 
+class QHBoxLayout;
+
 using namespace VPE;
 
 VColorPropertyEditor::VColorPropertyEditor(QWidget *parent)
diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h
index 05760823c..e5ee451f5 100644
--- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h
+++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h
@@ -21,13 +21,25 @@
 #ifndef VCOLORPROPERTYEDITOR_H
 #define VCOLORPROPERTYEDITOR_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMetaObject>
+#include <QObject>
+#include <QPixmap>
+#include <QSpacerItem>
+#include <QString>
+#include <QToolButton>
+#include <QWidget>
+#include <QtGlobal>
+
 #include "../vpropertyexplorer_global.h"
 
-#include <QWidget>
-#include <QToolButton>
-#include <QLineEdit>
-#include <QLabel>
-#include <QSpacerItem>
+class QEvent;
+class QLabel;
+class QSpacerItem;
+class QToolButton;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp b/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp
index db1f9959e..43bbdd65c 100644
--- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp
@@ -20,6 +20,21 @@
 
 #include "vemptyproperty.h"
 
+#include <stddef.h>
+#include <QBrush>
+#include <QColor>
+#include <QFlags>
+#include <QFont>
+
+#include "plugins/../vproperty.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
+namespace VPE {
+class VPropertyPrivate;
+}  // namespace VPE
+
 using namespace VPE;
 
 VEmptyProperty::VEmptyProperty(const QString& name)
diff --git a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h
index c526c70c0..afc1da9c9 100644
--- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h
@@ -21,7 +21,24 @@
 #ifndef VEMPTYPROPERTY_H
 #define VEMPTYPROPERTY_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+
 #include "../vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
+namespace VPE {
+class VPropertyPrivate;
+}  // namespace VPE
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/venumproperty.cpp b/src/libs/vpropertyexplorer/plugins/venumproperty.cpp
index 14d3d5ea7..24495253b 100644
--- a/src/libs/vpropertyexplorer/plugins/venumproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/venumproperty.cpp
@@ -19,10 +19,16 @@
  *************************************************************************/
 
 #include "venumproperty.h"
-#include "../vproperty_p.h"
 
 #include <QComboBox>
 #include <QCoreApplication>
+#include <QLocale>
+#include <QWidget>
+
+#include "../vproperty_p.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/venumproperty.h b/src/libs/vpropertyexplorer/plugins/venumproperty.h
index 4e7b12ad9..f2e165e2f 100644
--- a/src/libs/vpropertyexplorer/plugins/venumproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/venumproperty.h
@@ -21,9 +21,23 @@
 #ifndef VENUMPROPERTY_H
 #define VENUMPROPERTY_H
 
-#include "../vproperty.h"
-
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
 #include <QStringList>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+
+#include "../vproperty.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp b/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp
index 8e965fabf..1ccef2f3f 100644
--- a/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp
@@ -19,12 +19,17 @@
  *************************************************************************/
 
 #include "vfileproperty.h"
-#include <QFileInfo>
-#include <QAbstractItemDelegate>
 
-#include "vfilepropertyeditor.h"
+#include <QAbstractItemDelegate>
+#include <QFileInfo>
+#include <QLocale>
+#include <QWidget>
 
 #include "../vfileproperty_p.h"
+#include "vfilepropertyeditor.h"
+#include "vproperty_p.h"
+
+class QStyleOptionViewItem;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vfileproperty.h b/src/libs/vpropertyexplorer/plugins/vfileproperty.h
index 244020e8c..36b99fcd5 100644
--- a/src/libs/vpropertyexplorer/plugins/vfileproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vfileproperty.h
@@ -21,11 +21,25 @@
 #ifndef VFILEPROPERTY_H
 #define VFILEPROPERTY_H
 
-#include "../vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointer>
+#include <QString>
+#include <QStringList>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
 
 #include "../vproperty.h"
+#include "../vpropertyexplorer_global.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
 
-#include <QPointer>
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp
index 741542a1c..942c976b8 100644
--- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp
@@ -20,12 +20,30 @@
 
 #include "vfilepropertyeditor.h"
 
-#include "vfileproperty.h"
-
-#include <QHBoxLayout>
+#include <QDragEnterEvent>
+#include <QDragLeaveEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QEvent>
+#include <QFile>
 #include <QFileDialog>
-#include <QKeyEvent>
+#include <QFileInfo>
+#include <QForeachContainer>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QList>
+#include <QMimeData>
+#include <QRegExp>
+#include <QSizePolicy>
+#include <QToolButton>
 #include <QUrl>
+#include <Qt>
+
+class QDragEnterEvent;
+class QDragLeaveEvent;
+class QDragMoveEvent;
+class QDropEvent;
+class QHBoxLayout;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h
index da0ce3e17..e52033c39 100644
--- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h
+++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h
@@ -21,12 +21,27 @@
 #ifndef VFILEPROPERTYEDITOR_H
 #define VFILEPROPERTYEDITOR_H
 
+#include <qcompilerdetection.h>
+#include <QLineEdit>
+#include <QMetaObject>
+#include <QMimeData>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QToolButton>
+#include <QWidget>
+#include <QtGlobal>
+
 #include "../vpropertyexplorer_global.h"
 
-#include <QWidget>
-#include <QToolButton>
-#include <QLineEdit>
-#include <QMimeData>
+class QDragEnterEvent;
+class QDragLeaveEvent;
+class QDragMoveEvent;
+class QDropEvent;
+class QEvent;
+class QLineEdit;
+class QMimeData;
+class QToolButton;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp
index 0ad7405e0..c2f04a636 100644
--- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp
@@ -27,10 +27,23 @@
  *************************************************************************/
 
 #include "vlinecolorproperty.h"
-#include "../vproperty_p.h"
 
+#include <QColor>
 #include <QComboBox>
 #include <QCoreApplication>
+#include <QIcon>
+#include <QLocale>
+#include <QPixmap>
+#include <QSize>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QWidget>
+
+#include "../vproperty_p.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h
index 654cc58df..37364ab61 100644
--- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h
@@ -29,10 +29,24 @@
 #ifndef VLINECOLORPROPERTY_H
 #define VLINECOLORPROPERTY_H
 
-#include "../vproperty.h"
-
+#include <qcompilerdetection.h>
 #include <QMap>
+#include <QMetaObject>
+#include <QObject>
 #include <QString>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+#include <QtGlobal>
+
+#include "../vproperty.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp
index 3d684e06f..ece3d58bd 100644
--- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp
@@ -27,10 +27,20 @@
  *************************************************************************/
 
 #include "vlinetypeproperty.h"
-#include "../vproperty_p.h"
 
 #include <QComboBox>
 #include <QCoreApplication>
+#include <QLocale>
+#include <QSize>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QWidget>
+
+#include "../vproperty_p.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h
index 50722e73f..eb21c13a3 100644
--- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h
@@ -29,11 +29,25 @@
 #ifndef VLINETYPEPROPERTY_H
 #define VLINETYPEPROPERTY_H
 
-#include "../vproperty.h"
-
-#include <QMap>
-#include <QString>
+#include <qcompilerdetection.h>
 #include <QIcon>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+#include <QtGlobal>
+
+#include "../vproperty.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp b/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp
index 65ee10a1a..b1524d5e6 100644
--- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp
@@ -20,13 +20,19 @@
 
 #include "vnumberproperty.h"
 
-#include <QDoubleSpinBox>
-#include <QSpinBox>
-#include <QSizePolicy>
 #include <QCoreApplication>
+#include <QDoubleSpinBox>
+#include <QLatin1String>
+#include <QLocale>
+#include <QSizePolicy>
+#include <QSpinBox>
+#include <QWidget>
 
 #include "../vproperty_p.h"
 
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+
 using namespace VPE;
 
 
diff --git a/src/libs/vpropertyexplorer/plugins/vnumberproperty.h b/src/libs/vpropertyexplorer/plugins/vnumberproperty.h
index e9ecc3209..2d39ff7d0 100644
--- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.h
@@ -21,8 +21,25 @@
 #ifndef VNUMBERPROPERTY_H
 #define VNUMBERPROPERTY_H
 
-#include "../vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <stddef.h>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QtGlobal>
+
 #include "../vproperty.h"
+#include "../vpropertyexplorer_global.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp
index 7d66eee1f..0ed8c347f 100644
--- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp
@@ -19,11 +19,16 @@
  *************************************************************************/
 
 #include "vobjectproperty.h"
-#include "../vproperty_p.h"
 
 #include <QComboBox>
 #include <QCoreApplication>
-#include <QDebug>
+#include <QLocale>
+#include <QWidget>
+
+#include "../vproperty_p.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h
index 3a7bf4c0d..729b9f63d 100644
--- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h
@@ -21,11 +21,25 @@
 #ifndef VOBJECTPROPERTY_H
 #define VOBJECTPROPERTY_H
 
-#include "../vproperty.h"
-
+#include <qcompilerdetection.h>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
 #include <QStringList>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
 
+#include "../vproperty.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
 class QComboBox;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp b/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp
index f5ed1b951..4074beacb 100644
--- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp
@@ -22,9 +22,15 @@
 
 using namespace VPE;
 
+#include <QFlags>
+#include <QForeachContainer>
+#include <QList>
+#include <QPointF>
+
 #include "../vproperty_p.h"
 #include "vnumberproperty.h"
-#include <QPointF>
+
+class QPointF;
 
 VPE::VPointFProperty::VPointFProperty(const QString &name)
     : VProperty(name, QVariant::PointF)
diff --git a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h
index 7bcce1f0d..9749bb4fb 100644
--- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h
@@ -21,9 +21,21 @@
 #ifndef VPOINTFPROPERTY_H
 #define VPOINTFPROPERTY_H
 
-#include "../vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
 
 #include "../vproperty.h"
+#include "../vpropertyexplorer_global.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QPointF;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp
index 6d10a23f2..2a7e60400 100644
--- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp
@@ -19,12 +19,16 @@
  *************************************************************************/
 
 #include "vshortcutproperty.h"
-#include <QFileInfo>
-#include <QAbstractItemDelegate>
 
-#include "vshortcutpropertyeditor.h"
+#include <QAbstractItemDelegate>
+#include <QKeySequence>
+#include <QLocale>
+#include <QWidget>
 
 #include "../vproperty_p.h"
+#include "vshortcutpropertyeditor.h"
+
+class QStyleOptionViewItem;
 
 
 using namespace VPE;
diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h
index e785acfb4..085286f09 100644
--- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h
@@ -21,8 +21,23 @@
 #ifndef VSHORTCUTROPERTY_H
 #define VSHORTCUTROPERTY_H
 
-#include "../vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+
 #include "../vproperty.h"
+#include "../vpropertyexplorer_global.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp
index 03dc13563..7137d40ae 100644
--- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp
@@ -20,8 +20,15 @@
 
 #include "vshortcutpropertyeditor.h"
 
+#include <QEvent>
 #include <QHBoxLayout>
 #include <QKeyEvent>
+#include <QLineEdit>
+#include <QSizePolicy>
+#include <Qt>
+
+class QHBoxLayout;
+class QKeyEvent;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h
index fa85aa7f8..83e5270ea 100644
--- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h
+++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h
@@ -21,12 +21,21 @@
 #ifndef VSHORTCUTPROPERTYEDITOR_H
 #define VSHORTCUTPROPERTYEDITOR_H
 
+#include <qcompilerdetection.h>
+#include <QKeySequence>
+#include <QLineEdit>
+#include <QMetaObject>
+#include <QMimeData>
+#include <QObject>
+#include <QString>
+#include <QToolButton>
+#include <QWidget>
+#include <QtGlobal>
+
 #include "../vpropertyexplorer_global.h"
 
-#include <QWidget>
-#include <QToolButton>
-#include <QLineEdit>
-#include <QMimeData>
+class QEvent;
+class QLineEdit;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp
index a7e008294..5aaf3e94e 100644
--- a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp
@@ -20,11 +20,20 @@
 
 #include "vstringproperty.h"
 
+#include <QLatin1String>
 #include <QLineEdit>
+#include <QLocale>
 #include <QSizePolicy>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QWidget>
 
 #include "../vproperty_p.h"
 
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+
 using namespace VPE;
 
 
diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.h b/src/libs/vpropertyexplorer/plugins/vstringproperty.h
index b10d03dc9..c4e6be612 100644
--- a/src/libs/vpropertyexplorer/plugins/vstringproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.h
@@ -21,8 +21,24 @@
 #ifndef VSTRINGPROPERTY_H
 #define VSTRINGPROPERTY_H
 
-#include "../vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QtGlobal>
+
 #include "../vproperty.h"
+#include "../vpropertyexplorer_global.h"
+#include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp
index 61159e9b5..26d962c75 100644
--- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp
+++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp
@@ -20,8 +20,13 @@
 
 #include "vwidgetproperty.h"
 
+#include <QPointer>
+#include <QVariant>
+#include <QWidget>
 
 #include "../vwidgetproperty_p.h"
+#include "plugins/vemptyproperty.h"
+#include "vproperty.h"
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h
index 1e6943eba..4d47258c4 100644
--- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h
@@ -21,11 +21,18 @@
 #ifndef VWIDGETROPERTY_H
 #define VWIDGETROPERTY_H
 
-#include "../vpropertyexplorer_global.h"
-
-#include "vemptyproperty.h"
-
+#include <qcompilerdetection.h>
 #include <QPointer>
+#include <QString>
+
+#include "../vpropertyexplorer_global.h"
+#include "vemptyproperty.h"
+#include "vpropertyexplorer_global.h"
+
+class QWidget;
+namespace VPE {
+class VProperty;
+}  // namespace VPE
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/vproperty.cpp b/src/libs/vpropertyexplorer/vproperty.cpp
index b0867627b..17b06bba3 100644
--- a/src/libs/vpropertyexplorer/vproperty.cpp
+++ b/src/libs/vpropertyexplorer/vproperty.cpp
@@ -19,13 +19,25 @@
  *************************************************************************/
 
 #include "vproperty.h"
-#include <QObject>
-#include <QMetaProperty>
+
+#include <QByteArray>
+#include <QFlags>
+#include <QForeachContainer>
 #include <QItemEditorFactory>
 #include <QLineEdit>
+#include <QList>
+#include <QMetaProperty>
+#include <QObject>
+#include <QStandardItemEditorCreator>
+#include <QWidget>
 
 #include "vproperty_p.h"
 
+class QAbstractItemDelegate;
+class QModelIndex;
+class QPainter;
+class QStyleOptionViewItem;
+
 using namespace VPE;
 
 //! Standard constructor, takes a name and a parent property as argument
diff --git a/src/libs/vpropertyexplorer/vproperty.h b/src/libs/vpropertyexplorer/vproperty.h
index 9ac6cc8be..edc4e47a6 100644
--- a/src/libs/vpropertyexplorer/vproperty.h
+++ b/src/libs/vpropertyexplorer/vproperty.h
@@ -21,14 +21,28 @@
 #ifndef VPROPERTY_H
 #define VPROPERTY_H
 
-#include "vpropertyexplorer_global.h"
-
-#include <QVariant>
-#include <QString>
-#include <QSharedPointer>
-#include <QStyleOptionViewItem>
+#include <qcompilerdetection.h>
 #include <QAbstractItemDelegate>
 #include <QEvent>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+
+#include "vpropertyexplorer_global.h"
+
+class QAbstractItemDelegate;
+class QModelIndex;
+class QPainter;
+class QStyleOptionViewItem;
+class QWidget;
+template <typename T> class QList;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/vpropertydelegate.cpp b/src/libs/vpropertyexplorer/vpropertydelegate.cpp
index 04a15e350..b2aa21a37 100644
--- a/src/libs/vpropertyexplorer/vpropertydelegate.cpp
+++ b/src/libs/vpropertyexplorer/vpropertydelegate.cpp
@@ -19,12 +19,22 @@
  *************************************************************************/
 
 #include "vpropertydelegate.h"
+
+#include <QAbstractItemModel>
+#include <QApplication>
+#include <QColor>
+#include <QModelIndex>
+#include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QRgb>
+#include <QStyle>
+#include <QVariant>
+
 #include "vproperty.h"
 
-#include <QApplication>
-#include <QStyle>
-#include <QPen>
-#include <QPainter>
+class QStyleOptionViewItem;
+class QWidget;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/vpropertydelegate.h b/src/libs/vpropertyexplorer/vpropertydelegate.h
index a2e8a4c1c..efa95bcd5 100644
--- a/src/libs/vpropertyexplorer/vpropertydelegate.h
+++ b/src/libs/vpropertyexplorer/vpropertydelegate.h
@@ -21,9 +21,21 @@
 #ifndef VPROPERTYDELEGATE_H
 #define VPROPERTYDELEGATE_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QSize>
+#include <QString>
+#include <QStyleOptionViewItem>
+#include <QStyledItemDelegate>
+
 #include "vpropertyexplorer_global.h"
 
-#include <QStyledItemDelegate>
+class QAbstractItemModel;
+class QModelIndex;
+class QPainter;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp b/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp
index 1abc151cb..6b7edf89e 100644
--- a/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp
+++ b/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp
@@ -19,10 +19,16 @@
  *************************************************************************/
 
 #include "vpropertyfactorymanager.h"
-#include "vpropertyfactorymanager_p.h"
 
-#include "vstandardpropertyfactory.h"
+#include <stddef.h>
+#include <QList>
+#include <QMap>
+#include <QStringList>
+
+#include "vabstractpropertyfactory.h"
 #include "vproperty.h"
+#include "vpropertyfactorymanager_p.h"
+#include "vstandardpropertyfactory.h"
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h
index feab9e4be..a17792e21 100644
--- a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h
+++ b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h
@@ -21,15 +21,22 @@
 #ifndef VPROPERTYFACTORYMANAGER_H
 #define VPROPERTYFACTORYMANAGER_H
 
-#include "vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
 #include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "vpropertyexplorer_global.h"
+
+class QStringList;
 
 namespace VPE
 {
 
 class VAbstractPropertyFactory;
-class VPropertyFactoryManagerPrivate;
 class VProperty;
+class VPropertyFactoryManagerPrivate;
 
 class VPROPERTYEXPLORERSHARED_EXPORT VPropertyFactoryManager : public QObject
 {
diff --git a/src/libs/vpropertyexplorer/vpropertyformview.cpp b/src/libs/vpropertyexplorer/vpropertyformview.cpp
index f74d70ab5..f83db5897 100644
--- a/src/libs/vpropertyexplorer/vpropertyformview.cpp
+++ b/src/libs/vpropertyexplorer/vpropertyformview.cpp
@@ -19,13 +19,19 @@
  *************************************************************************/
 
 #include "vpropertyformview.h"
-#include "vpropertymodel.h"
-#include "vpropertyset.h"
-#include <QFormLayout>
-#include <QGroupBox>
-#include <QShowEvent>
+
+#include <QForeachContainer>
+#include <QList>
+#include <Qt>
 
 #include "vpropertyformview_p.h"
+#include "vpropertyformwidget_p.h"
+#include "vpropertymodel.h"
+#include "vpropertyset.h"
+
+class QModelIndex;
+class QShowEvent;
+class QWidget;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/vpropertyformview.h b/src/libs/vpropertyexplorer/vpropertyformview.h
index abe3c7592..0610dbdc7 100644
--- a/src/libs/vpropertyexplorer/vpropertyformview.h
+++ b/src/libs/vpropertyexplorer/vpropertyformview.h
@@ -21,10 +21,20 @@
 #ifndef VPROPERTYFORMVIEW_H
 #define VPROPERTYFORMVIEW_H
 
-#include "vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
 #include <QPointer>
+#include <QString>
+#include <QtGlobal>
+
+#include "vpropertyexplorer_global.h"
 #include "vpropertyformwidget.h"
 
+class QModelIndex;
+class QShowEvent;
+class QWidget;
+
 namespace VPE
 {
 
diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp
index fa0a976e7..b442d5cb2 100644
--- a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp
+++ b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp
@@ -20,14 +20,23 @@
 
 #include "vpropertyformwidget.h"
 
+#include <QEvent>
+#include <QForeachContainer>
 #include <QFormLayout>
-#include "vpropertyformwidget_p.h"
+#include <QKeyEvent>
+#include <QLayout>
+#include <QLayoutItem>
+#include <QMargins>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QWidget>
+#include <Qt>
 
 #include "plugins/vwidgetproperty.h"
-#include <QEvent>
-#include <QKeyEvent>
 #include "vproperty.h"
-#include <QDebug>
+#include "vpropertyformwidget_p.h"
+
+class QKeyEvent;
 
 using namespace VPE;
 
diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget.h b/src/libs/vpropertyexplorer/vpropertyformwidget.h
index 55338084c..bb16abf05 100644
--- a/src/libs/vpropertyexplorer/vpropertyformwidget.h
+++ b/src/libs/vpropertyexplorer/vpropertyformwidget.h
@@ -23,9 +23,18 @@
 
 #include <QGroupBox>
 #include <QLabel>
+#include <QList>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "plugins/../vproperty.h"
 #include "vproperty.h"
 
+class QEvent;
 class QFormLayout;
+class QWidget;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/vpropertymodel.cpp b/src/libs/vpropertyexplorer/vpropertymodel.cpp
index 6597ed9f3..9dd573963 100644
--- a/src/libs/vpropertyexplorer/vpropertymodel.cpp
+++ b/src/libs/vpropertyexplorer/vpropertymodel.cpp
@@ -20,7 +20,9 @@
 
 #include "vpropertymodel.h"
 
-#include <QBrush>
+#include <QList>
+
+#include "vproperty.h"
 #include "vpropertyset.h"
 
 using namespace VPE;
diff --git a/src/libs/vpropertyexplorer/vpropertymodel.h b/src/libs/vpropertyexplorer/vpropertymodel.h
index 485ab088b..0ac12babf 100644
--- a/src/libs/vpropertyexplorer/vpropertymodel.h
+++ b/src/libs/vpropertyexplorer/vpropertymodel.h
@@ -21,13 +21,23 @@
 #ifndef VPROPERTYMODEL_H
 #define VPROPERTYMODEL_H
 
-#include "vpropertyexplorer_global.h"
-
+#include <qcompilerdetection.h>
 #include <QAbstractItemModel>
 #include <QMap>
+#include <QMetaObject>
+#include <QModelIndex>
+#include <QObject>
 #include <QString>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
 
 #include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+namespace VPE {
+class VProperty;
+}  // namespace VPE
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/vpropertyset.cpp b/src/libs/vpropertyexplorer/vpropertyset.cpp
index dc217bf90..dd9503792 100644
--- a/src/libs/vpropertyexplorer/vpropertyset.cpp
+++ b/src/libs/vpropertyexplorer/vpropertyset.cpp
@@ -19,8 +19,15 @@
  *************************************************************************/
 
 #include "vpropertyset.h"
+
+#include <stddef.h>
+#include <QForeachContainer>
+#include <QList>
+#include <QMap>
+
 using namespace VPE;
 
+#include "vproperty.h"
 #include "vpropertyset_p.h"
 
 
diff --git a/src/libs/vpropertyexplorer/vpropertyset.h b/src/libs/vpropertyexplorer/vpropertyset.h
index 0868a3916..45c8dd7ac 100644
--- a/src/libs/vpropertyexplorer/vpropertyset.h
+++ b/src/libs/vpropertyexplorer/vpropertyset.h
@@ -21,12 +21,19 @@
 #ifndef VPROPERTYSET_H
 #define VPROPERTYSET_H
 
-#include "vpropertyexplorer_global.h"
-
+#include <qcompilerdetection.h>
 #include <QMap>
 #include <QString>
+#include <QtGlobal>
 
 #include "vproperty.h"
+#include "vpropertyexplorer_global.h"
+
+namespace VPE {
+class VProperty;
+}  // namespace VPE
+template <class Key, class T> class QMap;
+template <typename T> class QList;
 
 namespace VPE
 {
diff --git a/src/libs/vpropertyexplorer/vpropertytreeview.cpp b/src/libs/vpropertyexplorer/vpropertytreeview.cpp
index 8456a39d6..761dfdbd8 100644
--- a/src/libs/vpropertyexplorer/vpropertytreeview.cpp
+++ b/src/libs/vpropertyexplorer/vpropertytreeview.cpp
@@ -20,11 +20,15 @@
 
 #include "vpropertytreeview.h"
 
+#include <QAbstractItemView>
+#include <QFlags>
+
 #include "vpropertydelegate.h"
 #include "vpropertymodel.h"
-
 #include "vpropertytreeview_p.h"
 
+class QWidget;
+
 using namespace VPE;
 
 VPropertyTreeView::VPropertyTreeView(QWidget *parent)
diff --git a/src/libs/vpropertyexplorer/vpropertytreeview.h b/src/libs/vpropertyexplorer/vpropertytreeview.h
index bc6e21a5a..ee8dc19c8 100644
--- a/src/libs/vpropertyexplorer/vpropertytreeview.h
+++ b/src/libs/vpropertyexplorer/vpropertytreeview.h
@@ -21,16 +21,23 @@
 #ifndef VPROPERTYTREEVIEW_H
 #define VPROPERTYTREEVIEW_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
 #include <QTreeView>
+#include <QtGlobal>
+
 #include "vpropertyexplorer_global.h"
 
+class QWidget;
+
 namespace VPE
 {
 
-class VPropertyTreeViewPrivate;
-
 class VPROPERTYEXPLORERSHARED_EXPORT VPropertyDelegate;
 class VPROPERTYEXPLORERSHARED_EXPORT VPropertyModel;
+class VPropertyTreeViewPrivate;
 
 class VPROPERTYEXPLORERSHARED_EXPORT VPropertyTreeView : public QTreeView
 {
diff --git a/src/libs/vpropertyexplorer/vserializedproperty.cpp b/src/libs/vpropertyexplorer/vserializedproperty.cpp
index d7b626daa..2afd6e729 100644
--- a/src/libs/vpropertyexplorer/vserializedproperty.cpp
+++ b/src/libs/vpropertyexplorer/vserializedproperty.cpp
@@ -20,6 +20,12 @@
 
 #include "vserializedproperty.h"
 
+#include <QForeachContainer>
+#include <QtGlobal>
+
+#include "vproperty.h"
+#include "vpropertyset.h"
+
 using namespace VPE;
 
 VSerializedProperty::VSerializedProperty()
diff --git a/src/libs/vpropertyexplorer/vserializedproperty.h b/src/libs/vpropertyexplorer/vserializedproperty.h
index a44bf459d..f0e1f852e 100644
--- a/src/libs/vpropertyexplorer/vserializedproperty.h
+++ b/src/libs/vpropertyexplorer/vserializedproperty.h
@@ -21,15 +21,19 @@
 #ifndef VSERIALIZEDPROPERTY_H
 #define VSERIALIZEDPROPERTY_H
 
-#include "vpropertyexplorer_global.h"
-
-#include <QString>
 #include <QList>
+#include <QString>
 #include <QVariant>
 
 #include "vproperty.h"
+#include "vpropertyexplorer_global.h"
 #include "vpropertyset.h"
 
+namespace VPE {
+class VProperty;
+class VPropertySet;
+}  // namespace VPE
+
 namespace VPE
 {
 
diff --git a/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp b/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp
index 243bd2eb7..0004e23f9 100644
--- a/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp
+++ b/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp
@@ -20,10 +20,8 @@
 
 #include "vstandardpropertyfactory.h"
 
-#include "vpropertyfactorymanager.h"
-
-// Supported Properties
-#include "vproperty.h"
+#include "plugins/Vector3d/../../vproperty.h"
+#include "plugins/Vector3d/vvector3dproperty.h"
 #include "plugins/vboolproperty.h"
 #include "plugins/vcolorproperty.h"
 #include "plugins/vemptyproperty.h"
@@ -31,7 +29,7 @@
 #include "plugins/vfileproperty.h"
 #include "plugins/vnumberproperty.h"
 #include "plugins/vshortcutproperty.h"
-#include "plugins/Vector3d/vvector3dproperty.h"
+#include "vpropertyfactorymanager.h"
 
 
 using namespace VPE;
diff --git a/src/libs/vpropertyexplorer/vstandardpropertyfactory.h b/src/libs/vpropertyexplorer/vstandardpropertyfactory.h
index 1c07ccf2e..9df340d5b 100644
--- a/src/libs/vpropertyexplorer/vstandardpropertyfactory.h
+++ b/src/libs/vpropertyexplorer/vstandardpropertyfactory.h
@@ -21,14 +21,16 @@
 #ifndef VASTANDARDPROPERTYFACTORY_H
 #define VASTANDARDPROPERTYFACTORY_H
 
-#include "vpropertyexplorer_global.h"
+#include <qcompilerdetection.h>
+#include <QString>
+
 #include "vabstractpropertyfactory.h"
+#include "vpropertyexplorer_global.h"
 
 namespace VPE
 {
 
 class VProperty;
-
 class VPropertyFactoryManager;
 
 //! The standard property factory is able to create all the properties that are included in VPropertyExplorer
diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
index 22ea0bd69..5b5289b17 100644
--- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
+++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
@@ -27,9 +27,50 @@
  *************************************************************************/
 
 #include "dialogeditwrongformula.h"
-#include "ui_dialogeditwrongformula.h"
+
+#include <qiterator.h>
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QCheckBox>
+#include <QCursor>
+#include <QDialog>
+#include <QFont>
+#include <QHeaderView>
+#include <QLabel>
+#include <QMapIterator>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSharedPointer>
+#include <QShowEvent>
+#include <QSize>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QTextCursor>
+#include <QToolButton>
+#include <QWidget>
+#include <Qt>
+#include <new>
+
 #include "../../../vpatterndb/vcontainer.h"
 #include "../../../vpatterndb/vtranslatevars.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vmisc/def.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/support/../tools/dialogtool.h"
+#include "ui_dialogeditwrongformula.h"
+#include "variables/varcradius.h"
+#include "variables/vcurveangle.h"
+#include "variables/vcurvelength.h"
+#include "variables/vincrement.h"
+#include "variables/vlineangle.h"
+#include "variables/vlinelength.h"
+#include "variables/vmeasurement.h"
+
+class QCloseEvent;
+class QShowEvent;
+template <class T> class QSharedPointer;
 
 enum {ColumnName = 0, ColumnFullName};
 
diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h
index 363fbe827..efb4fb0e9 100644
--- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h
+++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h
@@ -29,8 +29,23 @@
 #ifndef DIALOGEDITWRONGFORMULA_H
 #define DIALOGEDITWRONGFORMULA_H
 
-#include "../tools/dialogtool.h"
+#include <qcompilerdetection.h>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
 #include <QTableWidgetItem>
+#include <QtGlobal>
+
+#include "../tools/dialogtool.h"
+
+class QCloseEvent;
+class QShowEvent;
+class QTableWidgetItem;
+class QWidget;
+class VContainer;
+class VMeasurement;
+template <class T> class QSharedPointer;
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/support/dialogundo.cpp b/src/libs/vtools/dialogs/support/dialogundo.cpp
index 4b858a632..bf86e1202 100644
--- a/src/libs/vtools/dialogs/support/dialogundo.cpp
+++ b/src/libs/vtools/dialogs/support/dialogundo.cpp
@@ -27,11 +27,18 @@
  *************************************************************************/
 
 #include "dialogundo.h"
-#include "ui_dialogundo.h"
-#include "../../../ifc/exception/vexceptionundo.h"
-#include "../../../vmisc/vabstractapplication.h"
+
 #include <QCloseEvent>
-#include <QUndoStack>
+#include <QLocale>
+#include <QPushButton>
+#include <Qt>
+
+#include "../../../vmisc/vabstractapplication.h"
+#include "dialogs/support/../../../ifc/exception/../../vmisc/vcommonsettings.h"
+#include "ui_dialogundo.h"
+
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogUndo::DialogUndo(QWidget *parent)
diff --git a/src/libs/vtools/dialogs/support/dialogundo.h b/src/libs/vtools/dialogs/support/dialogundo.h
index be9ef5c34..86023da49 100644
--- a/src/libs/vtools/dialogs/support/dialogundo.h
+++ b/src/libs/vtools/dialogs/support/dialogundo.h
@@ -29,7 +29,15 @@
 #ifndef DIALOGUNDO_H
 #define DIALOGUNDO_H
 
+#include <qcompilerdetection.h>
 #include <QDialog>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+class QCloseEvent;
+class QWidget;
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
index 3b0f14df4..a689ade8c 100644
--- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
@@ -27,15 +27,37 @@
  *************************************************************************/
 
 #include "dialogalongline.h"
-#include "ui_dialogalongline.h"
-#include "../../visualization/line/vistoolalongline.h"
-#include "../../tools/vabstracttool.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../support/dialogeditwrongformula.h"
-#include "../vgeometry/vpointf.h"
 
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLatin1String>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
 #include <QPushButton>
+#include <QSharedPointer>
+#include <QToolButton>
+#include <new>
+
+#include "../../../vpatterndb/vtranslatevars.h"
+#include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoolalongline.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../support/dialogeditwrongformula.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
+#include "ui_dialogalongline.h"
+#include "variables/vlinelength.h"
+
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.h b/src/libs/vtools/dialogs/tools/dialogalongline.h
index 641eef5e1..f8ae57d15 100644
--- a/src/libs/vtools/dialogs/tools/dialogalongline.h
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGALONGLINE_H
 #define DIALOGALONGLINE_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogAlongLine;
diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp
index 38e592113..8489c1aee 100644
--- a/src/libs/vtools/dialogs/tools/dialogarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp
@@ -27,17 +27,29 @@
  *************************************************************************/
 
 #include "dialogarc.h"
-#include "ui_dialogarc.h"
 
+#include <limits.h>
+#include <QDialog>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QPointer>
 #include <QPushButton>
 #include <QTimer>
+#include <QToolButton>
+#include <Qt>
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
-#include "../../../vpatterndb/vtranslatevars.h"
 #include "../../../ifc/xml/vdomdocument.h"
+#include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolarc.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "ui_dialogarc.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogarc.h b/src/libs/vtools/dialogs/tools/dialogarc.h
index fe545413a..0f5f28ed0 100644
--- a/src/libs/vtools/dialogs/tools/dialogarc.h
+++ b/src/libs/vtools/dialogs/tools/dialogarc.h
@@ -29,8 +29,21 @@
 #ifndef DIALOGARC_H
 #define DIALOGARC_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QTimer;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogArc;
diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
index 46dae81de..bacaad2de 100644
--- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
@@ -27,17 +27,29 @@
  *************************************************************************/
 
 #include "dialogarcwithlength.h"
-#include "ui_dialogarcwithlength.h"
 
+#include <limits.h>
+#include <QDialog>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QPointer>
 #include <QPushButton>
 #include <QTimer>
+#include <QToolButton>
+#include <Qt>
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
-#include "../../../vpatterndb/vtranslatevars.h"
 #include "../../../ifc/xml/vdomdocument.h"
+#include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolarcwithlength.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "ui_dialogarcwithlength.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogArcWithLength::DialogArcWithLength(const VContainer *data, const quint32 &toolId, QWidget *parent)
diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h
index 0c89edcbc..f836f0e11 100644
--- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h
+++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h
@@ -29,8 +29,21 @@
 #ifndef DIALOGARCWITHLENGTH_H
 #define DIALOGARCWITHLENGTH_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QTimer;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogArcWithLength;
diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
index d8e7d08ac..a812235aa 100644
--- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
@@ -27,15 +27,32 @@
  *************************************************************************/
 
 #include "dialogbisector.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QSet>
+#include <QToolButton>
+
+#include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoolbisector.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "ui_dialogbisector.h"
 
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../vpatterndb/vtranslatevars.h"
-#include "../../visualization/line/vistoolbisector.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../../tools/vabstracttool.h"
-#include "../support/dialogeditwrongformula.h"
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.h b/src/libs/vtools/dialogs/tools/dialogbisector.h
index b4b2cc702..5575e539b 100644
--- a/src/libs/vtools/dialogs/tools/dialogbisector.h
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGBISECTOR_H
 #define DIALOGBISECTOR_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogBisector;
diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
index 0f4103100..3db63df11 100644
--- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
@@ -27,8 +27,22 @@
  *************************************************************************/
 
 #include "dialogcubicbezier.h"
-#include "ui_dialogcubicbezier.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPointer>
+#include <new>
+
 #include "../../visualization/path/vistoolcubicbezier.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
+#include "ui_dialogcubicbezier.h"
+
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogCubicBezier::DialogCubicBezier(const VContainer *data, const quint32 &toolId, QWidget *parent)
diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h
index 490afb13a..dc72c7f1c 100644
--- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h
@@ -29,8 +29,21 @@
 #ifndef DIALOGCUBICBEZIER_H
 #define DIALOGCUBICBEZIER_H
 
-#include "dialogtool.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vgeometry/vcubicbezier.h"
+#include "../vmisc/def.h"
+#include "dialogtool.h"
+
+class QWidget;
+class VContainer;
+class VPointF;
+template <class T> class QSharedPointer;
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
index a0f1145c6..8a1a7bc5e 100644
--- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
@@ -27,14 +27,37 @@
  *************************************************************************/
 
 #include "dialogcubicbezierpath.h"
-#include "ui_dialogcubicbezierpath.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QFont>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPointer>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+#include <new>
+
 #include "../../visualization/path/vistoolcubicbezierpath.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vabstractmainwindow.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
+#include "ui_dialogcubicbezierpath.h"
+
+class QWidget;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h
index ead6931de..725f639b0 100644
--- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGCUBICBEZIERPATH_H
 #define DIALOGCUBICBEZIERPATH_H
 
-#include "dialogtool.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QSet>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vgeometry/vcubicbezierpath.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/def.h"
+#include "dialogtool.h"
+
+class QWidget;
+class VContainer;
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
index df369c3ec..cea51b3ea 100644
--- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
@@ -27,18 +27,35 @@
  *************************************************************************/
 
 #include "dialogcurveintersectaxis.h"
-#include "ui_dialogcurveintersectaxis.h"
+
+#include <QDialog>
+#include <QLineEdit>
+#include <QLineF>
+#include <QPlainTextEdit>
+#include <QPointF>
+#include <QPointer>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QToolButton>
+#include <new>
 
 #include "../../../vgeometry/vpointf.h"
 #include "../../../vpatterndb/vcontainer.h"
 #include "../../../vpatterndb/vtranslatevars.h"
-#include "../../visualization/line/vistoolcurveintersectaxis.h"
 #include "../../../vwidgets/vmaingraphicsscene.h"
 #include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoolcurveintersectaxis.h"
+#include "../ifc/xml/vabstractpattern.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
 #include "../vwidgets/vabstractmainwindow.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
+#include "ui_dialogcurveintersectaxis.h"
 
-#include <QTimer>
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent)
diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h
index cba64ba51..11ef9f67d 100644
--- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h
+++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGCURVEINTERSECTAXIS_H
 #define DIALOGCURVEINTERSECTAXIS_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogCurveIntersectAxis;
diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
index 531e3da96..7193f6598 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
@@ -27,14 +27,27 @@
  *************************************************************************/
 
 #include "dialogcutarc.h"
-#include "ui_dialogcutarc.h"
 
-#include "../../../vgeometry/varc.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include <QDialog>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QToolButton>
+
 #include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolcutarc.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "ui_dialogcutarc.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.h b/src/libs/vtools/dialogs/tools/dialogcutarc.h
index 28ecd4479..24270b800 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutarc.h
+++ b/src/libs/vtools/dialogs/tools/dialogcutarc.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGCUTARC_H
 #define DIALOGCUTARC_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogCutArc;
diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
index f5c8a46a2..9b924e308 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
@@ -27,13 +27,27 @@
  *************************************************************************/
 
 #include "dialogcutspline.h"
-#include "ui_dialogcutspline.h"
 
-#include "../../../vgeometry/vspline.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include <QDialog>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QToolButton>
+
 #include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolcutspline.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "ui_dialogcutspline.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.h b/src/libs/vtools/dialogs/tools/dialogcutspline.h
index e52d505f0..930495f14 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutspline.h
+++ b/src/libs/vtools/dialogs/tools/dialogcutspline.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGCUTSPLINE_H
 #define DIALOGCUTSPLINE_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogCutSpline;
diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
index d240740bc..cc5a74f42 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
@@ -27,13 +27,27 @@
  *************************************************************************/
 
 #include "dialogcutsplinepath.h"
-#include "ui_dialogcutsplinepath.h"
 
-#include "../../../vgeometry/vsplinepath.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include <QDialog>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QToolButton>
+
 #include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolcutsplinepath.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "ui_dialogcutsplinepath.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h
index 5a667e16c..e9da1636d 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h
+++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGCUTSPLINEPATH_H
 #define DIALOGCUTSPLINEPATH_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogCutSplinePath;
diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp
index 10131cfbe..da255cd2e 100644
--- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp
@@ -29,13 +29,45 @@
 #include "dialogdetail.h"
 
 #include <QBuffer>
+#include <QByteArray>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDebug>
+#include <QDialogButtonBox>
+#include <QDoubleSpinBox>
+#include <QFlags>
+#include <QFont>
+#include <QIcon>
+#include <QLabel>
+#include <QLatin1String>
+#include <QLineEdit>
+#include <QList>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QMessageLogger>
+#include <QPixmap>
+#include <QPointF>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSpinBox>
+#include <QTabWidget>
+#include <QToolButton>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+#include <QtDebug>
+#include <new>
 
-#include "../../../vgeometry/varc.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vgeometry/vsplinepath.h"
-#include "../../../vpatterndb/vcontainer.h"
 #include "../../../ifc/xml/vdomdocument.h"
+#include "../../../vpatterndb/vcontainer.h"
+#include "../vgeometry/vgobject.h"
+#include "../vmisc/vabstractapplication.h"
+#include "dialogs/tools/dialogtool.h"
+#include "vnodedetail.h"
+
+class QPointF;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.h b/src/libs/vtools/dialogs/tools/dialogdetail.h
index 482a5ee5d..69a3928af 100644
--- a/src/libs/vtools/dialogs/tools/dialogdetail.h
+++ b/src/libs/vtools/dialogs/tools/dialogdetail.h
@@ -29,11 +29,22 @@
 #ifndef DIALOGDETAIL_H
 #define DIALOGDETAIL_H
 
-#include "ui_dialogdetail.h"
-#include "dialogtool.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "../vpatterndb/vdetail.h"
-#include "../vpatterndb/vpatternpiecedata.h"
 #include "../vpatterndb/vpatterninfogeometry.h"
+#include "../vpatterndb/vpatternpiecedata.h"
+#include "dialogtool.h"
+#include "ui_dialogdetail.h"
+
+class QWidget;
+class VContainer;
 
 /**
  * @brief The DialogDetail class dialog for ToolDetai. Help create detail and edit option.
diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp
index 4d45c0532..056f8b903 100644
--- a/src/libs/vtools/dialogs/tools/dialogendline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp
@@ -27,17 +27,36 @@
  *************************************************************************/
 
 #include "dialogendline.h"
-#include "ui_dialogendline.h"
+
+#include <QDialog>
+#include <QLineEdit>
+#include <QLineF>
+#include <QPlainTextEdit>
+#include <QPointF>
+#include <QPointer>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QToolButton>
+#include <new>
 
 #include "../../../vgeometry/vpointf.h"
 #include "../../../vpatterndb/vcontainer.h"
 #include "../../../vpatterndb/vtranslatevars.h"
-#include "../../visualization/line/vistoolendline.h"
 #include "../../../vwidgets/vmaingraphicsscene.h"
 #include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoolendline.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
 #include "../vwidgets/vabstractmainwindow.h"
-#include <QTimer>
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
+#include "ui_dialogendline.h"
+
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogendline.h b/src/libs/vtools/dialogs/tools/dialogendline.h
index 5ae777ee8..baedf29ef 100644
--- a/src/libs/vtools/dialogs/tools/dialogendline.h
+++ b/src/libs/vtools/dialogs/tools/dialogendline.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGENDLINE_H
 #define DIALOGENDLINE_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogEndLine;
diff --git a/src/libs/vtools/dialogs/tools/dialoggroup.cpp b/src/libs/vtools/dialogs/tools/dialoggroup.cpp
index d9e64ef23..31fd3e94b 100644
--- a/src/libs/vtools/dialogs/tools/dialoggroup.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoggroup.cpp
@@ -27,8 +27,13 @@
  *************************************************************************/
 
 #include "dialoggroup.h"
+
+#include <QLineEdit>
+
 #include "ui_dialoggroup.h"
-#include "../vtools/tools/drawTools/drawtools.h"
+
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogGroup::DialogGroup(const VContainer *data, const quint32 &toolId, QWidget *parent)
diff --git a/src/libs/vtools/dialogs/tools/dialoggroup.h b/src/libs/vtools/dialogs/tools/dialoggroup.h
index 249e0e5f7..0462a7148 100644
--- a/src/libs/vtools/dialogs/tools/dialoggroup.h
+++ b/src/libs/vtools/dialogs/tools/dialoggroup.h
@@ -29,8 +29,19 @@
 #ifndef DIALOGGROUP_H
 #define DIALOGGROUP_H
 
+#include <qcompilerdetection.h>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vtools/tools/drawTools/../../dialogs/tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogGroup;
diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp
index 9cb4fad5d..05c70e330 100644
--- a/src/libs/vtools/dialogs/tools/dialogheight.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp
@@ -27,13 +27,32 @@
  *************************************************************************/
 
 #include "dialogheight.h"
-#include "ui_dialogheight.h"
 
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QLineF>
+#include <QPoint>
+#include <QPointF>
+#include <QPointer>
+#include <QSet>
+#include <QSharedPointer>
+#include <new>
+
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolheight.h"
-#include "../vwidgets/vmaingraphicsscene.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogs/tools/../../visualization/line/visline.h"
+#include "dialogs/tools/dialogtool.h"
+#include "ui_dialogheight.h"
+
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogheight.h b/src/libs/vtools/dialogs/tools/dialogheight.h
index c490b68bb..af9b2c76b 100644
--- a/src/libs/vtools/dialogs/tools/dialogheight.h
+++ b/src/libs/vtools/dialogs/tools/dialogheight.h
@@ -29,8 +29,18 @@
 #ifndef DIALOGHEIGHT_H
 #define DIALOGHEIGHT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogHeight;
diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp
index 298937b69..565fa950f 100644
--- a/src/libs/vtools/dialogs/tools/dialogline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogline.cpp
@@ -27,13 +27,24 @@
  *************************************************************************/
 
 #include "dialogline.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QIcon>
+#include <QLabel>
+#include <QMap>
+#include <QPointer>
+#include <QVariant>
+
+#include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoolline.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
+#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogline.h"
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
-#include "../../visualization/line/vistoolline.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../tools/vabstracttool.h"
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogline.h b/src/libs/vtools/dialogs/tools/dialogline.h
index 3a34125a0..b0148c889 100644
--- a/src/libs/vtools/dialogs/tools/dialogline.h
+++ b/src/libs/vtools/dialogs/tools/dialogline.h
@@ -29,8 +29,18 @@
 #ifndef DIALOGLINE_H
 #define DIALOGLINE_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogLine;
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
index 5fe9c1f4b..e3fff2efb 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
@@ -27,12 +27,30 @@
  *************************************************************************/
 
 #include "dialoglineintersect.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLine>
+#include <QLineEdit>
+#include <QLineF>
+#include <QPointF>
+#include <QPointer>
+#include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <new>
+
+#include "../../visualization/line/vistoollineintersect.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
 #include "ui_dialoglineintersect.h"
 
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../../visualization/line/vistoollineintersect.h"
-#include "../vwidgets/vmaingraphicsscene.h"
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.h b/src/libs/vtools/dialogs/tools/dialoglineintersect.h
index 43e03e733..af95ab2db 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersect.h
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.h
@@ -29,8 +29,18 @@
 #ifndef DIALOGLINEINTERSECT_H
 #define DIALOGLINEINTERSECT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogLineIntersect;
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
index 870914df1..74453a47c 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
@@ -27,18 +27,39 @@
  *************************************************************************/
 
 #include "dialoglineintersectaxis.h"
-#include "ui_dialoglineintersectaxis.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QLineF>
+#include <QPlainTextEdit>
+#include <QPointF>
+#include <QPointer>
+#include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QToolButton>
+#include <new>
 
 #include "../../../vgeometry/vpointf.h"
 #include "../../../vpatterndb/vcontainer.h"
 #include "../../../vpatterndb/vtranslatevars.h"
-#include "../../visualization/line/vistoollineintersectaxis.h"
 #include "../../../vwidgets/vmaingraphicsscene.h"
 #include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoollineintersectaxis.h"
+#include "../ifc/xml/vabstractpattern.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
 #include "../vwidgets/vabstractmainwindow.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
+#include "ui_dialoglineintersectaxis.h"
 
-#include <QTimer>
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent)
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h
index 03a4135e0..db473b2ff 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGLINEINTERSECTAXIS_H
 #define DIALOGLINEINTERSECTAXIS_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogLineIntersectAxis;
diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp
index 11505b5b4..06d0781ff 100644
--- a/src/libs/vtools/dialogs/tools/dialognormal.cpp
+++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp
@@ -27,12 +27,32 @@
  *************************************************************************/
 
 #include "dialognormal.h"
-#include "ui_dialognormal.h"
-#include "../../visualization/line/vistoolnormal.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../tools/vabstracttool.h"
-#include "../support/dialogeditwrongformula.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QDoubleSpinBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QToolButton>
+
 #include "../../../vpatterndb/vtranslatevars.h"
+#include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoolnormal.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
+#include "ui_dialognormal.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialognormal.h b/src/libs/vtools/dialogs/tools/dialognormal.h
index e6979fb45..e9d19e10d 100644
--- a/src/libs/vtools/dialogs/tools/dialognormal.h
+++ b/src/libs/vtools/dialogs/tools/dialognormal.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGNORMAL_H
 #define DIALOGNORMAL_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogNormal;
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
index b35e26fcf..cf23437e5 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
@@ -27,12 +27,19 @@
  *************************************************************************/
 
 #include "dialogpointfromarcandtangent.h"
+
+#include <QComboBox>
+#include <QLineEdit>
+#include <QPointer>
+
+#include "../../visualization/line/vistoolpointfromarcandtangent.h"
+#include "../vmisc/vabstractapplication.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogpointfromarcandtangent.h"
 
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../../visualization/line/vistoolpointfromarcandtangent.h"
-#include "../vwidgets/vmaingraphicsscene.h"
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *data, const quint32 &toolId,
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h
index c62ba7bf6..e9c121f5d 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h
@@ -29,8 +29,19 @@
 #ifndef DIALOGPOINTFROMARCANDTANGENT_H
 #define DIALOGPOINTFROMARCANDTANGENT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogPointFromArcAndTangent;
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
index ed7ce0ac8..abce3057c 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
@@ -27,16 +27,32 @@
  *************************************************************************/
 
 #include "dialogpointfromcircleandtangent.h"
-#include "ui_dialogpointfromcircleandtangent.h"
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include <limits.h>
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QTimer>
+#include <QToolButton>
+#include <Qt>
+
 #include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/line/vistoolpointfromcircleandtangent.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "ui_dialogpointfromcircleandtangent.h"
 
-#include <QTimer>
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContainer *data, const quint32 &toolId,
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h
index 0d96b463d..d6f5e69ee 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h
@@ -29,8 +29,22 @@
 #ifndef DIALOGPOINTFROMCIRCLEANDTANGENT_H
 #define DIALOGPOINTFROMCIRCLEANDTANGENT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QTimer;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogPointFromCircleAndTangent;
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
index 29d367c0e..e96468d5c 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
@@ -28,12 +28,30 @@
 
 #include "dialogpointofcontact.h"
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QSet>
+#include <QToolButton>
+
 #include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/line/vistoolpointofcontact.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "ui_dialogpointofcontact.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
index afdf66943..4937c0162 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGPOINTOFCONTACT_H
 #define DIALOGPOINTOFCONTACT_H
 
-#include "ui_dialogpointofcontact.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
+#include "ui_dialogpointofcontact.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
index 869af1e5e..0923521b2 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
@@ -27,12 +27,23 @@
  *************************************************************************/
 
 #include "dialogpointofintersection.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPointer>
+
+#include "../../visualization/line/vistoolpointofintersection.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogpointofintersection.h"
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
-#include "../../visualization/line/vistoolpointofintersection.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h
index 2f5e1f6ad..ff0b834de 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h
@@ -29,8 +29,18 @@
 #ifndef DIALOGPOINTOFINTERSECTION_H
 #define DIALOGPOINTOFINTERSECTION_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogPointOfIntersection;
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
index 00b31ca68..8c710b38e 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
@@ -27,12 +27,21 @@
  *************************************************************************/
 
 #include "dialogpointofintersectionarcs.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPointer>
+
+#include "../../visualization/line/vistoolpointofintersectionarcs.h"
+#include "../vmisc/vabstractapplication.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogpointofintersectionarcs.h"
 
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../../visualization/line/vistoolpointofintersectionarcs.h"
-#include "../vwidgets/vmaingraphicsscene.h"
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *data, const quint32 &toolId,
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h
index 7e067e126..94339c763 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h
@@ -29,8 +29,19 @@
 #ifndef DIALOGPOINTOFINTERSECTIONARCS_H
 #define DIALOGPOINTOFINTERSECTIONARCS_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogPointOfIntersectionArcs;
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
index d43be12c0..dd05201e4 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
@@ -27,16 +27,32 @@
  *************************************************************************/
 
 #include "dialogpointofintersectioncircles.h"
-#include "ui_dialogpointofintersectioncircles.h"
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include <limits.h>
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QTimer>
+#include <QToolButton>
+#include <Qt>
+
 #include "../../../vpatterndb/vtranslatevars.h"
 #include "../../visualization/line/vistoolpointofintersectioncircles.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "ui_dialogpointofintersectioncircles.h"
 
-#include <QTimer>
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContainer *data, const quint32 &toolId,
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h
index 4a5b11772..a11ac7619 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h
@@ -29,8 +29,22 @@
 #ifndef DIALOGPOINTOFINTERSECTIONCIRCLES_H
 #define DIALOGPOINTOFINTERSECTIONCIRCLES_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QTimer;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogPointOfIntersectionCircles;
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp
index 2a0bb2e9b..c001fe99a 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp
@@ -27,8 +27,22 @@
  *************************************************************************/
 
 #include "dialogpointofintersectioncurves.h"
-#include "ui_dialogpointofintersectioncurves.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPointer>
+#include <QPushButton>
+
 #include "../../visualization/path/vistoolpointofintersectioncurves.h"
+#include "../vmisc/vabstractapplication.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
+#include "ui_dialogpointofintersectioncurves.h"
+
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersectionCurves::DialogPointOfIntersectionCurves(const VContainer *data, const quint32 &toolId,
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h
index 7b6aea822..6c32f9ce1 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h
@@ -29,8 +29,19 @@
 #ifndef DIALOGPOINTOFINTERSECTIONCURVES_H
 #define DIALOGPOINTOFINTERSECTIONCURVES_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui {
 class DialogPointOfIntersectionCurves;
 }
diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp
index 77b1a23fd..02663df1b 100644
--- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp
@@ -27,18 +27,43 @@
  *************************************************************************/
 
 #include "dialogrotation.h"
-#include "ui_dialogrotation.h"
 
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QLineF>
+#include <QPlainTextEdit>
+#include <QPointF>
+#include <QPointer>
+#include <QPushButton>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QStringList>
 #include <QTimer>
+#include <QToolButton>
+#include <Qt>
+#include <new>
 
+#include "../../visualization/line/vistoolrotation.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../qmuparser/qmudef.h"
+#include "../support/dialogeditwrongformula.h"
 #include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vtranslatevars.h"
-#include "../ifc/xml/vdomdocument.h"
-#include "../../visualization/line/vistoolrotation.h"
-#include "../support/dialogeditwrongformula.h"
-#include "../qmuparser/qmudef.h"
 #include "../vwidgets/vabstractmainwindow.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "ui_dialogrotation.h"
+
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogRotation::DialogRotation(const VContainer *data, const quint32 &toolId, QWidget *parent)
diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.h b/src/libs/vtools/dialogs/tools/dialogrotation.h
index f21ba28c8..32c65e8a7 100644
--- a/src/libs/vtools/dialogs/tools/dialogrotation.h
+++ b/src/libs/vtools/dialogs/tools/dialogrotation.h
@@ -29,8 +29,23 @@
 #ifndef DIALOGROTATION_H
 #define DIALOGROTATION_H
 
+#include <qcompilerdetection.h>
+#include <QList>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QTimer;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogRotation;
diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
index 881944dd8..55a4d797b 100644
--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
@@ -27,15 +27,32 @@
  *************************************************************************/
 
 #include "dialogshoulderpoint.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QSet>
+#include <QToolButton>
+
+#include "../../../vpatterndb/vtranslatevars.h"
+#include "../../tools/vabstracttool.h"
+#include "../../visualization/line/vistoolshoulderpoint.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../support/dialogeditwrongformula.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "ui_dialogshoulderpoint.h"
 
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../visualization/line/vistoolshoulderpoint.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../tools/vabstracttool.h"
-#include "../support/dialogeditwrongformula.h"
+class QCloseEvent;
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h
index c34cc7e57..2714152e2 100644
--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGSHOULDERPOINT_H
 #define DIALOGSHOULDERPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
+class QCloseEvent;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogShoulderPoint;
diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp
index 6dabbaa38..6c241575d 100644
--- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp
@@ -27,8 +27,19 @@
  *************************************************************************/
 
 #include "dialogsinglepoint.h"
+
+#include <QDoubleSpinBox>
+#include <QLineEdit>
+
+#include "../vmisc/def.h"
+#include "../vmisc/vabstractapplication.h"
+#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogsinglepoint.h"
 
+class QPointF;
+class QWidget;
+class VContainer;
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief DialogSinglePoint create dialog
diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.h b/src/libs/vtools/dialogs/tools/dialogsinglepoint.h
index b797390f5..49723e99d 100644
--- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.h
+++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.h
@@ -29,8 +29,19 @@
 #ifndef DIALOGSINGLEPOINT_H
 #define DIALOGSINGLEPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
 #include "dialogtool.h"
 
+class QPointF;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogSinglePoint;
diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp
index cc74e38e2..71efb46f9 100644
--- a/src/libs/vtools/dialogs/tools/dialogspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp
@@ -27,16 +27,37 @@
  *************************************************************************/
 
 #include "dialogspline.h"
-#include "ui_dialogspline.h"
 
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QHash>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QSet>
+#include <QTimer>
+#include <QToolButton>
+#include <Qt>
+#include <new>
+
+#include "../../visualization/path/vistoolspline.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../support/dialogeditwrongformula.h"
 #include "../vgeometry/vpointf.h"
 #include "../vgeometry/vspline.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vcontainer.h"
-#include "../../visualization/path/vistoolspline.h"
-#include "../support/dialogeditwrongformula.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "ui_dialogspline.h"
+#include "vtranslatevars.h"
 
-#include <QDebug>
-#include <QTimer>
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h
index d2cb64496..1a71cf2d5 100644
--- a/src/libs/vtools/dialogs/tools/dialogspline.h
+++ b/src/libs/vtools/dialogs/tools/dialogspline.h
@@ -29,8 +29,24 @@
 #ifndef DIALOGSPLINE_H
 #define DIALOGSPLINE_H
 
-#include "dialogtool.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vgeometry/vspline.h"
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
+#include "dialogtool.h"
+
+class QCloseEvent;
+class QTimer;
+class QWidget;
+class VContainer;
+class VPointF;
+template <class T> class QSharedPointer;
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
index 30fcc043b..b0ac6eee7 100644
--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
@@ -27,15 +27,44 @@
  *************************************************************************/
 
 #include "dialogsplinepath.h"
-#include "ui_dialogsplinepath.h"
-#include "../vgeometry/vsplinepoint.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../../visualization/path/vistoolsplinepath.h"
-#include "../support/dialogeditwrongformula.h"
-#include "../qmuparser/qmuparsererror.h"
-#include "../vwidgets/vabstractmainwindow.h"
 
-#include <QTimer>
+#include <QColor>
+#include <QComboBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QFont>
+#include <QLabel>
+#include <QLatin1String>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QToolButton>
+#include <QVariant>
+#include <Qt>
+#include <new>
+
+#include "../../visualization/path/vistoolsplinepath.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../qmuparser/qmuparsererror.h"
+#include "../support/dialogeditwrongformula.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vsplinepoint.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vabstractmainwindow.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "ui_dialogsplinepath.h"
+#include "vtranslatevars.h"
+
+class QCloseEvent;
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h
index bf4ecfde5..5f5f0f3ba 100644
--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h
@@ -29,8 +29,23 @@
 #ifndef DIALOGSPLINEPATH_H
 #define DIALOGSPLINEPATH_H
 
-#include "dialogtool.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QSet>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
 #include "../vgeometry/vsplinepath.h"
+#include "../vmisc/def.h"
+#include "dialogs/tools/../support/../tools/dialogtool.h"
+#include "dialogtool.h"
+
+class QCloseEvent;
+class QWidget;
+class VContainer;
+class VSplinePoint;
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp
index 5e56b1c0f..1f828bdfc 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp
@@ -27,29 +27,55 @@
  *************************************************************************/
 
 #include "dialogtool.h"
+
+#include <limits.h>
+#include <qiterator.h>
+#include <qnumeric.h>
+#include <QCloseEvent>
+#include <QComboBox>
+#include <QDebug>
+#include <QDoubleSpinBox>
+#include <QEvent>
+#include <QHash>
+#include <QIcon>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMapIterator>
+#include <QMessageLogger>
+#include <QPalette>
+#include <QPixmap>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QScopedPointer>
+#include <QSharedPointer>
+#include <QShowEvent>
+#include <QSize>
+#include <QTextCursor>
+#include <QTimer>
+#include <QWidget>
+#include <Qt>
+#include <QtDebug>
+#include <new>
+
+#include "../../../ifc/xml/vdomdocument.h"
+#include "../../../qmuparser/qmudef.h"
+#include "../../../qmuparser/qmuparsererror.h"
+#include "../../../vgeometry/vpointf.h"
 #include "../../../vpatterndb/calculator.h"
 #include "../../../vpatterndb/vcontainer.h"
 #include "../../../vpatterndb/vtranslatevars.h"
-#include "../../../vgeometry/varc.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vgeometry/vsplinepath.h"
 #include "../../tools/vabstracttool.h"
-#include "../../../qmuparser/qmuparsererror.h"
-#include "../../../qmuparser/qmudef.h"
-#include "../../../ifc/xml/vdomdocument.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgobject.h"
 
-#include <QTimer>
-#include <QCloseEvent>
-#include <QShowEvent>
-#include <QComboBox>
-#include <QListWidgetItem>
-#include <QTextCursor>
-#include <QPlainTextEdit>
-#include <QLabel>
-#include <QSettings>
-#include <QPushButton>
-#include <QDoubleSpinBox>
-#include <QtNumeric>
+class QCloseEvent;
+class QKeyEvent;
+class QShowEvent;
+template <class T> class QSharedPointer;
 
 Q_LOGGING_CATEGORY(vDialog, "v.dialog")
 
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h
index 5a3644a71..35b3479ee 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.h
+++ b/src/libs/vtools/dialogs/tools/dialogtool.h
@@ -29,29 +29,56 @@
 #ifndef DIALOGTOOL_H
 #define DIALOGTOOL_H
 
-#include "../vmisc/vabstractapplication.h"
-#include "../vmisc/logging.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../../visualization/visualization.h"
-#include "../ifc/xml/vabstractpattern.h"
-
+#include <qcompilerdetection.h>
+#include <QCheckBox>
+#include <QColor>
+#include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QLineEdit>
+#include <QList>
 #include <QListWidget>
-#include <QRadioButton>
+#include <QLocale>
+#include <QLoggingCategory>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointer>
 #include <QPushButton>
-#include <QCheckBox>
-#include <QComboBox>
+#include <QRadioButton>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
+
+#include "../../visualization/visualization.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vmisc/def.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "dialogs/tools/../../tools/../visualization/visualization.h"
+
+class QCloseEvent;
+class QEvent;
+class QIcon;
+class QLineEdit;
+class QShowEvent;
+class QTimer;
+class QWidget;
+class VGObject;
+template <class T> class QSharedPointer;
 
 Q_DECLARE_LOGGING_CATEGORY(vDialog)
 
 class QDoubleSpinBox;
 class QLabel;
 class QListWidgetItem;
-class VContainer;
 class QPlainTextEdit;
 class VAbstractTool;
+class VContainer;
 
 enum class FillComboBox : char { Whole, NoChildren};
 
diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp
index 248390888..0439e133f 100644
--- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp
@@ -27,11 +27,23 @@
  *************************************************************************/
 
 #include "dialogtriangle.h"
-#include "ui_dialogtriangle.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPointer>
+#include <QSet>
+
 #include "../../visualization/line/vistooltriangle.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/vabstractapplication.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
+#include "ui_dialogtriangle.h"
+
+class QWidget;
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.h b/src/libs/vtools/dialogs/tools/dialogtriangle.h
index 8fd47ee2b..07e819907 100644
--- a/src/libs/vtools/dialogs/tools/dialogtriangle.h
+++ b/src/libs/vtools/dialogs/tools/dialogtriangle.h
@@ -29,8 +29,18 @@
 #ifndef DIALOGTRIANGLE_H
 #define DIALOGTRIANGLE_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogTriangle;
diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
index cb8c310b4..fde915757 100644
--- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
@@ -27,12 +27,29 @@
  *************************************************************************/
 
 #include "dialogtruedarts.h"
-#include "ui_dialogtruedarts.h"
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
+
+#include <QColor>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSet>
+#include <Qt>
+
 #include "../../visualization/line/vistooltruedarts.h"
-#include "../vwidgets/vmaingraphicsscene.h"
+#include "../ifc/xml/vabstractpattern.h"
 #include "../qmuparser/qmudef.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogs/tools/dialogtool.h"
+#include "ui_dialogtruedarts.h"
+
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogTrueDarts::DialogTrueDarts(const VContainer *data, const quint32 &toolId, QWidget *parent)
diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.h b/src/libs/vtools/dialogs/tools/dialogtruedarts.h
index 37e05fbff..031ebd393 100644
--- a/src/libs/vtools/dialogs/tools/dialogtruedarts.h
+++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.h
@@ -29,8 +29,20 @@
 #ifndef DIALOGTRUEDARTS_H
 #define DIALOGTRUEDARTS_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QLabel;
+class QLineEdit;
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogTrueDarts;
diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
index cc256a33d..39c33a499 100644
--- a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
@@ -27,9 +27,17 @@
  *************************************************************************/
 
 #include "dialoguniondetails.h"
-#include "ui_dialoguniondetails.h"
-#include "../vpatterndb/vdetail.h"
+
+#include <QCheckBox>
+#include <QVector>
+
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vdetail.h"
+#include "dialogs/tools/dialogtool.h"
+#include "ui_dialoguniondetails.h"
+
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.h b/src/libs/vtools/dialogs/tools/dialoguniondetails.h
index 90fc8df01..b1edf103c 100644
--- a/src/libs/vtools/dialogs/tools/dialoguniondetails.h
+++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.h
@@ -29,8 +29,18 @@
 #ifndef DIALOGUNIONDETAILS_H
 #define DIALOGUNIONDETAILS_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "dialogtool.h"
 
+class QWidget;
+class VContainer;
+
 namespace Ui
 {
     class DialogUnionDetails;
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
index 7ba3ac86b..11cf49387 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
@@ -27,19 +27,57 @@
  *************************************************************************/
 
 #include "vtoolrotation.h"
+
+#include <limits.h>
+#include <qiterator.h>
+#include <QColor>
+#include <QDomNode>
+#include <QDomNodeList>
+#include <QMapIterator>
+#include <QPoint>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QUndoStack>
+#include <new>
+
 #include "../../../dialogs/tools/dialogrotation.h"
-#include "../vgeometry/vpointf.h"
+#include "../../../undocommands/label/rotationmovelabel.h"
+#include "../../../visualization/line/vistoolrotation.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../vmisc/diagnostic.h"
+#include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
-#include "../vgeometry/vellipticalarc.h"
-#include "../vgeometry/vspline.h"
-#include "../vgeometry/vsplinepath.h"
 #include "../vgeometry/vcubicbezier.h"
 #include "../vgeometry/vcubicbezierpath.h"
-#include "../../../visualization/line/vistoolrotation.h"
-#include "../vwidgets/vsimplepoint.h"
-#include "../vwidgets/vsimplecurve.h"
-#include "../../../undocommands/label/rotationmovelabel.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vgeometry/vsplinepath.h"
+#include "../vmisc/../vpatterndb/vtranslatevars.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"
+#include "../vwidgets/../ifc/ifcdef.h"
+#include "../vwidgets/vabstractsimple.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vsimplecurve.h"
+#include "../vwidgets/vsimplepoint.h"
+#include "tools/drawTools/operation/../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/operation/../../../undocommands/label/../../../vmisc/logging.h"
+#include "tools/drawTools/operation/../../../visualization/line/../visualization.h"
+#include "tools/drawTools/operation/../../vabstracttool.h"
+#include "tools/drawTools/operation/../../vdatatool.h"
+#include "tools/drawTools/operation/../vdrawtool.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPainter;
+class QStyleOptionGraphicsItem;
+class QWidget;
+template <class T> class QSharedPointer;
 
 const QString VToolRotation::ToolType       = QStringLiteral("rotation");
 const QString VToolRotation::TagItem        = QStringLiteral("item");
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h
index 3d811b691..a2cf33713 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h
@@ -29,7 +29,34 @@
 #ifndef VTOOLROTATION_H
 #define VTOOLROTATION_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QGraphicsLineItem>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
 #include "../vdrawtool.h"
+#include "../vwidgets/../vgeometry/vgeometrydef.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/drawTools/operation/../../../undocommands/label/../../../ifc/xml/vabstractpattern.h"
+
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPainter;
+class QPointF;
+class QStyleOptionGraphicsItem;
+class QWidget;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 struct DestinationItem
 {
@@ -39,8 +66,8 @@ struct DestinationItem
 };
 
 class VAbstractSimple;
-class VSimpleCurve;
 class VFormula;
+class VSimpleCurve;
 
 // FIXME. I don't know how to use QGraphicsItem properly, so just took first available finished class.
 // QGraphicsItem itself produce case where clicking on empty space produce call to QGraphicsItem.
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
index 2bcfba7c3..aca0725de 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
@@ -27,10 +27,38 @@
  *************************************************************************/
 
 #include "vabstractspline.h"
-#include "../vwidgets/vcontrolpointspline.h"
-#include "../qmuparser/qmutokenparser.h"
 
+#include <QColor>
+#include <QFlags>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QGuiApplication>
 #include <QKeyEvent>
+#include <QLineF>
+#include <QPen>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../ifc/exception/vexception.h"
+#include "../ifc/exception/vexceptionbadid.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../qmuparser/qmutokenparser.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vcontrolpointspline.h"
+#include "tools/drawTools/toolcurve/../../../visualization/line/visline.h"
+#include "tools/drawTools/toolcurve/../../vabstracttool.h"
+#include "tools/drawTools/toolcurve/../vdrawtool.h"
+
+class QDomElement;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractSpline::VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent)
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
index 677b4aaa7..2700b2134 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
@@ -29,13 +29,40 @@
 #ifndef VABSTRACTSPLINE_H
 #define VABSTRACTSPLINE_H
 
-#include "../vdrawtool.h"
-#include "../../../visualization/line/visline.h"
-
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
 #include <QGraphicsPathItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPainterPath>
+#include <QPointF>
+#include <QString>
+#include <QVariant>
+#include <QVector>
+#include <QtGlobal>
 
+#include "../../../visualization/line/visline.h"
+#include "../vdrawtool.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "tools/drawTools/toolcurve/../../../visualization/line/../visualization.h"
+
+class QDomElement;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+class QPointF;
+class VAbstractPattern;
+class VContainer;
 class VControlPointSpline;
+class VGObject;
 class VSpline;
+template <class T> class QSharedPointer;
 
 class VAbstractSpline:public VDrawTool, public QGraphicsPathItem
 {
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
index bdf23acc2..6068bdbdf 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
@@ -27,14 +27,37 @@
  *************************************************************************/
 
 #include "vtoolarc.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
-#include "../../../dialogs/tools/dialogarc.h"
-#include "../vgeometry/varc.h"
-#include "../vpatterndb/vformula.h"
-#include "../../../visualization/path/vistoolarc.h"
 
-#include <QKeyEvent>
+#include <QPen>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <Qt>
+#include <new>
+
+#include "../../../dialogs/tools/dialogarc.h"
+#include "../../../visualization/path/vistoolarc.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/varc.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vformula.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolcurve/../../vabstracttool.h"
+#include "tools/drawTools/toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolcurve/vabstractspline.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
 
 const QString VToolArc::ToolType = QStringLiteral("simple");
 
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h
index 27e040b45..67da72b2b 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h
@@ -29,9 +29,25 @@
 #ifndef VTOOLARC_H
 #define VTOOLARC_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vabstractspline.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
 class VFormula;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolArc class tool for creation arc.
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
index 757706536..b642deb2b 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
@@ -27,14 +27,37 @@
  *************************************************************************/
 
 #include "vtoolarcwithlength.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
-#include "../../../dialogs/tools/dialogarcwithlength.h"
-#include "../vgeometry/varc.h"
-#include "../vpatterndb/vformula.h"
-#include "../../../visualization/path/vistoolarcwithlength.h"
 
-#include <QKeyEvent>
+#include <QPen>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <Qt>
+#include <new>
+
+#include "../../../dialogs/tools/dialogarcwithlength.h"
+#include "../../../visualization/path/vistoolarcwithlength.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/varc.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vformula.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolcurve/../../vabstracttool.h"
+#include "tools/drawTools/toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolcurve/vabstractspline.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
 
 const QString VToolArcWithLength::ToolType = QStringLiteral("arcWithLength");
 
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h
index ee0d718e5..71d85ec2f 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h
@@ -29,9 +29,25 @@
 #ifndef VTOOLARCWITHLENGTH_H
 #define VTOOLARCWITHLENGTH_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vabstractspline.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
 class VFormula;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 class VToolArcWithLength : public VAbstractSpline
 {
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp
index ab3e81eb6..53f17c721 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp
@@ -27,10 +27,35 @@
  *************************************************************************/
 
 #include "vtoolcubicbezier.h"
-#include "../vgeometry/vcubicbezier.h"
+
+#include <QDomElement>
+#include <QPen>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <Qt>
+#include <new>
+
 #include "../../../dialogs/tools/dialogcubicbezier.h"
-#include "../../../undocommands/movespline.h"
 #include "../../../visualization/path/vistoolcubicbezier.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vcubicbezier.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolcurve/../../vabstracttool.h"
+#include "tools/drawTools/toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolcurve/vabstractspline.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
 
 const QString VToolCubicBezier::ToolType = QStringLiteral("cubicBezier");
 
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h
index 53be60915..b9bb1a397 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h
@@ -29,9 +29,25 @@
 #ifndef VTOOLCUBICBEZIER_H
 #define VTOOLCUBICBEZIER_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/drawTools/toolcurve/../../../undocommands/../../ifc/xml/vabstractpattern.h"
 #include "vabstractspline.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
 class VCubicBezier;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 class VToolCubicBezier : public VAbstractSpline
 {
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp
index db00f4325..75926fbf1 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp
@@ -27,8 +27,37 @@
  *************************************************************************/
 
 #include "vtoolcubicbezierpath.h"
+
+#include <QDomElement>
+#include <QPen>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <Qt>
+#include <new>
+
 #include "../../../dialogs/tools/dialogcubicbezierpath.h"
 #include "../../../visualization/path/vistoolcubicbezierpath.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vcubicbezierpath.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolcurve/../../vabstracttool.h"
+#include "tools/drawTools/toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolcurve/vabstractspline.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
 
 const QString VToolCubicBezierPath::ToolType = QStringLiteral("cubicBezierPath");
 
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h
index 7761f8dee..1a56aa3a5 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h
@@ -29,9 +29,26 @@
 #ifndef VTOOLCUBICBEZIERPATH_H
 #define VTOOLCUBICBEZIERPATH_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vabstractspline.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
 class VCubicBezierPath;
+class VGObject;
+class VMainGraphicsScene;
+class VPointF;
+template <class T> class QSharedPointer;
 
 class VToolCubicBezierPath:public VAbstractSpline
 {
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
index 71404d2b5..2bc9cf308 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
@@ -27,17 +27,57 @@
  *************************************************************************/
 
 #include "vtoolspline.h"
-#include "../vgeometry/vspline.h"
+
+#include <math.h>
+#include <qmath.h>
+#include <QDomElement>
+#include <QEvent>
+#include <QFlags>
+#include <QForeachContainer>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QList>
+#include <QPen>
+#include <QPoint>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QUndoStack>
+#include <QVector>
+#include <Qt>
+#include <new>
+
 #include "../../../dialogs/tools/dialogspline.h"
 #include "../../../undocommands/movespline.h"
 #include "../../../visualization/path/vistoolspline.h"
-#include "../vwidgets/vcontrolpointspline.h"
+#include "../ifc/exception/vexception.h"
 #include "../qmuparser/qmutokenparser.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vcontrolpointspline.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolcurve/../../vabstracttool.h"
+#include "tools/drawTools/toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolcurve/vabstractspline.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 const QString VToolSpline::ToolType = QStringLiteral("simpleInteractive");
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h
index 344e9542f..a4450ac37 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h
@@ -29,9 +29,30 @@
 #ifndef VTOOLSPLINE_H
 #define VTOOLSPLINE_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vgeometry/vgeometrydef.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/drawTools/toolcurve/../../../undocommands/../../ifc/xml/vabstractpattern.h"
 #include "vabstractspline.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
 class VSpline;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolSpline class tool for creation spline. I mean bezier curve.
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
index a975558b2..c212fa511 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
@@ -27,16 +27,62 @@
  *************************************************************************/
 
 #include "vtoolsplinepath.h"
+
+#include <math.h>
+#include <qmath.h>
+#include <QDomElement>
+#include <QEvent>
+#include <QFlags>
+#include <QForeachContainer>
+#include <QGraphicsScene>
+#include <QGraphicsSceneHoverEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QList>
+#include <QPen>
+#include <QPoint>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QUndoStack>
+#include <Qt>
+#include <new>
+
 #include "../../../dialogs/tools/dialogsplinepath.h"
 #include "../../../undocommands/movesplinepath.h"
 #include "../../../visualization/path/vistoolsplinepath.h"
-#include "../vwidgets/vcontrolpointspline.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../qmuparser/qmutokenparser.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vgeometry/vsplinepoint.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/../vgeometry/vsplinepath.h"
+#include "../vwidgets/vcontrolpointspline.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolcurve/../../../undocommands/vundocommand.h"
+#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolcurve/../../vabstracttool.h"
+#include "tools/drawTools/toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolcurve/vabstractspline.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/vmath.h"
 #else
-#   include <QtMath>
 #endif
 
 const QString VToolSplinePath::ToolType = QStringLiteral("pathInteractive");
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h
index b6e963332..1b039f808 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h
@@ -29,11 +29,33 @@
 #ifndef VTOOLSPLINEPATH_H
 #define VTOOLSPLINEPATH_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../vgeometry/vgeometrydef.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/drawTools/toolcurve/../../../undocommands/../../ifc/xml/vabstractpattern.h"
 #include "vabstractspline.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+class VSpline;
 class VSplinePath;
 class VSplinePoint;
-class VSpline;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolSplinePath class tool for creation spline path.
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp
index 5ef6e7e6d..b5040943e 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp
@@ -27,11 +27,35 @@
  *************************************************************************/
 
 #include "vtooldoublepoint.h"
-#include "../vwidgets/vsimplepoint.h"
-#include "../vgeometry/vpointf.h"
-#include "../../../../undocommands/label/movedoublelabel.h"
 
+#include <QColor>
+#include <QDomElement>
 #include <QKeyEvent>
+#include <QPoint>
+#include <QSharedPointer>
+#include <QUndoStack>
+#include <Qt>
+#include <new>
+
+#include "../../../../undocommands/label/movedoublelabel.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/exception/vexceptionbadid.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/../ifc/ifcdef.h"
+#include "../vwidgets/vsimplepoint.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../undocommands/label/../../../ifc/xml/vabstractpattern.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../undocommands/label/../../../vmisc/logging.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../../vdatatool.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../vabstractpoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QKeyEvent;
 
 //---------------------------------------------------------------------------------------------------------------------
 VToolDoublePoint::VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 p1id, quint32 p2id,
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h
index 8612864e1..dc573c27c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h
@@ -29,13 +29,30 @@
 #ifndef VTOOLDOUBLEPOINT_H
 #define VTOOLDOUBLEPOINT_H
 
-#include "../vabstractpoint.h"
-
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
 #include <QGraphicsPathItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
 
-class VPointF;
+#include "../vabstractpoint.h"
+#include "../vwidgets/../vmisc/def.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QKeyEvent;
+class QPointF;
+class VAbstractPattern;
+class VContainer;
+class VGObject;
 class VGraphicsSimpleTextItem;
+class VPointF;
 class VSimplePoint;
+template <class T> class QSharedPointer;
 
 class VToolDoublePoint: public VAbstractPoint, public QGraphicsPathItem
 {
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
index 4fa80b2f2..f3f195dfc 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
@@ -27,9 +27,33 @@
  *************************************************************************/
 
 #include "vtooltruedarts.h"
+
+#include <QLine>
+#include <QLineF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogtruedarts.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../visualization/line/vistooltruedarts.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolTrueDarts::ToolType = QStringLiteral("trueDarts");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h
index 4832d1a19..c3c57767c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h
@@ -29,8 +29,28 @@
 #ifndef VTOOLTRUEDARTS_H
 #define VTOOLTRUEDARTS_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtooldoublepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 class VToolTrueDarts : public VToolDoublePoint
 {
     Q_OBJECT
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
index 4082a8e76..582330801 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
@@ -27,8 +27,21 @@
  *************************************************************************/
 
 #include "vtoolcut.h"
+
+#include <QDomElement>
+#include <QSharedPointer>
+#include <new>
+
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../vtoolsinglepoint.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VToolCut::VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h
index a44a7a72d..5cfbe5e3f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h
@@ -29,9 +29,21 @@
 #ifndef VTOOLCUT_H
 #define VTOOLCUT_H
 
-#include "../vtoolsinglepoint.h"
-#include "../../../toolcurve/vabstractspline.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
 
+#include "../../../toolcurve/vabstractspline.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vtoolsinglepoint.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vdatatool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../../../visualization/line/../visualization.h"
+
+class VContainer;
 class VFormula;
 
 class VToolCut : public VToolSinglePoint
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
index ab4bda056..dee0ade29 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
@@ -27,12 +27,35 @@
  *************************************************************************/
 
 #include "vtoolcutarc.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QPointF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogcutarc.h"
-#include "../vgeometry/vpointf.h"
-#include "../vgeometry/varc.h"
 #include "../../../../../visualization/path/vistoolcutarc.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/varc.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VGObject;
+template <class T> class QSharedPointer;
 
 const QString VToolCutArc::ToolType = QStringLiteral("cutArc");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h
index de0140e92..568a9597c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h
@@ -29,8 +29,26 @@
 #ifndef VTOOLCUTARC_H
 #define VTOOLCUTARC_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolcut.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolCutArc class tool for cutting arc.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
index a3b755e22..f45e97a6b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
@@ -27,12 +27,37 @@
  *************************************************************************/
 
 #include "vtoolcutspline.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QPointF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogcutspline.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/path/vistoolcutspline.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcubicbezier.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vpointf.h"
 #include "../vgeometry/vspline.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VGObject;
+template <class T> class QSharedPointer;
 
 const QString VToolCutSpline::ToolType   = QStringLiteral("cutSpline");
 const QString VToolCutSpline::AttrSpline = QStringLiteral("spline");
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h
index 7f614aadf..e9ee40901 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h
@@ -29,8 +29,26 @@
 #ifndef VTOOLCUTSPLINE_H
 #define VTOOLCUTSPLINE_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolcut.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolCutSpline class for tool CutSpline. This tool find point on spline and cut spline on two.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
index 463debfb0..c2710ab4c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
@@ -27,12 +27,40 @@
  *************************************************************************/
 
 #include "vtoolcutsplinepath.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QPointF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QVector>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogcutsplinepath.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/path/vistoolcutsplinepath.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
 #include "../vgeometry/vsplinepath.h"
+#include "../vgeometry/vsplinepoint.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VGObject;
+template <class T> class QSharedPointer;
 
 const QString VToolCutSplinePath::ToolType       = QStringLiteral("cutSplinePath");
 const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath");
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h
index 8b5dbb593..788e091ce 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h
@@ -29,10 +29,28 @@
 #ifndef VTOOLCUTSPLINEPATH_H
 #define VTOOLCUTSPLINEPATH_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolcut.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
 class VAbstractCubicBezierPath;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+class VPointF;
 class VSplinePath;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolCutSplinePath class for tool CutSplinePath. This tool find point on splinePath and cut splinePath on
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
index 124d9b4af..db296a32f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
@@ -27,12 +27,36 @@
  *************************************************************************/
 
 #include "vtoolalongline.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogalongline.h"
-#include "../vgeometry/vpointf.h"
-#include "../ifc/exception/vexceptionobjecterror.h"
 #include "../../../../../visualization/line/vistoolalongline.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+#include "variables/vlinelength.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+template <class T> class QSharedPointer;
 
 const QString VToolAlongLine::ToolType = QStringLiteral("alongLine");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h
index 826634b70..e80ecb3f6 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h
@@ -29,8 +29,26 @@
 #ifndef VTOOLALONGLINE_H
 #define VTOOLALONGLINE_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolAlongLine class tool for creation point along line.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
index ebd735aa3..8de87f1fd 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
@@ -27,11 +27,35 @@
  *************************************************************************/
 
 #include "vtoolbisector.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QLineF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogbisector.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/line/vistoolbisector.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolBisector::ToolType = QStringLiteral("bisector");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h
index deab4d68f..8ad5e9eed 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h
@@ -29,8 +29,28 @@
 #ifndef VTOOLBISECTOR_H
 #define VTOOLBISECTOR_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolBisector class tool for creation bisector point.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
index 40449cf20..4290f8fc9 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
@@ -27,19 +27,47 @@
  *************************************************************************/
 
 #include "vtoolcurveintersectaxis.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <limits.h>
+#include <QLineF>
+#include <QMap>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QVector>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogcurveintersectaxis.h"
-#include "../../../../../dialogs/support/dialogeditwrongformula.h"
-#include "../vgeometry/vpointf.h"
-#include "../vgeometry/varc.h"
-#include "../vgeometry/vspline.h"
-#include "../vgeometry/vsplinepath.h"
+#include "../ifc/exception/vexception.h"
+#include "../qmuparser/qmudef.h"
+#include "../toolcut/vtoolcutsplinepath.h"
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcubicbezier.h"
 #include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/varc.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vgeometry/vsplinepath.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vtools/visualization/line/../visualization.h"
 #include "../vtools/visualization/line/vistoolcurveintersectaxis.h"
-#include "../toolcut/vtoolcutsplinepath.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/support/../tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../toolcut/../../../toolcurve/../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h
index f83b41572..b42374e7d 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h
@@ -29,8 +29,32 @@
 #ifndef VTOOLCURVEINTERSECTAXIS_H
 #define VTOOLCURVEINTERSECTAXIS_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vpatterndb/vformula.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VAbstractCurve;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+class VPointF;
+template <class T> class QSharedPointer;
+
 class VToolCurveIntersectAxis : public VToolLinePoint
 {
     Q_OBJECT
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
index d993bdc20..9d97b7bde 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
@@ -27,13 +27,35 @@
  *************************************************************************/
 
 #include "vtoolendline.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogendline.h"
-#include "../../../../../dialogs/support/dialogeditwrongformula.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/line/vistoolendline.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/support/../tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VGObject;
+template <class T> class QSharedPointer;
 
 const QString VToolEndLine::ToolType = QStringLiteral("endLine");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h
index 052321933..7d343cb99 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h
@@ -29,8 +29,27 @@
 #ifndef VTOOLENDLINE_H
 #define VTOOLENDLINE_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vpatterndb/vformula.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolEndLine class tool for creation point on the line end.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
index b259a920f..8ffc498ee 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
@@ -27,9 +27,32 @@
  *************************************************************************/
 
 #include "vtoolheight.h"
+
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogheight.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/line/vistoolheight.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QLineF;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolHeight::ToolType = QStringLiteral("height");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h
index d04faa996..2fc97537e 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h
@@ -29,8 +29,30 @@
 #ifndef VTOOLHEIGHT_H
 #define VTOOLHEIGHT_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QLineF;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolHeight class tool for creation point of height. Help find point of projection onto line.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
index bb161497c..c3b5f5d77 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
@@ -27,13 +27,34 @@
  *************************************************************************/
 
 #include "vtoollineintersectaxis.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QLine>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialoglineintersectaxis.h"
-#include "../../../../../dialogs/support/dialogeditwrongformula.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/line/vistoollineintersectaxis.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/support/../tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VGObject;
+template <class T> class QSharedPointer;
 
 const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAxis");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h
index 40e42d35a..cd5478df6 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h
@@ -29,8 +29,31 @@
 #ifndef VTOOLLINEINTERSECTAXIS_H
 #define VTOOLLINEINTERSECTAXIS_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vpatterndb/vformula.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QLineF;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 class VToolLineIntersectAxis : public VToolLinePoint
 {
     Q_OBJECT
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
index 9e2966af8..81b6f1239 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
@@ -27,7 +27,30 @@
  *************************************************************************/
 
 #include "vtoollinepoint.h"
+
+#include <QColor>
+#include <QGraphicsLineItem>
+#include <QLineF>
+#include <QPen>
+#include <QPoint>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../vtoolsinglepoint.h"
+
+class QDomElement;
+template <class T> class QSharedPointer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h
index e9ca4a01b..0fd379569 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h
@@ -29,8 +29,22 @@
 #ifndef VTOOLLINEPOINT_H
 #define VTOOLLINEPOINT_H
 
-#include "../vtoolsinglepoint.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vpatterndb/vformula.h"
+#include "../vtoolsinglepoint.h"
+#include "../vwidgets/../vmisc/def.h"
+
+class QDomElement;
+class VAbstractPattern;
+class VContainer;
+class VGObject;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolLinePoint class parent for all tools what create point with line.
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
index 2250ca5ae..6319cdd06 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
@@ -27,11 +27,35 @@
  *************************************************************************/
 
 #include "vtoolnormal.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QLineF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialognormal.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/line/vistoolnormal.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolNormal::ToolType = QStringLiteral("normal");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h
index cc188c977..1c8253dd4 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h
@@ -29,8 +29,28 @@
 #ifndef VTOOLNORMAL_H
 #define VTOOLNORMAL_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolNormal class tool for creation point on normal. Normal begin from first point of line.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
index edae92ae4..2e8ed95b8 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
@@ -27,11 +27,38 @@
  *************************************************************************/
 
 #include "vtoolshoulderpoint.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QDebug>
+#include <QLineF>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QtDebug>
+#include <new>
+
 #include "../../../../../dialogs/tools/dialogshoulderpoint.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../../visualization/line/vistoolshoulderpoint.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h
index ad2095cfc..bc0d8baac 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h
@@ -29,8 +29,28 @@
 #ifndef VTOOLSHOULDERPOINT_H
 #define VTOOLSHOULDERPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoollinepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolShoulderPoint class tool for creation point on shoulder. This tool for special situation, when you
  * want find point along line, but have only length from another point (shoulder).
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
index 7e1c32dab..f9823c89c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
@@ -27,14 +27,51 @@
  *************************************************************************/
 
 #include "vtoolbasepoint.h"
+
+#include <QApplication>
+#include <QEvent>
+#include <QFlags>
+#include <QGraphicsLineItem>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QList>
+#include <QMessageBox>
+#include <QPen>
+#include <QPointF>
+#include <QPolygonF>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QUndoStack>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogsinglepoint.h"
-#include "../vwidgets/vgraphicssimpletextitem.h"
-#include "../../../../undocommands/movespoint.h"
 #include "../../../../undocommands/addpatternpiece.h"
 #include "../../../../undocommands/deletepatternpiece.h"
+#include "../../../../undocommands/movespoint.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vgraphicssimpletextitem.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../undocommands/../../vmisc/logging.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vdatatool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
 
-#include <QMessageBox>
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
 
 const QString VToolBasePoint::ToolType = QStringLiteral("single");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h
index 326778fcc..a49e9806b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h
@@ -29,8 +29,30 @@
 #ifndef VTOOLBASEPOINT_H
 #define VTOOLBASEPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../undocommands/../../ifc/xml/vabstractpattern.h"
 #include "vtoolsinglepoint.h"
 
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+class VPointF;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolBasePoint class tool for creation pattern base point. Only base point can move. All object
  * pattern peace depend on base point.
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
index 17b65031b..9345e0a90 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
@@ -27,9 +27,33 @@
  *************************************************************************/
 
 #include "vtoollineintersect.h"
+
+#include <QLine>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialoglineintersect.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../visualization/line/vistoollineintersect.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+template <class T> class QSharedPointer;
 
 const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h
index 3e441a7c6..7c566838c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h
@@ -29,8 +29,26 @@
 #ifndef VTOOLLINEINTERSECT_H
 #define VTOOLLINEINTERSECT_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolLineIntersect class help find point intersection lines.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
index b2383e20a..f89b2687f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
@@ -27,10 +27,33 @@
  *************************************************************************/
 
 #include "vtoolpointfromarcandtangent.h"
+
+#include <QLineF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogpointfromarcandtangent.h"
-#include "../vgeometry/vpointf.h"
-#include "../vgeometry/varc.h"
 #include "../../../../visualization/line/vistoolpointfromarcandtangent.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/varc.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolPointFromArcAndTangent::ToolType = QStringLiteral("pointFromArcAndTangent");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h
index 43555895e..7d2165dd1 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h
@@ -29,8 +29,29 @@
 #ifndef VTOOLPOINTFROMARCANDTANGENT_H
 #define VTOOLPOINTFROMARCANDTANGENT_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VArc;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 class VToolPointFromArcAndTangent : public VToolSinglePoint
 {
     Q_OBJECT
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
index 41f5fb58c..8ab077441 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
@@ -27,11 +27,34 @@
  *************************************************************************/
 
 #include "vtoolpointfromcircleandtangent.h"
+
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogpointfromcircleandtangent.h"
-#include "../vgeometry/vpointf.h"
-#include "../vgeometry/varc.h"
 #include "../../../../visualization/line/vistoolpointfromcircleandtangent.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFromCircleAndTangent");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h
index e5902f163..dab0fe51b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h
@@ -29,9 +29,28 @@
 #ifndef VTOOLPOINTFROMCIRCLEANDTANGENT_H
 #define VTOOLPOINTFROMCIRCLEANDTANGENT_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
 class VFormula;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 class VToolPointFromCircleAndTangent : public VToolSinglePoint
 {
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
index 7e92b8021..d86ecbc8a 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
@@ -27,13 +27,40 @@
  *************************************************************************/
 
 #include "vtoolpointofcontact.h"
-#include "../vpatterndb/calculator.h"
-#include "../vpatterndb/vtranslatevars.h"
+
+#include <QDebug>
+#include <QLineF>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QtDebug>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogpointofcontact.h"
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vformula.h"
 #include "../../../../visualization/line/vistoolpointofcontact.h"
-#include <QtCore/qmath.h>
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vformula.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h
index 85655c32d..ee42fff0e 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h
@@ -29,9 +29,28 @@
 #ifndef VTOOLPOINTOFCONTACT_H
 #define VTOOLPOINTOFCONTACT_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
 class VFormula;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolPointOfContact class tool for creation point intersection line and arc.
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp
index 46af9a1bd..2876a286c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp
@@ -27,9 +27,31 @@
  *************************************************************************/
 
 #include "vtoolpointofintersection.h"
+
+#include <QPointF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogpointofintersection.h"
-#include "../vgeometry/vpointf.h"
 #include "../../../../visualization/line/vistoolpointofintersection.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+template <class T> class QSharedPointer;
 
 const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h
index 29af360df..f0058065a 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h
@@ -29,8 +29,26 @@
 #ifndef VTOOLPOINTOFINTERSECTION_H
 #define VTOOLPOINTOFINTERSECTION_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolPointOfIntersection class tool for creation point intersection two lines.
  */
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
index a751d7122..3666c212f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
@@ -27,10 +27,32 @@
  *************************************************************************/
 
 #include "vtoolpointofintersectionarcs.h"
+
+#include <QLineF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogpointofintersectionarcs.h"
-#include "../vgeometry/vpointf.h"
-#include "../vgeometry/varc.h"
 #include "../../../../visualization/line/vistoolpointofintersectionarcs.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/varc.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+template <class T> class QSharedPointer;
 
 const QString VToolPointOfIntersectionArcs::ToolType = QStringLiteral("pointOfIntersectionArcs");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h
index 46cd4d39e..96c7ba2d6 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h
@@ -29,9 +29,28 @@
 #ifndef VTOOLPOINTOFINTERSECTIONARCS_H
 #define VTOOLPOINTOFINTERSECTIONARCS_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
 class VArc;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 class VToolPointOfIntersectionArcs : public VToolSinglePoint
 {
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
index 5e760c15d..6b365c318 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
@@ -27,11 +27,34 @@
  *************************************************************************/
 
 #include "vtoolpointofintersectioncircles.h"
+
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogpointofintersectioncircles.h"
-#include "../vgeometry/vpointf.h"
-#include "../vgeometry/varc.h"
 #include "../../../../visualization/line/vistoolpointofintersectioncircles.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointOfIntersectionCircles");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h
index cacccfd20..562aee565 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h
@@ -29,9 +29,28 @@
 #ifndef VTOOLPOINTOFINTERSECTIONCIRCLES_H
 #define VTOOLPOINTOFINTERSECTIONCIRCLES_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
 class VFormula;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 class VToolPointOfIntersectionCircles : public VToolSinglePoint
 {
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
index b0d0da647..6a4f188ba 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
@@ -27,8 +27,33 @@
  *************************************************************************/
 
 #include "vtoolpointofintersectioncurves.h"
+
+#include <QLineF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
 #include "../../../../dialogs/tools/dialogpointofintersectioncurves.h"
 #include "../../../../visualization/path/vistoolpointofintersectioncurves.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/path/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolPointOfIntersectionCurves::ToolType = QStringLiteral("pointOfIntersectionCurves");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h
index acea09333..71b3e842f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h
@@ -29,8 +29,29 @@
 #ifndef VTOOLPOINTOFINTERSECTIONCURVES_H
 #define VTOOLPOINTOFINTERSECTIONCURVES_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 class VToolPointOfIntersectionCurves : public VToolSinglePoint
 {
     Q_OBJECT
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp
index ad7f2acac..85b8a3ea7 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp
@@ -27,12 +27,43 @@
  *************************************************************************/
 
 #include "vtoolsinglepoint.h"
-#include "../vmisc/logging.h"
-#include "../vgeometry/vpointf.h"
-#include "../vwidgets/vgraphicssimpletextitem.h"
-#include "../../../../undocommands/label/movelabel.h"
 
+#include <QBrush>
+#include <QFlags>
+#include <QFont>
+#include <QGraphicsLineItem>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
+#include <QLoggingCategory>
+#include <QPen>
+#include <QPoint>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QUndoStack>
+#include <Qt>
+#include <new>
+
+#include "../../../../undocommands/label/movelabel.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/exception/vexceptionbadid.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/../vmisc/diagnostic.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vgraphicssimpletextitem.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../undocommands/label/../../../ifc/xml/vabstractpattern.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../vabstractpoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h
index dbacedea4..31bb0bfd2 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h
@@ -29,11 +29,31 @@
 #ifndef VTOOLSINGLEPOINT_H
 #define VTOOLSINGLEPOINT_H
 
-#include "../vabstractpoint.h"
+#include <qcompilerdetection.h>
 #include <QGraphicsEllipseItem>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
 
-class VPointF;
+#include "../vabstractpoint.h"
+#include "../vwidgets/../vmisc/def.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+class QPointF;
+class VAbstractPattern;
+class VContainer;
+class VGObject;
 class VGraphicsSimpleTextItem;
+class VPointF;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolSinglePoint class parent for all tools what create points.
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
index 49899608c..fcf68c965 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
@@ -27,10 +27,34 @@
  *************************************************************************/
 
 #include "vtooltriangle.h"
-#include "../../../../dialogs/tools/dialogtriangle.h"
-#include "../vgeometry/vpointf.h"
-#include "../../../../visualization/line/vistooltriangle.h"
+
 #include <QtCore/qmath.h>
+#include <QLine>
+#include <QLineF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <new>
+
+#include "../../../../dialogs/tools/dialogtriangle.h"
+#include "../../../../visualization/line/vistooltriangle.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h"
+#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+template <class T> class QSharedPointer;
 
 const QString VToolTriangle::ToolType = QStringLiteral("triangle");
 
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h
index e26024d67..13e611f2b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h
@@ -29,8 +29,28 @@
 #ifndef VTOOLTRIANGLE_H
 #define VTOOLTRIANGLE_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
 #include "vtoolsinglepoint.h"
 
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QPointF;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
+
 /**
  * @brief The VToolTriangle class for tool that find point intersection two foots right triangle
  * (triangle with 90 degree).
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp
index 9d2e751fc..b8476e99c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp
@@ -27,7 +27,13 @@
  *************************************************************************/
 
 #include "vabstractpoint.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QSharedPointer>
+
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/vgobject.h"
+#include "tools/drawTools/toolpoint/../vdrawtool.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractPoint::VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id)
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h
index c818f6c66..bbdb68fcc 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h
@@ -29,8 +29,28 @@
 #ifndef VABSTRACTPOINT_H
 #define VABSTRACTPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QMetaObject>
+#include <QObject>
+#include <QPen>
+#include <QPointF>
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
+
 #include "../vdrawtool.h"
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/toolpoint/../../../dialogs/tools/../../visualization/visualization.h"
+#include "tools/drawTools/toolpoint/../../vabstracttool.h"
+
+class QPointF;
+class VAbstractPattern;
 
 class VAbstractPoint: public VDrawTool
 {
diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.cpp b/src/libs/vtools/tools/drawTools/vdrawtool.cpp
index 81bbfb172..a5ce06c7f 100644
--- a/src/libs/vtools/tools/drawTools/vdrawtool.cpp
+++ b/src/libs/vtools/tools/drawTools/vdrawtool.cpp
@@ -28,15 +28,34 @@
 
 #include "vdrawtool.h"
 
-#include "../../../qmuparser/qmuparsererror.h"
+#include <qnumeric.h>
+#include <QDebug>
+#include <QDialog>
+#include <QDomNode>
+#include <QMessageLogger>
+#include <QScopedPointer>
+#include <QSharedPointer>
+#include <QUndoStack>
+#include <Qt>
+#include <QtDebug>
+
+#include "../../../ifc/exception/vexceptionundo.h"
+#include "../../../vpatterndb/calculator.h"
 #include "../../dialogs/support/dialogeditwrongformula.h"
 #include "../../dialogs/support/dialogundo.h"
-#include "../../../vpatterndb/calculator.h"
 #include "../../undocommands/addtocalc.h"
 #include "../../undocommands/savetooloptions.h"
-#include "../../../ifc/exception/vexceptionundo.h"
+#include "../ifc/xml/vdomdocument.h"
+#include "../qmuparser/qmuparsererror.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vpatterndb/vcontainer.h"
+#include "tools/drawTools/../../undocommands/../../ifc/xml/vabstractpattern.h"
+#include "tools/drawTools/../../undocommands/../../vmisc/logging.h"
+#include "tools/drawTools/../vabstracttool.h"
 
-#include <QtNumeric>
+class QDomElement;
+class VGObject;
+template <class T> class QSharedPointer;
 
 qreal VDrawTool::factor = 1;
 
diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h
index 3e0854163..ab558d788 100644
--- a/src/libs/vtools/tools/drawTools/vdrawtool.h
+++ b/src/libs/vtools/tools/drawTools/vdrawtool.h
@@ -29,12 +29,35 @@
 #ifndef VDRAWTOOL_H
 #define VDRAWTOOL_H
 
-#include "../vabstracttool.h"
-#include "../../dialogs/tools/dialogtool.h"
-#include "../vwidgets/vmaingraphicsview.h"
-
-#include <QMenu>
+#include <qcompilerdetection.h>
+#include <QAction>
+#include <QByteArray>
+#include <QColor>
+#include <QDomElement>
 #include <QGraphicsSceneContextMenuEvent>
+#include <QIcon>
+#include <QMenu>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../../dialogs/tools/dialogtool.h"
+#include "../ifc/exception/vexceptionbadid.h"
+#include "../vabstracttool.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "tools/drawTools/../../dialogs/support/../tools/dialogtool.h"
+#include "tools/drawTools/../vdatatool.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class VAbstractPattern;
+class VContainer;
+class VGObject;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VDrawTool abstract class for all draw tool.
diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp
index f6aa4beac..336ae6a1c 100644
--- a/src/libs/vtools/tools/drawTools/vtoolline.cpp
+++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp
@@ -27,11 +27,37 @@
  *************************************************************************/
 
 #include "vtoolline.h"
-#include "../../dialogs/tools/dialogline.h"
+
+#include <QDebug>
 #include <QKeyEvent>
-#include "../vgeometry/vpointf.h"
+#include <QLineF>
+#include <QMessageLogger>
+#include <QPen>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <QtDebug>
+#include <new>
+
 #include "../../dialogs/tools/dialogline.h"
 #include "../../visualization/line/vistoolline.h"
+#include "../ifc/exception/vexception.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/drawTools/../../dialogs/tools/dialogtool.h"
+#include "tools/drawTools/../../visualization/line/../visualization.h"
+#include "tools/drawTools/../vabstracttool.h"
+#include "tools/drawTools/vdrawtool.h"
+
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QKeyEvent;
+template <class T> class QSharedPointer;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vtools/tools/drawTools/vtoolline.h b/src/libs/vtools/tools/drawTools/vtoolline.h
index ebbf96e74..0a6990ed1 100644
--- a/src/libs/vtools/tools/drawTools/vtoolline.h
+++ b/src/libs/vtools/tools/drawTools/vtoolline.h
@@ -29,8 +29,29 @@
 #ifndef VTOOLLINE_H
 #define VTOOLLINE_H
 
-#include "vdrawtool.h"
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QGraphicsItem>
 #include <QGraphicsLineItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "vdrawtool.h"
+
+class DialogTool;
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QKeyEvent;
+class VContainer;
+class VGObject;
+class VMainGraphicsScene;
+template <class T> class QSharedPointer;
 
 /**
  * @brief The VToolLine class tool for creation line.
diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp b/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp
index 889fb3331..1be0314bd 100644
--- a/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp
+++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp
@@ -27,9 +27,24 @@
  *************************************************************************/
 
 #include "vabstractnode.h"
-#include "../../undocommands/adddetnode.h"
 
-#include <QDebug>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QUndoStack>
+#include <Qt>
+
+#include "../../undocommands/adddetnode.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/nodeDetails/../../undocommands/../../ifc/xml/vabstractpattern.h"
+#include "tools/nodeDetails/../vabstracttool.h"
+
+class QDomElement;
 
 const QString VAbstractNode::AttrIdTool = QStringLiteral("idTool");
 
diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.h b/src/libs/vtools/tools/nodeDetails/vabstractnode.h
index 795f44c9f..666eaa19c 100644
--- a/src/libs/vtools/tools/nodeDetails/vabstractnode.h
+++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.h
@@ -29,9 +29,19 @@
 #ifndef VABSTRACTNODE_H
 #define VABSTRACTNODE_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vabstracttool.h"
 
-#include <QColor>
+class QDomElement;
+class VAbstractPattern;
+class VContainer;
 
 enum class ParentType : bool {Scene, Item};
 
diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp
index 04381a653..4141a601c 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp
+++ b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp
@@ -27,9 +27,19 @@
  *************************************************************************/
 
 #include "vnodearc.h"
-#include "../../../vgeometry/varc.h"
-#include <QGraphicsSceneMouseEvent>
-#include <QPen>
+
+#include <QDomElement>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "tools/nodeDetails/../vabstracttool.h"
+#include "tools/nodeDetails/../vdatatool.h"
+#include "tools/nodeDetails/vabstractnode.h"
+
+class VContainer;
 
 const QString VNodeArc::ToolType = QStringLiteral("modeling");
 
diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.h b/src/libs/vtools/tools/nodeDetails/vnodearc.h
index 3ca8afbd6..836c5b491 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodearc.h
+++ b/src/libs/vtools/tools/nodeDetails/vnodearc.h
@@ -29,8 +29,18 @@
 #ifndef VNODEARC_H
 #define VNODEARC_H
 
-#include "vabstractnode.h"
+#include <qcompilerdetection.h>
 #include <QGraphicsPathItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "vabstractnode.h"
+
+class VContainer;
 
 /**
  * @brief The VNodeArc class arc detail node.
diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp
index 0f33788c9..a89803002 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp
+++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp
@@ -27,11 +27,37 @@
  *************************************************************************/
 
 #include "vnodepoint.h"
+
+#include <QBrush>
+#include <QDomElement>
+#include <QFlags>
+#include <QGraphicsLineItem>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QPen>
+#include <QPoint>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <Qt>
+#include <new>
+
 #include "../../../vgeometry/vpointf.h"
 #include "../../../vwidgets/vgraphicssimpletextitem.h"
-#include <QPen>
-#include <QBrush>
-#include <QGraphicsSceneMouseEvent>
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/nodeDetails/../vabstracttool.h"
+#include "tools/nodeDetails/../vdatatool.h"
+#include "tools/nodeDetails/vabstractnode.h"
+
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
 
 const QString VNodePoint::ToolType = QStringLiteral("modeling");
 
diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.h b/src/libs/vtools/tools/nodeDetails/vnodepoint.h
index e5304133f..089fec1ba 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodepoint.h
+++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.h
@@ -29,13 +29,29 @@
 #ifndef VNODEPOINT_H
 #define VNODEPOINT_H
 
-#include "vabstractnode.h"
+#include <qcompilerdetection.h>
 #include <QGraphicsEllipseItem>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "vabstractnode.h"
 
-class VPointF;
-class VGraphicsSimpleTextItem;
-class QGraphicsLineItem;
 class QGraphicsItem;
+class QGraphicsLineItem;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QPointF;
+class VContainer;
+class VGraphicsSimpleTextItem;
+class VMainGraphicsScene;
+class VPointF;
 
 /**
  * @brief The VNodePoint class point detail node.
diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp
index 6abb3036b..aa00df5d7 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp
+++ b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp
@@ -27,9 +27,19 @@
  *************************************************************************/
 
 #include "vnodespline.h"
-#include "../../../vgeometry/vspline.h"
-#include <QGraphicsSceneMouseEvent>
-#include <QPen>
+
+#include <QDomElement>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "tools/nodeDetails/../vabstracttool.h"
+#include "tools/nodeDetails/../vdatatool.h"
+#include "tools/nodeDetails/vabstractnode.h"
+
+class VContainer;
 
 const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline");
 
diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.h b/src/libs/vtools/tools/nodeDetails/vnodespline.h
index 878285492..f04cecc9a 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodespline.h
+++ b/src/libs/vtools/tools/nodeDetails/vnodespline.h
@@ -29,8 +29,18 @@
 #ifndef VNODESPLINE_H
 #define VNODESPLINE_H
 
-#include "vabstractnode.h"
+#include <qcompilerdetection.h>
 #include <QGraphicsPathItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "vabstractnode.h"
+
+class VContainer;
 
 /**
  * @brief The VNodeSpline class spline detail node.
diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp
index 42112bf6b..d51db5ca2 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp
+++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp
@@ -28,9 +28,18 @@
 
 #include "vnodesplinepath.h"
 
-#include "../../../vgeometry/vsplinepath.h"
-#include <QGraphicsSceneMouseEvent>
-#include <QPen>
+#include <QDomElement>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "tools/nodeDetails/../vabstracttool.h"
+#include "tools/nodeDetails/../vdatatool.h"
+#include "tools/nodeDetails/vabstractnode.h"
+
+class VContainer;
 
 const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath");
 
diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h
index 3519a6c9e..18e258fbe 100644
--- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h
+++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h
@@ -29,8 +29,18 @@
 #ifndef VNODESPLINEPATH_H
 #define VNODESPLINEPATH_H
 
-#include "vabstractnode.h"
+#include <qcompilerdetection.h>
 #include <QGraphicsPathItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "vabstractnode.h"
+
+class VContainer;
 
 /**
  * @brief The VNodeSplinePath class spline path detail node.
diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp
index a3a2edcb7..818c0cc17 100644
--- a/src/libs/vtools/tools/vabstracttool.cpp
+++ b/src/libs/vtools/tools/vabstracttool.cpp
@@ -27,19 +27,50 @@
  *************************************************************************/
 
 #include "vabstracttool.h"
-#include "../../vpropertyexplorer/checkablemessagebox.h"
-#include "../../vgeometry/vpointf.h"
-#include "../../vwidgets/vmaingraphicsview.h"
-#include "../../vmisc/vsettings.h"
-#include "../undocommands/deltool.h"
-#include "../undocommands/savetooloptions.h"
-#include "../vwidgets/vgraphicssimpletextitem.h"
 
-#include <QGraphicsView>
+#include <QBrush>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QFlags>
+#include <QGraphicsEllipseItem>
+#include <QGraphicsLineItem>
+#include <QHash>
 #include <QIcon>
-#include <QStyle>
+#include <QLineF>
 #include <QMessageBox>
-#include <QtCore/qmath.h>
+#include <QPainter>
+#include <QPen>
+#include <QPixmap>
+#include <QPoint>
+#include <QPointF>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QStyle>
+#include <QUndoStack>
+#include <QVector>
+#include <new>
+
+#include "../../vgeometry/vpointf.h"
+#include "../../vpropertyexplorer/checkablemessagebox.h"
+#include "../../vwidgets/vmaingraphicsview.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vtoolrecord.h"
+#include "../undocommands/deltool.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vgraphicssimpletextitem.h"
+#include "tools/../undocommands/../../vmisc/logging.h"
+#include "tools/vdatatool.h"
+
+class QGraphicsEllipseItem;
+class QGraphicsLineItem;
+template <class T> class QSharedPointer;
 
 const QString VAbstractTool::AttrInUse = QStringLiteral("inUse");
 
diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h
index b4b808399..9886c0ea2 100644
--- a/src/libs/vtools/tools/vabstracttool.h
+++ b/src/libs/vtools/tools/vabstracttool.h
@@ -29,21 +29,36 @@
 #ifndef VABSTRACTTOOL_H
 #define VABSTRACTTOOL_H
 
-#include "vdatatool.h"
+#include <qcompilerdetection.h>
+#include <QMap>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <Qt>
+#include <QtGlobal>
+
 #include "../ifc/xml/vabstractpattern.h"
-#include "../vmisc/vabstractapplication.h"
-#include "../vwidgets/vmaingraphicsscene.h"
 #include "../visualization/visualization.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "tools/../undocommands/../../ifc/xml/vabstractpattern.h"
+#include "vdatatool.h"
 
 class QDomElement;
-class QLineF;
-class QPointF;
+class QGraphicsEllipseItem;
+class QGraphicsItem;
+class QGraphicsLineItem;
 class QGraphicsScene;
 class QGraphicsView;
-class QGraphicsItem;
+class QIcon;
+class QLineF;
+class QPointF;
 class QRectF;
-class Visualization;
+class VContainer;
 class VGraphicsSimpleTextItem;
+class Visualization;
 
 /**
  * @brief The VAbstractTool abstract class for all tools.
diff --git a/src/libs/vtools/tools/vdatatool.cpp b/src/libs/vtools/tools/vdatatool.cpp
index 3bfda5999..3d67c61ef 100644
--- a/src/libs/vtools/tools/vdatatool.cpp
+++ b/src/libs/vtools/tools/vdatatool.cpp
@@ -28,6 +28,8 @@
 
 #include "vdatatool.h"
 
+#include "../vmisc/def.h"
+
 Q_LOGGING_CATEGORY(vTool, "v.tool")
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/tools/vdatatool.h b/src/libs/vtools/tools/vdatatool.h
index 6405e2a59..6d33bd68f 100644
--- a/src/libs/vtools/tools/vdatatool.h
+++ b/src/libs/vtools/tools/vdatatool.h
@@ -29,8 +29,15 @@
 #ifndef VDATATOOL_H
 #define VDATATOOL_H
 
-#include "../vpatterndb/vcontainer.h"
+#include <qcompilerdetection.h>
+#include <QLoggingCategory>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vmisc/logging.h"
+#include "../vpatterndb/vcontainer.h"
 
 Q_DECLARE_LOGGING_CATEGORY(vTool)
 
diff --git a/src/libs/vtools/tools/vtextgraphicsitem.cpp b/src/libs/vtools/tools/vtextgraphicsitem.cpp
index 10f392748..4ea716599 100644
--- a/src/libs/vtools/tools/vtextgraphicsitem.cpp
+++ b/src/libs/vtools/tools/vtextgraphicsitem.cpp
@@ -26,18 +26,30 @@
  **
  *************************************************************************/
 
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
+#include <math.h>
+#include <qmath.h>
+#include <QColor>
+#include <QFlags>
+#include <QFont>
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsView>
-#include <QTransform>
-#include <QCursor>
-#include <QtMath>
-#include <QDebug>
+#include <QPainter>
+#include <QPen>
+#include <QPoint>
+#include <QStyleOptionGraphicsItem>
+#include <Qt>
 
-#include "../vmisc/def.h"
+#include "../ifc/../vmisc/def.h"
 #include "vtextgraphicsitem.h"
 
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QStyleOptionGraphicsItem;
+class QWidget;
+class VAbstractPattern;
+class VPatternPieceData;
+
 #define RESIZE_SQUARE               30
 #define ROTATE_CIRCLE               20
 #define ROTATE_RECT                 60
diff --git a/src/libs/vtools/tools/vtextgraphicsitem.h b/src/libs/vtools/tools/vtextgraphicsitem.h
index d8638eff6..b6f0ba59a 100644
--- a/src/libs/vtools/tools/vtextgraphicsitem.h
+++ b/src/libs/vtools/tools/vtextgraphicsitem.h
@@ -29,12 +29,31 @@
 #ifndef VTEXTGRAPHICSITEM_H
 #define VTEXTGRAPHICSITEM_H
 
-#include <QGraphicsObject>
 #include <QFont>
+#include <QGraphicsObject>
 #include <QList>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
+#include <QtGlobal>
 
 #include "../vlayout/vtextmanager.h"
 
+class QFont;
+class QGraphicsItem;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QPainter;
+class QPointF;
+class QRectF;
+class QStyleOptionGraphicsItem;
+class QWidget;
+class VAbstractPattern;
+class VPatternPieceData;
+
 /**
  * @brief The VTextGraphicsItem class. This class implements text graphics item,
  * which can be dragged around, resized and rotated within the parent item. The text font
diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp
index be8d58ea0..422a0fb24 100644
--- a/src/libs/vtools/tools/vtooldetail.cpp
+++ b/src/libs/vtools/tools/vtooldetail.cpp
@@ -27,27 +27,91 @@
  *************************************************************************/
 
 #include "vtooldetail.h"
-#include "nodeDetails/nodedetails.h"
-#include "../vgeometry/varc.h"
-#include "../vgeometry/vcubicbezier.h"
-#include "../vgeometry/vsplinepath.h"
-#include "../vgeometry/vcubicbezierpath.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../vwidgets/vmaingraphicsview.h"
-#include "../dialogs/tools/dialogtool.h"
+
+#include <QAction>
+#include <QBrush>
+#include <QDebug>
+#include <QDialog>
+#include <QDomElement>
+#include <QEvent>
+#include <QFlags>
+#include <QFont>
+#include <QGraphicsItem>
+#include <QGraphicsScene>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QHash>
+#include <QIcon>
+#include <QKeyEvent>
+#include <QList>
+#include <QMenu>
+#include <QMessageBox>
+#include <QMessageLogger>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPen>
+#include <QPoint>
+#include <QPointF>
+#include <QPolygonF>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QString>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QStringList>
+#include <QUndoStack>
+#include <QVariant>
+#include <Qt>
+#include <QtDebug>
+#include <new>
+
 #include "../dialogs/tools/dialogdetail.h"
-#include "../undocommands/savedetailoptions.h"
-#include "../undocommands/movedetail.h"
+#include "../dialogs/tools/dialogtool.h"
+#include "../ifc/exception/vexception.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../undocommands/adddet.h"
 #include "../undocommands/deletedetail.h"
-#include "../vpatterndb/vpatternpiecedata.h"
+#include "../undocommands/movedetail.h"
+#include "../undocommands/savedetailoptions.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/varc.h"
+#include "../vgeometry/vcubicbezier.h"
+#include "../vgeometry/vcubicbezierpath.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vgeometry/vsplinepath.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vdetail.h"
 #include "../vpatterndb/vpatterninfogeometry.h"
+#include "../vpatterndb/vpatternpiecedata.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "../vwidgets/vnobrushscalepathitem.h"
+#include "tools/../undocommands/../../ifc/xml/vabstractpattern.h"
+#include "tools/../undocommands/../tools/vtooldetail.h"
+#include "tools/nodeDetails/../vabstracttool.h"
+#include "tools/nodeDetails/vabstractnode.h"
+#include "tools/nodeDetails/vnodearc.h"
+#include "tools/nodeDetails/vnodepoint.h"
+#include "tools/nodeDetails/vnodespline.h"
+#include "tools/nodeDetails/vnodesplinepath.h"
+#include "tools/vtextgraphicsitem.h"
+#include "vnodedetail.h"
 
-#include <QKeyEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QMenu>
-#include <QGraphicsView>
-#include <QMessageBox>
+class QDomElement;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+class QStyleOptionGraphicsItem;
+class QWidget;
+class VDataTool;
 
 const QString VToolDetail::TagNode          = QStringLiteral("node");
 
diff --git a/src/libs/vtools/tools/vtooldetail.h b/src/libs/vtools/tools/vtooldetail.h
index 9c470e96c..9e69f77d1 100644
--- a/src/libs/vtools/tools/vtooldetail.h
+++ b/src/libs/vtools/tools/vtooldetail.h
@@ -29,8 +29,12 @@
 #ifndef VTOOLDETAIL_H
 #define VTOOLDETAIL_H
 
-#include "vabstracttool.h"
+#include <qcompilerdetection.h>
+#include <QObject>
+#include <QtGlobal>
+
 #include "../vwidgets/vnobrushscalepathitem.h"
+#include "vabstracttool.h"
 #include "vtextgraphicsitem.h"
 
 class VMainGraphicsScene;
diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp
index 769c77b82..67e7a146b 100644
--- a/src/libs/vtools/tools/vtooluniondetails.cpp
+++ b/src/libs/vtools/tools/vtooluniondetails.cpp
@@ -27,15 +27,50 @@
  *************************************************************************/
 
 #include "vtooluniondetails.h"
-#include "nodeDetails/nodedetails.h"
-#include "vtooldetail.h"
-#include "../../vgeometry/vpointf.h"
+
+#include <QByteArray>
+#include <QDebug>
+#include <QDomNodeList>
+#include <QHash>
+#include <QLineF>
+#include <QLoggingCategory>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <QUndoStack>
+#include <QtDebug>
+#include <new>
+
 #include "../../vgeometry/varc.h"
 #include "../../vgeometry/vsplinepath.h"
 #include "../dialogs/tools/dialoguniondetails.h"
+#include "../ifc/xml/vabstractconverter.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../ifc/xml/vpatternconverter.h"
+#include "../vgeometry/../vmisc/diagnostic.h"
+#include "../vgeometry/vabstractcubicbezier.h"
+#include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vgeometry/vsplinepoint.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "tools/../dialogs/tools/dialogtool.h"
+#include "tools/nodeDetails/vnodearc.h"
+#include "tools/nodeDetails/vnodepoint.h"
+#include "tools/nodeDetails/vnodespline.h"
+#include "tools/nodeDetails/vnodesplinepath.h"
+#include "tools/vdatatool.h"
+#include "vnodedetail.h"
+#include "vtooldetail.h"
 
-#include <QUndoStack>
+class QDomElement;
+class QDomNode;
+class QPointF;
 
 const QString VToolUnionDetails::ToolType         = QStringLiteral("unionDetails");
 const QString VToolUnionDetails::TagDetail        = QStringLiteral("det");
diff --git a/src/libs/vtools/tools/vtooluniondetails.h b/src/libs/vtools/tools/vtooluniondetails.h
index 6e02d456f..00402d121 100644
--- a/src/libs/vtools/tools/vtooluniondetails.h
+++ b/src/libs/vtools/tools/vtooluniondetails.h
@@ -29,11 +29,31 @@
 #ifndef VTOOLUNIONDETAILS_H
 #define VTOOLUNIONDETAILS_H
 
-#include "vabstracttool.h"
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QDomNode>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vlayout/../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "tools/nodeDetails/../vabstracttool.h"
+#include "vabstracttool.h"
+#include "vdetail.h"
 
-class VPointF;
-class VMainGraphicsScene;
 class DialogTool;
+class QDomElement;
+class QDomNode;
+class QPointF;
+class VContainer;
+class VMainGraphicsScene;
+class VNodeDetail;
+class VPointF;
 
 /**
  * @brief The VToolUnionDetails class tool union details.
diff --git a/src/libs/vtools/undocommands/adddet.cpp b/src/libs/vtools/undocommands/adddet.cpp
index a73fb7e1a..106be87de 100644
--- a/src/libs/vtools/undocommands/adddet.cpp
+++ b/src/libs/vtools/undocommands/adddet.cpp
@@ -28,6 +28,16 @@
 
 #include "adddet.h"
 
+#include <QByteArray>
+#include <QDomNode>
+
+#include "../vlayout/../ifc/xml/vabstractpattern.h"
+#include "../vmisc/logging.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
+
 //---------------------------------------------------------------------------------------------------------------------
 AddDet::AddDet(const QDomElement &xml, VAbstractPattern *doc, const VDetail &detail, const QString &drawName,
                QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/adddet.h b/src/libs/vtools/undocommands/adddet.h
index ff5187180..a6583cf6e 100644
--- a/src/libs/vtools/undocommands/adddet.h
+++ b/src/libs/vtools/undocommands/adddet.h
@@ -29,8 +29,20 @@
 #ifndef ADDDET_H
 #define ADDDET_H
 
-#include "vundocommand.h"
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../tools/vtooldetail.h"
+#include "vdetail.h"
+#include "vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
+class VAbstractPattern;
 
 class AddDet : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/adddetnode.cpp b/src/libs/vtools/undocommands/adddetnode.cpp
index 7d263f7d2..5b3b445c9 100644
--- a/src/libs/vtools/undocommands/adddetnode.cpp
+++ b/src/libs/vtools/undocommands/adddetnode.cpp
@@ -28,6 +28,16 @@
 
 #include "adddetnode.h"
 
+#include <QByteArray>
+#include <QDomNode>
+
+#include "../vmisc/logging.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
+
 //---------------------------------------------------------------------------------------------------------------------
 AddDetNode::AddDetNode(const QDomElement &xml, VAbstractPattern *doc, const QString &drawName, QUndoCommand *parent)
     : VUndoCommand(xml, doc, parent), m_drawName(drawName)
diff --git a/src/libs/vtools/undocommands/adddetnode.h b/src/libs/vtools/undocommands/adddetnode.h
index 828408798..abca3b84a 100644
--- a/src/libs/vtools/undocommands/adddetnode.h
+++ b/src/libs/vtools/undocommands/adddetnode.h
@@ -29,8 +29,19 @@
 #ifndef ADDDETNODE_H
 #define ADDDETNODE_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QDomElement;
+class QUndoCommand;
+class VAbstractPattern;
+
 class AddDetNode : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/addgroup.cpp b/src/libs/vtools/undocommands/addgroup.cpp
index fbb4f05c7..cc9a83ee7 100644
--- a/src/libs/vtools/undocommands/addgroup.cpp
+++ b/src/libs/vtools/undocommands/addgroup.cpp
@@ -27,9 +27,19 @@
  *************************************************************************/
 
 #include "addgroup.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../vwidgets/vmaingraphicsview.h"
+
+#include <QDomNode>
+#include <QDomNodeList>
+
+#include "../vmisc/logging.h"
 #include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/../../vmisc/def.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 AddGroup::AddGroup(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/addgroup.h b/src/libs/vtools/undocommands/addgroup.h
index ca0807fdf..90844599c 100644
--- a/src/libs/vtools/undocommands/addgroup.h
+++ b/src/libs/vtools/undocommands/addgroup.h
@@ -29,8 +29,19 @@
 #ifndef ADDGROUP_H
 #define ADDGROUP_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QDomElement;
+class QUndoCommand;
+class VAbstractPattern;
+
 class AddGroup : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/addpatternpiece.cpp b/src/libs/vtools/undocommands/addpatternpiece.cpp
index b4453bf34..b8b02000c 100644
--- a/src/libs/vtools/undocommands/addpatternpiece.cpp
+++ b/src/libs/vtools/undocommands/addpatternpiece.cpp
@@ -28,6 +28,14 @@
 
 #include "addpatternpiece.h"
 
+#include "../vmisc/def.h"
+#include "../vmisc/logging.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
+
 //---------------------------------------------------------------------------------------------------------------------
 AddPatternPiece::AddPatternPiece(const QDomElement &xml, VAbstractPattern *doc, const QString &namePP,
                                  QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/addpatternpiece.h b/src/libs/vtools/undocommands/addpatternpiece.h
index 814131425..7da9e32c5 100644
--- a/src/libs/vtools/undocommands/addpatternpiece.h
+++ b/src/libs/vtools/undocommands/addpatternpiece.h
@@ -29,8 +29,19 @@
 #ifndef ADDPATTERNPIECE_H
 #define ADDPATTERNPIECE_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QDomElement;
+class QUndoCommand;
+class VAbstractPattern;
+
 class AddPatternPiece : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/addtocalc.cpp b/src/libs/vtools/undocommands/addtocalc.cpp
index 904d72992..9cb70ce00 100644
--- a/src/libs/vtools/undocommands/addtocalc.cpp
+++ b/src/libs/vtools/undocommands/addtocalc.cpp
@@ -27,9 +27,18 @@
  *************************************************************************/
 
 #include "addtocalc.h"
-#include "../tools/vabstracttool.h"
-#include "../../vwidgets/vmaingraphicsscene.h"
+
+#include <QDomNode>
+
 #include "../../vwidgets/vmaingraphicsview.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 AddToCalc::AddToCalc(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/addtocalc.h b/src/libs/vtools/undocommands/addtocalc.h
index 3b2aa0739..730d75833 100644
--- a/src/libs/vtools/undocommands/addtocalc.h
+++ b/src/libs/vtools/undocommands/addtocalc.h
@@ -29,8 +29,19 @@
 #ifndef ADDTOCALC_H
 #define ADDTOCALC_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QDomElement;
+class QUndoCommand;
+class VAbstractPattern;
+
 class AddToCalc : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/deletedetail.cpp b/src/libs/vtools/undocommands/deletedetail.cpp
index 5ece463a6..73f76c0b6 100644
--- a/src/libs/vtools/undocommands/deletedetail.cpp
+++ b/src/libs/vtools/undocommands/deletedetail.cpp
@@ -27,7 +27,20 @@
  *************************************************************************/
 
 #include "deletedetail.h"
+
+#include <QDomElement>
+#include <QHash>
+
 #include "../tools/vtooldetail.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vlayout/../ifc/xml/vabstractpattern.h"
+#include "../vmisc/logging.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "undocommands/../../ifc/xml/vdomdocument.h"
+#include "undocommands/../tools/vdatatool.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 DeleteDetail::DeleteDetail(VAbstractPattern *doc, quint32 id, const VDetail &detail, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/deletedetail.h b/src/libs/vtools/undocommands/deletedetail.h
index 780d10f75..abbe30b7e 100644
--- a/src/libs/vtools/undocommands/deletedetail.h
+++ b/src/libs/vtools/undocommands/deletedetail.h
@@ -29,10 +29,20 @@
 #ifndef DELETEDETAIL_H
 #define DELETEDETAIL_H
 
-#include "vundocommand.h"
+#include <qcompilerdetection.h>
+#include <QDomNode>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../tools/vtooldetail.h"
+#include "vdetail.h"
+#include "vundocommand.h"
 
 class QGraphicsItem;
+class QUndoCommand;
+class VAbstractPattern;
 
 class DeleteDetail : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/deletepatternpiece.cpp b/src/libs/vtools/undocommands/deletepatternpiece.cpp
index e518cba28..9ac7ad9f5 100644
--- a/src/libs/vtools/undocommands/deletepatternpiece.cpp
+++ b/src/libs/vtools/undocommands/deletepatternpiece.cpp
@@ -27,7 +27,15 @@
  *************************************************************************/
 
 #include "deletepatternpiece.h"
-#include "addpatternpiece.h"
+
+#include <QDomNode>
+#include <QDomNodeList>
+
+#include "../vmisc/logging.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 DeletePatternPiece::DeletePatternPiece(VAbstractPattern *doc, const QString &namePP, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/deletepatternpiece.h b/src/libs/vtools/undocommands/deletepatternpiece.h
index 641ceecdf..513ba0d65 100644
--- a/src/libs/vtools/undocommands/deletepatternpiece.h
+++ b/src/libs/vtools/undocommands/deletepatternpiece.h
@@ -29,8 +29,18 @@
 #ifndef DELETEPATTERNPIECE_H
 #define DELETEPATTERNPIECE_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QUndoCommand;
+class VAbstractPattern;
+
 class DeletePatternPiece : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/delgroup.cpp b/src/libs/vtools/undocommands/delgroup.cpp
index 818e5e1a6..df2527cf2 100644
--- a/src/libs/vtools/undocommands/delgroup.cpp
+++ b/src/libs/vtools/undocommands/delgroup.cpp
@@ -27,9 +27,19 @@
  *************************************************************************/
 
 #include "delgroup.h"
-#include "../vwidgets/vmaingraphicsscene.h"
-#include "../vwidgets/vmaingraphicsview.h"
+
+#include <QDomElement>
+#include <QDomNode>
+#include <QDomNodeList>
+
+#include "../vmisc/logging.h"
 #include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/../../vmisc/def.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 DelGroup::DelGroup(VAbstractPattern *doc, quint32 id, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/delgroup.h b/src/libs/vtools/undocommands/delgroup.h
index a04372470..315aca590 100644
--- a/src/libs/vtools/undocommands/delgroup.h
+++ b/src/libs/vtools/undocommands/delgroup.h
@@ -29,8 +29,17 @@
 #ifndef DELGROUP_H
 #define DELGROUP_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QUndoCommand;
+class VAbstractPattern;
+
 class DelGroup : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/deltool.cpp b/src/libs/vtools/undocommands/deltool.cpp
index 9036a01cd..0bebd4415 100644
--- a/src/libs/vtools/undocommands/deltool.cpp
+++ b/src/libs/vtools/undocommands/deltool.cpp
@@ -27,8 +27,15 @@
  *************************************************************************/
 
 #include "deltool.h"
-#include <QGraphicsItem>
-#include "../tools/vtooldetail.h"
+
+#include <QDomElement>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vlayout/../ifc/xml/vabstractpattern.h"
+#include "../vmisc/logging.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 DelTool::DelTool(VAbstractPattern *doc, quint32 id, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/deltool.h b/src/libs/vtools/undocommands/deltool.h
index 625a86c7a..59e25c087 100644
--- a/src/libs/vtools/undocommands/deltool.h
+++ b/src/libs/vtools/undocommands/deltool.h
@@ -29,8 +29,18 @@
 #ifndef DELTOOL_H
 #define DELTOOL_H
 
+#include <qcompilerdetection.h>
+#include <QDomNode>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
+
 class QGraphicsItem;
+class QUndoCommand;
+class VAbstractPattern;
 
 class DelTool : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/label/moveabstractlabel.cpp b/src/libs/vtools/undocommands/label/moveabstractlabel.cpp
index 1ba5c0d39..76c736e9d 100644
--- a/src/libs/vtools/undocommands/label/moveabstractlabel.cpp
+++ b/src/libs/vtools/undocommands/label/moveabstractlabel.cpp
@@ -27,8 +27,16 @@
  *************************************************************************/
 
 #include "moveabstractlabel.h"
-#include "../vwidgets/vmaingraphicsview.h"
+
+#include <QDomElement>
+
+#include "../vmisc/logging.h"
 #include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "undocommands/label/../vundocommand.h"
+
+class QUndoCommand;
+class VAbstractPattern;
 
 //---------------------------------------------------------------------------------------------------------------------
 MoveAbstractLabel::MoveAbstractLabel(VAbstractPattern *doc, quint32 pointId, double x, double y,
diff --git a/src/libs/vtools/undocommands/label/moveabstractlabel.h b/src/libs/vtools/undocommands/label/moveabstractlabel.h
index 5aa885955..b29dc8027 100644
--- a/src/libs/vtools/undocommands/label/moveabstractlabel.h
+++ b/src/libs/vtools/undocommands/label/moveabstractlabel.h
@@ -29,10 +29,18 @@
 #ifndef MOVEABSTRACTLABEL_H
 #define MOVEABSTRACTLABEL_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../vundocommand.h"
 
 class QGraphicsScene;
 class QGraphicsView;
+class QUndoCommand;
+class VAbstractPattern;
 
 class MoveAbstractLabel : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/label/movedoublelabel.cpp b/src/libs/vtools/undocommands/label/movedoublelabel.cpp
index 960a49409..3fa4f5681 100644
--- a/src/libs/vtools/undocommands/label/movedoublelabel.cpp
+++ b/src/libs/vtools/undocommands/label/movedoublelabel.cpp
@@ -27,7 +27,18 @@
  *************************************************************************/
 
 #include "movedoublelabel.h"
+
+#include <QDomElement>
+
+#include "../ifc/ifcdef.h"
+#include "../vmisc/logging.h"
 #include "../vmisc/vabstractapplication.h"
+#include "undocommands/label/../../../ifc/xml/vabstractpattern.h"
+#include "undocommands/label/../../../vmisc/def.h"
+#include "undocommands/label/../vundocommand.h"
+#include "undocommands/label/moveabstractlabel.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 MoveDoubleLabel::MoveDoubleLabel(VAbstractPattern *doc, const double &x, const double &y, DoublePoint type,
diff --git a/src/libs/vtools/undocommands/label/movedoublelabel.h b/src/libs/vtools/undocommands/label/movedoublelabel.h
index 19bd4604a..d9ea6900c 100644
--- a/src/libs/vtools/undocommands/label/movedoublelabel.h
+++ b/src/libs/vtools/undocommands/label/movedoublelabel.h
@@ -29,8 +29,17 @@
 #ifndef MOVEDOUBLELABEL_H
 #define MOVEDOUBLELABEL_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "moveabstractlabel.h"
 
+class QUndoCommand;
+class VAbstractPattern;
+
 enum class DoublePoint: char { FirstPoint, SecondPoint };
 
 class MoveDoubleLabel : public MoveAbstractLabel
diff --git a/src/libs/vtools/undocommands/label/movelabel.cpp b/src/libs/vtools/undocommands/label/movelabel.cpp
index 82b75289a..68ec9796c 100644
--- a/src/libs/vtools/undocommands/label/movelabel.cpp
+++ b/src/libs/vtools/undocommands/label/movelabel.cpp
@@ -27,7 +27,18 @@
  *************************************************************************/
 
 #include "movelabel.h"
+
+#include <QDomElement>
+
+#include "../ifc/ifcdef.h"
+#include "../vmisc/logging.h"
 #include "../vmisc/vabstractapplication.h"
+#include "undocommands/label/../../../ifc/xml/vabstractpattern.h"
+#include "undocommands/label/../../../vmisc/def.h"
+#include "undocommands/label/../vundocommand.h"
+#include "undocommands/label/moveabstractlabel.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 MoveLabel::MoveLabel(VAbstractPattern *doc, const double &x, const double &y, const quint32 &id, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/label/movelabel.h b/src/libs/vtools/undocommands/label/movelabel.h
index 3b5887919..a7ce5793d 100644
--- a/src/libs/vtools/undocommands/label/movelabel.h
+++ b/src/libs/vtools/undocommands/label/movelabel.h
@@ -29,8 +29,17 @@
 #ifndef MOVELABEL_H
 #define MOVELABEL_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "moveabstractlabel.h"
 
+class QUndoCommand;
+class VAbstractPattern;
+
 class MoveLabel : public MoveAbstractLabel
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/label/rotationmovelabel.cpp b/src/libs/vtools/undocommands/label/rotationmovelabel.cpp
index 0d73a9450..6b4ae04f0 100644
--- a/src/libs/vtools/undocommands/label/rotationmovelabel.cpp
+++ b/src/libs/vtools/undocommands/label/rotationmovelabel.cpp
@@ -27,7 +27,20 @@
  *************************************************************************/
 
 #include "rotationmovelabel.h"
+
+#include <QDomNode>
+#include <QDomNodeList>
+
 #include "../../tools/drawTools/operation/vtoolrotation.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "undocommands/label/../vundocommand.h"
+#include "undocommands/label/moveabstractlabel.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 RotationMoveLabel::RotationMoveLabel(quint32 idTool, VAbstractPattern *doc, double x, double y, quint32 idPoint,
diff --git a/src/libs/vtools/undocommands/label/rotationmovelabel.h b/src/libs/vtools/undocommands/label/rotationmovelabel.h
index ba156eb01..5308ddd02 100644
--- a/src/libs/vtools/undocommands/label/rotationmovelabel.h
+++ b/src/libs/vtools/undocommands/label/rotationmovelabel.h
@@ -29,8 +29,19 @@
 #ifndef ROTATIONMOVELABEL_H
 #define ROTATIONMOVELABEL_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "moveabstractlabel.h"
 
+class QDomElement;
+class QUndoCommand;
+class VAbstractPattern;
+
 class RotationMoveLabel : public MoveAbstractLabel
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/movedetail.cpp b/src/libs/vtools/undocommands/movedetail.cpp
index 603db86a7..d955be5e9 100644
--- a/src/libs/vtools/undocommands/movedetail.cpp
+++ b/src/libs/vtools/undocommands/movedetail.cpp
@@ -27,12 +27,20 @@
  *************************************************************************/
 
 #include "movedetail.h"
-#include "../tools/vabstracttool.h"
-#include "../vwidgets/vmaingraphicsview.h"
 
-#include <QGraphicsScene>
 #include <QDomElement>
 
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
+
 //---------------------------------------------------------------------------------------------------------------------
 MoveDetail::MoveDetail(VAbstractPattern *doc, const double &x, const double &y, const quint32 &id,
                        QGraphicsScene *scene, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/movedetail.h b/src/libs/vtools/undocommands/movedetail.h
index a8e306c4d..37c0d1db2 100644
--- a/src/libs/vtools/undocommands/movedetail.h
+++ b/src/libs/vtools/undocommands/movedetail.h
@@ -29,9 +29,18 @@
 #ifndef MOVEDETAIL_H
 #define MOVEDETAIL_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QDomElement;
 class QGraphicsScene;
+class QUndoCommand;
+class VAbstractPattern;
 
 class MoveDetail : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/movespline.cpp b/src/libs/vtools/undocommands/movespline.cpp
index 4c1a4702d..523fce7ae 100644
--- a/src/libs/vtools/undocommands/movespline.cpp
+++ b/src/libs/vtools/undocommands/movespline.cpp
@@ -27,11 +27,20 @@
  *************************************************************************/
 
 #include "movespline.h"
-#include "../tools/vabstracttool.h"
-#include "../vwidgets/vmaingraphicsview.h"
 
 #include <QDomElement>
-#include <QGraphicsView>
+
+#include "../ifc/exception/../ifcdef.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "undocommands/../../vgeometry/vpointf.h"
+#include "undocommands/../../vgeometry/vspline.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 MoveSpline::MoveSpline(VAbstractPattern *doc, const VSpline *oldSpl, const VSpline &newSpl, const quint32 &id,
diff --git a/src/libs/vtools/undocommands/movespline.h b/src/libs/vtools/undocommands/movespline.h
index fa067771d..ad12b7c0f 100644
--- a/src/libs/vtools/undocommands/movespline.h
+++ b/src/libs/vtools/undocommands/movespline.h
@@ -29,10 +29,18 @@
 #ifndef MOVESPLINE_H
 #define MOVESPLINE_H
 
-#include "vundocommand.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../../vgeometry/vspline.h"
+#include "vundocommand.h"
 
 class QGraphicsScene;
+class QUndoCommand;
+class VAbstractPattern;
 
 class MoveSpline : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/movesplinepath.cpp b/src/libs/vtools/undocommands/movesplinepath.cpp
index 7109bbc93..b9fab9702 100644
--- a/src/libs/vtools/undocommands/movesplinepath.cpp
+++ b/src/libs/vtools/undocommands/movesplinepath.cpp
@@ -27,8 +27,19 @@
  *************************************************************************/
 
 #include "movesplinepath.h"
+
 #include <QDomElement>
+
+#include "../ifc/xml/vabstractpattern.h"
 #include "../tools/drawTools/toolcurve/vtoolsplinepath.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "../vwidgets/vmaingraphicsview.h"
+#include "undocommands/../../vgeometry/vsplinepath.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 MoveSplinePath::MoveSplinePath(VAbstractPattern *doc, const VSplinePath &oldSplPath, const VSplinePath &newSplPath,
diff --git a/src/libs/vtools/undocommands/movesplinepath.h b/src/libs/vtools/undocommands/movesplinepath.h
index 445b03c9b..23cf42c08 100644
--- a/src/libs/vtools/undocommands/movesplinepath.h
+++ b/src/libs/vtools/undocommands/movesplinepath.h
@@ -29,10 +29,18 @@
 #ifndef MOVESPLINEPATH_H
 #define MOVESPLINEPATH_H
 
-#include "vundocommand.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../../vgeometry/vsplinepath.h"
+#include "vundocommand.h"
 
 class QGraphicsScene;
+class QUndoCommand;
+class VAbstractPattern;
 
 class MoveSplinePath : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/movespoint.cpp b/src/libs/vtools/undocommands/movespoint.cpp
index 881e33b94..cb8f282c4 100644
--- a/src/libs/vtools/undocommands/movespoint.cpp
+++ b/src/libs/vtools/undocommands/movespoint.cpp
@@ -27,12 +27,18 @@
  *************************************************************************/
 
 #include "movespoint.h"
-#include "../tools/vabstracttool.h"
-#include "../../vwidgets/vmaingraphicsview.h"
 
-#include <QGraphicsScene>
 #include <QDomElement>
 
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
+
 //---------------------------------------------------------------------------------------------------------------------
 MoveSPoint::MoveSPoint(VAbstractPattern *doc, const double &x, const double &y, const quint32 &id,
                        QGraphicsScene *scene, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/movespoint.h b/src/libs/vtools/undocommands/movespoint.h
index f6defcd60..1558c913f 100644
--- a/src/libs/vtools/undocommands/movespoint.h
+++ b/src/libs/vtools/undocommands/movespoint.h
@@ -29,9 +29,17 @@
 #ifndef MOVESPOINT_H
 #define MOVESPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
 class QGraphicsScene;
+class QUndoCommand;
+class VAbstractPattern;
 
 class MoveSPoint : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/renamepp.cpp b/src/libs/vtools/undocommands/renamepp.cpp
index dc20b970b..ea94d386f 100644
--- a/src/libs/vtools/undocommands/renamepp.cpp
+++ b/src/libs/vtools/undocommands/renamepp.cpp
@@ -29,6 +29,14 @@
 #include "renamepp.h"
 
 #include <QComboBox>
+#include <QDomElement>
+
+#include "../vmisc/def.h"
+#include "../vmisc/logging.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/vundocommand.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 RenamePP::RenamePP(VAbstractPattern *doc, const QString &newPPname, QComboBox *combo, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/renamepp.h b/src/libs/vtools/undocommands/renamepp.h
index 663ceb874..cc376a083 100644
--- a/src/libs/vtools/undocommands/renamepp.h
+++ b/src/libs/vtools/undocommands/renamepp.h
@@ -29,8 +29,17 @@
 #ifndef RENAMEPP_H
 #define RENAMEPP_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
+
 class QComboBox;
+class QUndoCommand;
+class VAbstractPattern;
 
 class RenamePP :public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/savedetailoptions.cpp b/src/libs/vtools/undocommands/savedetailoptions.cpp
index 1aadf15f6..a79b8fb92 100644
--- a/src/libs/vtools/undocommands/savedetailoptions.cpp
+++ b/src/libs/vtools/undocommands/savedetailoptions.cpp
@@ -27,13 +27,22 @@
  *************************************************************************/
 
 #include "savedetailoptions.h"
-#include "../tools/nodeDetails/vabstractnode.h"
-#include "../../vwidgets/vmaingraphicsview.h"
-#include "../ifc/xml/vabstractpattern.h"
-#include "../vpatterndb/vpatternpiecedata.h"
-#include "../vpatterndb/vpatterninfogeometry.h"
 
-#include <QGraphicsView>
+#include <QDomElement>
+#include <QPointF>
+#include <QUndoCommand>
+
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/logging.h"
+#include "../vpatterndb/vpatterninfogeometry.h"
+#include "../vpatterndb/vpatternpiecedata.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "undocommands/../tools/vtooldetail.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 SaveDetailOptions::SaveDetailOptions(const VDetail &oldDet, const VDetail &newDet, VAbstractPattern *doc,
diff --git a/src/libs/vtools/undocommands/savedetailoptions.h b/src/libs/vtools/undocommands/savedetailoptions.h
index 58e1ba789..d1ff979d9 100644
--- a/src/libs/vtools/undocommands/savedetailoptions.h
+++ b/src/libs/vtools/undocommands/savedetailoptions.h
@@ -29,10 +29,20 @@
 #ifndef SAVEDETAILOPTIONS_H
 #define SAVEDETAILOPTIONS_H
 
-#include "vundocommand.h"
-#include "../tools/vtooldetail.h"
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
 
+#include "../tools/vtooldetail.h"
+#include "vdetail.h"
+#include "vundocommand.h"
+
+class QDomElement;
 class QGraphicsScene;
+class QUndoCommand;
+class VAbstractPattern;
 
 class SaveDetailOptions : public VUndoCommand
 {
diff --git a/src/libs/vtools/undocommands/savetooloptions.cpp b/src/libs/vtools/undocommands/savetooloptions.cpp
index ad33013bb..dc6fecbc9 100644
--- a/src/libs/vtools/undocommands/savetooloptions.cpp
+++ b/src/libs/vtools/undocommands/savetooloptions.cpp
@@ -28,6 +28,16 @@
 
 #include "savetooloptions.h"
 
+#include <QDomNode>
+
+#include "../vmisc/def.h"
+#include "../vmisc/logging.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/vundocommand.h"
+
+class QDomElement;
+class QUndoCommand;
+
 //---------------------------------------------------------------------------------------------------------------------
 SaveToolOptions::SaveToolOptions(const QDomElement &oldXml, const QDomElement &newXml, VAbstractPattern *doc,
                                  const quint32 &id, QUndoCommand *parent)
diff --git a/src/libs/vtools/undocommands/savetooloptions.h b/src/libs/vtools/undocommands/savetooloptions.h
index dc297e0a3..fda49775b 100644
--- a/src/libs/vtools/undocommands/savetooloptions.h
+++ b/src/libs/vtools/undocommands/savetooloptions.h
@@ -29,8 +29,19 @@
 #ifndef SAVETOOLOPTIONS_H
 #define SAVETOOLOPTIONS_H
 
+#include <qcompilerdetection.h>
+#include <QDomElement>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QDomElement;
+class QUndoCommand;
+class VAbstractPattern;
+
 class SaveToolOptions : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/toggledetailinlayout.cpp b/src/libs/vtools/undocommands/toggledetailinlayout.cpp
index 4b13fd15f..7f1baf2e1 100644
--- a/src/libs/vtools/undocommands/toggledetailinlayout.cpp
+++ b/src/libs/vtools/undocommands/toggledetailinlayout.cpp
@@ -27,8 +27,21 @@
  *************************************************************************/
 
 #include "toggledetailinlayout.h"
-#include "../vpatterndb/vdetail.h"
+
+#include <QDomElement>
+#include <QHash>
+#include <QMessageLogger>
+#include <QtDebug>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/def.h"
+#include "../vmisc/logging.h"
 #include "../vpatterndb/vcontainer.h"
+#include "undocommands/../../ifc/xml/vabstractpattern.h"
+#include "undocommands/vundocommand.h"
+#include "vdetail.h"
+
+class QUndoCommand;
 
 //---------------------------------------------------------------------------------------------------------------------
 ToggleDetailInLayout::ToggleDetailInLayout(quint32 id, bool state, VContainer *data, VAbstractPattern *doc,
diff --git a/src/libs/vtools/undocommands/toggledetailinlayout.h b/src/libs/vtools/undocommands/toggledetailinlayout.h
index ca9833ce0..eca12d4e4 100644
--- a/src/libs/vtools/undocommands/toggledetailinlayout.h
+++ b/src/libs/vtools/undocommands/toggledetailinlayout.h
@@ -29,8 +29,18 @@
 #ifndef TOGGLEDETAILINLAYOUT_H
 #define TOGGLEDETAILINLAYOUT_H
 
+#include <qcompilerdetection.h>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "vundocommand.h"
 
+class QUndoCommand;
+class VAbstractPattern;
+class VContainer;
+
 class ToggleDetailInLayout : public VUndoCommand
 {
     Q_OBJECT
diff --git a/src/libs/vtools/undocommands/vundocommand.cpp b/src/libs/vtools/undocommands/vundocommand.cpp
index 208d8a13f..90a70cbb8 100644
--- a/src/libs/vtools/undocommands/vundocommand.cpp
+++ b/src/libs/vtools/undocommands/vundocommand.cpp
@@ -27,9 +27,16 @@
  *************************************************************************/
 
 #include "vundocommand.h"
-#include "../vmisc/def.h"
-#include "../vgeometry/vpointf.h"
-#include "../vtools/tools/vabstracttool.h"
+
+#include <QDomNode>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vwidgets/../vmisc/def.h"
+#include "vnodedetail.h"
+
+class QDomElement;
+class QDomNode;
+class QUndoCommand;
 
 Q_LOGGING_CATEGORY(vUndo, "v.undo")
 
diff --git a/src/libs/vtools/undocommands/vundocommand.h b/src/libs/vtools/undocommands/vundocommand.h
index 241288ad2..c2b3fa429 100644
--- a/src/libs/vtools/undocommands/vundocommand.h
+++ b/src/libs/vtools/undocommands/vundocommand.h
@@ -29,11 +29,23 @@
 #ifndef VUNDOCOMMAND_H
 #define VUNDOCOMMAND_H
 
-#include <QUndoCommand>
+#include <qcompilerdetection.h>
 #include <QDomElement>
+#include <QLoggingCategory>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QUndoCommand>
+#include <QVector>
+#include <QtGlobal>
 
-#include "../../vmisc/logging.h"
 #include "../../ifc/xml/vabstractpattern.h"
+#include "../../vmisc/logging.h"
+#include "../ifc/xml/vabstractpattern.h"
+
+class QDomElement;
+class QDomNode;
+class QUndoCommand;
 
 Q_DECLARE_LOGGING_CATEGORY(vUndo)
 
@@ -54,8 +66,8 @@ enum class UndoCommand: char { AddPatternPiece,
                                ToggleDetailInLayout
                              };
 
-class VPattern;
 class VNodeDetail;
+class VPattern;
 
 class VUndoCommand : public QObject, public QUndoCommand
 {
diff --git a/src/libs/vtools/visualization/line/visline.cpp b/src/libs/vtools/visualization/line/visline.cpp
index 7a245acdf..ac1d6c5cd 100644
--- a/src/libs/vtools/visualization/line/visline.cpp
+++ b/src/libs/vtools/visualization/line/visline.cpp
@@ -27,8 +27,19 @@
  *************************************************************************/
 
 #include "visline.h"
-#include "../../tools/drawTools/vdrawtool.h"
+
 #include <QtCore/qmath.h>
+#include <QGraphicsScene>
+#include <QGuiApplication>
+#include <QPen>
+#include <QRectF>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VisLine::VisLine(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/visline.h b/src/libs/vtools/visualization/line/visline.h
index 80b2ca141..0253360cd 100644
--- a/src/libs/vtools/visualization/line/visline.h
+++ b/src/libs/vtools/visualization/line/visline.h
@@ -29,10 +29,24 @@
 #ifndef VISLINE_H
 #define VISLINE_H
 
-#include "../visualization.h"
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QGraphicsItem>
 #include <QGraphicsLineItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
 #include <QPointF>
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
 
+#include "../visualization.h"
+#include "../vmisc/def.h"
+#include "visualization/line/../../tools/drawTools/../../dialogs/tools/../../visualization/visualization.h"
+
+class QLineF;
+class QPointF;
 class VContainer;
 
 class VisLine: public Visualization, public QGraphicsLineItem
diff --git a/src/libs/vtools/visualization/line/vistoolalongline.cpp b/src/libs/vtools/visualization/line/vistoolalongline.cpp
index 96f30342e..fff15c970 100644
--- a/src/libs/vtools/visualization/line/vistoolalongline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolalongline.cpp
@@ -27,8 +27,21 @@
  *************************************************************************/
 
 #include "vistoolalongline.h"
-#include "../vpatterndb/vcontainer.h"
+
+#include <QColor>
+#include <QGraphicsLineItem>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolAlongLine::VisToolAlongLine(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolalongline.h b/src/libs/vtools/visualization/line/vistoolalongline.h
index 8bf6129f6..fd9a161f7 100644
--- a/src/libs/vtools/visualization/line/vistoolalongline.h
+++ b/src/libs/vtools/visualization/line/vistoolalongline.h
@@ -29,6 +29,14 @@
 #ifndef VISTOOLALONGLINE_H
 #define VISTOOLALONGLINE_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
 class VContainer;
diff --git a/src/libs/vtools/visualization/line/vistoolbisector.cpp b/src/libs/vtools/visualization/line/vistoolbisector.cpp
index c5c92eee1..83beaedce 100644
--- a/src/libs/vtools/visualization/line/vistoolbisector.cpp
+++ b/src/libs/vtools/visualization/line/vistoolbisector.cpp
@@ -27,9 +27,20 @@
  *************************************************************************/
 
 #include "vistoolbisector.h"
+
+#include <QGraphicsLineItem>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <new>
+
+#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
-#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolBisector::VisToolBisector(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolbisector.h b/src/libs/vtools/visualization/line/vistoolbisector.h
index 429b28de2..3bc21be09 100644
--- a/src/libs/vtools/visualization/line/vistoolbisector.h
+++ b/src/libs/vtools/visualization/line/vistoolbisector.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLBISECTOR_H
 #define VISTOOLBISECTOR_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class VContainer;
+
 class VisToolBisector :public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp
index 356886fb4..a03868ee7 100644
--- a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp
+++ b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp
@@ -27,9 +27,24 @@
  *************************************************************************/
 
 #include "vistoolcurveintersectaxis.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QColor>
+#include <QGraphicsLineItem>
+#include <QGraphicsPathItem>
+#include <QLineF>
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolCurveIntersectAxis::VisToolCurveIntersectAxis(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h
index f90d885a0..6133af4c1 100644
--- a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h
+++ b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h
@@ -29,9 +29,18 @@
 #ifndef VISTOOLCURVEINTERSECTAXIS_H
 #define VISTOOLCURVEINTERSECTAXIS_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
 class QGraphicsEllipseItem;
+class VContainer;
 
 class VisToolCurveIntersectAxis : public VisLine
 {
diff --git a/src/libs/vtools/visualization/line/vistoolendline.cpp b/src/libs/vtools/visualization/line/vistoolendline.cpp
index ca9d7e373..ced2182b2 100644
--- a/src/libs/vtools/visualization/line/vistoolendline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolendline.cpp
@@ -27,11 +27,24 @@
  *************************************************************************/
 
 #include "vistoolendline.h"
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../../tools/vabstracttool.h"
 
-#include <QGraphicsScene>
+#include <QColor>
+#include <QGuiApplication>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../ifc/xml/vdomdocument.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/../visualization/visualization.h"
+#include "visualization/line/visline.h"
+#include "vtranslatevars.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolEndLine::VisToolEndLine(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolendline.h b/src/libs/vtools/visualization/line/vistoolendline.h
index 87e4b0bca..888f4fe18 100644
--- a/src/libs/vtools/visualization/line/vistoolendline.h
+++ b/src/libs/vtools/visualization/line/vistoolendline.h
@@ -29,9 +29,18 @@
 #ifndef VISTOOLENDLINE_H
 #define VISTOOLENDLINE_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
 class QGraphicsEllipseItem;
+class VContainer;
 
 class VisToolEndLine : public VisLine
 {
diff --git a/src/libs/vtools/visualization/line/vistoolheight.cpp b/src/libs/vtools/visualization/line/vistoolheight.cpp
index 20f1a2217..ad95f9af2 100644
--- a/src/libs/vtools/visualization/line/vistoolheight.cpp
+++ b/src/libs/vtools/visualization/line/vistoolheight.cpp
@@ -27,8 +27,20 @@
  *************************************************************************/
 
 #include "vistoolheight.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QGraphicsLineItem>
+#include <QLine>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolHeight::VisToolHeight(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolheight.h b/src/libs/vtools/visualization/line/vistoolheight.h
index 173748295..065fea621 100644
--- a/src/libs/vtools/visualization/line/vistoolheight.h
+++ b/src/libs/vtools/visualization/line/vistoolheight.h
@@ -29,8 +29,20 @@
 #ifndef VISTOOLHEIGHT_H
 #define VISTOOLHEIGHT_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class QLineF;
+class VContainer;
+
 class VisToolHeight : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoolline.cpp b/src/libs/vtools/visualization/line/vistoolline.cpp
index 49780bc6a..600f8664b 100644
--- a/src/libs/vtools/visualization/line/vistoolline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolline.cpp
@@ -27,9 +27,21 @@
  *************************************************************************/
 
 #include "vistoolline.h"
-#include "../vpatterndb/vcontainer.h"
+
+#include <QGraphicsLineItem>
+#include <QPen>
+#include <QPointF>
+#include <QSharedPointer>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
-#include "../../tools/drawTools/vdrawtool.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
+
+class QLineF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolLine::VisToolLine(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolline.h b/src/libs/vtools/visualization/line/vistoolline.h
index a35ead45e..2dd4019d2 100644
--- a/src/libs/vtools/visualization/line/vistoolline.h
+++ b/src/libs/vtools/visualization/line/vistoolline.h
@@ -29,8 +29,22 @@
 #ifndef VGRAPHICSLINEITEM_H
 #define VGRAPHICSLINEITEM_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QGraphicsItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class QLineF;
+class VContainer;
+
 class VisToolLine : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoollineintersect.cpp b/src/libs/vtools/visualization/line/vistoollineintersect.cpp
index 904113d9f..468b999c5 100644
--- a/src/libs/vtools/visualization/line/vistoollineintersect.cpp
+++ b/src/libs/vtools/visualization/line/vistoollineintersect.cpp
@@ -27,8 +27,19 @@
  *************************************************************************/
 
 #include "vistoollineintersect.h"
+
+#include <QGraphicsLineItem>
+#include <QLine>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolLineIntersect::VisToolLineIntersect(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoollineintersect.h b/src/libs/vtools/visualization/line/vistoollineintersect.h
index cab06ec15..7aab10d3c 100644
--- a/src/libs/vtools/visualization/line/vistoollineintersect.h
+++ b/src/libs/vtools/visualization/line/vistoollineintersect.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLLINEINTERSECT_H
 #define VISTOOLLINEINTERSECT_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class VContainer;
+
 class VisToolLineIntersect :public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp
index b2b7becfa..5ebeecb60 100644
--- a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp
+++ b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp
@@ -27,9 +27,21 @@
  *************************************************************************/
 
 #include "vistoollineintersectaxis.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QColor>
+#include <QGraphicsLineItem>
+#include <QLine>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolLineIntersectAxis::VisToolLineIntersectAxis(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoollineintersectaxis.h b/src/libs/vtools/visualization/line/vistoollineintersectaxis.h
index b55cec534..b8deeafcd 100644
--- a/src/libs/vtools/visualization/line/vistoollineintersectaxis.h
+++ b/src/libs/vtools/visualization/line/vistoollineintersectaxis.h
@@ -29,9 +29,20 @@
 #ifndef VISTOOLLINEINTERSECTAXIS_H
 #define VISTOOLLINEINTERSECTAXIS_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
 class QGraphicsEllipseItem;
+class QLineF;
+class VContainer;
 
 class VisToolLineIntersectAxis : public VisLine
 {
diff --git a/src/libs/vtools/visualization/line/vistoolnormal.cpp b/src/libs/vtools/visualization/line/vistoolnormal.cpp
index fc326a169..74c13bbef 100644
--- a/src/libs/vtools/visualization/line/vistoolnormal.cpp
+++ b/src/libs/vtools/visualization/line/vistoolnormal.cpp
@@ -27,8 +27,21 @@
  *************************************************************************/
 
 #include "vistoolnormal.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QColor>
+#include <QGraphicsLineItem>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolNormal::VisToolNormal(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolnormal.h b/src/libs/vtools/visualization/line/vistoolnormal.h
index bb2a4e67e..d197835b7 100644
--- a/src/libs/vtools/visualization/line/vistoolnormal.h
+++ b/src/libs/vtools/visualization/line/vistoolnormal.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLNORMAL_H
 #define VISTOOLNORMAL_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class VContainer;
+
 class VisToolNormal : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp
index e589380de..86173dd99 100644
--- a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp
+++ b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp
@@ -27,10 +27,26 @@
  *************************************************************************/
 
 #include "vistoolpointfromarcandtangent.h"
-#include "../vpatterndb/vcontainer.h"
+
+#include <QGraphicsLineItem>
+#include <QGraphicsPathItem>
+#include <QLineF>
+#include <QPainterPath>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h"
-#include "../vgeometry/vpointf.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
+
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointFromArcAndTangent::VisToolPointFromArcAndTangent(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h
index a6678712c..58654475e 100644
--- a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h
+++ b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h
@@ -29,8 +29,21 @@
 #ifndef VISTOOLPOINTFROMARCANDTANGENT_H
 #define VISTOOLPOINTFROMARCANDTANGENT_H
 
-#include "visline.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
 #include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
+#include "visline.h"
+
+class QPointF;
+class VArc;
+class VContainer;
 
 class VisToolPointFromArcAndTangent : public VisLine
 {
diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp
index dd813e90b..6ccf09e30 100644
--- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp
+++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp
@@ -27,9 +27,22 @@
  *************************************************************************/
 
 #include "vistoolpointfromcircleandtangent.h"
-#include "../vpatterndb/vcontainer.h"
+
+#include <QGraphicsEllipseItem>
+#include <QGraphicsLineItem>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
+
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointFromCircleAndTangent::VisToolPointFromCircleAndTangent(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h
index b4ea5f11b..a9c679fb8 100644
--- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h
+++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h
@@ -29,8 +29,20 @@
 #ifndef VISTOOLPOINTFROMCIRCLEANDTANGENT_H
 #define VISTOOLPOINTFROMCIRCLEANDTANGENT_H
 
-#include "visline.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QtGlobal>
+
 #include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
+#include "visline.h"
+
+class QPointF;
+class VContainer;
 
 class VisToolPointFromCircleAndTangent : public VisLine
 {
diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp
index 866e932d2..3f7367009 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp
+++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp
@@ -27,8 +27,20 @@
  *************************************************************************/
 
 #include "vistoolpointofcontact.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QGraphicsEllipseItem>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfContact::VisToolPointOfContact(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.h b/src/libs/vtools/visualization/line/vistoolpointofcontact.h
index 1b46343d9..cd6c68630 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofcontact.h
+++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLPOINTOFCONTACT_H
 #define VISTOOLPOINTOFCONTACT_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class VContainer;
+
 class VisToolPointOfContact : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp
index 378da41c0..2e1a142f7 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp
+++ b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp
@@ -27,8 +27,20 @@
  *************************************************************************/
 
 #include "vistoolpointofintersection.h"
+
+#include <QGraphicsEllipseItem>
+#include <QGraphicsLineItem>
+#include <QLine>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfIntersection::VisToolPointOfIntersection(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersection.h b/src/libs/vtools/visualization/line/vistoolpointofintersection.h
index 7a2ff8809..e333ed895 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofintersection.h
+++ b/src/libs/vtools/visualization/line/vistoolpointofintersection.h
@@ -29,8 +29,21 @@
 #ifndef VISTOOLPOINTOFINTERSECTION_H
 #define VISTOOLPOINTOFINTERSECTION_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QGraphicsItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class QLineF;
+class VContainer;
+
 class VisToolPointOfIntersection : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp
index faf126d5a..9b090f334 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp
+++ b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp
@@ -27,9 +27,25 @@
  *************************************************************************/
 
 #include "vistoolpointofintersectionarcs.h"
-#include "../vgeometry/varc.h"
-#include "../vpatterndb/vcontainer.h"
+
+#include <QGraphicsEllipseItem>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QPen>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/varc.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfIntersectionArcs::VisToolPointOfIntersectionArcs(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h
index 7acbd6437..c8237d9d1 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h
+++ b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLPOINTOFINTERSECTIONARCS_H
 #define VISTOOLPOINTOFINTERSECTIONARCS_H
 
-#include "visline.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
+#include "visline.h"
+
+class VContainer;
 
 class VisToolPointOfIntersectionArcs : public VisLine
 {
diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp
index 3de0104ab..94ba0fa0f 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp
+++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp
@@ -27,9 +27,22 @@
  *************************************************************************/
 
 #include "vistoolpointofintersectioncircles.h"
-#include "../vpatterndb/vcontainer.h"
+
+#include <QGraphicsEllipseItem>
+#include <QPen>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h"
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfIntersectionCircles::VisToolPointOfIntersectionCircles(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h
index 73d97a0ad..bcd65ab94 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h
+++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLPOINTOFINTERSECTIONCIRCLES_H
 #define VISTOOLPOINTOFINTERSECTIONCIRCLES_H
 
-#include "visline.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
+#include "visline.h"
+
+class VContainer;
 
 class VisToolPointOfIntersectionCircles : public VisLine
 {
diff --git a/src/libs/vtools/visualization/line/vistoolrotation.cpp b/src/libs/vtools/visualization/line/vistoolrotation.cpp
index 70a47d229..3c6f15c44 100644
--- a/src/libs/vtools/visualization/line/vistoolrotation.cpp
+++ b/src/libs/vtools/visualization/line/vistoolrotation.cpp
@@ -27,16 +27,36 @@
  *************************************************************************/
 
 #include "vistoolrotation.h"
-#include "../vgeometry/vpointf.h"
+
+#include <limits.h>
+#include <QGraphicsLineItem>
+#include <QGraphicsPathItem>
+#include <QGuiApplication>
+#include <QLineF>
+#include <QPainterPath>
+#include <QSharedPointer>
+#include <Qt>
+#include <QtAlgorithms>
+#include <new>
+
+#include "../vgeometry/../vmisc/diagnostic.h"
+#include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
-#include "../vgeometry/vellipticalarc.h"
-#include "../vgeometry/vspline.h"
-#include "../vgeometry/vsplinepath.h"
 #include "../vgeometry/vcubicbezier.h"
 #include "../vgeometry/vcubicbezierpath.h"
+#include "../vgeometry/vellipticalarc.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vgeometry/vgobject.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vgeometry/vsplinepath.h"
+#include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "visualization/line/../visualization.h"
+#include "visualization/line/visline.h"
 
-#include <QGraphicsScene>
+class QPointF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolRotation::VisToolRotation(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolrotation.h b/src/libs/vtools/visualization/line/vistoolrotation.h
index 66030149c..4dda5fd95 100644
--- a/src/libs/vtools/visualization/line/vistoolrotation.h
+++ b/src/libs/vtools/visualization/line/vistoolrotation.h
@@ -29,8 +29,23 @@
 #ifndef VISTOOLROTATION_H
 #define VISTOOLROTATION_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class QPointF;
+class VContainer;
+
 class VisToolRotation : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp
index 3b786dfe6..b76f52003 100644
--- a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp
+++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp
@@ -27,8 +27,21 @@
  *************************************************************************/
 
 #include "vistoolshoulderpoint.h"
+
+#include <QGraphicsLineItem>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolShoulderPoint::VisToolShoulderPoint(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolshoulderpoint.h b/src/libs/vtools/visualization/line/vistoolshoulderpoint.h
index 3d3655375..825299bef 100644
--- a/src/libs/vtools/visualization/line/vistoolshoulderpoint.h
+++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLSHOULDERPOINT_H
 #define VISTOOLSHOULDERPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class VContainer;
+
 class VisToolShoulderPoint : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistooltriangle.cpp b/src/libs/vtools/visualization/line/vistooltriangle.cpp
index 11eec05ca..dd365ac65 100644
--- a/src/libs/vtools/visualization/line/vistooltriangle.cpp
+++ b/src/libs/vtools/visualization/line/vistooltriangle.cpp
@@ -27,10 +27,25 @@
  *************************************************************************/
 
 #include "vistooltriangle.h"
-#include "../vgeometry/vpointf.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h"
+
 #include <QtCore/qmath.h>
+#include <QGraphicsLineItem>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QPen>
+#include <QPointF>
+#include <QSharedPointer>
+#include <new>
+
+#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
+
+class QLineF;
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolTriangle::VisToolTriangle(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistooltriangle.h b/src/libs/vtools/visualization/line/vistooltriangle.h
index 8e0e4de45..51bb10512 100644
--- a/src/libs/vtools/visualization/line/vistooltriangle.h
+++ b/src/libs/vtools/visualization/line/vistooltriangle.h
@@ -29,8 +29,23 @@
 #ifndef VISTOOLTRIANGLE_H
 #define VISTOOLTRIANGLE_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QGraphicsItem>
+#include <QLineF>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class QLineF;
+class QPainterPath;
+class VContainer;
+
 class VisToolTriangle : public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/line/vistooltruedarts.cpp b/src/libs/vtools/visualization/line/vistooltruedarts.cpp
index f6dbbdab9..34d192150 100644
--- a/src/libs/vtools/visualization/line/vistooltruedarts.cpp
+++ b/src/libs/vtools/visualization/line/vistooltruedarts.cpp
@@ -27,9 +27,20 @@
  *************************************************************************/
 
 #include "vistooltruedarts.h"
+
+#include <QGraphicsLineItem>
+#include <QLineF>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../../tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h"
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
-#include "../../tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h"
+#include "visualization/line/../../tools/drawTools/toolpoint/tooldoublepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolTrueDarts::VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistooltruedarts.h b/src/libs/vtools/visualization/line/vistooltruedarts.h
index 4843472ce..ace642210 100644
--- a/src/libs/vtools/visualization/line/vistooltruedarts.h
+++ b/src/libs/vtools/visualization/line/vistooltruedarts.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLTRUEDARTS_H
 #define VISTOOLTRUEDARTS_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "visline.h"
 
+class VContainer;
+
 class VisToolTrueDarts :public VisLine
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/path/vispath.cpp b/src/libs/vtools/visualization/path/vispath.cpp
index 5fd99a48c..e257b43c2 100644
--- a/src/libs/vtools/visualization/path/vispath.cpp
+++ b/src/libs/vtools/visualization/path/vispath.cpp
@@ -28,6 +28,13 @@
 
 #include "vispath.h"
 
+#include <QPen>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/path/../visualization.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 VisPath::VisPath(const VContainer *data, QGraphicsItem *parent)
     :Visualization(data), QGraphicsPathItem(parent)
diff --git a/src/libs/vtools/visualization/path/vispath.h b/src/libs/vtools/visualization/path/vispath.h
index d72ff6b1f..3e42e952f 100644
--- a/src/libs/vtools/visualization/path/vispath.h
+++ b/src/libs/vtools/visualization/path/vispath.h
@@ -29,8 +29,18 @@
 #ifndef VISPATH_H
 #define VISPATH_H
 
-#include "../visualization.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
 #include <QGraphicsPathItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../visualization.h"
+#include "../vmisc/def.h"
+
+class VContainer;
 
 class VisPath : public Visualization, public QGraphicsPathItem
 {
diff --git a/src/libs/vtools/visualization/path/vistoolarc.cpp b/src/libs/vtools/visualization/path/vistoolarc.cpp
index 1d2786473..69ec97c6e 100644
--- a/src/libs/vtools/visualization/path/vistoolarc.cpp
+++ b/src/libs/vtools/visualization/path/vistoolarc.cpp
@@ -27,9 +27,20 @@
  *************************************************************************/
 
 #include "vistoolarc.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
+#include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolArc::VisToolArc(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolarc.h b/src/libs/vtools/visualization/path/vistoolarc.h
index 3b542ce1b..e2a2f86c4 100644
--- a/src/libs/vtools/visualization/path/vistoolarc.h
+++ b/src/libs/vtools/visualization/path/vistoolarc.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLARC_H
 #define VISTOOLARC_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vispath.h"
 
+class VContainer;
+
 class VisToolArc : public VisPath
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
index c703f8ac2..16ee5f4b6 100644
--- a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
+++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
@@ -27,9 +27,20 @@
  *************************************************************************/
 
 #include "vistoolarcwithlength.h"
-#include "../vgeometry/vpointf.h"
+
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
+#include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolArcWithLength::VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.h b/src/libs/vtools/visualization/path/vistoolarcwithlength.h
index c86431d7d..9696b789e 100644
--- a/src/libs/vtools/visualization/path/vistoolarcwithlength.h
+++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLARCWITHLENGTH_H
 #define VISTOOLARCWITHLENGTH_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vispath.h"
 
+class VContainer;
+
 class VisToolArcWithLength : public VisPath
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp b/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp
index 951f33f3f..3dfd0da60 100644
--- a/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp
+++ b/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp
@@ -27,7 +27,22 @@
  *************************************************************************/
 
 #include "vistoolcubicbezier.h"
+
+#include <QGraphicsLineItem>
+#include <QLineF>
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vcubicbezier.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolCubicBezier::VisToolCubicBezier(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezier.h b/src/libs/vtools/visualization/path/vistoolcubicbezier.h
index 2fc6d5fd9..10f861df1 100644
--- a/src/libs/vtools/visualization/path/vistoolcubicbezier.h
+++ b/src/libs/vtools/visualization/path/vistoolcubicbezier.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLCUBICBEZIER_H
 #define VISTOOLCUBICBEZIER_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vispath.h"
 
+class VContainer;
+
 class VisToolCubicBezier : public VisPath
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp
index 708819cb3..8ce946eee 100644
--- a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp
+++ b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp
@@ -27,7 +27,22 @@
  *************************************************************************/
 
 #include "vistoolcubicbezierpath.h"
+
+#include <QGraphicsLineItem>
+#include <QGraphicsPathItem>
+#include <QLineF>
+#include <QPainterPath>
+#include <QPointF>
+#include <Qt>
+#include <QtAlgorithms>
+
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vpointf.h"
 #include "../vgeometry/vspline.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
+
+class VContainer;
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolCubicBezierPath::VisToolCubicBezierPath(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h
index 32943d714..e1a077d90 100644
--- a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h
+++ b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h
@@ -29,8 +29,20 @@
 #ifndef VISTOOLCUBICBEZIERPATH_H
 #define VISTOOLCUBICBEZIERPATH_H
 
-#include "vispath.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
 #include "../vgeometry/vcubicbezierpath.h"
+#include "../vmisc/def.h"
+#include "vispath.h"
+
+class VContainer;
+class VPointF;
 
 class VisToolCubicBezierPath : public VisPath
 {
diff --git a/src/libs/vtools/visualization/path/vistoolcutarc.cpp b/src/libs/vtools/visualization/path/vistoolcutarc.cpp
index 05aff6f1f..0eb04c16a 100644
--- a/src/libs/vtools/visualization/path/vistoolcutarc.cpp
+++ b/src/libs/vtools/visualization/path/vistoolcutarc.cpp
@@ -27,8 +27,21 @@
  *************************************************************************/
 
 #include "vistoolcutarc.h"
+
+#include <QGraphicsEllipseItem>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
 #include "../vpatterndb/vcontainer.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolCutArc::VisToolCutArc(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolcutarc.h b/src/libs/vtools/visualization/path/vistoolcutarc.h
index 070366a4d..220117b00 100644
--- a/src/libs/vtools/visualization/path/vistoolcutarc.h
+++ b/src/libs/vtools/visualization/path/vistoolcutarc.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLCUTARC_H
 #define VISTOOLCUTARC_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vispath.h"
 
+class VContainer;
+
 class VisToolCutArc : public VisPath
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/path/vistoolcutspline.cpp b/src/libs/vtools/visualization/path/vistoolcutspline.cpp
index ecff53cf7..0660cdce8 100644
--- a/src/libs/vtools/visualization/path/vistoolcutspline.cpp
+++ b/src/libs/vtools/visualization/path/vistoolcutspline.cpp
@@ -27,8 +27,23 @@
  *************************************************************************/
 
 #include "vistoolcutspline.h"
+
+#include <QGraphicsEllipseItem>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcubicbezier.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vpointf.h"
 #include "../vgeometry/vspline.h"
 #include "../vpatterndb/vcontainer.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolCutSpline::VisToolCutSpline(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolcutspline.h b/src/libs/vtools/visualization/path/vistoolcutspline.h
index 6fee48562..324a31036 100644
--- a/src/libs/vtools/visualization/path/vistoolcutspline.h
+++ b/src/libs/vtools/visualization/path/vistoolcutspline.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLCUTSPLINE_H
 #define VISTOOLCUTSPLINE_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vispath.h"
 
+class VContainer;
+
 class VisToolCutSpline : public VisPath
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp
index b4881f0e4..7d8b7d174 100644
--- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp
+++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp
@@ -27,9 +27,23 @@
  *************************************************************************/
 
 #include "vistoolcutsplinepath.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../vgeometry/vsplinepath.h"
+
+#include <QGraphicsEllipseItem>
+#include <QGraphicsPathItem>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcubicbezierpath.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vsplinepath.h"
+#include "../vpatterndb/vcontainer.h"
+#include "visualization/path/../../tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../../../visualization/line/../visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolCutSplinePath::VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.h b/src/libs/vtools/visualization/path/vistoolcutsplinepath.h
index 4010a42ce..09aaf45e9 100644
--- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.h
+++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLCUTSPLINEPATH_H
 #define VISTOOLCUTSPLINEPATH_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vispath.h"
 
+class VContainer;
+
 class VisToolCutSplinePath : public VisPath
 {
     Q_OBJECT
diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp
index eb0e56266..ae0b9baed 100644
--- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp
+++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp
@@ -27,7 +27,22 @@
  *************************************************************************/
 
 #include "vistoolpointofintersectioncurves.h"
+
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QPointF>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "visualization/path/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfIntersectionCurves::VisToolPointOfIntersectionCurves(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h
index c97fc550a..ab5485d20 100644
--- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h
+++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h
@@ -29,8 +29,18 @@
 #ifndef VISTOOLPOINTOFINTERSECTIONCURVES_H
 #define VISTOOLPOINTOFINTERSECTIONCURVES_H
 
-#include "vispath.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 #include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/def.h"
+#include "vispath.h"
+
+class VContainer;
 
 class VisToolPointOfIntersectionCurves : public VisPath
 {
diff --git a/src/libs/vtools/visualization/path/vistoolspline.cpp b/src/libs/vtools/visualization/path/vistoolspline.cpp
index b135f9009..d34990ac4 100644
--- a/src/libs/vtools/visualization/path/vistoolspline.cpp
+++ b/src/libs/vtools/visualization/path/vistoolspline.cpp
@@ -27,10 +27,22 @@
  *************************************************************************/
 
 #include "vistoolspline.h"
+
+#include <QLineF>
+#include <QPainterPath>
+#include <QSharedPointer>
+#include <Qt>
+#include <new>
+
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgeometrydef.h"
 #include "../vgeometry/vpointf.h"
 #include "../vgeometry/vspline.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vcontrolpointspline.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
 
 const int EMPTY_ANGLE = -1;
 
diff --git a/src/libs/vtools/visualization/path/vistoolspline.h b/src/libs/vtools/visualization/path/vistoolspline.h
index 531619efc..f80a8e9ed 100644
--- a/src/libs/vtools/visualization/path/vistoolspline.h
+++ b/src/libs/vtools/visualization/path/vistoolspline.h
@@ -29,8 +29,20 @@
 #ifndef VISTOOLSPLINE_H
 #define VISTOOLSPLINE_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../vmisc/def.h"
 #include "vispath.h"
 
+class QPointF;
+class VContainer;
 class VControlPointSpline;
 
 class VisToolSpline : public VisPath
diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp
index 894305358..b9cfc642e 100644
--- a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp
+++ b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp
@@ -27,7 +27,23 @@
  *************************************************************************/
 
 #include "vistoolsplinepath.h"
+
+#include <QGraphicsPathItem>
+#include <QLineF>
+#include <QPainterPath>
+#include <QPoint>
+#include <Qt>
+#include <QtAlgorithms>
+
+#include "../vgeometry/vabstractcurve.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/vspline.h"
+#include "../vgeometry/vsplinepoint.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vcontrolpointspline.h"
+#include "visualization/path/../visualization.h"
+#include "visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolSplinePath::VisToolSplinePath(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.h b/src/libs/vtools/visualization/path/vistoolsplinepath.h
index 93a9fe26a..b0e6a5b91 100644
--- a/src/libs/vtools/visualization/path/vistoolsplinepath.h
+++ b/src/libs/vtools/visualization/path/vistoolsplinepath.h
@@ -29,9 +29,22 @@
 #ifndef VISTOOLSPLINEPATH_H
 #define VISTOOLSPLINEPATH_H
 
-#include "vispath.h"
-#include "../vgeometry/vsplinepath.h"
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
 
+#include "../vgeometry/vsplinepath.h"
+#include "../vmisc/def.h"
+#include "../vwidgets/../vgeometry/vsplinepath.h"
+#include "vispath.h"
+
+class QPointF;
+class VContainer;
 class VControlPointSpline;
 
 class VisToolSplinePath : public VisPath
diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp
index fc0838621..5b02c6bb0 100644
--- a/src/libs/vtools/visualization/visualization.cpp
+++ b/src/libs/vtools/visualization/visualization.cpp
@@ -27,12 +27,39 @@
  *************************************************************************/
 
 #include "visualization.h"
-#include "../tools/drawTools/vdrawtool.h"
+
+#include <qnumeric.h>
+#include <QBrush>
+#include <QColor>
+#include <QDebug>
+#include <QGraphicsEllipseItem>
+#include <QGraphicsItem>
+#include <QGraphicsLineItem>
+#include <QGraphicsPathItem>
+#include <QLineF>
+#include <QMessageLogger>
+#include <QPen>
+#include <QPointF>
+#include <QRectF>
+#include <QScopedPointer>
+#include <QString>
+#include <Qt>
+#include <QtDebug>
+
 #include "../../vpatterndb/calculator.h"
 #include "../../vpatterndb/vtranslatevars.h"
+#include "../qmuparser/qmuparsererror.h"
+#include "../tools/drawTools/vdrawtool.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/vcommonsettings.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "visualization/../tools/drawTools/../../dialogs/tools/../../visualization/visualization.h"
 
-#include <QGraphicsEllipseItem>
-#include <QtNumeric>
+class QLineF;
+class QPainterPath;
+class QPointF;
+template <class K, class V> class QHash;
 
 Q_LOGGING_CATEGORY(vVis, "v.visualization")
 
diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h
index f4be1c451..bd95a32b8 100644
--- a/src/libs/vtools/visualization/visualization.h
+++ b/src/libs/vtools/visualization/visualization.h
@@ -29,13 +29,17 @@
 #ifndef VISUALIZATION_H
 #define VISUALIZATION_H
 
-#include <QObject>
+#include <qcompilerdetection.h>
 #include <QGraphicsItem>
+#include <QLoggingCategory>
+#include <QObject>
+#include <QtGlobal>
 
-#include "../vmisc/vabstractapplication.h"
-#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vmisc/def.h"
 #include "../vmisc/logging.h"
+#include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
+#include "../vwidgets/vmaingraphicsscene.h"
 
 Q_DECLARE_LOGGING_CATEGORY(vVis)
 
diff --git a/src/libs/vwidgets/vabstractmainwindow.cpp b/src/libs/vwidgets/vabstractmainwindow.cpp
index 350c1e98d..778947577 100644
--- a/src/libs/vwidgets/vabstractmainwindow.cpp
+++ b/src/libs/vwidgets/vabstractmainwindow.cpp
@@ -28,6 +28,8 @@
 
 #include "vabstractmainwindow.h"
 
+class QWidget;
+
 VAbstractMainWindow::VAbstractMainWindow(QWidget *parent) : QMainWindow(parent)
 {}
 
diff --git a/src/libs/vwidgets/vabstractmainwindow.h b/src/libs/vwidgets/vabstractmainwindow.h
index c51aefb35..2ba6c5f9d 100644
--- a/src/libs/vwidgets/vabstractmainwindow.h
+++ b/src/libs/vwidgets/vabstractmainwindow.h
@@ -29,7 +29,13 @@
 #ifndef VABSTRACTMAINWINDOW_H
 #define VABSTRACTMAINWINDOW_H
 
+#include <qcompilerdetection.h>
 #include <QMainWindow>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+
+class QWidget;
 
 class VAbstractMainWindow : public QMainWindow
 {
diff --git a/src/libs/vwidgets/vabstractsimple.cpp b/src/libs/vwidgets/vabstractsimple.cpp
index 44b890f79..ddf042afa 100644
--- a/src/libs/vwidgets/vabstractsimple.cpp
+++ b/src/libs/vwidgets/vabstractsimple.cpp
@@ -28,9 +28,6 @@
 
 #include "vabstractsimple.h"
 
-#include <QGraphicsItem>
-#include <QGraphicsSceneContextMenuEvent>
-
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractSimple::VAbstractSimple(quint32 id, const QColor &currentColor, Unit patternUnit, qreal *factor,
                                  QObject *parent)
diff --git a/src/libs/vwidgets/vabstractsimple.h b/src/libs/vwidgets/vabstractsimple.h
index b4c9600fd..8b914bc4f 100644
--- a/src/libs/vwidgets/vabstractsimple.h
+++ b/src/libs/vwidgets/vabstractsimple.h
@@ -29,15 +29,21 @@
 #ifndef VABSTRACTSIMPLE_H
 #define VABSTRACTSIMPLE_H
 
+#include <QColor>
+#include <QMetaObject>
 #include <QObject>
 #include <QPen>
-#include <QColor>
-#include "../vmisc/def.h"
-#include "../vgeometry/vgeometrydef.h"
-#include "../ifc/ifcdef.h"
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
+#include "../ifc/ifcdef.h"
+#include "../vgeometry/vgeometrydef.h"
+#include "../vmisc/def.h"
 
-class QGraphicsSceneContextMenuEvent;
 class QGraphicsItem;
+class QGraphicsSceneContextMenuEvent;
 
 class VAbstractSimple : public QObject
 {
diff --git a/src/libs/vwidgets/vcontrolpointspline.cpp b/src/libs/vwidgets/vcontrolpointspline.cpp
index 79e35ac61..2cc1bf98d 100644
--- a/src/libs/vwidgets/vcontrolpointspline.cpp
+++ b/src/libs/vwidgets/vcontrolpointspline.cpp
@@ -28,13 +28,29 @@
 
 #include "vcontrolpointspline.h"
 
+#include <QBrush>
+#include <QEvent>
+#include <QGraphicsLineItem>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
+#include <QLineF>
+#include <QList>
+#include <QMessageLogger>
 #include <QPen>
-#include <QStyleOptionGraphicsItem>
+#include <QPoint>
+#include <QPolygonF>
+#include <QRectF>
+#include <Qt>
 
-#include "vmaingraphicsview.h"
+#include "../vgeometry/../ifc/ifcdef.h"
+#include "../vgeometry/vgobject.h"
 #include "vmaingraphicsscene.h"
+#include "vmaingraphicsview.h"
+
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
 
 //---------------------------------------------------------------------------------------------------------------------
 VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, Unit patternUnit,
diff --git a/src/libs/vwidgets/vcontrolpointspline.h b/src/libs/vwidgets/vcontrolpointspline.h
index 292ae3209..288a416a7 100644
--- a/src/libs/vwidgets/vcontrolpointspline.h
+++ b/src/libs/vwidgets/vcontrolpointspline.h
@@ -29,11 +29,25 @@
 #ifndef VCONTROLPOINTSPLINE_H
 #define VCONTROLPOINTSPLINE_H
 
+#include <qcompilerdetection.h>
 #include <QGraphicsEllipseItem>
+#include <QGraphicsItem>
+#include <QMetaObject>
 #include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
+
+#include "../vgeometry/vgeometrydef.h"
 #include "../vgeometry/vsplinepath.h"
 #include "../vmisc/def.h"
 
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QPointF;
+
 /**
  * @brief The VControlPointSpline class control spline point.
  */
diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.cpp b/src/libs/vwidgets/vgraphicssimpletextitem.cpp
index e9a8ca248..8a4c89393 100644
--- a/src/libs/vwidgets/vgraphicssimpletextitem.cpp
+++ b/src/libs/vwidgets/vgraphicssimpletextitem.cpp
@@ -27,18 +27,30 @@
  *************************************************************************/
 
 #include "vgraphicssimpletextitem.h"
+
+#include <QEvent>
+#include <QFlags>
 #include <QFont>
-#include <QBrush>
-#include <QStyle>
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsSceneMouseEvent>
-#include <QKeyEvent>
 #include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
+#include <QKeyEvent>
+#include <QList>
+#include <QMessageLogger>
+#include <QPalette>
+#include <QPoint>
+#include <QPolygonF>
+#include <QRectF>
+#include <Qt>
 
 #include "vmaingraphicsscene.h"
 #include "vmaingraphicsview.h"
 
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VGraphicsSimpleTextItem default constructor.
diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.h b/src/libs/vwidgets/vgraphicssimpletextitem.h
index 44c164e04..e6d66f50c 100644
--- a/src/libs/vwidgets/vgraphicssimpletextitem.h
+++ b/src/libs/vwidgets/vgraphicssimpletextitem.h
@@ -29,10 +29,24 @@
 #ifndef VGRAPHICSSIMPLETEXTITEM_H
 #define VGRAPHICSSIMPLETEXTITEM_H
 
+#include <qcompilerdetection.h>
+#include <QGraphicsItem>
 #include <QGraphicsSimpleTextItem>
+#include <QMetaObject>
 #include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
+
 #include "../vmisc/def.h"
 
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+class QPointF;
+
 /**
  * @brief The VGraphicsSimpleTextItem class pointer label.
  */
diff --git a/src/libs/vwidgets/vmaingraphicsscene.cpp b/src/libs/vwidgets/vmaingraphicsscene.cpp
index 791903482..d451afd1d 100644
--- a/src/libs/vwidgets/vmaingraphicsscene.cpp
+++ b/src/libs/vwidgets/vmaingraphicsscene.cpp
@@ -27,14 +27,26 @@
  *************************************************************************/
 
 #include "vmaingraphicsscene.h"
-#include <QGraphicsSceneMouseEvent>
-#include <QList>
-#include <QGraphicsItem>
-#include <QApplication>
 
-#include "../vmisc/def.h"
+#include <QBrush>
+#include <QEvent>
+#include <QForeachContainer>
+#include <QGraphicsItem>
+#include <QGraphicsLineItem>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSimpleTextItem>
+#include <QLineF>
+#include <QPen>
+#include <QStaticStringData>
+#include <QStringData>
+#include <QStringDataPtr>
+#include <Qt>
+
 #include "../ifc/ifcdef.h"
 
+class QGraphicsSceneMouseEvent;
+class QRectF;
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VMainGraphicsScene default constructor.
diff --git a/src/libs/vwidgets/vmaingraphicsscene.h b/src/libs/vwidgets/vmaingraphicsscene.h
index 6f86c46a3..c691b10a7 100644
--- a/src/libs/vwidgets/vmaingraphicsscene.h
+++ b/src/libs/vwidgets/vmaingraphicsscene.h
@@ -29,9 +29,25 @@
 #ifndef VMAINGRAPHICSSCENE_H
 #define VMAINGRAPHICSSCENE_H
 
+#include <qcompilerdetection.h>
 #include <QGraphicsScene>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QRectF>
+#include <QString>
+#include <QTransform>
+#include <QVector>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
 #include "../vmisc/def.h"
 
+class QGraphicsItem;
+class QGraphicsSceneMouseEvent;
+class QPointF;
+class QRectF;
+
 /**
  * @brief The VMainGraphicsScene class main scene.
  */
diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp
index c33877fe4..925161f68 100644
--- a/src/libs/vwidgets/vmaingraphicsview.cpp
+++ b/src/libs/vwidgets/vmaingraphicsview.cpp
@@ -28,16 +28,31 @@
 
 #include "vmaingraphicsview.h"
 
-#include <QTimeLine>
-#include <QWheelEvent>
-#include <QApplication>
-#include <QScrollBar>
-#include "vsimplecurve.h"
-#include "vmaingraphicsscene.h"
-
-#include <QGraphicsItem>
-#include <QMouseEvent>
 #include <qmath.h>
+#include <QApplication>
+#include <QCursor>
+#include <QEvent>
+#include <QFlags>
+#include <QGraphicsItem>
+#include <QGraphicsScene>
+#include <QLineF>
+#include <QList>
+#include <QMessageLogger>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPoint>
+#include <QScrollBar>
+#include <QTimeLine>
+#include <QTransform>
+#include <QWheelEvent>
+#include <QWidget>
+
+#include "../ifc/../vmisc/def.h"
+#include "vmaingraphicsscene.h"
+#include "vsimplecurve.h"
+
+class QMouseEvent;
+class QWheelEvent;
 
 const int GraphicsViewZoom::duration = 300;
 const int GraphicsViewZoom::updateInterval = 40;
diff --git a/src/libs/vwidgets/vmaingraphicsview.h b/src/libs/vwidgets/vmaingraphicsview.h
index 3ce6f5603..02cadf041 100644
--- a/src/libs/vwidgets/vmaingraphicsview.h
+++ b/src/libs/vwidgets/vmaingraphicsview.h
@@ -29,8 +29,23 @@
 #ifndef VMAINGRAPHICSVIEW_H
 #define VMAINGRAPHICSVIEW_H
 
-#include <QObject>
+#include <qcompilerdetection.h>
 #include <QGraphicsView>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QRectF>
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
+
+class QEvent;
+class QGraphicsItem;
+class QGraphicsScene;
+class QMouseEvent;
+class QRectF;
+class QWheelEvent;
+class QWidget;
 
 /*!
  * This class adds ability to zoom QGraphicsView using mouse wheel. The point under cursor
diff --git a/src/libs/vwidgets/vnobrushscalepathitem.cpp b/src/libs/vwidgets/vnobrushscalepathitem.cpp
index 30676efca..56e971890 100644
--- a/src/libs/vwidgets/vnobrushscalepathitem.cpp
+++ b/src/libs/vwidgets/vnobrushscalepathitem.cpp
@@ -29,8 +29,13 @@
 #include "vnobrushscalepathitem.h"
 
 #include <QBrush>
+#include <QMatrix>
 #include <QPainter>
 
+class QGraphicsItem;
+class QStyleOptionGraphicsItem;
+class QWidget;
+
 //---------------------------------------------------------------------------------------------------------------------
 VNoBrushScalePathItem::VNoBrushScalePathItem(QGraphicsItem *parent) :
     QGraphicsPathItem(parent)
diff --git a/src/libs/vwidgets/vnobrushscalepathitem.h b/src/libs/vwidgets/vnobrushscalepathitem.h
index bcf4d3aba..09bb9c363 100644
--- a/src/libs/vwidgets/vnobrushscalepathitem.h
+++ b/src/libs/vwidgets/vnobrushscalepathitem.h
@@ -29,7 +29,14 @@
 #ifndef VNOBRUSHSCALEPATHITEM_H
 #define VNOBRUSHSCALEPATHITEM_H
 
+#include <qcompilerdetection.h>
 #include <QGraphicsPathItem>
+#include <QtGlobal>
+
+class QGraphicsItem;
+class QPainter;
+class QStyleOptionGraphicsItem;
+class QWidget;
 
 class VNoBrushScalePathItem : public QGraphicsPathItem
 {
diff --git a/src/libs/vwidgets/vsimplecurve.cpp b/src/libs/vwidgets/vsimplecurve.cpp
index 40ec7992b..becf53d9b 100644
--- a/src/libs/vwidgets/vsimplecurve.cpp
+++ b/src/libs/vwidgets/vsimplecurve.cpp
@@ -27,13 +27,27 @@
  *************************************************************************/
 
 #include "vsimplecurve.h"
-#include "../ifc/ifcdef.h"
+
+#include <QBrush>
+#include <QDebug>
+#include <QFlags>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QKeyEvent>
+#include <QMessageLogger>
+#include <QPainterPath>
+#include <QPen>
+#include <Qt>
+#include <QtDebug>
+
+#include "../vgeometry/../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcurve.h"
 
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsScene>
-#include <QKeyEvent>
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+template <class T> class QSharedPointer;
 
 //---------------------------------------------------------------------------------------------------------------------
 VSimpleCurve::VSimpleCurve(quint32 id, const QColor &currentColor, Unit patternUnit, qreal *factor, QObject *parent)
diff --git a/src/libs/vwidgets/vsimplecurve.h b/src/libs/vwidgets/vsimplecurve.h
index 98ad0c6b0..948da6b74 100644
--- a/src/libs/vwidgets/vsimplecurve.h
+++ b/src/libs/vwidgets/vsimplecurve.h
@@ -29,11 +29,26 @@
 #ifndef VSIMPLECURVE_H
 #define VSIMPLECURVE_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
+#include <QGraphicsItem>
+#include <QGraphicsPathItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
+
+#include "../ifc/../vmisc/def.h"
 #include "vabstractsimple.h"
 
-#include <QGraphicsPathItem>
-
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
 class VAbstractCurve;
+template <class T> class QSharedPointer;
 
 class VSimpleCurve : public VAbstractSimple, public QGraphicsPathItem
 {
diff --git a/src/libs/vwidgets/vsimplepoint.cpp b/src/libs/vwidgets/vsimplepoint.cpp
index 820cfc4dd..239dd4bee 100644
--- a/src/libs/vwidgets/vsimplepoint.cpp
+++ b/src/libs/vwidgets/vsimplepoint.cpp
@@ -27,16 +27,29 @@
  *************************************************************************/
 
 #include "vsimplepoint.h"
-#include "vgraphicssimpletextitem.h"
+
+#include <QBrush>
+#include <QFlags>
+#include <QFont>
+#include <QGraphicsLineItem>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QKeyEvent>
+#include <QLineF>
+#include <QPen>
+#include <QPoint>
+#include <QRectF>
+#include <Qt>
+
 #include "../ifc/ifcdef.h"
 #include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
+#include "vgraphicssimpletextitem.h"
 
-#include <QGraphicsSceneMouseEvent>
-#include <QStyleOptionGraphicsItem>
-#include <QPen>
-#include <QKeyEvent>
-#include <QGraphicsScene>
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
 
 //---------------------------------------------------------------------------------------------------------------------
 VSimplePoint::VSimplePoint(quint32 id, const QColor &currentColor, Unit patternUnit, qreal *factor, QObject *parent)
diff --git a/src/libs/vwidgets/vsimplepoint.h b/src/libs/vwidgets/vsimplepoint.h
index 87e7e92e1..68f3ff40f 100644
--- a/src/libs/vwidgets/vsimplepoint.h
+++ b/src/libs/vwidgets/vsimplepoint.h
@@ -29,12 +29,27 @@
 #ifndef VSIMPLEPOINT_H
 #define VSIMPLEPOINT_H
 
+#include <qcompilerdetection.h>
+#include <QColor>
 #include <QGraphicsEllipseItem>
+#include <QGraphicsItem>
+#include <QMetaObject>
+#include <QObject>
+#include <QPointF>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
 
+#include "../ifc/../vmisc/def.h"
 #include "vabstractsimple.h"
 
-class VPointF;
+class QGraphicsSceneContextMenuEvent;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QKeyEvent;
+class QPointF;
 class VGraphicsSimpleTextItem;
+class VPointF;
 
 class VSimplePoint : public VAbstractSimple, public QGraphicsEllipseItem
 {
diff --git a/src/libs/vwidgets/vwidgetpopup.cpp b/src/libs/vwidgets/vwidgetpopup.cpp
index 44f102a0b..9d67790b3 100644
--- a/src/libs/vwidgets/vwidgetpopup.cpp
+++ b/src/libs/vwidgets/vwidgetpopup.cpp
@@ -28,10 +28,17 @@
 
 #include "vwidgetpopup.h"
 
-#include <QVBoxLayout>
 #include <QDesktopWidget>
-#include <QTimer>
+#include <QFont>
 #include <QLabel>
+#include <QLayout>
+#include <QMessageLogger>
+#include <QPoint>
+#include <QRect>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <Qt>
 
 #include "../vmisc/def.h"
 
diff --git a/src/libs/vwidgets/vwidgetpopup.h b/src/libs/vwidgets/vwidgetpopup.h
index 8f6153c44..72b097a4a 100644
--- a/src/libs/vwidgets/vwidgetpopup.h
+++ b/src/libs/vwidgets/vwidgetpopup.h
@@ -30,6 +30,13 @@
 #define VWIDGETPOPUP_H
 
 #include <QFrame>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+class QPoint;
+class QWidget;
 
 /**
     \brief Class showing a widget as popup window.