diff --git a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp
index 8ee8b9c682..fa0f98e16f 100644
--- a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp
+++ b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp
@@ -51,7 +51,8 @@
 #else
 #include<ros_error.h>
 #include <cmath>
-#define isfinite std::isfinite
+//#define isfinite std::isfinite
+using namespace std;
 #endif
 
 ECL_PitchController::ECL_PitchController() :
@@ -68,7 +69,7 @@ ECL_PitchController::ECL_PitchController() :
 	_integrator(0.0f),
 	_rate_error(0.0f),
 	_rate_setpoint(0.0f),
-	_bodyrate_setpoint(0.0f)
+	_bodyrate_setpoint(0.0f),
 	_nonfinite_input_perf(perf_alloc(PC_COUNT, "fw att control pitch nonfinite input"))
 {
 }
diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
index 6707a11ba7..640940c99a 100644
--- a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
+++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
@@ -51,7 +51,7 @@
 #else
 #include<ros_error.h>
 #include <cmath>
-#define isfinite std::isfinite
+using namespace std;
 #endif
 
 ECL_RollController::ECL_RollController() :
@@ -67,7 +67,7 @@ ECL_RollController::ECL_RollController() :
 	_rate_error(0.0f),
 	_rate_setpoint(0.0f),
 	_bodyrate_setpoint(0.0f),
-	_nonfinite_input_perf(perf_alloc(PC_COUNT, "fw att control roll nonfinite input")),
+	_nonfinite_input_perf(perf_alloc(PC_COUNT, "fw att control roll nonfinite input"))
 {
 }
 
diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp
index 7ff8641756..5f01cecf9a 100644
--- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp
+++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp
@@ -50,7 +50,7 @@
 #else
 #include<ros_error.h>
 #include <cmath>
-#define isfinite std::isfinite
+using namespace std;
 #endif
 
 ECL_YawController::ECL_YawController() :