adjust includes

Device/Data/DataUtils.cpp

@@ -16,19 +16,16 @@
 #include "Base/Axis/Bin.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
-#include "Base/Axis/IAxis.h"
 #include "Base/Math/FourierTransform.h"
 #include "Base/Math/Numeric.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/ArrayUtils.h"
-#include "Device/Data/DataUtils.h"
 #include "Device/Data/Powerfield.h"
 #include "Device/Data/SimulationResult.h"
 #include "Device/Histo/IOFactory.h"
 #include <algorithm>
 #include <cmath>
 #include <functional>
-#include <iostream>
 #include <tspectrum.h> // third-party code, extracted from CERN ROOT (class TSpectrum2)
 
 namespace {

Device/Data/DataUtils.h

@@ -15,13 +15,11 @@
 #ifndef BORNAGAIN_DEVICE_DATA_DATAUTILS_H
 #define BORNAGAIN_DEVICE_DATA_DATAUTILS_H
 
-#include "Device/Data/Powerfield.h"
 #include <memory>
 #include <string>
 #include <vector>
 
 class Powerfield;
-class SimulationResult;
 
 namespace DataUtils::Data {
 

GUI/View/Import/RealDataSelectorWidget.cpp

@@ -14,6 +14,7 @@
 
 #include "GUI/View/Import/RealDataSelectorWidget.h"
 #include "Device/Data/DataUtils.h"
+#include "Device/Data/Powerfield.h"
 #include "GUI/Application/ApplicationSettings.h"
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Model/RealDataModel.h"

Sim/Fitting/SimDataPair.cpp

@@ -20,6 +20,7 @@
 #include "Device/Coord/CoordSystem1D.h"
 #include "Device/Coord/CoordSystem2D.h"
 #include "Device/Data/DataUtils.h"
+#include "Device/Data/Powerfield.h"
 #include "Device/Detector/IDetector.h"
 #include "Sim/Scan/ISpecularScan.h"
 #include "Sim/Simulation/ISimulation2D.h"

Tests/Unit/Device/IntensityDataFunctionsTest.cpp

@@ -3,6 +3,7 @@
 #include "Base/Axis/FrameUtil.h"
 #include "Base/Axis/VariableBinAxis.h"
 #include "Device/Data/DataUtils.h"
+#include "Device/Data/Powerfield.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class DataUtilsTest : public ::testing::Test {

Tests/Unit/Device/PowerfieldTest.cpp

@@ -3,6 +3,7 @@
 #include "Base/Axis/Frame.h"
 #include "Base/Axis/VariableBinAxis.h"
 #include "Device/Data/DataUtils.h"
+#include "Device/Data/Powerfield.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <algorithm>