diff --git a/CEP/Calibration/ExpIon/src/baselinefitting.cc b/CEP/Calibration/ExpIon/src/baselinefitting.cc
index c81e7dc193423a364bc6be8b1d0d3362cf226c10..7d7b482835283c7406ef687e6ff3191ef29612b0 100644
--- a/CEP/Calibration/ExpIon/src/baselinefitting.cc
+++ b/CEP/Calibration/ExpIon/src/baselinefitting.cc
@@ -149,7 +149,10 @@ ValueHolder fit(const ValueHolder &phases_vh, const ValueHolder &A_vh, const Val
                                 phase_ij_model += (sol[i + l*N_station] - sol[j + l*N_station]) * coeff ;
                             }
                             Float sin_dphase, cos_dphase;
-                            __sincosf(phase_ij_obs - phase_ij_model, &sin_dphase, &cos_dphase);
+#if defined(_LIBCPP_VERSION)
+#define sincosf __sincosf
+#endif
+                            sincosf(phase_ij_obs - phase_ij_model, &sin_dphase, &cos_dphase);
                             Float residual_re = cos_dphase - 1.0;
                             Float residual_im = sin_dphase;
                             Float derivative_re = -sin_dphase;
diff --git a/CEP/PyBDSM/src/c++/MGFunction2.cc b/CEP/PyBDSM/src/c++/MGFunction2.cc
index e4a8a2271787da5c62fecdeabb5c6e3aef40e9aa..90e8a5e72b554fa75302d7d2cab3763498b8e669 100644
--- a/CEP/PyBDSM/src/c++/MGFunction2.cc
+++ b/CEP/PyBDSM/src/c++/MGFunction2.cc
@@ -35,7 +35,7 @@ and parameters under exponents (NL_ij) are non-linear.
 #include "boost_python.h"
 #include "MGFunction.h"
    
-#if not(defined(_LIBCPP_VERSION))
+#if defined(GLIBCXX)
 #include <ext/algorithm>
 #endif
 #include <num_util/num_util.h>