diff --git a/Base/Types/Span.h b/Base/Types/Span.h
index 5b0c15ccf40053b5d4e9b4a76e0539024cb46422..922d891a13efb9486f5f96bda64e25bb546dfa29 100644
--- a/Base/Types/Span.h
+++ b/Base/Types/Span.h
@@ -15,9 +15,7 @@
 #ifndef BORNAGAIN_BASE_TYPES_SPAN_H
 #define BORNAGAIN_BASE_TYPES_SPAN_H
 
-#include <cmath>
-#include <iostream>
-#include <limits>
+#include <utility>
 
 //! An interval. Limits are of type double, and may be infinite.
 //! Used for the z-coordinate, especially when slicing form factors.
diff --git a/Resample/Slice/ZLimits.h b/Resample/Slice/ZLimits.h
index c484baea39c223c62506e577add6792acc2871b6..19c23a79f96affd25913b0e8d9053545dd306c51 100644
--- a/Resample/Slice/ZLimits.h
+++ b/Resample/Slice/ZLimits.h
@@ -19,6 +19,7 @@
 #define BORNAGAIN_RESAMPLE_SLICE_ZLIMITS_H
 
 #include "Base/Types/Span.h"
+#include <cmath>
 #include <iostream>
 #include <limits>