diff --git a/src/drivers/differential_pressure/ets/ets_airspeed.cpp b/src/drivers/differential_pressure/ets/ets_airspeed.cpp
index 5929ab82ac..4a529f41d3 100644
--- a/src/drivers/differential_pressure/ets/ets_airspeed.cpp
+++ b/src/drivers/differential_pressure/ets/ets_airspeed.cpp
@@ -38,7 +38,7 @@
  * Driver for the Eagle Tree Airspeed V3 connected via I2C.
  */
 
-#include <cfloat>
+#include <float.h>
 
 #include <px4_config.h>
 
diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp
index 109662a2a7..c76fdc04ba 100644
--- a/src/drivers/px4fmu/fmu.cpp
+++ b/src/drivers/px4fmu/fmu.cpp
@@ -37,7 +37,7 @@
  * Driver/configurator for the PX4 FMU
  */
 
-#include <cfloat>
+#include <float.h>
 
 #include <board_config.h>
 #include <drivers/device/device.h>
diff --git a/src/drivers/rc_input/RCInput.hpp b/src/drivers/rc_input/RCInput.hpp
index b99395c4aa..fed21b51cc 100644
--- a/src/drivers/rc_input/RCInput.hpp
+++ b/src/drivers/rc_input/RCInput.hpp
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <cfloat>
+#include <float.h>
 
 #include <board_config.h>
 #include <drivers/drv_hrt.h>
diff --git a/src/lib/mixer/mixer_multirotor.cpp b/src/lib/mixer/mixer_multirotor.cpp
index adb3702bb0..0fbfa323d9 100644
--- a/src/lib/mixer/mixer_multirotor.cpp
+++ b/src/lib/mixer/mixer_multirotor.cpp
@@ -39,7 +39,7 @@
 
 #include "mixer.h"
 
-#include <cfloat>
+#include <float.h>
 #include <cstring>
 #include <cstdio>
 
diff --git a/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp b/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
index 187f6d54ee..d18c995c88 100644
--- a/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
+++ b/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
@@ -39,7 +39,7 @@
  * @author Anton Babushkin <anton.babushkin@me.com>
  */
 
-#include <cfloat>
+#include <float.h>
 #include <drivers/drv_hrt.h>
 #include <lib/ecl/geo/geo.h>
 #include <lib/ecl/geo_lookup/geo_mag_declination.h>
diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp
index b263327ef7..562471d941 100644
--- a/src/modules/commander/Commander.cpp
+++ b/src/modules/commander/Commander.cpp
@@ -80,7 +80,7 @@
 #include <parameters/param.h>
 
 #include <cmath>
-#include <cfloat>
+#include <float.h>
 #include <cstring>
 
 #include <uORB/topics/actuator_armed.h>
diff --git a/src/modules/ekf2/ekf2_main.cpp b/src/modules/ekf2/ekf2_main.cpp
index 42716c5d53..09dc0cf6f1 100644
--- a/src/modules/ekf2/ekf2_main.cpp
+++ b/src/modules/ekf2/ekf2_main.cpp
@@ -38,7 +38,7 @@
  * @author Roman Bapst
  */
 
-#include <cfloat>
+#include <float.h>
 
 #include <drivers/drv_hrt.h>
 #include <lib/ecl/EKF/ekf.h>
diff --git a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
index bb53148a72..9f79c91760 100644
--- a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
+++ b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
@@ -51,7 +51,7 @@
 #include "launchdetection/LaunchDetector.h"
 #include "runway_takeoff/RunwayTakeoff.h"
 
-#include <cfloat>
+#include <float.h>
 
 #include <drivers/drv_hrt.h>
 #include <lib/ecl/geo/geo.h>
diff --git a/src/modules/gnd_pos_control/GroundRoverPositionControl.hpp b/src/modules/gnd_pos_control/GroundRoverPositionControl.hpp
index e400ad883f..cd910422a0 100644
--- a/src/modules/gnd_pos_control/GroundRoverPositionControl.hpp
+++ b/src/modules/gnd_pos_control/GroundRoverPositionControl.hpp
@@ -41,7 +41,7 @@
  * @author Marco Zorzi <mzorzi@student.ethz.ch>
  */
 
-#include <cfloat>
+#include <float.h>
 
 #include <drivers/drv_hrt.h>
 #include <lib/ecl/geo/geo.h>
diff --git a/src/modules/land_detector/LandDetector.cpp b/src/modules/land_detector/LandDetector.cpp
index 9dcffc7bb5..6908397b3a 100644
--- a/src/modules/land_detector/LandDetector.cpp
+++ b/src/modules/land_detector/LandDetector.cpp
@@ -40,7 +40,7 @@
 
 #include "LandDetector.h"
 
-#include <cfloat>
+#include <float.h>
 
 #include <px4_config.h>
 #include <px4_defines.h>
diff --git a/src/modules/navigator/geofence.h b/src/modules/navigator/geofence.h
index 1d19f9a4c1..9a5412bbaa 100644
--- a/src/modules/navigator/geofence.h
+++ b/src/modules/navigator/geofence.h
@@ -40,7 +40,7 @@
 
 #pragma once
 
-#include <cfloat>
+#include <float.h>
 
 #include <px4_module_params.h>
 #include <drivers/drv_hrt.h>
diff --git a/src/modules/navigator/mission.h b/src/modules/navigator/mission.h
index a5bdf3fed3..d9b8eea23c 100644
--- a/src/modules/navigator/mission.h
+++ b/src/modules/navigator/mission.h
@@ -48,7 +48,7 @@
 #include "mission_feasibility_checker.h"
 #include "navigator_mode.h"
 
-#include <cfloat>
+#include <float.h>
 
 #include <dataman/dataman.h>
 #include <drivers/drv_hrt.h>
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp
index 6510373a98..8356ec5b11 100644
--- a/src/modules/navigator/navigator_main.cpp
+++ b/src/modules/navigator/navigator_main.cpp
@@ -45,7 +45,7 @@
 
 #include "navigator.h"
 
-#include <cfloat>
+#include <float.h>
 #include <sys/stat.h>
 
 #include <dataman/dataman.h>
diff --git a/src/modules/vtol_att_control/vtol_type.cpp b/src/modules/vtol_att_control/vtol_type.cpp
index c52d018de9..5d4b2c2188 100644
--- a/src/modules/vtol_att_control/vtol_type.cpp
+++ b/src/modules/vtol_att_control/vtol_type.cpp
@@ -42,7 +42,7 @@
 #include "vtol_type.h"
 #include "vtol_att_control_main.h"
 
-#include <cfloat>
+#include <float.h>
 #include <px4_defines.h>
 #include <matrix/math.hpp>
 
diff --git a/src/systemcmds/tests/test_controlmath.cpp b/src/systemcmds/tests/test_controlmath.cpp
index fb5c3d6a2a..169578bfb7 100644
--- a/src/systemcmds/tests/test_controlmath.cpp
+++ b/src/systemcmds/tests/test_controlmath.cpp
@@ -1,7 +1,7 @@
 #include <unit_test.h>
 #include <mc_pos_control/Utility/ControlMath.hpp>
 #include <mathlib/mathlib.h>
-#include <cfloat>
+#include <float.h>
 
 #define SIGMA_SINGLE_OP			0.000001f
 
diff --git a/src/systemcmds/tests/test_float.cpp b/src/systemcmds/tests/test_float.cpp
index bc67cf5b9b..c066dbbb7e 100644
--- a/src/systemcmds/tests/test_float.cpp
+++ b/src/systemcmds/tests/test_float.cpp
@@ -1,7 +1,7 @@
 #include <unit_test.h>
 
 #include <px4_config.h>
-#include <cfloat>
+#include <float.h>
 
 typedef union {
 	float f;