diff --git a/core/src/scopypreferencespage.cpp b/core/src/scopypreferencespage.cpp
index 400675e91a..62c256e90c 100644
--- a/core/src/scopypreferencespage.cpp
+++ b/core/src/scopypreferencespage.cpp
@@ -9,7 +9,7 @@
 #include <QCoreApplication>
 #include <QScrollArea>
 #include <stylehelper.h>
-#include "pluginbase/preferenceshelper.h"
+#include "gui/preferenceshelper.h"
 #include "application_restarter.h"
 #include <QDir>
 #include <QDebug>
diff --git a/pluginbase/include/pluginbase/preferenceshelper.h b/gui/include/gui/preferenceshelper.h
similarity index 89%
rename from pluginbase/include/pluginbase/preferenceshelper.h
rename to gui/include/gui/preferenceshelper.h
index 34885bbedf..e2cc5a4fb8 100644
--- a/pluginbase/include/pluginbase/preferenceshelper.h
+++ b/gui/include/gui/preferenceshelper.h
@@ -1,18 +1,19 @@
 #ifndef PREFERENCESHELPER_H
 #define PREFERENCESHELPER_H
-#include "preferences.h"
-#include "scopy-pluginbase_export.h"
+#include "scopy-gui_export.h"
 
 #include <QCheckBox>
 #include <QComboBox>
 #include <QLineEdit>
 
+#include <pluginbase/preferences.h>
+
 namespace scopy {
 /**
  * @brief The PreferencesHelper class
  * PreferencesHelper class used to create widgets and connect the widgets to the Preferences singleton
  */
-class SCOPY_PLUGINBASE_EXPORT PreferencesHelper
+class SCOPY_GUI_EXPORT PreferencesHelper
 {
 
 public:
diff --git a/pluginbase/src/preferenceshelper.cpp b/gui/src/preferenceshelper.cpp
similarity index 100%
rename from pluginbase/src/preferenceshelper.cpp
rename to gui/src/preferenceshelper.cpp
diff --git a/plugins/adc/src/adcplugin.cpp b/plugins/adc/src/adcplugin.cpp
index d56a7420bc..d488b09eba 100644
--- a/plugins/adc/src/adcplugin.cpp
+++ b/plugins/adc/src/adcplugin.cpp
@@ -12,7 +12,7 @@
 
 #include <iioutil/connectionprovider.h>
 #include <pluginbase/preferences.h>
-#include <pluginbase/preferenceshelper.h>
+#include <gui/preferenceshelper.h>
 #include <widgets/menucollapsesection.h>
 #include <widgets/menusectionwidget.h>
 
diff --git a/plugins/bareminimum/src/bareminimum.cpp b/plugins/bareminimum/src/bareminimum.cpp
index 43f67e003b..b65575520e 100644
--- a/plugins/bareminimum/src/bareminimum.cpp
+++ b/plugins/bareminimum/src/bareminimum.cpp
@@ -9,7 +9,6 @@
 
 #include <pluginbase/messagebroker.h>
 #include <pluginbase/preferences.h>
-#include <pluginbase/preferenceshelper.h>
 
 Q_LOGGING_CATEGORY(CAT_TESTPLUGIN, "BareMinimum");
 using namespace scopy;
diff --git a/plugins/datalogger/src/dataloggerplugin.cpp b/plugins/datalogger/src/dataloggerplugin.cpp
index 9a61325763..3bbdc21fcb 100644
--- a/plugins/datalogger/src/dataloggerplugin.cpp
+++ b/plugins/datalogger/src/dataloggerplugin.cpp
@@ -14,7 +14,7 @@
 #include <iioutil/connectionprovider.h>
 
 #include <pluginbase/preferences.h>
-#include <pluginbase/preferenceshelper.h>
+#include <gui/preferenceshelper.h>
 
 #include <pluginbase/scopyjs.h>
 
diff --git a/plugins/m2k/src/m2kplugin.cpp b/plugins/m2k/src/m2kplugin.cpp
index 6ca1193a9f..fa78521750 100644
--- a/plugins/m2k/src/m2kplugin.cpp
+++ b/plugins/m2k/src/m2kplugin.cpp
@@ -28,7 +28,7 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #include <pluginbase/messagebroker.h>
 #include <pluginbase/preferences.h>
-#include <pluginbase/preferenceshelper.h>
+#include <gui/preferenceshelper.h>
 #include <pluginbase/scopyjs.h>
 #include <widgets/menucollapsesection.h>
 #include <widgets/menusectionwidget.h>
diff --git a/plugins/regmap/src/regmapplugin.cpp b/plugins/regmap/src/regmapplugin.cpp
index 63f45bbb72..6f8e8c529c 100644
--- a/plugins/regmap/src/regmapplugin.cpp
+++ b/plugins/regmap/src/regmapplugin.cpp
@@ -21,7 +21,7 @@
 #include <src/readwrite/iioregisterreadstrategy.hpp>
 #include <src/readwrite/iioregisterwritestrategy.hpp>
 #include <pluginbase/preferences.h>
-#include <pluginbase/preferenceshelper.h>
+#include <gui/preferenceshelper.h>
 #include <widgets/menucollapsesection.h>
 #include <widgets/menusectionwidget.h>
 #include <readwrite/fileregisterreadstrategy.hpp>
diff --git a/plugins/test/src/testplugin.cpp b/plugins/test/src/testplugin.cpp
index 69e5b6296d..a3df649a86 100644
--- a/plugins/test/src/testplugin.cpp
+++ b/plugins/test/src/testplugin.cpp
@@ -19,7 +19,7 @@
 #include <gui/widgets/hoverwidget.h>
 #include <pluginbase/messagebroker.h>
 #include <pluginbase/preferences.h>
-#include <pluginbase/preferenceshelper.h>
+#include <gui/preferenceshelper.h>
 #include <widgets/menucollapsesection.h>
 #include <widgets/menusectionwidget.h>