diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp
index 5678d0210..ccee8a32e 100644
--- a/src/app/valentina/core/vcmdexport.cpp
+++ b/src/app/valentina/core/vcmdexport.cpp
@@ -27,9 +27,9 @@
  *************************************************************************/
 
 #include "vcmdexport.h"
-#include "dialogs/dialoglayoutsettings.h"
-#include "dialogs/dialogsavelayout.h"
-#include "xml/vdomdocument.h"
+#include "../dialogs/dialoglayoutsettings.h"
+#include "../dialogs/dialogsavelayout.h"
+#include "../ifc/xml/vdomdocument.h"
 #include "../vformat/vmeasurements.h"
 #include "../vmisc/commandoptions.h"
 #include "../vmisc/vsettings.h"
diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp
index 76077f3ee..c47d84ded 100644
--- a/src/app/valentina/mainwindow.cpp
+++ b/src/app/valentina/mainwindow.cpp
@@ -29,11 +29,11 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "../vgeometry/vspline.h"
-#include "exception/vexceptionobjecterror.h"
-#include "exception/vexceptionconversionerror.h"
-#include "exception/vexceptionemptyparameter.h"
-#include "exception/vexceptionwrongid.h"
-#include "exception/vexceptionundo.h"
+#include "../ifc/exception/vexceptionobjecterror.h"
+#include "../ifc/exception/vexceptionconversionerror.h"
+#include "../ifc/exception/vexceptionemptyparameter.h"
+#include "../ifc/exception/vexceptionwrongid.h"
+#include "../ifc/exception/vexceptionundo.h"
 #include "version.h"
 #include "core/vapplication.h"
 #include "../vmisc/undoevent.h"
diff --git a/src/libs/ifc/xml/vabstractconverter.cpp b/src/libs/ifc/xml/vabstractconverter.cpp
index 1609ed214..4f9d255bf 100644
--- a/src/libs/ifc/xml/vabstractconverter.cpp
+++ b/src/libs/ifc/xml/vabstractconverter.cpp
@@ -27,8 +27,8 @@
  *************************************************************************/
 
 #include "vabstractconverter.h"
-#include "exception/vexception.h"
-#include "exception/vexceptionwrongid.h"
+#include "../exception/vexception.h"
+#include "../exception/vexceptionwrongid.h"
 
 #include <QFile>
 #include <QFileInfo>
diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp
index 59c4cb9ba..ac116e2e7 100644
--- a/src/libs/ifc/xml/vabstractpattern.cpp
+++ b/src/libs/ifc/xml/vabstractpattern.cpp
@@ -27,8 +27,8 @@
  *************************************************************************/
 
 #include "vabstractpattern.h"
-#include "exception/vexceptionbadid.h"
-#include "exception/vexceptionemptyparameter.h"
+#include "../exception/vexceptionbadid.h"
+#include "../exception/vexceptionemptyparameter.h"
 #include "vpatternconverter.h"
 #include "../qmuparser/qmutokenparser.h"
 #include "../exception/vexceptionobjecterror.h"
diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp
index 16acd4bda..470ba3ec0 100644
--- a/src/libs/ifc/xml/vdomdocument.cpp
+++ b/src/libs/ifc/xml/vdomdocument.cpp
@@ -27,10 +27,10 @@
  *************************************************************************/
 
 #include "vdomdocument.h"
-#include "exception/vexceptionconversionerror.h"
-#include "exception/vexceptionemptyparameter.h"
-#include "exception/vexceptionbadid.h"
-#include "exception/vexceptionwrongid.h"
+#include "../exception/vexceptionconversionerror.h"
+#include "../exception/vexceptionemptyparameter.h"
+#include "../exception/vexceptionbadid.h"
+#include "../exception/vexceptionwrongid.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/backport/qsavefile.h"
diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp
index 7c9b25c75..7000b4bd9 100644
--- a/src/libs/ifc/xml/vpatternconverter.cpp
+++ b/src/libs/ifc/xml/vpatternconverter.cpp
@@ -27,8 +27,8 @@
  *************************************************************************/
 
 #include "vpatternconverter.h"
-#include "exception/vexception.h"
-#include "exception/vexceptionemptyparameter.h"
+#include "../exception/vexception.h"
+#include "../exception/vexceptionemptyparameter.h"
 #include "../qmuparser/qmutokenparser.h"
 
 #include <QDir>
diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp
index d9d9f9d26..7b3236a25 100644
--- a/src/libs/ifc/xml/vvitconverter.cpp
+++ b/src/libs/ifc/xml/vvitconverter.cpp
@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vvitconverter.h"
-#include "exception/vexception.h"
+#include "../exception/vexception.h"
 
 #include <QFile>
 
diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp
index 5b6e09d74..5233bd7a0 100644
--- a/src/libs/ifc/xml/vvstconverter.cpp
+++ b/src/libs/ifc/xml/vvstconverter.cpp
@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vvstconverter.h"
-#include "exception/vexception.h"
+#include "../exception/vexception.h"
 
 #include <QFile>
 
diff --git a/src/libs/vdxf/dxflib/dl_entities.h b/src/libs/vdxf/dxflib/dl_entities.h
index 34a16202d..a6507818e 100644
--- a/src/libs/vdxf/dxflib/dl_entities.h
+++ b/src/libs/vdxf/dxflib/dl_entities.h
@@ -26,7 +26,7 @@
 #define DL_ENTITIES_H
 
 #include "dl_global.h"
-#include "dxfdef.h"
+#include "../dxfdef.h"
 
 #include <string>
 #include <vector>
diff --git a/src/libs/vmisc/qxtcsvmodel.h b/src/libs/vmisc/qxtcsvmodel.h
index 34858cdfc..413ef18b7 100644
--- a/src/libs/vmisc/qxtcsvmodel.h
+++ b/src/libs/vmisc/qxtcsvmodel.h
@@ -38,7 +38,9 @@
 #include <QString>
 #include <QStringList>
 #include <QModelIndex>
-#include <def.h>
+
+#include "def.h"
+
 class QTextCodec;
 
 class QxtCsvModelPrivate;
diff --git a/src/libs/vpatterndb/variables/varcradius.h b/src/libs/vpatterndb/variables/varcradius.h
index f39659f75..68f53de81 100644
--- a/src/libs/vpatterndb/variables/varcradius.h
+++ b/src/libs/vpatterndb/variables/varcradius.h
@@ -29,7 +29,7 @@
 #ifndef VARCRADIUS_H
 #define VARCRADIUS_H
 
-#include "../vpatterndb/variables/vcurvevariable.h"
+#include "vcurvevariable.h"
 #include "../ifc/ifcdef.h"
 
 class VArc;
diff --git a/src/libs/vpatterndb/variables/vcurveangle.h b/src/libs/vpatterndb/variables/vcurveangle.h
index 0cd66195a..ddf440750 100644
--- a/src/libs/vpatterndb/variables/vcurveangle.h
+++ b/src/libs/vpatterndb/variables/vcurveangle.h
@@ -29,7 +29,7 @@
 #ifndef VCURVEANGLE_H
 #define VCURVEANGLE_H
 
-#include "../vpatterndb/variables/vcurvevariable.h"
+#include "vcurvevariable.h"
 
 class VAbstractCurve;
 class VSpline;
diff --git a/src/libs/vpatterndb/variables/vcurvelength.h b/src/libs/vpatterndb/variables/vcurvelength.h
index 01e4e2e28..4df871ad2 100644
--- a/src/libs/vpatterndb/variables/vcurvelength.h
+++ b/src/libs/vpatterndb/variables/vcurvelength.h
@@ -29,7 +29,7 @@
 #ifndef VCURVELENGTH_H
 #define VCURVELENGTH_H
 
-#include "../vpatterndb/variables/vcurvevariable.h"
+#include "vcurvevariable.h"
 #include "../ifc/ifcdef.h"
 
 class VAbstractCurve;
diff --git a/src/libs/vpatterndb/variables/vlineangle.h b/src/libs/vpatterndb/variables/vlineangle.h
index f64440035..28a9e6ff3 100644
--- a/src/libs/vpatterndb/variables/vlineangle.h
+++ b/src/libs/vpatterndb/variables/vlineangle.h
@@ -29,7 +29,7 @@
 #ifndef VLINEANGLE_H
 #define VLINEANGLE_H
 
-#include "../vpatterndb/variables/vinternalvariable.h"
+#include "vinternalvariable.h"
 
 class VPointF;
 class VLineAngleData;
diff --git a/src/libs/vpatterndb/variables/vlinelength.h b/src/libs/vpatterndb/variables/vlinelength.h
index 00a3eedd9..836eca9c0 100644
--- a/src/libs/vpatterndb/variables/vlinelength.h
+++ b/src/libs/vpatterndb/variables/vlinelength.h
@@ -29,7 +29,7 @@
 #ifndef VLINELENGTH_H
 #define VLINELENGTH_H
 
-#include "../vpatterndb/variables/vinternalvariable.h"
+#include "vinternalvariable.h"
 #include "../ifc/ifcdef.h"
 
 class VPointF;
diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h
index 488e9e04e..efbe2f698 100644
--- a/src/libs/vpatterndb/variables/vvariable.h
+++ b/src/libs/vpatterndb/variables/vvariable.h
@@ -29,7 +29,7 @@
 #ifndef VVARIABLE_H
 #define VVARIABLE_H
 
-#include "../vpatterndb/variables/vinternalvariable.h"
+#include "vinternalvariable.h"
 #include "../ifc/ifcdef.h"
 
 class VVariableData;
diff --git a/src/libs/vtools/dialogs/tooldialogs.h b/src/libs/vtools/dialogs/tooldialogs.h
index 8383ebd91..d82ef4fb2 100644
--- a/src/libs/vtools/dialogs/tooldialogs.h
+++ b/src/libs/vtools/dialogs/tooldialogs.h
@@ -29,41 +29,41 @@
 #ifndef TOOLDIALOGS_H
 #define TOOLDIALOGS_H
 
-#include "dialogs/tools/dialogalongline.h"
-#include "dialogs/tools/dialogarc.h"
-#include "dialogs/tools/dialogarcwithlength.h"
-#include "dialogs/tools/dialogbisector.h"
-#include "dialogs/tools/dialogdetail.h"
-#include "dialogs/tools/dialogendline.h"
-#include "dialogs/tools/dialogline.h"
-#include "dialogs/tools/dialoglineintersect.h"
-#include "dialogs/tools/dialognormal.h"
-#include "dialogs/tools/dialogpointofcontact.h"
-#include "dialogs/tools/dialogshoulderpoint.h"
-#include "dialogs/tools/dialogsinglepoint.h"
-#include "dialogs/tools/dialogspline.h"
-#include "dialogs/tools/dialogcubicbezier.h"
-#include "dialogs/tools/dialogsplinepath.h"
-#include "dialogs/tools/dialogcubicbezierpath.h"
-#include "dialogs/tools/dialogheight.h"
-#include "dialogs/tools/dialogcutarc.h"
-#include "dialogs/tools/dialogcutspline.h"
-#include "dialogs/tools/dialogcutsplinepath.h"
-#include "dialogs/tools/dialoguniondetails.h"
-#include "dialogs/tools/dialogtriangle.h"
-#include "dialogs/tools/dialogpointofintersection.h"
-#include "dialogs/tools/dialoglineintersectaxis.h"
-#include "dialogs/tools/dialogcurveintersectaxis.h"
-#include "dialogs/tools/dialogpointofintersectionarcs.h"
-#include "dialogs/tools/dialogpointofintersectioncircles.h"
-#include "dialogs/tools/dialogpointofintersectioncurves.h"
-#include "dialogs/tools/dialogpointfromcircleandtangent.h"
-#include "dialogs/tools/dialogpointfromarcandtangent.h"
-#include "dialogs/tools/dialogtruedarts.h"
-#include "dialogs/tools/dialoggroup.h"
-#include "dialogs/tools/dialogrotation.h"
+#include "tools/dialogalongline.h"
+#include "tools/dialogarc.h"
+#include "tools/dialogarcwithlength.h"
+#include "tools/dialogbisector.h"
+#include "tools/dialogdetail.h"
+#include "tools/dialogendline.h"
+#include "tools/dialogline.h"
+#include "tools/dialoglineintersect.h"
+#include "tools/dialognormal.h"
+#include "tools/dialogpointofcontact.h"
+#include "tools/dialogshoulderpoint.h"
+#include "tools/dialogsinglepoint.h"
+#include "tools/dialogspline.h"
+#include "tools/dialogcubicbezier.h"
+#include "tools/dialogsplinepath.h"
+#include "tools/dialogcubicbezierpath.h"
+#include "tools/dialogheight.h"
+#include "tools/dialogcutarc.h"
+#include "tools/dialogcutspline.h"
+#include "tools/dialogcutsplinepath.h"
+#include "tools/dialoguniondetails.h"
+#include "tools/dialogtriangle.h"
+#include "tools/dialogpointofintersection.h"
+#include "tools/dialoglineintersectaxis.h"
+#include "tools/dialogcurveintersectaxis.h"
+#include "tools/dialogpointofintersectionarcs.h"
+#include "tools/dialogpointofintersectioncircles.h"
+#include "tools/dialogpointofintersectioncurves.h"
+#include "tools/dialogpointfromcircleandtangent.h"
+#include "tools/dialogpointfromarcandtangent.h"
+#include "tools/dialogtruedarts.h"
+#include "tools/dialoggroup.h"
+#include "tools/dialogrotation.h"
 
-#include "dialogs/support/dialogeditwrongformula.h"
-#include "dialogs/support/dialogundo.h"
+#include "support/dialogeditwrongformula.h"
+#include "support/dialogundo.h"
 
 #endif // TOOLDIALOGS_H
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
index 5b77b1dc9..677b4aaa7 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
@@ -30,7 +30,7 @@
 #define VABSTRACTSPLINE_H
 
 #include "../vdrawtool.h"
-#include "visualization/line/visline.h"
+#include "../../../visualization/line/visline.h"
 
 #include <QGraphicsPathItem>
 
diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h
index 3d6588eb4..3e0854163 100644
--- a/src/libs/vtools/tools/drawTools/vdrawtool.h
+++ b/src/libs/vtools/tools/drawTools/vdrawtool.h
@@ -30,7 +30,7 @@
 #define VDRAWTOOL_H
 
 #include "../vabstracttool.h"
-#include "dialogs/tools/dialogtool.h"
+#include "../../dialogs/tools/dialogtool.h"
 #include "../vwidgets/vmaingraphicsview.h"
 
 #include <QMenu>
diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h
index 526d03936..b4b808399 100644
--- a/src/libs/vtools/tools/vabstracttool.h
+++ b/src/libs/vtools/tools/vabstracttool.h
@@ -33,7 +33,7 @@
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vwidgets/vmaingraphicsscene.h"
-#include "visualization/visualization.h"
+#include "../visualization/visualization.h"
 
 class QDomElement;
 class QLineF;