diff --git a/ScStwLibraries/headers/client/scstwclient.h b/ScStwLibraries/headers/client/scstwclient.h
index 60c3684..df9c5f8 100644
--- a/ScStwLibraries/headers/client/scstwclient.h
+++ b/ScStwLibraries/headers/client/scstwclient.h
@@ -33,6 +33,7 @@
 #include <QByteArray>
 
 #include "ScStw.hpp"
+#include "scstwsettings.h"
 
 /*!
  * This class is used to connect and talk to the ScStw basestation.
@@ -139,14 +140,14 @@ public slots:
      * \param value the value to write to
      * \return the status code returned by the command
      */
-    ScStw::StatusCode writeRemoteSetting(ScStw::BaseStationSetting key, QString value);
+    ScStw::StatusCode writeRemoteSetting(ScStwSettings::BaseStationSetting key, QString value);
 
     /*!
      * \brief Function to read a setting on the base station
      * \param key the key to read from
      * \return the value of the key or "false" if the key is not found or an error occured
      */
-    QString readRemoteSetting(ScStw::BaseStationSetting key);
+    QString readRemoteSetting(ScStwSettings::BaseStationSetting key);
 
     /*! Getter fuctions */
 
diff --git a/ScStwLibraries/sources/client/scstwclient.cpp b/ScStwLibraries/sources/client/scstwclient.cpp
index e6eaaf8..795ce4a 100644
--- a/ScStwLibraries/sources/client/scstwclient.cpp
+++ b/ScStwLibraries/sources/client/scstwclient.cpp
@@ -392,14 +392,14 @@ void ScStwClient::handleSignal(QVariantMap data) {
 // --- helper functions ---
 // ------------------------
 
-ScStw::StatusCode ScStwClient::writeRemoteSetting(ScStw::BaseStationSetting key, QString value) {
+ScStw::StatusCode ScStwClient::writeRemoteSetting(ScStwSettings::BaseStationSetting key, QString value) {
     QJsonArray requestData;
     requestData.append(key);
     requestData.append(value);
     return ScStw::StatusCode(this->sendCommand(3000, requestData)["status"].toInt());
 }
 
-QString ScStwClient::readRemoteSetting(ScStw::BaseStationSetting key) {
+QString ScStwClient::readRemoteSetting(ScStwSettings::BaseStationSetting key) {
     QVariantMap reply = this->sendCommand(3001, key);
     if(reply["status"] != 200){
         return "false";
diff --git a/ScStwLibraries/sources/scstwlibraries.cpp b/ScStwLibraries/sources/scstwlibraries.cpp
index 14068d2..af0228d 100644
--- a/ScStwLibraries/sources/scstwlibraries.cpp
+++ b/ScStwLibraries/sources/scstwlibraries.cpp
@@ -26,7 +26,7 @@ ScStwLibraries::ScStwLibraries(QObject *parent) : QObject(parent)
 void ScStwLibraries::init() {
 #ifdef ScStwLibraries_QML
     qmlRegisterType<ScStw>("de.itsblue.ScStw", 2, 0, "ScStw");
-    qRegisterMetaType<ScStw::BaseStationSetting>("ScStw::BaseStationSetting");
+    qRegisterMetaType<ScStwSettings::BaseStationSetting>("ScStw::BaseStationSetting");
     qRegisterMetaType<ScStw::SocketCommand>("ScStw::SocketCommand");
 
     qmlRegisterType<ScStwRace>("de.itsblue.ScStw", 2, 0, "ScStwRace");