--- a/src/spectrum/model/spectrum-value.cc	Fri Aug 31 12:24:28 2012 +0200
+++ b/src/spectrum/model/spectrum-value.cc	Sat Sep 01 20:57:21 2012 +0200
@@ -20,14 +20,9 @@
  */
 
 #include <ns3/spectrum-value.h>
-#include <math.h>
+#include <ns3/math.h>
 #include <ns3/log.h>
 
-#ifdef __FreeBSD__
-#define log2(x) (log (x) / M_LN2)
-#endif
-
-
 NS_LOG_COMPONENT_DEFINE ("SpectrumValue");
 
 
@@ -285,7 +280,7 @@
 
   while (it1 != m_values.end ())
     {
-      *it1 = pow (*it1, exp);
+      *it1 = std::pow (*it1, exp);
       ++it1;
     }
 }
@@ -299,7 +294,7 @@
 
   while (it1 != m_values.end ())
     {
-      *it1 = pow (base, *it1);
+      *it1 = std::pow (base, *it1);
       ++it1;
     }
 }
@@ -313,7 +308,7 @@
 
   while (it1 != m_values.end ())
     {
-      *it1 = log10 (*it1);
+      *it1 = std::log10 (*it1);
       ++it1;
     }
 }
@@ -340,7 +335,7 @@
 
   while (it1 != m_values.end ())
     {
-      *it1 = log (*it1);
+      *it1 = std::log (*it1);
       ++it1;
     }
 }
@@ -355,7 +350,7 @@
       s += (*it1) * (*it1);
       ++it1;
     }
-  return sqrt (s);
+  return std::sqrt (s);
 }