Use "Include What You Use" tool for optimizing #includes.

--HG--
branch : develop

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"

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
 {

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 "../vmisc/vcommonsettings.h"
-#include "../ifc/exception/vexception.h"
+#include "fvavailableupdate.h"
-
+#include "fvupdatewindow.h"
-#include <QtNetwork>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QDebug>
 
 const QString defaultFeedURL = QStringLiteral("http://valentinaproject.bitbucket.org/Appcast.xml");
 

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;
 

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 <QLabel>
-#include <QDebug>
+#include <QPointer>
+#include <QPushButton>
+#include <Qt>
+
+#include "fvavailableupdate.h"
+#include "fvupdater.h"
+#include "ui_fvupdatewindow.h"
+
+class QWidget;
 
 //---------------------------------------------------------------------------------------------------------------------
 FvUpdateWindow::FvUpdateWindow(QWidget *parent)

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
 {

src/libs/ifc/exception/vexception.cpp

@@ -27,13 +27,11 @@
  *************************************************************************/
 
 #include "vexception.h"
-#include "../vmisc/logging.h"
-#include "../vmisc/def.h"
 
-#include <QGridLayout>
+#include <QByteArray>
-#include <QMessageBox>
+#include <QtGlobal>
-#include <QSpacerItem>
+
-#include <QApplication>
+#include "exception/../ifcdef.h"
 
 //Q_LOGGING_CATEGORY(vExcep, "v.excep") //Commented because don't use now
 

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"
 
 /**

src/libs/ifc/exception/vexceptionbadid.cpp

@@ -28,6 +28,8 @@
 
 #include "vexceptionbadid.h"
 
+#include "exception/vexception.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VExceptionBadId exception bad id

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"
 
 /**

src/libs/ifc/exception/vexceptionconversionerror.cpp

@@ -28,6 +28,10 @@
 
 #include "vexceptionconversionerror.h"
 
+#include <QtGlobal>
+
+#include "exception/vexception.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VExceptionConversionError exception conversion error

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"
 
 /**

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

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;

src/libs/ifc/exception/vexceptionobjecterror.cpp

@@ -27,8 +27,11 @@
  *************************************************************************/
 
 #include "vexceptionobjecterror.h"
-#include <QDebug>
+
 #include <QDomElement>
+#include <QTextStream>
+
+#include "exception/vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

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;

src/libs/ifc/exception/vexceptionundo.cpp

@@ -28,6 +28,8 @@
 
 #include "vexceptionundo.h"
 
+#include "exception/vexception.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 VExceptionUndo::VExceptionUndo(const QString &what)
     :VException(what)

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

src/libs/ifc/exception/vexceptionwrongid.cpp

@@ -27,8 +27,11 @@
  *************************************************************************/
 
 #include "vexceptionwrongid.h"
-#include <QDebug>
+
 #include <QDomElement>
+#include <QTextStream>
+
+#include "exception/vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

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;

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("#");
 

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;

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)

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

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)

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

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");

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>
+class QDomElement;
-#include <QDate>
 
 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
 {

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 <QtDebug>
-#include <QFileInfo>
-#include <QTemporaryFile>
 
 //This class need for validation pattern file using XSD shema
 class MessageHandler : public QAbstractMessageHandler

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)
 

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>
+class QDomElement;
-#include <QFile>
 
 /*
  * Version rules:

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)

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.

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:

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
 {

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:

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
 {

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
 {

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
 {

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;
 

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"
 

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;
 

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 "../qmuparser/qmuparser_global.h"
-#include "qmuparsertokenreader.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
 {

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 <QtDebug>
-#include <QtCore/qmath.h>
+
+#include "qmudef.h"
+#include "qmuparsererror.h"
 
 namespace qmu
 {

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

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"
 
 /**

src/libs/qmuparser/qmuparsererror.cpp

@@ -21,9 +21,6 @@
 
 #include "qmuparsererror.h"
 
-#include <QTextStream>
-#include <QDebug>
-
 #ifdef Q_OS_WIN
 #include <assert.h>
 #endif

src/libs/qmuparser/qmuparsererror.h

@@ -22,12 +22,17 @@
 #ifndef QMUPARSERERROR_H
 #define QMUPARSERERROR_H
 
-#include "qmuparser_global.h"
+#include <qcompilerdetection.h>
-#include <sstream>
-#include <QException>
-#include <QVector>
 #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"
 

src/libs/qmuparser/qmuparsertest.cpp

@@ -20,14 +20,27 @@
  ******************************************************************************************************/
 
 #include "qmuparsertest.h"
-#include "qmudef.h"
 
-#include <QString>
+#include <math.h>
-#include <QDebug>
+#include <stdio.h>
+#include <QChar>
 #include <QCoreApplication>
-#include "qmuparsererror.h"
+#include <QDebug>
-#include <QtCore/qmath.h>
+#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;
 

src/libs/qmuparser/qmuparsertest.h

@@ -22,9 +22,19 @@
 #ifndef QMUPARSERTEST_H
 #define QMUPARSERTEST_H
 
-#include "qmuparser_global.h"
+#include <stdlib.h>
-#include "qmuparser.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

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.

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"
 
 /**

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
 {
 

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
 {

src/libs/qmuparser/qmutranslation.cpp

@@ -20,6 +20,8 @@
  ******************************************************************************************************/
 
 #include "qmutranslation.h"
+
+#include <QByteArray>
 #include <QCoreApplication>
 
 namespace qmu

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 <memory>
-
+#include <string>
-#include "dl_attributes.h"
+#include <utility>
-#include "dl_codes.h"
-#include "dl_creationadapter.h"
-#include "dl_writer_ascii.h"
-
-#include "iostream"
 
 #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.

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 <QtGlobal>
-#include <sstream>
+#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

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.
  */

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;
+
 
 
 /**

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"
 
 /**

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.

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
 
 //---------------------------------------------------------------------------------------------------------------------

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

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()

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

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");

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

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)

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;

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)

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

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)

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;

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())

src/libs/vgeometry/vabstractcurve.h

@@ -29,9 +29,19 @@
 #ifndef VABSTRACTCURVE_H
 #define VABSTRACTCURVE_H
 
-#include "vgobject.h"
+#include <qcompilerdetection.h>
-#include "../ifc/ifcdef.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

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>
+class QPointF;
-#include <QLineF>
-#include <QPainterPath>
-#include <QPointF>
-#include <QtCore/qmath.h>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/vgeometry/varc.h

@@ -29,11 +29,21 @@
 #ifndef VARC_H
 #define VARC_H
 
-#include "vabstractarc.h"
+#include <qcompilerdetection.h>
-#include "vpointf.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;
 
 /**

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)

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

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
 
 //---------------------------------------------------------------------------------------------------------------------

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
 {

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>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/vgeometry/vellipticalarc.h

@@ -29,10 +29,20 @@
 #ifndef VELLIPTICALARC_H
 #define VELLIPTICALARC_H
 
-#include "vabstractarc.h"
+#include <qcompilerdetection.h>
-#include "vpointf.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

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"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

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.

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;

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>
+class QPointF;
-#include <QtCore/qmath.h>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/vgeometry/vspline.h

@@ -29,12 +29,23 @@
 #ifndef VSPLINE_H
 #define VSPLINE_H
 
-#include "vabstractcubicbezier.h"
+#include <qcompilerdetection.h>
-#include "vpointf.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;
 
 /**

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
 
 //---------------------------------------------------------------------------------------------------------------------

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;
 
 /**

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.

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;
 

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 "vabstractdetail_p.h"
-#include <QVector>
-#include <QPointF>
-#include <QLineF>
-#include <QDebug>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

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;
+template <typename T> class QVector;
-class QLineF;
 
 /**
  * @brief The VAbstractDetail class abstract class for all details.

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")

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

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)),

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
 {

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
 
 //---------------------------------------------------------------------------------------------------------------------

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
 {