diff --git a/Core/include/Acts/EventData/SpacePointContainer.hpp b/Core/include/Acts/EventData/SpacePointContainer.hpp
index 5a7be3b23f7..619a1393ecc 100644
--- a/Core/include/Acts/EventData/SpacePointContainer.hpp
+++ b/Core/include/Acts/EventData/SpacePointContainer.hpp
@@ -19,8 +19,6 @@
 #include <any>
 #include <vector>
 
-#include <math.h>
-
 namespace Acts {
 
 struct SpacePointContainerConfig {
diff --git a/Core/include/Acts/EventData/SpacePointContainer.ipp b/Core/include/Acts/EventData/SpacePointContainer.ipp
index 01800be7cd5..e0c381e4a50 100644
--- a/Core/include/Acts/EventData/SpacePointContainer.ipp
+++ b/Core/include/Acts/EventData/SpacePointContainer.ipp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include <math.h>
+#include <cmath>
 
 namespace Acts {
 
@@ -44,7 +44,7 @@ void SpacePointContainer<container_t, holder_t>::initialize() {
     m_data.setZ(i, external_container.z_impl(i));
     m_data.setRadius(
         i, std::sqrt(m_data.x(i) * m_data.x(i) + m_data.y(i) * m_data.y(i)));
-    m_data.setPhi(i, atan2f(m_data.y(i), m_data.x(i)));
+    m_data.setPhi(i, std::atan2(m_data.y(i), m_data.x(i)));
     m_data.setVarianceR(i, external_container.varianceR_impl(i));
     m_data.setVarianceZ(i, external_container.varianceZ_impl(i));