diff --git a/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp b/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp
index 42edb15..fbb43dd 100644
--- a/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp
+++ b/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp
@@ -34,12 +34,8 @@
 
 // SLIP: https://tools.ietf.org/html/rfc1055
 
-Q_DECLARE_METATYPE(QSerialPort::SerialPortError);
-
 ZigbeeInterfaceDeconz::ZigbeeInterfaceDeconz(QObject *parent) : QObject(parent)
 {
-    qRegisterMetaType<QSerialPort::SerialPortError>();
-
     m_reconnectTimer = new QTimer(this);
     m_reconnectTimer->setSingleShot(true);
     m_reconnectTimer->setInterval(5000);
diff --git a/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp b/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp
index df43daa..98eacae 100644
--- a/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp
+++ b/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp
@@ -34,12 +34,8 @@
 
 // SLIP: https://tools.ietf.org/html/rfc1055
 
-Q_DECLARE_METATYPE(QSerialPort::SerialPortError);
-
 ZigbeeInterfaceNxp::ZigbeeInterfaceNxp(QObject *parent) : QObject(parent)
 {
-    qRegisterMetaType<QSerialPort::SerialPortError>();
-
     m_reconnectTimer = new QTimer(this);
     m_reconnectTimer->setSingleShot(true);
     m_reconnectTimer->setInterval(5000);
diff --git a/libnymea-zigbee/zigbeebridgecontroller.cpp b/libnymea-zigbee/zigbeebridgecontroller.cpp
index 58220c4..004ad82 100644
--- a/libnymea-zigbee/zigbeebridgecontroller.cpp
+++ b/libnymea-zigbee/zigbeebridgecontroller.cpp
@@ -30,7 +30,7 @@
 
 ZigbeeBridgeController::ZigbeeBridgeController(QObject *parent) : QObject(parent)
 {
-
+    qRegisterMetaType<QSerialPort::SerialPortError>();
 }
 
 QString ZigbeeBridgeController::firmwareVersion() const
diff --git a/libnymea-zigbee/zigbeebridgecontroller.h b/libnymea-zigbee/zigbeebridgecontroller.h
index 7db5087..ac54e34 100644
--- a/libnymea-zigbee/zigbeebridgecontroller.h
+++ b/libnymea-zigbee/zigbeebridgecontroller.h
@@ -29,9 +29,11 @@
 #define ZIGBEEBRIDGECONTROLLER_H
 
 #include <QObject>
-
+#include <QSerialPort>
 #include "zigbee.h"
 
+Q_DECLARE_METATYPE(QSerialPort::SerialPortError);
+
 class ZigbeeBridgeController : public QObject
 {
     Q_OBJECT
diff --git a/nymea-zigbee.pro b/nymea-zigbee.pro
index dbc7bcb..f2af4eb 100644
--- a/nymea-zigbee.pro
+++ b/nymea-zigbee.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-SUBDIRS += libnymea-zigbee zigbee-cli
+SUBDIRS += libnymea-zigbee #zigbee-cli