diff --git a/GUI/Model/Axis/BasicAxisItem.h b/GUI/Model/Axis/BasicAxisItem.h
index 5e158e809ce57af13ed9e58bdb642bfc74322635..229079c89ab360c97880f7241df9904f0d6efd7d 100644
--- a/GUI/Model/Axis/BasicAxisItem.h
+++ b/GUI/Model/Axis/BasicAxisItem.h
@@ -17,7 +17,6 @@
 
 #include <QObject>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 class Scale;
 
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index b0d8d97bfe3d638295b2e163914749b13d1c107a..b90893d5ba042e3512c30dc76a9179412e0015f0 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -17,7 +17,6 @@
 
 #include <QDateTime>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 #include <mutex>
 
 class AmplitudeAxisItem;
diff --git a/GUI/Model/Device/InstrumentsSet.h b/GUI/Model/Device/InstrumentsSet.h
index 48e9bed36f3d32018ad7af524023c91fe37d7bb1..91920e4bfcb1193bfbf022dc7539f8c9ef352438 100644
--- a/GUI/Model/Device/InstrumentsSet.h
+++ b/GUI/Model/Device/InstrumentsSet.h
@@ -17,7 +17,7 @@
 
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Type/SetWithModel.h"
-#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
 
 class InstrumentsSet : public SetWithModel<InstrumentItem> {
 public:
diff --git a/GUI/Model/Files/DatafileItem.h b/GUI/Model/Files/DatafileItem.h
index 763e0f326a282c61d792fa4cd4a9ea546b0511e4..6e3fd21e289b53c56ab1a26a47a2fe20bbf3052f 100644
--- a/GUI/Model/Files/DatafileItem.h
+++ b/GUI/Model/Files/DatafileItem.h
@@ -18,7 +18,6 @@
 #include "GUI/Model/Type/NamedItem.h"
 #include <QObject>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 class Data1DItem;
 class Data2DItem;
diff --git a/GUI/Model/Files/DatafilesSet.h b/GUI/Model/Files/DatafilesSet.h
index a04d4224b96db4433b132227acd418c38d670467..99ea7964f38280e745d9c495f1c9a87009cf6806 100644
--- a/GUI/Model/Files/DatafilesSet.h
+++ b/GUI/Model/Files/DatafilesSet.h
@@ -18,7 +18,6 @@
 #include "GUI/Model/Files/DatafileItem.h"
 #include "GUI/Model/Files/DatafilesCleaner.h"
 #include "GUI/Model/Type/SetWithModel.h"
-#include <QXmlStreamWriter>
 
 class DataItem;
 
diff --git a/GUI/Model/Job/BatchInfo.h b/GUI/Model/Job/BatchInfo.h
index 02d8b7a3c5d38c74cfea4dfb7e92347d49836829..c842b9c5270d461d8c09f5f1ef94186d96ccffea 100644
--- a/GUI/Model/Job/BatchInfo.h
+++ b/GUI/Model/Job/BatchInfo.h
@@ -18,7 +18,6 @@
 #include <QDateTime>
 #include <QObject>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 enum class JobStatus;
 
diff --git a/GUI/Model/Job/JobsSet.h b/GUI/Model/Job/JobsSet.h
index 7eff8a0928bfe0acb4b60d5f04d1ea87898dba0b..c6a6cc84578e268c32d4eba0bfe7db21c36c3c2a 100644
--- a/GUI/Model/Job/JobsSet.h
+++ b/GUI/Model/Job/JobsSet.h
@@ -19,7 +19,6 @@
 #include "GUI/Model/Files/DatafilesCleaner.h"
 #include <QObject>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 class DataItem;
 class ISimulation;
diff --git a/GUI/Model/Mask/MasksSet.h b/GUI/Model/Mask/MasksSet.h
index 2e92b1e1fa420ab72af8561a43f1070cdc3842df..d275a7f1877a3111d3f70ebf51bf46365ce9e09b 100644
--- a/GUI/Model/Mask/MasksSet.h
+++ b/GUI/Model/Mask/MasksSet.h
@@ -18,7 +18,7 @@
 #include "Base/Types/VectorWC.h"
 #include "GUI/Model/Mask/MaskItems.h"
 #include <QModelIndex>
-#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
 
 class RegionOfInterestItem;
 
diff --git a/GUI/Model/Sample/ItemWithMaterial.h b/GUI/Model/Sample/ItemWithMaterial.h
index d054227e86bbaa4027bb797c65fcf0289003bafc..77168cceedcf666523a26e7029dc09bb41341589 100644
--- a/GUI/Model/Sample/ItemWithMaterial.h
+++ b/GUI/Model/Sample/ItemWithMaterial.h
@@ -17,7 +17,7 @@
 
 #include <QColor>
 #include <QString>
-#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
 #include <functional>
 
 class MaterialItem;
diff --git a/GUI/Model/Sample/SampleItem.cpp b/GUI/Model/Sample/SampleItem.cpp
index e2afc4f7e5b01b58cadc65c53f88f6d4b1a8432e..79ea452080d5c8b7f686fc5b1be43eb02ac6cc70 100644
--- a/GUI/Model/Sample/SampleItem.cpp
+++ b/GUI/Model/Sample/SampleItem.cpp
@@ -18,7 +18,6 @@
 #include "GUI/Support/Style/PredefinedColors.h"
 #include "GUI/Support/XML/Backup.h"
 #include "GUI/Support/XML/UtilXML.h"
-#include <QXmlStreamWriter>
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Tune/FitParameterContainerItem.h b/GUI/Model/Tune/FitParameterContainerItem.h
index e1247866df03684d8327945fb821c56ad41e823b..80ffa0ab317316af1868e28a6068fc7e828a68a5 100644
--- a/GUI/Model/Tune/FitParameterContainerItem.h
+++ b/GUI/Model/Tune/FitParameterContainerItem.h
@@ -19,7 +19,6 @@
 #include "GUI/Model/Tune/FitParameterLinkItem.h"
 #include <QObject>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 namespace mumufit {
 class Parameters;
diff --git a/GUI/Model/Tune/FitParameterLinkItem.h b/GUI/Model/Tune/FitParameterLinkItem.h
index 984ccaa90d3e9468fc66b02f307bf7bbeb32d673..7bd6405352cf832fb68781716aaa6dfc6ed616be 100644
--- a/GUI/Model/Tune/FitParameterLinkItem.h
+++ b/GUI/Model/Tune/FitParameterLinkItem.h
@@ -17,7 +17,6 @@
 
 #include <QObject>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 //! Holds link value, accessible from FitparameterModel.
 class LinkItem : public QObject {
diff --git a/GUI/Support/Data/ComboProperty.h b/GUI/Support/Data/ComboProperty.h
index f5580e9f2469057ab53134677a19b9d6364c17a3..78740edf24e42e7e10613f39b342b2c54203abbb 100644
--- a/GUI/Support/Data/ComboProperty.h
+++ b/GUI/Support/Data/ComboProperty.h
@@ -19,7 +19,6 @@
 #include <QVariant>
 #include <QVector>
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 //! Custom property to define list of string values with multiple selections.
 //! Intended for QVariant.
diff --git a/GUI/Support/Data/SimulationOptionsItem.h b/GUI/Support/Data/SimulationOptionsItem.h
index dc7a489a4181875877096e58044b7b13f65eceaf..b4691b342b685529af7155ed23b3716574e1cf37 100644
--- a/GUI/Support/Data/SimulationOptionsItem.h
+++ b/GUI/Support/Data/SimulationOptionsItem.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_SUPPORT_DATA_SIMULATIONOPTIONSITEM_H
 #define BORNAGAIN_GUI_SUPPORT_DATA_SIMULATIONOPTIONSITEM_H
 
-#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
 
 //! The SimulationOptionsItem class holds simulation status (run policy, number of threads,
 //! integration flag). Used in SimulationView to define job settings. When job is started,
diff --git a/GUI/Support/XML/Backup.h b/GUI/Support/XML/Backup.h
index 2845ec7660a6ea9ae6b5663264daf2d00abaa9d7..d05b5eabcad373ad63535b1629f484008be584c4 100644
--- a/GUI/Support/XML/Backup.h
+++ b/GUI/Support/XML/Backup.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_SUPPORT_XML_BACKUP_H
 
 #include "Base/Util/Assert.h"
-#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
 
 namespace {
 namespace Tag {
diff --git a/GUI/Support/XML/UtilXML.h b/GUI/Support/XML/UtilXML.h
index 8454df4ab3ed1bd7c052371ab55a4438231b25cf..f6ae2b848831b190fe078c46174ff59c9946c079 100644
--- a/GUI/Support/XML/UtilXML.h
+++ b/GUI/Support/XML/UtilXML.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
 #define BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
 
-#include <QXmlStreamWriter> // used in every including file
+#include <QXmlStreamReader> // used in every including file, also provides QXmlStreamWriter
 #include <heinz/Complex.h>
 #include <heinz/Vectors3D.h>