diff --git a/src/atlas/util/Geometry.cc b/src/atlas/util/Geometry.cc
index 9b107b74b..074d72d34 100644
--- a/src/atlas/util/Geometry.cc
+++ b/src/atlas/util/Geometry.cc
@@ -10,6 +10,8 @@
 
 #include "atlas/util/Geometry.h"
 
+#include <cmath>
+
 #include "eckit/geometry/Point2.h"
 #include "eckit/geometry/Point3.h"
 
diff --git a/src/atlas/util/Geometry.h b/src/atlas/util/Geometry.h
index a17f3e457..dd8173c3a 100644
--- a/src/atlas/util/Geometry.h
+++ b/src/atlas/util/Geometry.h
@@ -13,6 +13,7 @@
 #include <memory>
 #include <sstream>
 #include <string>
+#include <utility>
 
 #include "atlas/runtime/Exception.h"
 #include "atlas/util/Earth.h"
diff --git a/src/atlas/util/UnitSphere.h b/src/atlas/util/UnitSphere.h
index a3d424b77..c1458468f 100644
--- a/src/atlas/util/UnitSphere.h
+++ b/src/atlas/util/UnitSphere.h
@@ -10,12 +10,6 @@
 
 #pragma once
 
-#include <cmath>
-#include <utility>
-
-#include "atlas/util/Constants.h"
-#include "atlas/util/Point.h"
-
 #include "eckit/geometry/UnitSphere.h"
 
 //------------------------------------------------------------------------------------------------------