diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt
index 48f3bc92..cbae80c3 100755
--- a/qucs/CMakeLists.txt
+++ b/qucs/CMakeLists.txt
@@ -132,6 +132,7 @@ SET(QUCS_SRCS
 
 SET(QUCS_HDRS
 element.h
+conductor.h
 main.h
 messagedock.h
 misc.h
diff --git a/qucs/element.h b/qucs/element.h
index 94e3c650..d37a5349 100644
--- a/qucs/element.h
+++ b/qucs/element.h
@@ -41,7 +41,6 @@
 #include <vector>
 
 class Node;
-class WireLabel;
 class Schematic;
 
 namespace qucs { // otherwise conflict with <windows.h>
@@ -207,14 +206,4 @@ public:
   int  cx, cy, x1, y1, x2, y2;  // center and relative boundings
 };
 
-
-/** \class Conductor
-  * \brief label for Node and Wire classes
-  *
-  */
-class Conductor : public Element {
-public:
-  WireLabel *Label;
-};
-
 #endif
diff --git a/qucs/mouseactions.h b/qucs/mouseactions.h
index 648c0139..b32c8bfa 100644
--- a/qucs/mouseactions.h
+++ b/qucs/mouseactions.h
@@ -24,6 +24,7 @@
 #include <qt3_compat/qt_compat.h>
 
 class Wire;
+class WireLabel;
 class Schematic;
 class Diagram;
 class QPainter;
diff --git a/qucs/node.h b/qucs/node.h
index ec94a505..b63da7f9 100644
--- a/qucs/node.h
+++ b/qucs/node.h
@@ -18,7 +18,7 @@
 #ifndef NODE_H
 #define NODE_H
 
-#include "element.h"
+#include "conductor.h"
 
 #include "qt3_compat/qt_compat.h"
 
diff --git a/qucs/wire.h b/qucs/wire.h
index 457c0ad5..d831a52d 100644
--- a/qucs/wire.h
+++ b/qucs/wire.h
@@ -18,8 +18,7 @@
 #ifndef WIRE_H
 #define WIRE_H
 
-#include "element.h"
-#include "components/component.h"    // because of struct Port
+#include "conductor.h"
 #include "wirelabel.h"
 
 class Schematic;
diff --git a/qucs/wirelabel.h b/qucs/wirelabel.h
index bfad2e23..c9546d9d 100644
--- a/qucs/wirelabel.h
+++ b/qucs/wirelabel.h
@@ -18,13 +18,11 @@
 #ifndef WIRELABEL_H
 #define WIRELABEL_H
 
-#include "element.h"
+#include "conductor.h"
 
 #include <QString>
 
 class QPainter;
-class Wire;
-class Node;
 
 
 class WireLabel : public Element {