diff --git a/Valentina.pro b/Valentina.pro
index bcdc56024..14e0c70e0 100644
--- a/Valentina.pro
+++ b/Valentina.pro
@@ -6,7 +6,7 @@
 
 # Use out-of-source builds (shadow builds)
 
-QT       += core gui widgets xml svg printsupport
+QT       += core gui widgets xml svg
 
 TARGET = Valentina
 TEMPLATE = app
@@ -234,10 +234,10 @@ CONFIG(debug, debug|release){
     # Debug
     QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \
                       -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \
-                      -isystem "/usr/include/qt5/QtCore" -O0 -Wall -Wextra -pedantic -Weffc++ \
-                      -isystem "$$OUT_PWD/uic" \
-                      -Woverloaded-virtual -Wctor-dtor-privacy -Wnon-virtual-dtor -Wold-style-cast \
-                      -Wconversion -Wsign-conversion -Winit-self -Wunreachable-code
+                      -isystem "/usr/include/qt5/QtCore" -isystem "$$OUT_PWD/uic" -isystem "$$OUT_PWD/moc/" \
+                      -Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \
+                      -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \
+                      -Wunreachable-code
 }else{
     # Release
     QMAKE_CXXFLAGS += -O1
@@ -249,6 +249,17 @@ CONFIG(debug, debug|release){
     lrelease.CONFIG       += no_link target_predeps
 }
 
-
+message(Qt version: $$[QT_VERSION])
+message(Qt is installed in $$[QT_INSTALL_PREFIX])
+message(Qt resources can be found in the following locations:)
+message(Documentation: $$[QT_INSTALL_DOCS])
+message(Header files: $$[QT_INSTALL_HEADERS])
+message(Libraries: $$[QT_INSTALL_LIBS])
+message(Binary files (executables): $$[QT_INSTALL_BINS])
+message(Plugins: $$[QT_INSTALL_PLUGINS])
+message(Data files: $$[QT_INSTALL_DATA])
+message(Translation files: $$[QT_INSTALL_TRANSLATIONS])
+message(Settings: $$[QT_INSTALL_SETTINGS])
+message(Examples: $$[QT_INSTALL_EXAMPLES])
 
 
diff --git a/container/vcontainer.h b/container/vcontainer.h
index 33ed7eede..fce8a378a 100644
--- a/container/vcontainer.h
+++ b/container/vcontainer.h
@@ -22,13 +22,9 @@
 #ifndef VCONTAINER_H
 #define VCONTAINER_H
 
-#include <QMap>
 #include <QTableWidget>
-#include "options.h"
-#include "vpointf.h"
 #include "vstandarttablecell.h"
 #include "vincrementtablerow.h"
-#include "geometry/vspline.h"
 #include "geometry/varc.h"
 #include "geometry/vsplinepath.h"
 #include "geometry/vdetail.h"
diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h
index d501f6323..3f004fb52 100644
--- a/dialogs/dialogalongline.h
+++ b/dialogs/dialogalongline.h
@@ -23,8 +23,6 @@
 #define DIALOGALONGLINE_H
 
 #include "dialogtool.h"
-#include "options.h"
-#include "container/vcontainer.h"
 #include "container/calculator.h"
 
 namespace Ui {
diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h
index 8cb7b3c82..00f23e8e5 100644
--- a/dialogs/dialogarc.h
+++ b/dialogs/dialogarc.h
@@ -23,7 +23,6 @@
 #define DIALOGARC_H
 
 #include "dialogtool.h"
-#include "container/vcontainer.h"
 
 namespace Ui {
 class DialogArc;
diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h
index 3f4c31d4b..aa7f529f2 100644
--- a/dialogs/dialogbisector.h
+++ b/dialogs/dialogbisector.h
@@ -23,11 +23,7 @@
 #define DIALOGBISECTOR_H
 
 #include "dialogtool.h"
-#include <QPushButton>
 #include <QListWidgetItem>
-#include <QTimer>
-#include "options.h"
-#include "container/vcontainer.h"
 #include "container/calculator.h"
 
 namespace Ui {
diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h
index 6086318ae..79cc1b55e 100644
--- a/dialogs/dialogdetail.h
+++ b/dialogs/dialogdetail.h
@@ -24,11 +24,9 @@
 
 #include "ui_dialogdetail.h"
 #include "dialogtool.h"
-#include "container/vcontainer.h"
 #include "geometry/vdetail.h"
 
-class DialogDetail : public DialogTool
-{
+class DialogDetail : public DialogTool{
     Q_OBJECT  
 public:
     explicit DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent = 0);
diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h
index 47852b9cf..5053e6462 100644
--- a/dialogs/dialogendline.h
+++ b/dialogs/dialogendline.h
@@ -23,11 +23,7 @@
 #define DIALOGENDLINE_H
 
 #include "dialogtool.h"
-#include <QPushButton>
 #include <QListWidgetItem>
-#include <QTimer>
-#include "options.h"
-#include "container/vcontainer.h"
 #include "container/calculator.h"
 
 namespace Ui {
diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h
index 0bdd56325..b7569b787 100644
--- a/dialogs/dialogincrements.h
+++ b/dialogs/dialogincrements.h
@@ -23,9 +23,7 @@
 #define DIALOGINCREMENTS_H
 
 #include "dialogtool.h"
-#include <QPushButton>
 #include "xml/vdomdocument.h"
-#include "container/vcontainer.h"
 
 namespace Ui {
 class DialogIncrements;
diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h
index f5a525294..dca627eaa 100644
--- a/dialogs/dialogline.h
+++ b/dialogs/dialogline.h
@@ -23,10 +23,6 @@
 #define DIALOGLINE_H
 
 #include "dialogtool.h"
-#include <QComboBox>
-#include "container/vcontainer.h"
-#include "options.h"
-
 
 namespace Ui {
 class DialogLine;
diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h
index b8010fb6b..5586ae825 100644
--- a/dialogs/dialognormal.h
+++ b/dialogs/dialognormal.h
@@ -23,11 +23,7 @@
 #define DIALOGNORMAL_H
 
 #include "dialogtool.h"
-#include <QPushButton>
 #include <QListWidgetItem>
-#include <QTimer>
-#include "options.h"
-#include "container/vcontainer.h"
 #include "container/calculator.h"
 
 namespace Ui {
diff --git a/dialogs/dialogpointofcontact.h b/dialogs/dialogpointofcontact.h
index 01b60d737..7d85ddcb3 100644
--- a/dialogs/dialogpointofcontact.h
+++ b/dialogs/dialogpointofcontact.h
@@ -24,8 +24,6 @@
 
 #include "ui_dialogpointofcontact.h"
 #include "dialogtool.h"
-#include "options.h"
-#include "container/vcontainer.h"
 #include "container/calculator.h"
 
 class DialogPointOfContact : public DialogTool
diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h
index d776062fb..49df44255 100644
--- a/dialogs/dialogshoulderpoint.h
+++ b/dialogs/dialogshoulderpoint.h
@@ -23,8 +23,6 @@
 #define DIALOGSHOULDERPOINT_H
 
 #include "dialogtool.h"
-#include "options.h"
-#include "container/vcontainer.h"
 #include "container/calculator.h"
 
 namespace Ui {
diff --git a/dialogs/dialogsinglepoint.h b/dialogs/dialogsinglepoint.h
index 4d1e187bb..02c064386 100644
--- a/dialogs/dialogsinglepoint.h
+++ b/dialogs/dialogsinglepoint.h
@@ -23,7 +23,6 @@
 #define DIALOGSINGLEPOINT_H
 
 #include "dialogtool.h"
-#include "container/vcontainer.h"
 
 namespace Ui {
 class DialogSinglePoint;
diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h
index 1f2a6c035..180f3a455 100644
--- a/dialogs/dialogspline.h
+++ b/dialogs/dialogspline.h
@@ -23,7 +23,6 @@
 #define DIALOGSPLINE_H
 
 #include "dialogtool.h"
-#include "container/vcontainer.h"
 
 namespace Ui {
 class DialogSpline;
diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h
index 683c44351..41cfeb0c2 100644
--- a/dialogs/dialogsplinepath.h
+++ b/dialogs/dialogsplinepath.h
@@ -23,7 +23,6 @@
 #define DIALOGSPLINEPATH_H
 
 #include "dialogtool.h"
-#include "container/vcontainer.h"
 #include "geometry/vsplinepath.h"
 
 namespace Ui {
diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h
index 0b28920f9..a6168934b 100644
--- a/dialogs/dialogtool.h
+++ b/dialogs/dialogtool.h
@@ -32,10 +32,8 @@
 #include <QRadioButton>
 #include <QTimer>
 #include "container/vcontainer.h"
-#include "options.h"
 
-class DialogTool : public QDialog
-{
+class DialogTool : public QDialog{
     Q_OBJECT
 public:
                      DialogTool(const VContainer *data, Draw::Draws mode = Draw::Calculation,
diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h
index 286b0bfac..5e2ad973f 100644
--- a/exception/vexceptionemptyparameter.h
+++ b/exception/vexceptionemptyparameter.h
@@ -23,7 +23,7 @@
 #define VEXCEPTIONEMPTYPARAMETER_H
 
 #include "vexception.h"
-#include "QDomElement"
+#include <QDomElement>
 
 class VExceptionEmptyParameter : public VException
 {
diff --git a/geometry/varc.h b/geometry/varc.h
index f467a15f9..d0f0b1285 100644
--- a/geometry/varc.h
+++ b/geometry/varc.h
@@ -22,10 +22,6 @@
 #ifndef VARC_H
 #define VARC_H
 
-#include <QPainterPath>
-#include <QVector>
-#include <QMap>
-#include "container/vpointf.h"
 #include "vspline.h"
 
 /**
diff --git a/geometry/vspline.h b/geometry/vspline.h
index 72898a9fb..6c7cf59c0 100644
--- a/geometry/vspline.h
+++ b/geometry/vspline.h
@@ -28,7 +28,6 @@
 #include <QVector>
 #include <QMap>
 #include "container/vpointf.h"
-#include "options.h"
 
 /**
  * @brief VSpline клас, що реалізує сплайн.
diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h
index 3170668b7..c6d6330f9 100644
--- a/geometry/vsplinepath.h
+++ b/geometry/vsplinepath.h
@@ -24,7 +24,6 @@
 
 #include "vsplinepoint.h"
 #include "vspline.h"
-#include "options.h"
 #include <QCoreApplication>
 
 namespace SplinePoint{
diff --git a/main.cpp b/main.cpp
index 5561ab56e..6ed51ac57 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "mainwindow.h"
-#include <QApplication>
+#include "widgets/vapplication.h"
 #include <QTextCodec>
 #include "tablewindow.h"
 
@@ -48,7 +48,7 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS
 
 int main(int argc, char *argv[]){
     qInstallMessageHandler(myMessageOutput);
-    QApplication app(argc, argv);
+    VApplication app(argc, argv);
 
     QTranslator qtTranslator;
     qtTranslator.load("qt_" + QLocale::system().name(),
diff --git a/mainwindow.h b/mainwindow.h
index 3a8cfd037..00cf115f8 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -35,8 +35,6 @@
 #include "tools/drawTools/drawtools.h"
 #include "tools/modelingTools/modelingtools.h"
 #include "xml/vdomdocument.h"
-#include "container/vcontainer.h"
-#include "options.h"
 #include "tools/vtooldetail.h"
 
 namespace Ui {
diff --git a/tablewindow.cpp b/tablewindow.cpp
index 61924f115..3189b9845 100644
--- a/tablewindow.cpp
+++ b/tablewindow.cpp
@@ -27,8 +27,6 @@
 #include <QFileDialog>
 #include "options.h"
 #include <QtSvg/QtSvg>
-#undef PaperSize
-#include <QtPrintSupport/QPrinter>
 
 TableWindow::TableWindow(QWidget *parent) :
     QMainWindow(parent), numberDetal(0), colission(0), ui(new Ui::TableWindow),
@@ -143,7 +141,7 @@ void TableWindow::StopTable(){
 }
 
 void TableWindow::saveScene(){
-    QString name = QFileDialog::getSaveFileName(0, "Зберегти розкладку", "", "Images (*.png);;Svg files (*.svg);;Ps files (*.ps)");
+    QString name = QFileDialog::getSaveFileName(0, "Зберегти розкладку", "", "Images (*.png);;Svg files (*.svg)");
     if(name.isNull()){
         return;
     }
@@ -164,8 +162,6 @@ void TableWindow::saveScene(){
         SvgFile(name);
     } else if(fi.suffix() == "png"){
         PngFile(name);
-    } else if(fi.suffix() == "ps"){
-        PsFile(name);
     }
 //    if(name.indexOf(".svg",name.size()-4)<0){
 //        name.append(".svg");
@@ -348,28 +344,3 @@ void TableWindow::PngFile(const QString &name) const{
     currentScene->render(&painter);
     image.save(name);
 }
-
-void TableWindow::PsFile(const QString &name) const{
-
-    QPrinter printer(QPrinter::HighResolution);
-    //printer.setOutputFormat(QPrinter::PostScriptFormat);
-
-    printer.setOutputFileName(name);
-    QRectF r = paper->rect();
-    qreal x=0, y=0, w=0, h=0;
-    r.getRect(&x,&y,&w,&h);
-    printer.setResolution(PrintDPI);
-    qDebug()<<printer.resolution();
-    printer.setPaperSize ( QSizeF(w/printer.resolution()*25.4, h/printer.resolution()*25.4), QPrinter::Millimeter );
-    QPainter painter;
-    if (! painter.begin( &printer )) { // failed to open file
-        qCritical("Не можу відкрити файл %s",qPrintable(name));
-        return;
-    }
-    painter.setFont( QFont( "Arial", 8, QFont::Normal ) );
-    painter.setRenderHint(QPainter::Antialiasing, true);
-    painter.setPen(QPen(Qt::black, widthMainLine, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-    painter.setBrush ( QBrush ( Qt::NoBrush ) );
-    currentScene->render(&painter);
-    painter.end();
-}
diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h
index 6f322f33e..513ca12cd 100644
--- a/tools/drawTools/vdrawtool.h
+++ b/tools/drawTools/vdrawtool.h
@@ -50,7 +50,7 @@ protected:
         if(!ignoreContextMenuEvent){
             QMenu menu;
             QAction *actionOption = menu.addAction(tr("Options"));
-            QAction *actionRemove;
+            QAction *actionRemove = 0;
             if(showRemove){
                 actionRemove = menu.addAction(tr("Delete"));
                 if(_referens > 1){
diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp
index c2c59128f..e0237cbdd 100644
--- a/tools/drawTools/vtoolalongline.cpp
+++ b/tools/drawTools/vtoolalongline.cpp
@@ -21,7 +21,6 @@
 
 #include "vtoolalongline.h"
 #include <QDialog>
-#include <QMenu>
 #include <QDebug>
 #include "container/calculator.h"
 
diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp
index d8f1c50be..84d453f8e 100644
--- a/tools/drawTools/vtoolarc.cpp
+++ b/tools/drawTools/vtoolarc.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vtoolarc.h"
-#include <QMenu>
 #include "container/calculator.h"
 
 VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation,
diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h
index 00c5a43a3..f78f26bbc 100644
--- a/tools/drawTools/vtoolarc.h
+++ b/tools/drawTools/vtoolarc.h
@@ -23,24 +23,23 @@
 #define VTOOLARC_H
 
 #include "vdrawtool.h"
-#include "xml/vdomdocument.h"
 #include <QGraphicsPathItem>
 #include "dialogs/dialogarc.h"
 #include "widgets/vcontrolpointspline.h"
-#include "container/vcontainer.h"
 
-class VToolArc :public VDrawTool, public QGraphicsPathItem
-{
+class VToolArc :public VDrawTool, public QGraphicsPathItem{
     Q_OBJECT
 public:
-    VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation,
-             QGraphicsItem * parent = 0);
-    virtual void setDialog();
-    static void Create(QSharedPointer<DialogArc> &dialog, VMainGraphicsScene  *scene, VDomDocument *doc,
+                              VToolArc(VDomDocument *doc, VContainer *data, qint64 id,
+                                       Tool::Sources typeCreation, QGraphicsItem * parent = 0);
+    virtual void              setDialog();
+    static void               Create(QSharedPointer<DialogArc> &dialog, VMainGraphicsScene  *scene,
+                                     VDomDocument *doc,
                        VContainer *data);
-    static void Create(const qint64 _id, const qint64 &center, const QString &radius,
-                       const QString &f1, const QString &f2, VMainGraphicsScene  *scene, VDomDocument *doc,
-                       VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation);
+    static void               Create(const qint64 _id, const qint64 &center, const QString &radius,
+                                     const QString &f1, const QString &f2, VMainGraphicsScene  *scene,
+                                     VDomDocument *doc, VContainer *data, const Document::Documents &parse,
+                                     Tool::Sources typeCreation);
 public slots:
     virtual void              FullUpdateFromFile();
     virtual void              FullUpdateFromGui(int result);
diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp
index 65dfd66eb..80ee7453d 100644
--- a/tools/drawTools/vtoolbisector.cpp
+++ b/tools/drawTools/vtoolbisector.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vtoolbisector.h"
-#include <QMenu>
 
 VToolBisector::VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id,
                              const QString &typeLine, const QString &formula, const qint64 &firstPointId,
diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h
index 2f257fd1e..1c88f670d 100644
--- a/tools/drawTools/vtoolbisector.h
+++ b/tools/drawTools/vtoolbisector.h
@@ -22,12 +22,10 @@
 #ifndef VTOOLBISECTOR_H
 #define VTOOLBISECTOR_H
 
-#include <QSharedPointer>
 #include "vtoollinepoint.h"
 #include "dialogs/dialogbisector.h"
 
-class VToolBisector : public VToolLinePoint
-{
+class VToolBisector : public VToolLinePoint{
 public:
     VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id,
                   const QString &typeLine, const QString &formula, const qint64 &firstPointId,
diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h
index d2656ed6d..4cd89b31b 100644
--- a/tools/drawTools/vtoolendline.h
+++ b/tools/drawTools/vtoolendline.h
@@ -22,12 +22,10 @@
 #ifndef VTOOLENDLINE_H
 #define VTOOLENDLINE_H
 
-#include <QSharedPointer>
 #include "vtoollinepoint.h"
 #include "dialogs/dialogendline.h"
 
-class VToolEndLine : public VToolLinePoint
-{
+class VToolEndLine : public VToolLinePoint{
     Q_OBJECT
 public:
                       VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id,
diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp
index bd83d48c9..fc5cc7577 100644
--- a/tools/drawTools/vtoolline.cpp
+++ b/tools/drawTools/vtoolline.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vtoolline.h"
-#include <QMenu>
 #include <QDebug>
 
 VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint,
diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h
index fa6fbe1db..799f09c8b 100644
--- a/tools/drawTools/vtoolline.h
+++ b/tools/drawTools/vtoolline.h
@@ -26,8 +26,7 @@
 #include "QGraphicsLineItem"
 #include "dialogs/dialogline.h"
 
-class VToolLine: public VDrawTool, public QGraphicsLineItem
-{
+class VToolLine: public VDrawTool, public QGraphicsLineItem{
     Q_OBJECT
 public:
     VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint,
diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp
index 701089c16..2fd033e3c 100644
--- a/tools/drawTools/vtoolnormal.cpp
+++ b/tools/drawTools/vtoolnormal.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vtoolnormal.h"
-#include <QMenu>
 
 VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id,
                          const QString &typeLine,
diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h
index 2410bc163..217328744 100644
--- a/tools/drawTools/vtoolnormal.h
+++ b/tools/drawTools/vtoolnormal.h
@@ -22,7 +22,6 @@
 #ifndef VTOOLNORMAL_H
 #define VTOOLNORMAL_H
 
-#include <QSharedPointer>
 #include "vtoollinepoint.h"
 #include "dialogs/dialognormal.h"
 
diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp
index 5afae933e..afd581fd4 100644
--- a/tools/drawTools/vtoolpoint.cpp
+++ b/tools/drawTools/vtoolpoint.cpp
@@ -24,7 +24,6 @@
 #include <QBrush>
 #include <QDebug>
 #include <QGraphicsItem>
-#include "container/vpointf.h"
 
 
 VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id,
diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h
index 1a6a15f4c..4b740bd74 100644
--- a/tools/drawTools/vtoolpoint.h
+++ b/tools/drawTools/vtoolpoint.h
@@ -24,7 +24,6 @@
 
 #include "vdrawtool.h"
 #include "widgets/vgraphicssimpletextitem.h"
-#include "options.h"
 
 class VToolPoint: public VDrawTool, public QGraphicsEllipseItem{
     Q_OBJECT
diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp
index bd137bf4a..3b41fe3ef 100644
--- a/tools/drawTools/vtoolshoulderpoint.cpp
+++ b/tools/drawTools/vtoolshoulderpoint.cpp
@@ -21,7 +21,6 @@
 
 #include "vtoolshoulderpoint.h"
 #include <QDebug>
-#include <QMenu>
 
 VToolShoulderPoint::VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id,
                                        const QString &typeLine, const QString &formula, const qint64 &p1Line,
diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp
index 3da725ceb..f244d0104 100644
--- a/tools/drawTools/vtoolsinglepoint.cpp
+++ b/tools/drawTools/vtoolsinglepoint.cpp
@@ -24,11 +24,7 @@
 #include <QBrush>
 #include <QDebug>
 #include <QGraphicsItem>
-#include <QMenu>
 #include <QGraphicsSceneContextMenuEvent>
-#include <cmath>
-#include "options.h"
-#include "container/vpointf.h"
 
 VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation,
                                     QGraphicsItem * parent ):VToolPoint(doc, data, id, parent),
diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h
index f2ff140a1..f5b2dad67 100644
--- a/tools/drawTools/vtoolsinglepoint.h
+++ b/tools/drawTools/vtoolsinglepoint.h
@@ -22,8 +22,6 @@
 #ifndef VTOOLSINGLEPOINT_H
 #define VTOOLSINGLEPOINT_H
 
-#include "container/vcontainer.h"
-#include "xml/vdomdocument.h"
 #include "dialogs/dialogsinglepoint.h"
 #include "vtoolpoint.h"
 
diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp
index 30dc78755..85d80d197 100644
--- a/tools/drawTools/vtoolspline.cpp
+++ b/tools/drawTools/vtoolspline.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vtoolspline.h"
-#include <QMenu>
 #include <QDebug>
 #include "geometry/vspline.h"
 
diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h
index 74ece8b89..b421b35a0 100644
--- a/tools/drawTools/vtoolspline.h
+++ b/tools/drawTools/vtoolspline.h
@@ -23,11 +23,9 @@
 #define VTOOLSPLINE_H
 
 #include "vdrawtool.h"
-#include "xml/vdomdocument.h"
 #include <QGraphicsPathItem>
 #include "dialogs/dialogspline.h"
 #include "widgets/vcontrolpointspline.h"
-#include "container/vcontainer.h"
 #include "geometry/vsplinepath.h"
 
 class VToolSpline:public VDrawTool, public QGraphicsPathItem
diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h
index f4559e6ec..b880bdfd2 100644
--- a/tools/drawTools/vtoolsplinepath.h
+++ b/tools/drawTools/vtoolsplinepath.h
@@ -23,11 +23,9 @@
 #define VTOOLSPLINEPATH_H
 
 #include "vdrawtool.h"
-#include "xml/vdomdocument.h"
 #include <QGraphicsPathItem>
 #include "dialogs/dialogsplinepath.h"
 #include "widgets/vcontrolpointspline.h"
-#include "container/vcontainer.h"
 
 class VToolSplinePath:public VDrawTool, public QGraphicsPathItem{
     Q_OBJECT
diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp
index 3423e2db8..76d448dad 100644
--- a/tools/modelingTools/vmodelingalongline.cpp
+++ b/tools/modelingTools/vmodelingalongline.cpp
@@ -21,7 +21,6 @@
 
 #include "vmodelingalongline.h"
 #include <QDialog>
-#include <QMenu>
 #include <QDebug>
 #include "container/calculator.h"
 
diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h
index 1ef1807e5..e452f59e1 100644
--- a/tools/modelingTools/vmodelingarc.h
+++ b/tools/modelingTools/vmodelingarc.h
@@ -23,11 +23,9 @@
 #define VMODELINGARC_H
 
 #include "vmodelingtool.h"
-#include "xml/vdomdocument.h"
 #include <QGraphicsPathItem>
 #include "dialogs/dialogarc.h"
 #include "widgets/vcontrolpointspline.h"
-#include "container/vcontainer.h"
 
 class VModelingArc :public VModelingTool, public QGraphicsPathItem{
     Q_OBJECT
diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h
index dd8180b13..8795d90de 100644
--- a/tools/modelingTools/vmodelingbisector.h
+++ b/tools/modelingTools/vmodelingbisector.h
@@ -22,7 +22,6 @@
 #ifndef VMODELINGBISECTOR_H
 #define VMODELINGBISECTOR_H
 
-#include <QSharedPointer>
 #include "vmodelinglinepoint.h"
 #include "dialogs/dialogbisector.h"
 
diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h
index 0708e9a75..6bd9d110b 100644
--- a/tools/modelingTools/vmodelingendline.h
+++ b/tools/modelingTools/vmodelingendline.h
@@ -22,7 +22,6 @@
 #ifndef VMODELINGENDLINE_H
 #define VMODELINGENDLINE_H
 
-#include <QSharedPointer>
 #include "vmodelinglinepoint.h"
 #include "dialogs/dialogendline.h"
 
diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp
index b434adfbb..06614bf09 100644
--- a/tools/modelingTools/vmodelingline.cpp
+++ b/tools/modelingTools/vmodelingline.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vmodelingline.h"
-#include <QMenu>
 #include <QDebug>
 
 VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint,
diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp
index d7d473194..51a45e7d0 100644
--- a/tools/modelingTools/vmodelinglineintersect.cpp
+++ b/tools/modelingTools/vmodelinglineintersect.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vmodelinglineintersect.h"
-#include <QMenu>
 
 VModelingLineIntersect::VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id,
                                        const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2,
diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp
index d7c7a3274..55edddd10 100644
--- a/tools/modelingTools/vmodelingnormal.cpp
+++ b/tools/modelingTools/vmodelingnormal.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "vmodelingnormal.h"
-#include <QMenu>
 
 VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id,
                          const QString &typeLine,
diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h
index 97c2c71aa..906aa797f 100644
--- a/tools/modelingTools/vmodelingnormal.h
+++ b/tools/modelingTools/vmodelingnormal.h
@@ -22,7 +22,6 @@
 #ifndef VMODELINGNORMAL_H
 #define VMODELINGNORMAL_H
 
-#include <QSharedPointer>
 #include "vmodelinglinepoint.h"
 #include "dialogs/dialognormal.h"
 
diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h
index c851f3d6b..e3bef5073 100644
--- a/tools/modelingTools/vmodelingpoint.h
+++ b/tools/modelingTools/vmodelingpoint.h
@@ -24,7 +24,6 @@
 
 #include "vmodelingtool.h"
 #include "widgets/vgraphicssimpletextitem.h"
-#include "options.h"
 
 class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem{
     Q_OBJECT
diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp
index c67f92427..d96b5ccdf 100644
--- a/tools/modelingTools/vmodelingshoulderpoint.cpp
+++ b/tools/modelingTools/vmodelingshoulderpoint.cpp
@@ -21,7 +21,6 @@
 
 #include "vmodelingshoulderpoint.h"
 #include <QDebug>
-#include <QMenu>
 
 VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id,
                                        const QString &typeLine, const QString &formula, const qint64 &p1Line,
diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h
index 09a7251d1..bffdb148b 100644
--- a/tools/modelingTools/vmodelingspline.h
+++ b/tools/modelingTools/vmodelingspline.h
@@ -23,11 +23,9 @@
 #define VMODELINGSPLINE_H
 
 #include "vmodelingtool.h"
-#include "xml/vdomdocument.h"
 #include <QGraphicsPathItem>
 #include "dialogs/dialogspline.h"
 #include "widgets/vcontrolpointspline.h"
-#include "container/vcontainer.h"
 #include "geometry/vsplinepath.h"
 
 class VModelingSpline:public VModelingTool, public QGraphicsPathItem{
diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h
index 75494a2ea..de3ea52c8 100644
--- a/tools/modelingTools/vmodelingsplinepath.h
+++ b/tools/modelingTools/vmodelingsplinepath.h
@@ -23,11 +23,9 @@
 #define VMODELINGSPLINEPATH_H
 
 #include "vmodelingtool.h"
-#include "xml/vdomdocument.h"
 #include <QGraphicsPathItem>
 #include "dialogs/dialogsplinepath.h"
 #include "widgets/vcontrolpointspline.h"
-#include "container/vcontainer.h"
 
 class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem{
     Q_OBJECT
diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h
index 22fe67dfe..2391e053b 100644
--- a/tools/vabstracttool.h
+++ b/tools/vabstracttool.h
@@ -24,7 +24,6 @@
 
 #include "xml/vdomdocument.h"
 #include "vdatatool.h"
-#include "container/vcontainer.h"
 
 class VAbstractTool: public VDataTool{
     Q_OBJECT
diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h
index 034dfae3f..231f8220a 100644
--- a/widgets/vcontrolpointspline.h
+++ b/widgets/vcontrolpointspline.h
@@ -25,7 +25,6 @@
 #include <QGraphicsEllipseItem>
 #include <QGraphicsLineItem>
 #include <QObject>
-#include "options.h"
 #include "geometry/vsplinepath.h"
 
 class VControlPointSpline : public QObject, public QGraphicsEllipseItem
diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h
index 62bbb275b..192bee821 100644
--- a/xml/vdomdocument.h
+++ b/xml/vdomdocument.h
@@ -25,7 +25,6 @@
 #include <QDomDocument>
 #include <QMap>
 #include <QComboBox>
-#include "container/vcontainer.h"
 #include "widgets/vmaingraphicsscene.h"
 #include "tools/vdatatool.h"
 #include "vtoolrecord.h"