--- a/src/core/model/default-simulator-impl.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/default-simulator-impl.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -28,8 +28,6 @@ 
 #include "assert.h"
 #include "log.h"
 
-#include <math.h>
-
 NS_LOG_COMPONENT_DEFINE ("DefaultSimulatorImpl");
 
 namespace ns3 {
--- a/src/core/model/int64x64-128.h	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/int64x64-128.h	Tue Mar 20 23:43:03 2012 +0100
@@ -4,7 +4,7 @@ 
 
 #include "ns3/core-config.h"
 #include <stdint.h>
-#include <math.h>
+#include <cmath>
 
 #if defined(HAVE___UINT128_T) && !defined(HAVE_UINT128_T)
 typedef __uint128_t uint128_t;
--- a/src/core/model/int64x64-cairo.h	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/int64x64-cairo.h	Tue Mar 20 23:43:03 2012 +0100
@@ -3,7 +3,7 @@ 
 #define INT64X64_CAIRO_H
 
 #include <stdint.h>
-#include <math.h>
+#include <cmath>
 #include "cairo-wideint-private.h"
 
 #ifdef __i386__
--- a/src/core/model/int64x64-double.h	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/int64x64-double.h	Tue Mar 20 23:43:03 2012 +0100
@@ -3,7 +3,7 @@ 
 #define INT64X64_DOUBLE_H
 
 #include <iostream>
-#include <math.h>
+#include <cmath>
 
 namespace ns3 {
 
--- a/src/core/model/ns2-calendar-scheduler.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/ns2-calendar-scheduler.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -23,8 +23,8 @@ 
 #include "assert.h"
 #include "log.h"
 #include <cassert>
-#include <math.h>
-#include <string.h>
+#include <cstring>
+#include <cmath>
 
 namespace ns3 {
 
--- a/src/core/model/nstime.h	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/nstime.h	Tue Mar 20 23:43:03 2012 +0100
@@ -25,7 +25,7 @@ 
 #include "attribute-helper.h"
 #include "int64x64.h"
 #include <stdint.h>
-#include <math.h>
+#include <cmath>
 #include <ostream>
 
 namespace ns3 {
--- a/src/core/model/random-variable.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/random-variable.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -21,7 +21,7 @@ 
 
 #include <iostream>
 
-#include <math.h>
+#include <cmath>
 #include <stdlib.h>
 #include <sys/time.h>                   // for gettimeofday
 #include <unistd.h>
--- a/src/core/model/realtime-simulator-impl.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/realtime-simulator-impl.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -33,8 +33,6 @@ 
 #include "enum.h"
 
 
-#include <math.h>
-
 NS_LOG_COMPONENT_DEFINE ("RealtimeSimulatorImpl");
 
 namespace ns3 {
--- a/src/core/model/simulator.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/simulator.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -31,7 +31,6 @@ 
 #include "assert.h"
 #include "log.h"
 
-#include <math.h>
 #include <fstream>
 #include <list>
 #include <vector>
--- a/src/core/model/test.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/test.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -20,8 +20,8 @@ 
 #include "assert.h"
 #include "abort.h"
 #include "system-path.h"
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include <vector>
 #include <list>
 
--- a/src/core/model/time.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/model/time.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -26,7 +26,7 @@ 
 #include "string.h"
 #include "object.h"
 #include "config.h"
-#include <math.h>
+#include <cmath>
 #include <sstream>
 
 namespace ns3 {
--- a/src/core/test/random-variable-test-suite.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/test/random-variable-test-suite.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -20,7 +20,7 @@ 
 //
 
 #include <iostream>
-#include <math.h>
+#include <cmath>
 
 #include "ns3/test.h"
 #include "ns3/assert.h"
--- a/src/core/test/rng-test-suite.cc	Fri Mar 16 22:07:20 2012 +0100
+++ a/src/core/test/rng-test-suite.cc	Tue Mar 20 23:43:03 2012 +0100
@@ -15,7 +15,7 @@ 
  */
 
 
-#include <math.h>
+#include <cmath>
 #include <gsl/gsl_cdf.h>
 #include <gsl/gsl_histogram.h>
 #include <time.h>