diff --git a/GUI/Model/Axis/AmplitudeAxisItem.cpp b/GUI/Model/Axis/AmplitudeAxisItem.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b3a197f90dd8fed33668ae3d6dbbc83ec5e6c88f
--- /dev/null
+++ b/GUI/Model/Axis/AmplitudeAxisItem.cpp
@@ -0,0 +1,108 @@
+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/Model/Axis/AmplitudeAxisItem.cpp
+//! @brief     Implements various axis items
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "Base/Axis/FixedBinAxis.h"
+#include "GUI/Support/XML/UtilXML.h"
+
+namespace {
+namespace Tag {
+
+const QString IsVisible("IsVisible");
+const QString Nbins("Nbins");
+const QString MinDeg("MinDeg");
+const QString MaxDeg("MaxDeg");
+const QString Title("Title");
+const QString BaseData("BaseData");
+const QString LockMinMax("LockMinMax");
+const QString LogScale("LogScale");
+
+} // namespace Tag
+} // namespace
+
+AmplitudeAxisItem::AmplitudeAxisItem(QObject* parent)
+    : BasicAxisItem(parent)
+    , m_lockMinMax(false)
+    , m_logScale(true)
+{
+}
+
+void AmplitudeAxisItem::writeTo(QXmlStreamWriter* w) const
+{
+    XML::writeAttribute(w, XML::Attrib::version, uint(1));
+
+    // parameters from base class
+    w->writeStartElement(Tag::BaseData);
+    BasicAxisItem::writeTo(w);
+    w->writeEndElement();
+
+    // lock min/max
+    w->writeStartElement(Tag::LockMinMax);
+    XML::writeAttribute(w, XML::Attrib::value, m_lockMinMax);
+    w->writeEndElement();
+
+    // log scale
+    w->writeStartElement(Tag::LogScale);
+    XML::writeAttribute(w, XML::Attrib::value, m_logScale);
+    w->writeEndElement();
+}
+
+void AmplitudeAxisItem::readFrom(QXmlStreamReader* r)
+{
+    const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
+    Q_UNUSED(version)
+
+    while (r->readNextStartElement()) {
+        QString tag = r->name().toString();
+
+        // parameters from base class
+        if (tag == Tag::BaseData) {
+            BasicAxisItem::readFrom(r);
+            XML::gotoEndElementOfTag(r, tag);
+
+            // lock min/max
+        } else if (tag == Tag::LockMinMax) {
+            XML::readAttribute(r, XML::Attrib::value, &m_lockMinMax);
+            XML::gotoEndElementOfTag(r, tag);
+
+            // title
+        } else if (tag == Tag::LogScale) {
+            XML::readAttribute(r, XML::Attrib::value, &m_logScale);
+            XML::gotoEndElementOfTag(r, tag);
+
+        } else
+            r->skipCurrentElement();
+    }
+}
+
+bool AmplitudeAxisItem::isLogScale() const
+{
+    return m_logScale;
+}
+
+void AmplitudeAxisItem::setLogScale(bool value)
+{
+    m_logScale = value;
+    emit logScaleChanged(value);
+}
+
+bool AmplitudeAxisItem::isLocked() const
+{
+    return m_lockMinMax;
+}
+
+void AmplitudeAxisItem::setLocked(bool locked)
+{
+    m_lockMinMax = locked;
+}
diff --git a/GUI/Model/Axis/AmplitudeAxisItem.h b/GUI/Model/Axis/AmplitudeAxisItem.h
new file mode 100644
index 0000000000000000000000000000000000000000..ebf1ff5ba087008f668f5d07dce468fdbffb3b4a
--- /dev/null
+++ b/GUI/Model/Axis/AmplitudeAxisItem.h
@@ -0,0 +1,43 @@
+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/Model/Axis/AmplitudeAxisItem.h
+//! @brief     Defines various axis items
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#ifndef BORNAGAIN_GUI_MODEL_AXIS_AMPLITUDEAXISITEM_H
+#define BORNAGAIN_GUI_MODEL_AXIS_AMPLITUDEAXISITEM_H
+
+#include "GUI/Model/Axis/BasicAxisItem.h"
+
+class AmplitudeAxisItem : public BasicAxisItem {
+    Q_OBJECT
+
+public:
+    explicit AmplitudeAxisItem(QObject* parent = nullptr);
+
+    void writeTo(QXmlStreamWriter* w) const override;
+    void readFrom(QXmlStreamReader* r) override;
+
+    bool isLogScale() const;
+    void setLogScale(bool value);
+
+    bool isLocked() const;
+    void setLocked(bool locked);
+
+signals:
+    void logScaleChanged(bool isLog);
+
+private:
+    bool m_lockMinMax;
+    bool m_logScale;
+};
+
+#endif // BORNAGAIN_GUI_MODEL_AXIS_AMPLITUDEAXISITEM_H
diff --git a/GUI/Model/Axis/AxisItems.cpp b/GUI/Model/Axis/BasicAxisItem.cpp
similarity index 68%
rename from GUI/Model/Axis/AxisItems.cpp
rename to GUI/Model/Axis/BasicAxisItem.cpp
index 227793b0e2cdf6172c4e53f7f4880256c6a8a4a2..3195605c9cf0995fb79c92a4b41d9882da326a86 100644
--- a/GUI/Model/Axis/AxisItems.cpp
+++ b/GUI/Model/Axis/BasicAxisItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Axis/AxisItems.cpp
+//! @file      GUI/Model/Axis/BasicAxisItem.cpp
 //! @brief     Implements various axis items
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "GUI/Support/XML/UtilXML.h"
 
@@ -177,81 +177,3 @@ void BasicAxisItem::readFrom(QXmlStreamReader* r)
             r->skipCurrentElement();
     }
 }
-
-// ---------------------------------------------------------------------------------------------- //
-
-AmplitudeAxisItem::AmplitudeAxisItem(QObject* parent)
-    : BasicAxisItem(parent)
-    , m_lockMinMax(false)
-    , m_logScale(true)
-{
-}
-
-void AmplitudeAxisItem::writeTo(QXmlStreamWriter* w) const
-{
-    XML::writeAttribute(w, XML::Attrib::version, uint(1));
-
-    // parameters from base class
-    w->writeStartElement(Tag::BaseData);
-    BasicAxisItem::writeTo(w);
-    w->writeEndElement();
-
-    // lock min/max
-    w->writeStartElement(Tag::LockMinMax);
-    XML::writeAttribute(w, XML::Attrib::value, m_lockMinMax);
-    w->writeEndElement();
-
-    // log scale
-    w->writeStartElement(Tag::LogScale);
-    XML::writeAttribute(w, XML::Attrib::value, m_logScale);
-    w->writeEndElement();
-}
-
-void AmplitudeAxisItem::readFrom(QXmlStreamReader* r)
-{
-    const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
-    Q_UNUSED(version)
-
-    while (r->readNextStartElement()) {
-        QString tag = r->name().toString();
-
-        // parameters from base class
-        if (tag == Tag::BaseData) {
-            BasicAxisItem::readFrom(r);
-            XML::gotoEndElementOfTag(r, tag);
-
-            // lock min/max
-        } else if (tag == Tag::LockMinMax) {
-            XML::readAttribute(r, XML::Attrib::value, &m_lockMinMax);
-            XML::gotoEndElementOfTag(r, tag);
-
-            // title
-        } else if (tag == Tag::LogScale) {
-            XML::readAttribute(r, XML::Attrib::value, &m_logScale);
-            XML::gotoEndElementOfTag(r, tag);
-
-        } else
-            r->skipCurrentElement();
-    }
-}
-
-bool AmplitudeAxisItem::isLogScale() const
-{
-    return m_logScale;
-}
-
-void AmplitudeAxisItem::setLogScale(bool value)
-{
-    m_logScale = value;
-    emit logScaleChanged(value);
-}
-
-bool AmplitudeAxisItem::isLocked() const
-{
-    return m_lockMinMax;
-}
-
-void AmplitudeAxisItem::setLocked(bool locked)
-{
-    m_lockMinMax = locked;
-}
diff --git a/GUI/Model/Axis/AxisItems.h b/GUI/Model/Axis/BasicAxisItem.h
similarity index 71%
rename from GUI/Model/Axis/AxisItems.h
rename to GUI/Model/Axis/BasicAxisItem.h
index 78d515fcc8e1010655011a72cb2052f6e251dde5..800a2ab8140977235c33c666e8848c53360b2fe2 100644
--- a/GUI/Model/Axis/AxisItems.h
+++ b/GUI/Model/Axis/BasicAxisItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Axis/AxisItems.h
+//! @file      GUI/Model/Axis/BasicAxisItem.h
 //! @brief     Defines various axis items
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_AXIS_AXISITEMS_H
-#define BORNAGAIN_GUI_MODEL_AXIS_AXISITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_AXIS_BASICAXISITEM_H
+#define BORNAGAIN_GUI_MODEL_AXIS_BASICAXISITEM_H
 
 #include <QObject>
 
@@ -63,27 +63,4 @@ private:
     QString m_title;
 };
 
-class AmplitudeAxisItem : public BasicAxisItem {
-    Q_OBJECT
-
-public:
-    explicit AmplitudeAxisItem(QObject* parent = nullptr);
-
-    void writeTo(QXmlStreamWriter* w) const override;
-    void readFrom(QXmlStreamReader* r) override;
-
-    bool isLogScale() const;
-    void setLogScale(bool value);
-
-    bool isLocked() const;
-    void setLocked(bool locked);
-
-signals:
-    void logScaleChanged(bool isLog);
-
-private:
-    bool m_lockMinMax;
-    bool m_logScale;
-};
-
-#endif // BORNAGAIN_GUI_MODEL_AXIS_AXISITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_AXIS_BASICAXISITEM_H
diff --git a/GUI/Model/Axis/PointwiseAxisItem.h b/GUI/Model/Axis/PointwiseAxisItem.h
index b7787e2efe4a8919dd60e0ee1ef5d842bd9dffec..ea796197194d4156f48e3f4f8a074e6efd27d3da 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.h
+++ b/GUI/Model/Axis/PointwiseAxisItem.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_AXIS_POINTWISEAXISITEM_H
 #define BORNAGAIN_GUI_MODEL_AXIS_POINTWISEAXISITEM_H
 
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 
 class ICoordSystem;
 
diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp
index c09693ad213158b1f7f89374000546b07eceb888..07a7eb2e3360bb1ea254b506ceb22fe70041590a 100644
--- a/GUI/Model/Data/DataItem.cpp
+++ b/GUI/Model/Data/DataItem.cpp
@@ -16,7 +16,8 @@
 #include "Base/Util/Assert.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/IOFactory.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.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/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index b97139973222803365983d44926e6170282b4888..4829d083af86cb8f4ccba6471664c3b4bc1d295b 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -15,7 +15,8 @@
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "Base/Axis/IAxis.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/JobItemUtil.h"
 #include "GUI/Model/Data/MaskUnitsConverter.h"
 #include "GUI/Model/Data/ProjectionItems.h"
diff --git a/GUI/Model/Data/JobItemUtil.cpp b/GUI/Model/Data/JobItemUtil.cpp
index 1b1e6ab402280673d04a0dd7ca58a1d7f76f7da1..106e7038b3d4ad64a74f62771fc0764a7c86ed51 100644
--- a/GUI/Model/Data/JobItemUtil.cpp
+++ b/GUI/Model/Data/JobItemUtil.cpp
@@ -30,6 +30,20 @@ void updateAxesTitle(DataItem* intensityItem, const ICoordSystem& converter, Coo
         intensityItem->setYaxisTitle(QString::fromStdString(converter.nameOfAxis(1, units)));
 }
 
+
+ComboProperty availableUnits(const ICoordSystem& converter)
+{
+    ComboProperty result;
+    for (auto units : converter.availableUnits()) {
+        auto unit_name = GUI::Util::CoordName::nameFromCoord(units);
+        if (!unit_name.isEmpty())
+            result << unit_name;
+    }
+
+    result.setCurrentValue(GUI::Util::CoordName::nameFromCoord(converter.defaultUnits()));
+    return result;
+}
+
 } // namespace
 
 
@@ -101,16 +115,3 @@ void GUI::Model::JobItemUtil::setResults(DataItem* dataItem, const SimulationRes
     auto selected_units = GUI::Util::CoordName::coordFromName(dataItem->currentAxesUnits());
     dataItem->setDatafield(result.datafield(selected_units));
 }
-
-ComboProperty GUI::Model::JobItemUtil::availableUnits(const ICoordSystem& converter)
-{
-    ComboProperty result;
-    for (auto units : converter.availableUnits()) {
-        auto unit_name = GUI::Util::CoordName::nameFromCoord(units);
-        if (!unit_name.isEmpty())
-            result << unit_name;
-    }
-
-    result.setCurrentValue(GUI::Util::CoordName::nameFromCoord(converter.defaultUnits()));
-    return result;
-}
diff --git a/GUI/Model/Data/JobItemUtil.h b/GUI/Model/Data/JobItemUtil.h
index 50c18473a3c4677e9fe8694d6760634763d008c3..3b2db1a32575d6a2b1dd05b7063fa3736a625d2a 100644
--- a/GUI/Model/Data/JobItemUtil.h
+++ b/GUI/Model/Data/JobItemUtil.h
@@ -41,8 +41,6 @@ void createDefaultDetectorMap(DataItem* dataItem, const InstrumentItem* instrume
 //! Sets simulation results into the DataItem
 void setResults(DataItem* dataItem, const SimulationResult& result);
 
-ComboProperty availableUnits(const ICoordSystem& converter);
-
 } // namespace GUI::Model::JobItemUtil
 
 #endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index c1623a2d78da3bdd825dd93fe1c86a6e616d5b38..6190c80a8b16f0545a968543a88efa6ed84a47e7 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -16,7 +16,8 @@
 #include "Base/Axis/IAxis.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/JobItemUtil.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "GUI/Support/Util/Error.h"
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 36dfe4bf411a0add068e04d86983d98b623bb3e3..ead33e8f8aa549f30f4d28dfc8ab3a5b2f60865c 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -25,7 +25,7 @@
 #include "Device/Mask/Rectangle.h"
 #include "Device/Resolution/ConvolutionDetectorResolution.h"
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/Model/Device/BackgroundItems.h"
 #include "GUI/Model/Device/BeamAngleItems.h"
diff --git a/GUI/View/Common/IntensityDataPropertyWidget.cpp b/GUI/View/Common/IntensityDataPropertyWidget.cpp
index 6a852d6c1434d08f65e3b759034a92e017c68162..9a906773276413b97b7430360aff079c18246599 100644
--- a/GUI/View/Common/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Common/IntensityDataPropertyWidget.cpp
@@ -14,7 +14,8 @@
 
 #include "GUI/View/Common/IntensityDataPropertyWidget.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
diff --git a/GUI/View/Device/SphericalAxisForm.cpp b/GUI/View/Device/SphericalAxisForm.cpp
index 4b093b48c069a9ad4f9c3ea903493479d57b304d..5e842143ea4f4461ead52d773eade7899a135837 100644
--- a/GUI/View/Device/SphericalAxisForm.cpp
+++ b/GUI/View/Device/SphericalAxisForm.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Device/SphericalAxisForm.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/View/Numeric/SafeSpinBox.h"
 
 SphericalAxisForm::SphericalAxisForm(QFormLayout* form, QWidget* parent)
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 7cd667cb0b7091eb0187e10c38c01e0661705f06..5c287ed475292f8f22f5f83a4049eb20582c8cfa 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/PlotComparison/FitComparisonWidget.h"
 #include "Base/Util/Assert.h"
 #include "Device/Histo/DiffUtil.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index e8852e69863e018097ba44a1f2a9aa9bbad77c53..546dd0a6730ca7c3706212da948f8c574a1fd8c5 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -15,7 +15,8 @@
 #include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
 #include "Base/Util/Assert.h"
 #include "Device/Histo/DiffUtil.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index e6fd574c2aa1658d5c71a1ddd15c6289594e73c3..8e839373944c517491b1c04ffffe0d1931488d8c 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -13,7 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotSpecular/SpecularDataPropertyWidget.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/ComboProperty.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index 8774d998bec395ce7dd6075b75a2bd804476b63c..990cfbea5e1f3668c29aac931b1e116601683434 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -16,7 +16,8 @@
 #include "Base/Axis/Frame.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/QCP_Util.h"
diff --git a/GUI/View/PlotUtil/ColorMap.cpp b/GUI/View/PlotUtil/ColorMap.cpp
index e639cfc5ec5de3b4a2c5bd4c078293c2eb7468ac..1e7adccdde468469cd7761bc5ed8d8b7393a5852 100644
--- a/GUI/View/PlotUtil/ColorMap.cpp
+++ b/GUI/View/PlotUtil/ColorMap.cpp
@@ -14,7 +14,8 @@
 
 #include "GUI/View/PlotUtil/ColorMap.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/QCP_Util.h"
diff --git a/GUI/View/PlotUtil/RangeUtil.cpp b/GUI/View/PlotUtil/RangeUtil.cpp
index a80e4b56bae8167fcd07f5fa09962154549373e2..5ffad383bbb285ba9af291c20549584701f237de 100644
--- a/GUI/View/PlotUtil/RangeUtil.cpp
+++ b/GUI/View/PlotUtil/RangeUtil.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotUtil/RangeUtil.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Support/Util/Error.h"
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index 19d4a2b29818ae3a55b5c7827d5df8fa7622073a..e6e96b049c4d0d66a6702952f7a07261da88cf1c 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -15,7 +15,8 @@
 #include "GUI/View/Projection/ProjectionsPlot.h"
 #include "Base/Axis/IAxis.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/AmplitudeAxisItem.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/MaskItems.h"
 #include "GUI/Model/Data/ProjectionItems.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 150ab95a467831d15e8059d6ae5cfefb63589523..26adf6ebcefef478b13a159fd38aca811b7d7cb3 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/JobItemUtil.h"
 #include "GUI/Model/Data/RealItem.h"
 #include "GUI/Model/Device/InstrumentItems.h"