diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp
index 4fbde71526544b65e4914d96387b951c70aabd55..ee8904b379c5fa982244529a34937e9d400f5b22 100644
--- a/GUI/Model/Data/DataItem.cpp
+++ b/GUI/Model/Data/DataItem.cpp
@@ -16,6 +16,7 @@
 #include "Base/Util/FileSystemUtils.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/IOFactory.h"
+#include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Support/Util/Error.h"
 #include "GUI/Support/Util/MessageService.h"
 #include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index 5dec0fd1e99cfb5ff76defbb44c6be296fb36ef3..01905a0a1eca4431b62473ebbe5f4a910ddc288b 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -16,11 +16,12 @@
 #define BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H
 
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Device/AxesItems.h"
 #include "GUI/View/Numeric/ComboProperty.h"
 #include <QDateTime>
 #include <mutex>
 
+class AmplitudeAxisItem;
+class BasicAxisItem;
 class ComboProperty;
 class Datafield;
 class ImportDataInfo;
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index a96dafd9073c5270d2c98d4740781bd842460669..c04ba6814ecfbdbe19e608ea97d334906e521b7c 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -17,6 +17,7 @@
 #include "Device/Data/Datafield.h"
 #include "GUI/Model/Data/JobItemUtils.h"
 #include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Model/Device/MaskUnitsConverter.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "GUI/Support/Util/Error.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index f9d44987cbcb68ab598252237de3c3e66f47b82b..bef41ecd416dea6fe64f37eed6986c6fe55c1634 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -16,6 +16,7 @@
 #include "Device/Histo/DiffUtil.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/ActionFactory.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 8e40675646553875a3ac383bc73cb5e539861e96..079bea9e7c6439fa22a12e8b332c6a9977768b9b 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -15,6 +15,7 @@
 #include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
 #include "Device/Histo/DiffUtil.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"