diff --git a/GUI/View/List/InstrumentsQListView.cpp b/GUI/View/List/InstrumentsQListView.cpp
index 31d9ea619fd0372cd7ce80141151f631b796c249..54784191e9a0b7aa076fb3038477e072ba5bbd72 100644
--- a/GUI/View/List/InstrumentsQListView.cpp
+++ b/GUI/View/List/InstrumentsQListView.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/List/InstrumentsQListView.h"
-#include "GUI/Model/Device/InstrumentsSet.h"
+#include "GUI/Model/Type/SetWithModel.h"
 #include "GUI/View/Widget/ListItemDelegate.h"
 
-InstrumentsQListView::InstrumentsQListView(InstrumentsSet* set)
+InstrumentsQListView::InstrumentsQListView(SetBase* set)
 {
     setMinimumWidth(200);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
diff --git a/GUI/View/List/InstrumentsQListView.h b/GUI/View/List/InstrumentsQListView.h
index 87261e66a39fa2157afab46c0a8f1574086b8d39..d922a7a3bc94d6b8e69ceb507a0a0127d1b24db0 100644
--- a/GUI/View/List/InstrumentsQListView.h
+++ b/GUI/View/List/InstrumentsQListView.h
@@ -17,13 +17,13 @@
 
 #include <QListView>
 
-class InstrumentsSet;
+class SetBase;
 
 //! Instrument selector on the left side of InstrumentView.
 
 class InstrumentsQListView : public QListView {
 public:
-    InstrumentsQListView(InstrumentsSet*);
+    InstrumentsQListView(SetBase*);
 };
 
 #endif // BORNAGAIN_GUI_VIEW_LIST_INSTRUMENTSQLISTVIEW_H
diff --git a/GUI/View/List/SamplesQListView.cpp b/GUI/View/List/SamplesQListView.cpp
index 181fbdaa2b9a4e92d70dd0cb69b95f7a64a9a22a..0948bc73b7f0ede035e206c490ec4c25a585bace 100644
--- a/GUI/View/List/SamplesQListView.cpp
+++ b/GUI/View/List/SamplesQListView.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/List/SamplesQListView.h"
-#include "GUI/Model/Sample/SamplesSet.h"
+#include "GUI/Model/Type/SetWithModel.h"
 #include "GUI/View/Widget/ListItemDelegate.h"
 
-SamplesQListView::SamplesQListView(SamplesSet* set)
+SamplesQListView::SamplesQListView(SetBase* set)
 {
     setMinimumWidth(200);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
diff --git a/GUI/View/List/SamplesQListView.h b/GUI/View/List/SamplesQListView.h
index 0f296d9eb9146f22808b2557969df5809a3cf48a..4d6930efd8d82b7d918d3c686f002c5675bb6630 100644
--- a/GUI/View/List/SamplesQListView.h
+++ b/GUI/View/List/SamplesQListView.h
@@ -17,12 +17,12 @@
 
 #include <QListView>
 
-class SamplesSet;
+class SetBase;
 
 //! List view to select one sample (left side of layer-oriented sample editor)
 class SamplesQListView : public QListView {
 public:
-    SamplesQListView(SamplesSet*);
+    SamplesQListView(SetBase*);
 };
 
 #endif // BORNAGAIN_GUI_VIEW_LIST_SAMPLESQLISTVIEW_H