diff --git a/sources/elementprovider.cpp b/sources/elementprovider.cpp
index 85345b610..9ce673e7a 100644
--- a/sources/elementprovider.cpp
+++ b/sources/elementprovider.cpp
@@ -16,7 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementprovider.h"
-#include "QUuid"
+#include "qetproject.h"
+#include "diagram.h"
+#include "qetgraphicsitem/element.h"
 
 /**
  * @brief ElementProvider::ElementProvider Constructor
diff --git a/sources/elementprovider.h b/sources/elementprovider.h
index 106bebd92..4321940df 100644
--- a/sources/elementprovider.h
+++ b/sources/elementprovider.h
@@ -18,9 +18,12 @@
 #ifndef ELEMENTPROVIDER_H
 #define ELEMENTPROVIDER_H
 
-#include "qetproject.h"
-#include "diagram.h"
-#include "qetgraphicsitem/element.h"
+#include <QUuid>
+#include <QList>
+
+class QETProject;
+class Diagram;
+class Element;
 
 /**
   this class can search in the given diagram or project some kind of element
diff --git a/sources/ui/masterpropertieswidget.cpp b/sources/ui/masterpropertieswidget.cpp
index 56070bd1b..09a4dffed 100644
--- a/sources/ui/masterpropertieswidget.cpp
+++ b/sources/ui/masterpropertieswidget.cpp
@@ -21,6 +21,8 @@
 #include <diagramposition.h>
 #include <elementprovider.h>
 #include <diagramcommands.h>
+#include <diagram.h>
+#include <element.h>
 
 /**
  * @brief MasterPropertiesWidget::MasterPropertiesWidget
diff --git a/sources/ui/masterpropertieswidget.h b/sources/ui/masterpropertieswidget.h
index c531e8eba..6f7f27752 100644
--- a/sources/ui/masterpropertieswidget.h
+++ b/sources/ui/masterpropertieswidget.h
@@ -19,9 +19,10 @@
 #define MASTERPROPERTIESWIDGET_H
 
 #include <QWidget>
-#include "element.h"
+#include <QHash>
 
 class QListWidgetItem;
+class Element;
 
 namespace Ui {
 	class MasterPropertiesWidget;