diff --git a/Valentina.pri b/Valentina.pri
index eb3a98d03..4703667a2 100644
--- a/Valentina.pri
+++ b/Valentina.pri
@@ -449,4 +449,6 @@ CLANG_CXXFLAGS += \
             -Wweak-template-vtables \
             -Wweak-vtables \
             -Wwrite-strings \
-            -Wzero-length-array
+            -Wzero-length-array \
+            -Qunused-arguments \
+            -fcolor-diagnostics
diff --git a/src/app/app.pro b/src/app/app.pro
index b69041e3e..0f8cfc67a 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -90,9 +90,11 @@ TRANSLATIONS += share/translations/valentina.ts \
 
 unix {
     *-g++{
+        QMAKE_CC = ccache gcc
         QMAKE_CXX = ccache g++
     }
     clang*{
+        QMAKE_CC = ccache clang
         QMAKE_CXX = ccache clang++
     }
 }
diff --git a/src/app/container/vformula.cpp b/src/app/container/vformula.cpp
index edfc8a96c..cb8fe443b 100644
--- a/src/app/container/vformula.cpp
+++ b/src/app/container/vformula.cpp
@@ -30,6 +30,7 @@
 #include "../container/calculator.h"
 #include "../container/vcontainer.h"
 #include "../core/vapplication.h"
+#include <QDebug>
 
 //VFormula
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp
index c42f4db3e..7b16d8eb1 100644
--- a/src/app/core/vapplication.cpp
+++ b/src/app/core/vapplication.cpp
@@ -39,6 +39,7 @@
 #include <QDir>
 #include <QProcess>
 #include <QUndoStack>
+#include <QtCore/qmath.h>
 
 const qreal VApplication::PrintDPI = 96.0;
 
diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp
index ef575dd10..148052628 100644
--- a/src/app/dialogs/app/dialogincrements.cpp
+++ b/src/app/dialogs/app/dialogincrements.cpp
@@ -39,6 +39,7 @@
 #include <QCloseEvent>
 #include <QTableWidget>
 #include <QSettings>
+#include <QTableWidgetItem>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h
index 867f389d8..15357200c 100644
--- a/src/app/dialogs/app/dialogincrements.h
+++ b/src/app/dialogs/app/dialogincrements.h
@@ -34,6 +34,7 @@
 
 class VIndividualMeasurements;
 class QTableWidget;
+class QTableWidgetItem;
 
 namespace Ui
 {
diff --git a/src/app/dialogs/app/dialogpatternproperties.h b/src/app/dialogs/app/dialogpatternproperties.h
index 1adcfbce3..8d09531a9 100644
--- a/src/app/dialogs/app/dialogpatternproperties.h
+++ b/src/app/dialogs/app/dialogpatternproperties.h
@@ -31,6 +31,7 @@
 
 #include <QDialog>
 #include "../../options.h"
+#include <QMap>
 
 class VPattern;
 class QCheckBox;
diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp
index 4d02ddc91..75934ac0f 100644
--- a/src/app/dialogs/tools/dialogendline.cpp
+++ b/src/app/dialogs/tools/dialogendline.cpp
@@ -34,6 +34,7 @@
 #include "../../visualization/vistoolendline.h"
 #include "../../widgets/vmaingraphicsscene.h"
 #include "../../tools/vabstracttool.h"
+#include <QTimer>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp
index 062c766cc..cd9f9ab29 100644
--- a/src/app/dialogs/tools/dialogspline.cpp
+++ b/src/app/dialogs/tools/dialogspline.cpp
@@ -32,6 +32,7 @@
 #include "../../geometry/vpointf.h"
 #include "../../container/vcontainer.h"
 #include "../../visualization/vistoolspline.h"
+#include <QDebug>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/app/geometry/vabstractcurve.cpp b/src/app/geometry/vabstractcurve.cpp
index 6c7bef2d2..006f143bb 100644
--- a/src/app/geometry/vabstractcurve.cpp
+++ b/src/app/geometry/vabstractcurve.cpp
@@ -29,6 +29,7 @@
 #include "vabstractcurve.h"
 
 #include <QPainterPath>
+#include <QDebug>
 
 VAbstractCurve::VAbstractCurve(const GOType &type, const quint32 &idObject, const Draw &mode)
     :VGObject(type, idObject, mode)
diff --git a/src/app/geometry/vsplinepoint_p.h b/src/app/geometry/vsplinepoint_p.h
index b1fe74429..4e7789358 100644
--- a/src/app/geometry/vsplinepoint_p.h
+++ b/src/app/geometry/vsplinepoint_p.h
@@ -32,6 +32,7 @@
 #include <QSharedData>
 #include "../options.h"
 #include "vpointf.h"
+#include <QDebug>
 
 #ifdef Q_CC_GNU
     #pragma GCC diagnostic push
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 6294ec7f9..5069c2ce9 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -38,6 +38,7 @@
     #include <QCommandLineParser>
 #endif
 
+#include <QtXml>
 #include <QLibraryInfo>
 #include "tablewindow.h"
 #include "version.h"
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index f5f312c84..fea132871 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -54,6 +54,7 @@
 #include <QAction>
 #include <QProcess>
 #include <QSettings>
+#include <QTimer>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/app/options.h b/src/app/options.h
index 725c75d4c..c8bc24b2c 100644
--- a/src/app/options.h
+++ b/src/app/options.h
@@ -30,13 +30,12 @@
 #define OPTIONS_H
 
 #include <csignal>
+#include <QtGlobal>
 
 #ifdef Q_OS_WIN32
 #   include <Windows.h>
 #endif /*Q_OS_WIN32*/
 
-#include <QtGlobal>
-
 class QString;
 class QStringList;
 
diff --git a/src/app/stable.h b/src/app/stable.h
index 3216fc962..5bd360ac9 100644
--- a/src/app/stable.h
+++ b/src/app/stable.h
@@ -35,10 +35,10 @@
 #endif
 
 /* Add C includes here */
-#include <csignal>
 
 #if defined __cplusplus
 /* Add C++ includes here */
+#include <csignal>
 
 /*In all cases we need include core header for getting defined values*/
 #ifdef QT_CORE_LIB
diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp
index 916e0b326..6afce72ce 100644
--- a/src/app/tools/drawTools/vtooltriangle.cpp
+++ b/src/app/tools/drawTools/vtooltriangle.cpp
@@ -30,6 +30,7 @@
 #include "../../dialogs/tools/dialogtriangle.h"
 #include "../../geometry/vpointf.h"
 #include "../../visualization/vistooltriangle.h"
+#include <QtCore/qmath.h>
 
 const QString VToolTriangle::ToolType = QStringLiteral("triangle");
 
diff --git a/src/app/visualization/visline.cpp b/src/app/visualization/visline.cpp
index 5d4ed87dc..2adcdc2a5 100644
--- a/src/app/visualization/visline.cpp
+++ b/src/app/visualization/visline.cpp
@@ -28,6 +28,7 @@
 
 #include "visline.h"
 #include "../tools/drawTools/vdrawtool.h"
+#include <QtCore/qmath.h>
 
 //---------------------------------------------------------------------------------------------------------------------
 VisLine::VisLine(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/app/visualization/vistooltriangle.cpp b/src/app/visualization/vistooltriangle.cpp
index 815733464..0fc8d2815 100644
--- a/src/app/visualization/vistooltriangle.cpp
+++ b/src/app/visualization/vistooltriangle.cpp
@@ -30,6 +30,7 @@
 #include "../geometry/vpointf.h"
 #include "../container/vcontainer.h"
 #include "../tools/drawTools/vtooltriangle.h"
+#include <QtCore/qmath.h>
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolTriangle::VisToolTriangle(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp
index 617c80633..8717e3839 100644
--- a/src/app/xml/vpattern.cpp
+++ b/src/app/xml/vpattern.cpp
@@ -45,6 +45,7 @@
 
 #include <QMessageBox>
 #include <QUndoStack>
+#include <QtCore/qmath.h>
 
 const QString VPattern::TagPattern      = QStringLiteral("pattern");
 const QString VPattern::TagCalculation  = QStringLiteral("calculation");
diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp
index df8cf9328..799c6c8ca 100644
--- a/src/libs/qmuparser/qmuparser.cpp
+++ b/src/libs/qmuparser/qmuparser.cpp
@@ -23,6 +23,7 @@
 #include "qmuparser.h"
 
 #include <QtGlobal>
+#include <QtCore/qmath.h>
 
 using namespace std;
 
diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro
index 6f0ccd7a1..01db1689c 100644
--- a/src/libs/qmuparser/qmuparser.pro
+++ b/src/libs/qmuparser/qmuparser.pro
@@ -54,10 +54,11 @@ unix {
     INSTALLS += target
 
     *-g++{
+        QMAKE_CC = ccache gcc
         QMAKE_CXX = ccache g++
     }
-
     clang*{
+        QMAKE_CC = ccache clang
         QMAKE_CXX = ccache clang++
     }
 }
diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp
index 26e3c83a6..8fbc64995 100644
--- a/src/libs/qmuparser/qmuparserbase.cpp
+++ b/src/libs/qmuparser/qmuparserbase.cpp
@@ -26,6 +26,7 @@
 #ifdef QMUP_USE_OPENMP
     #include <omp.h>
 #endif
+#include <QtCore/qmath.h>
 
 using namespace std;
 
diff --git a/src/libs/qmuparser/qmuparserbytecode.cpp b/src/libs/qmuparser/qmuparserbytecode.cpp
index e0ed1f710..c76392323 100644
--- a/src/libs/qmuparser/qmuparserbytecode.cpp
+++ b/src/libs/qmuparser/qmuparserbytecode.cpp
@@ -26,6 +26,8 @@
 #include <QString>
 #include <QDebug>
 #include "qmuparsertoken.h"
+#include <QtCore/qmath.h>
+#include <QtGlobal>
 
 namespace qmu
 {
diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro
index 2e88e76b0..35e7156e2 100644
--- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro
+++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro
@@ -97,10 +97,11 @@ unix {
     INSTALLS += target
 
     *-g++{
+        QMAKE_CC = ccache gcc
         QMAKE_CXX = ccache g++
     }
-
     clang*{
+        QMAKE_CC = ccache clang
         QMAKE_CXX = ccache clang++
     }
 }