diff --git a/sources/conductorautonumerotation.cpp b/sources/conductorautonumerotation.cpp
index 0c087ad67..10edd23dd 100644
--- a/sources/conductorautonumerotation.cpp
+++ b/sources/conductorautonumerotation.cpp
@@ -19,6 +19,7 @@
 #include "conductorautonumerotationwidget.h"
 #include "diagramcommands.h"
 #include "numerotationcontextcommands.h"
+#include "qetdiagrameditor.h"
 
 /**
  *Constructor
diff --git a/sources/conductorprofile.cpp b/sources/conductorprofile.cpp
index e0d8bc9e2..6e63e7296 100644
--- a/sources/conductorprofile.cpp
+++ b/sources/conductorprofile.cpp
@@ -18,6 +18,7 @@
 #include "conductorprofile.h"
 #include "qetgraphicsitem/conductor.h"
 #include "conductorsegmentprofile.h"
+#include "terminal.h"
 
 /// Constructeur
 ConductorProfile::ConductorProfile() {
diff --git a/sources/diagram.cpp b/sources/diagram.cpp
index fa0260c7d..d6db7c30b 100644
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -33,6 +33,7 @@
 #include "qetapp.h"
 #include "qetgraphicsitem/diagramimageitem.h"
 #include "qetgraphicsitem/qetshapeitem.h"
+#include "terminal.h"
 
 const int   Diagram::xGrid  = 10;
 const int   Diagram::yGrid  = 10;
diff --git a/sources/diagramcommands.h b/sources/diagramcommands.h
index 7a5c5531b..50062e841 100644
--- a/sources/diagramcommands.h
+++ b/sources/diagramcommands.h
@@ -25,6 +25,7 @@
 #include "titleblockproperties.h"
 #include "qet.h"
 #include "qetgraphicsitem/qetshapeitem.h"
+#include "conductorprofile.h"
 class Diagram;
 class DiagramTextItem;
 class Element;
diff --git a/sources/elementscollectioncache.cpp b/sources/elementscollectioncache.cpp
index e1ec9e159..cef172a90 100644
--- a/sources/elementscollectioncache.cpp
+++ b/sources/elementscollectioncache.cpp
@@ -20,6 +20,8 @@
 #include "elementscategory.h"
 #include "elementdefinition.h"
 #include "factory/elementfactory.h"
+#include "element.h"
+#include <QImageWriter>
 
 /**
 	Construct a cache for elements collections.
diff --git a/sources/elementspanel.cpp b/sources/elementspanel.cpp
index 10e0bf546..9e88c889b 100644
--- a/sources/elementspanel.cpp
+++ b/sources/elementspanel.cpp
@@ -27,6 +27,7 @@
 #include "qeticons.h"
 #include "templatescollection.h"
 #include "treecoloranimation.h"
+#include "element.h"
 
 /*
 	Lorsque le flag ENABLE_PANEL_DND_CHECKS est defini, le panel d'elements
diff --git a/sources/factory/elementfactory.h b/sources/factory/elementfactory.h
index 7fcb970b9..098e8098d 100644
--- a/sources/factory/elementfactory.h
+++ b/sources/factory/elementfactory.h
@@ -19,7 +19,10 @@
 #define ELEMENTFACTORY_H
 
 #include <QMutex>
-#include "qetgraphicsitem/element.h"
+class Element;
+class ElementsLocation;
+class QGraphicsItem;
+class Diagram;
 
 /**
  * @brief The ElementFactory class
diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp
index f9a38a606..a9caf2b58 100644
--- a/sources/qetgraphicsitem/conductor.cpp
+++ b/sources/qetgraphicsitem/conductor.cpp
@@ -24,6 +24,8 @@
 #include "diagram.h"
 #include "diagramcommands.h"
 #include "conductorautonumerotation.h"
+#include "qetdiagrameditor.h"
+#include "terminal.h"
 #define PR(x) qDebug() << #x " = " << x;
 
 bool Conductor::pen_and_brush_initialized = false;
diff --git a/sources/qetgraphicsitem/conductor.h b/sources/qetgraphicsitem/conductor.h
index 717612a63..943db1e2f 100644
--- a/sources/qetgraphicsitem/conductor.h
+++ b/sources/qetgraphicsitem/conductor.h
@@ -17,14 +17,17 @@
 */
 #ifndef CONDUCTOR_H
 #define CONDUCTOR_H
-#include <QtGui>
-#include "terminal.h"
-#include "conductorprofile.h"
+
 #include "conductorproperties.h"
-#include "qetdiagrameditor.h"
+
+class ConductorProfile;
+class ConductorSegmentProfile;
+class Diagram;
+class Terminal;
 class ConductorSegment;
 class ConductorTextItem;
 class Element;
+class QETDiagramEditor;
 typedef QPair<QPointF, Qt::Corner> ConductorBend;
 typedef QHash<Qt::Corner, ConductorProfile> ConductorProfilesGroup;
 /**
diff --git a/sources/qetgraphicsitem/conductortextitem.cpp b/sources/qetgraphicsitem/conductortextitem.cpp
index a4c1c1199..61691df2e 100644
--- a/sources/qetgraphicsitem/conductortextitem.cpp
+++ b/sources/qetgraphicsitem/conductortextitem.cpp
@@ -18,6 +18,7 @@
 #include "conductortextitem.h"
 #include "conductor.h"
 #include "diagramcommands.h"
+#include "diagram.h"
 
 /**
 	Constructeur
diff --git a/sources/qetgraphicsitem/crossrefitem.cpp b/sources/qetgraphicsitem/crossrefitem.cpp
index 102946ca6..5d94da5ff 100644
--- a/sources/qetgraphicsitem/crossrefitem.cpp
+++ b/sources/qetgraphicsitem/crossrefitem.cpp
@@ -20,6 +20,7 @@
 #include "qetapp.h"
 #include "diagramposition.h"
 #include "elementtextitem.h"
+#include "diagram.h"
 
 //define the height of the header.
 #define header 5
diff --git a/sources/qetgraphicsitem/crossrefitem.h b/sources/qetgraphicsitem/crossrefitem.h
index 1c29db5cf..5338b504c 100644
--- a/sources/qetgraphicsitem/crossrefitem.h
+++ b/sources/qetgraphicsitem/crossrefitem.h
@@ -18,9 +18,11 @@
 #ifndef CROSSREFITEM_H
 #define CROSSREFITEM_H
 
-#include "qetgraphicsitem/qetgraphicsitem.h"
+#include <QGraphicsObject>
 #include"properties/xrefproperties.h"
-class element;
+#include <QPicture>
+
+class Element;
 
 /**
  * @brief The CrossRefItem class
diff --git a/sources/qetgraphicsitem/customelement.cpp b/sources/qetgraphicsitem/customelement.cpp
index 0b8f493a0..dd7fa5213 100644
--- a/sources/qetgraphicsitem/customelement.cpp
+++ b/sources/qetgraphicsitem/customelement.cpp
@@ -22,6 +22,7 @@
 #include "partline.h"
 #include "elementdefinition.h"
 #include <iostream>
+#include "terminal.h"
 
 /**
 	Constructeur de la classe CustomElement. Permet d'instancier un element
diff --git a/sources/qetgraphicsitem/customelement.h b/sources/qetgraphicsitem/customelement.h
index 06da21d21..c55cdf107 100644
--- a/sources/qetgraphicsitem/customelement.h
+++ b/sources/qetgraphicsitem/customelement.h
@@ -18,11 +18,13 @@
 #ifndef CUSTOM_ELEMENT_H
 #define CUSTOM_ELEMENT_H
 #include "fixedelement.h"
-#include <QtGui>
 #include "nameslist.h"
 #include "elementslocation.h"
+#include <QPicture>
+
 class ElementTextItem;
 class Terminal;
+
 /**
 	This class represents an electrical element; it may be used like a fixed
 	element, the difference being that the CustomElement reads its description
diff --git a/sources/qetgraphicsitem/diagramimageitem.cpp b/sources/qetgraphicsitem/diagramimageitem.cpp
index 2aa080cae..4c0d86da3 100644
--- a/sources/qetgraphicsitem/diagramimageitem.cpp
+++ b/sources/qetgraphicsitem/diagramimageitem.cpp
@@ -17,6 +17,7 @@
 */
 #include "diagramimageitem.h"
 #include "diagramcommands.h"
+#include "diagram.h"
 
 /**
  * @brief DiagramImageItem::DiagramImageItem
diff --git a/sources/qetgraphicsitem/diagramimageitem.h b/sources/qetgraphicsitem/diagramimageitem.h
index 59de61642..26eb57301 100644
--- a/sources/qetgraphicsitem/diagramimageitem.h
+++ b/sources/qetgraphicsitem/diagramimageitem.h
@@ -17,9 +17,12 @@
 */
 #ifndef DIAGRAM_IMAGE_ITEM_H
 #define DIAGRAM_IMAGE_ITEM_H
-#include <QtGui>
+
 #include "qetgraphicsitem.h"
 
+class QDomElement;
+class QDomDocument;
+
 /**
 	This class represents a selectable, movable and editable image on a
 	diagram.
diff --git a/sources/qetgraphicsitem/diagramtextitem.cpp b/sources/qetgraphicsitem/diagramtextitem.cpp
index 561292570..f94d9ef23 100644
--- a/sources/qetgraphicsitem/diagramtextitem.cpp
+++ b/sources/qetgraphicsitem/diagramtextitem.cpp
@@ -19,8 +19,8 @@
 #include "diagramcommands.h"
 #include "qet.h"
 #include "qetapp.h"
-
 #include "richtext/richtexteditor_p.h"
+#include "diagram.h"
 
 /**
 	Constructeur
diff --git a/sources/qetgraphicsitem/diagramtextitem.h b/sources/qetgraphicsitem/diagramtextitem.h
index 011ec3e69..230e3c8df 100644
--- a/sources/qetgraphicsitem/diagramtextitem.h
+++ b/sources/qetgraphicsitem/diagramtextitem.h
@@ -17,8 +17,13 @@
 */
 #ifndef DIAGRAM_TEXT_ITEM_H
 #define DIAGRAM_TEXT_ITEM_H
-#include <QtGui>
-#include "diagram.h"
+
+#include <QGraphicsTextItem>
+
+class Diagram;
+class QDomElement;
+class QDomDocument;
+
 /**
 	This class represents a selectable, movable and editable text field on a
 	diagram.
diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp
index 4dca2c15d..7504ecd5d 100644
--- a/sources/qetgraphicsitem/element.cpp
+++ b/sources/qetgraphicsitem/element.cpp
@@ -25,6 +25,7 @@
 #include <ui/elementpropertieswidget.h>
 #include "elementprovider.h"
 #include "diagramposition.h"
+#include "terminal.h"
 
 /**
 	Constructeur pour un element sans scene ni parent
diff --git a/sources/qetgraphicsitem/element.h b/sources/qetgraphicsitem/element.h
index e6cfce471..67af0168b 100644
--- a/sources/qetgraphicsitem/element.h
+++ b/sources/qetgraphicsitem/element.h
@@ -17,13 +17,16 @@
 */
 #ifndef ELEMENT_H
 #define ELEMENT_H
-#include <QtGui>
-#include "terminal.h"
+
+#include "qet.h"
 #include "qetgraphicsitem.h"
-#include <QUuid>
+#include "diagramcontext.h"
+
 class Diagram;
 class ElementTextItem;
-
+class QETProject;
+class Terminal;
+class Conductor;
 
 /**
 	This is the base class for electrical elements.
diff --git a/sources/qetgraphicsitem/elementtextitem.h b/sources/qetgraphicsitem/elementtextitem.h
index fe6df2878..74268deac 100644
--- a/sources/qetgraphicsitem/elementtextitem.h
+++ b/sources/qetgraphicsitem/elementtextitem.h
@@ -17,10 +17,12 @@
 */
 #ifndef ELEMENT_TEXT_ITEM_H
 #define ELEMENT_TEXT_ITEM_H
+
 #include "diagramtextitem.h"
-#include <QtXml>
+
 class Diagram;
 class Element;
+
 /**
 	This class represents a text item attached to an element. Users can change its
 	value, adjust its position (defined relatively to its parent element), and
diff --git a/sources/qetgraphicsitem/independenttextitem.h b/sources/qetgraphicsitem/independenttextitem.h
index db507ec62..eb25342d7 100644
--- a/sources/qetgraphicsitem/independenttextitem.h
+++ b/sources/qetgraphicsitem/independenttextitem.h
@@ -17,8 +17,9 @@
 */
 #ifndef INDEPENDENT_TEXT_ITEM_H
 #define INDEPENDENT_TEXT_ITEM_H
-#include <QtGui>
+
 #include "diagramtextitem.h"
+
 /**
 	This class represents an independent text field on a particular diagram.
 	It may be moved, edited, and rotated.
diff --git a/sources/qetgraphicsitem/masterelement.cpp b/sources/qetgraphicsitem/masterelement.cpp
index 1099f6410..b798d535f 100644
--- a/sources/qetgraphicsitem/masterelement.cpp
+++ b/sources/qetgraphicsitem/masterelement.cpp
@@ -16,6 +16,7 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "masterelement.h"
+#include "crossrefitem.h"
 
 /**
  * @brief MasterElement::MasterElement
diff --git a/sources/qetgraphicsitem/masterelement.h b/sources/qetgraphicsitem/masterelement.h
index 32d1170c5..9bffda1c3 100644
--- a/sources/qetgraphicsitem/masterelement.h
+++ b/sources/qetgraphicsitem/masterelement.h
@@ -19,7 +19,8 @@
 #define MASTERELEMENT_H
 
 #include "customelement.h"
-#include "crossrefitem.h"
+
+class CrossRefItem;
 
 class MasterElement : public CustomElement
 {
diff --git a/sources/qetgraphicsitem/qetgraphicsitem.cpp b/sources/qetgraphicsitem/qetgraphicsitem.cpp
index b5bcbe7eb..801431413 100644
--- a/sources/qetgraphicsitem/qetgraphicsitem.cpp
+++ b/sources/qetgraphicsitem/qetgraphicsitem.cpp
@@ -16,6 +16,7 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetgraphicsitem.h"
+#include "diagram.h"
 
 /**
  * @brief QetGraphicsItem::QetGraphicsItem Default constructor
diff --git a/sources/qetgraphicsitem/qetgraphicsitem.h b/sources/qetgraphicsitem/qetgraphicsitem.h
index 69727d783..00fba901e 100644
--- a/sources/qetgraphicsitem/qetgraphicsitem.h
+++ b/sources/qetgraphicsitem/qetgraphicsitem.h
@@ -18,7 +18,9 @@
 #ifndef QETGRAPHICSITEM_H
 #define QETGRAPHICSITEM_H
 
-#include "diagram.h"
+#include <QGraphicsObject>
+
+class Diagram;
 
 class QetGraphicsItem : public QGraphicsObject {
 	Q_OBJECT
@@ -29,7 +31,7 @@ class QetGraphicsItem : public QGraphicsObject {
 	virtual ~QetGraphicsItem() = 0;
 
 	//public methode
-	Diagram* diagram() const;
+	Diagram * diagram() const;
 	virtual void setPos(const QPointF &p);
 	virtual void setPos(qreal x, qreal y);
 	virtual void rotateBy(const qreal &);
diff --git a/sources/qetgraphicsitem/qetshapeitem.h b/sources/qetgraphicsitem/qetshapeitem.h
index ee6e517cb..098794fed 100644
--- a/sources/qetgraphicsitem/qetshapeitem.h
+++ b/sources/qetgraphicsitem/qetshapeitem.h
@@ -20,6 +20,9 @@
 
 #include "qetgraphicsitem.h"
 
+class QDomElement;
+class QDomDocument;
+
 /**
  * @brief The QetShapeItem class
  * this class is used to draw a basic shape (line, rectangle, ellipse)
diff --git a/sources/qetgraphicsitem/reportelement.cpp b/sources/qetgraphicsitem/reportelement.cpp
index 34ed7777c..5844c8270 100644
--- a/sources/qetgraphicsitem/reportelement.cpp
+++ b/sources/qetgraphicsitem/reportelement.cpp
@@ -19,6 +19,7 @@
 #include "elementtextitem.h"
 #include "diagramposition.h"
 #include "qetproject.h"
+#include "diagram.h"
 
 ReportElement::ReportElement(const ElementsLocation &location, QString link_type,QGraphicsItem *qgi, Diagram *s, int *state) :
 	CustomElement(location, qgi, s, state)
diff --git a/sources/qetgraphicsitem/slaveelement.cpp b/sources/qetgraphicsitem/slaveelement.cpp
index e6fcd2ec7..47ec93954 100644
--- a/sources/qetgraphicsitem/slaveelement.cpp
+++ b/sources/qetgraphicsitem/slaveelement.cpp
@@ -19,6 +19,7 @@
 #include "diagramposition.h"
 #include "qetapp.h"
 #include "elementtextitem.h"
+#include "diagram.h"
 
 /**
  * @brief SlaveElement::SlaveElement
diff --git a/sources/ui/elementselectorwidget.cpp b/sources/ui/elementselectorwidget.cpp
index 25f851757..454e404a1 100644
--- a/sources/ui/elementselectorwidget.cpp
+++ b/sources/ui/elementselectorwidget.cpp
@@ -19,6 +19,8 @@
 #include "ui_elementselectorwidget.h"
 #include "diagramposition.h"
 #include "qeticons.h"
+#include "diagram.h"
+#include "element.h"
 
 /**
  * @brief ElementSelectorWidget::ElementSelectorWidget
diff --git a/sources/ui/elementselectorwidget.h b/sources/ui/elementselectorwidget.h
index fb3d46b52..24b4ca354 100644
--- a/sources/ui/elementselectorwidget.h
+++ b/sources/ui/elementselectorwidget.h
@@ -19,7 +19,8 @@
 #define ELEMENTSELECTORWIDGET_H
 
 #include <QWidget>
-#include "qetgraphicsitem/element.h"
+class Element;
+class QSignalMapper;
 
 namespace Ui {
 	class ElementSelectorWidget;
diff --git a/sources/ui/linksingleelementwidget.cpp b/sources/ui/linksingleelementwidget.cpp
index 9b45fdf3f..ff9dcb597 100644
--- a/sources/ui/linksingleelementwidget.cpp
+++ b/sources/ui/linksingleelementwidget.cpp
@@ -18,9 +18,9 @@
 #include "linksingleelementwidget.h"
 #include "ui_linksingleelementwidget.h"
 #include "diagram.h"
-#include "element.h"
 #include "elementprovider.h"
 #include "diagramcommands.h"
+#include "elementselectorwidget.h"
 
 /**
  * @brief LinkSingleElementWidget::LinkSingleElementWidget
diff --git a/sources/ui/linksingleelementwidget.h b/sources/ui/linksingleelementwidget.h
index 511802474..5b71cda63 100644
--- a/sources/ui/linksingleelementwidget.h
+++ b/sources/ui/linksingleelementwidget.h
@@ -19,10 +19,11 @@
 #define LINKSINGLEELEMENTWIDGET_H
 
 #include <QWidget>
-#include "elementselectorwidget.h"
+#include "element.h"
 
-class Element;
 class Diagram;
+class QLineEdit;
+class ElementSelectorWidget;
 
 namespace Ui {
 	class LinkSingleElementWidget;
diff --git a/sources/ui/masterpropertieswidget.h b/sources/ui/masterpropertieswidget.h
index 92b131f89..c531e8eba 100644
--- a/sources/ui/masterpropertieswidget.h
+++ b/sources/ui/masterpropertieswidget.h
@@ -19,7 +19,9 @@
 #define MASTERPROPERTIESWIDGET_H
 
 #include <QWidget>
-#include <qetgraphicsitem/element.h>
+#include "element.h"
+
+class QListWidgetItem;
 
 namespace Ui {
 	class MasterPropertiesWidget;