diff -r 9042f35c445e src/common/buffer.h
--- a/src/common/buffer.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/common/buffer.h	Mon Jun 30 10:22:11 2008 -0700
@@ -520,6 +520,7 @@ private:
 #ifdef BUFFER_USE_INLINE
 
 #include "ns3/assert.h"
+#include <string.h>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/common/data-rate.cc
--- a/src/common/data-rate.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/common/data-rate.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -29,7 +29,10 @@ DoParse (const std::string s, uint64_t *
   std::string::size_type n = s.find_first_not_of("0123456789.");
   if (n != std::string::npos)
   { // Found non-numeric
-    double r = ::atof(s.substr(0, n).c_str());
+    std::istringstream iss;
+    iss.str (s.substr(0, n));
+    double r;
+    iss >> r;
     std::string trailer = s.substr(n, std::string::npos);
     if (trailer == "bps")
       {
@@ -117,7 +120,9 @@ DoParse (const std::string s, uint64_t *
       }
     return true;
   }
-  *v = ::atoll(s.c_str());
+  std::istringstream iss;
+  iss.str (s);
+  iss >> *v;
   return true;
 }
 
diff -r 9042f35c445e src/common/tag-list.cc
--- a/src/common/tag-list.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/common/tag-list.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -20,6 +20,7 @@
 #include "tag-list.h"
 #include "ns3/log.h"
 #include <vector>
+#include <string.h>
 
 NS_LOG_COMPONENT_DEFINE ("TagList");
 
diff -r 9042f35c445e src/contrib/config-store.cc
--- a/src/contrib/config-store.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/contrib/config-store.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -8,6 +8,7 @@
 #include <fstream>
 #include <iostream>
 #include <unistd.h>
+#include <stdlib.h>
 
 NS_LOG_COMPONENT_DEFINE ("ConfigStore");
 
diff -r 9042f35c445e src/core/callback.h
--- a/src/core/callback.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/core/callback.h	Mon Jun 30 10:22:11 2008 -0700
@@ -25,6 +25,7 @@
 #include "fatal-error.h"
 #include "empty.h"
 #include "type-traits.h"
+#include <typeinfo>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/core/double.h
--- a/src/core/double.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/core/double.h	Mon Jun 30 10:22:11 2008 -0700
@@ -23,6 +23,7 @@
 #include "attribute.h"
 #include "attribute-helper.h"
 #include <stdint.h>
+#include <limits>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/core/integer.h
--- a/src/core/integer.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/core/integer.h	Mon Jun 30 10:22:11 2008 -0700
@@ -23,6 +23,7 @@
 #include "attribute.h"
 #include "attribute-helper.h"
 #include <stdint.h>
+#include <limits>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/core/uinteger.h
--- a/src/core/uinteger.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/core/uinteger.h	Mon Jun 30 10:22:11 2008 -0700
@@ -23,6 +23,7 @@
 #include "attribute.h"
 #include "attribute-helper.h"
 #include <stdint.h>
+#include <limits>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/devices/wifi/status-code.h
--- a/src/devices/wifi/status-code.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/devices/wifi/status-code.h	Mon Jun 30 10:22:11 2008 -0700
@@ -21,6 +21,7 @@
 #define STATUS_CODE_H
 
 #include <stdint.h>
+#include <ostream>
 #include "ns3/buffer.h"
 
 namespace ns3 {
diff -r 9042f35c445e src/devices/wifi/supported-rates.h
--- a/src/devices/wifi/supported-rates.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/devices/wifi/supported-rates.h	Mon Jun 30 10:22:11 2008 -0700
@@ -21,6 +21,7 @@
 #define SUPPORTED_RATES_H
 
 #include <stdint.h>
+#include <ostream>
 #include "ns3/buffer.h"
 
 namespace ns3 {
diff -r 9042f35c445e src/helper/internet-stack-helper.cc
--- a/src/helper/internet-stack-helper.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/helper/internet-stack-helper.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -26,6 +26,7 @@
 #include "ns3/packet-socket-factory.h"
 #include "ns3/config.h"
 #include "ns3/simulator.h"
+#include <limits>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/helper/olsr-helper.h
--- a/src/helper/olsr-helper.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/helper/olsr-helper.h	Mon Jun 30 10:22:11 2008 -0700
@@ -39,7 +39,7 @@ public:
    */
   void SetAgent (std::string tid,
 		 std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
-		 std::string n1 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+		 std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
 		 std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
 		 std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
 		 std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
diff -r 9042f35c445e src/internet-stack/sgi-hashmap.h
--- a/src/internet-stack/sgi-hashmap.h	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/internet-stack/sgi-hashmap.h	Mon Jun 30 10:22:11 2008 -0700
@@ -20,8 +20,14 @@ namespace sgi = ::__gnu_cxx;       // GC
 namespace sgi = ::__gnu_cxx;       // GCC 3.1 and later
        #endif
      #else  // gcc 4.x and later
+       #if __GNUC_MINOR__ < 3
        #include <ext/hash_map>
-       namespace sgi = ::__gnu_cxx;
+namespace sgi = ::__gnu_cxx;
+       #else
+#undef __DEPRECATED
+       #include <backward/hash_map>
+namespace sgi = ::__gnu_cxx;
+       #endif
      #endif
   #endif
 #else      // ...  there are other compilers, right?
diff -r 9042f35c445e src/node/address.cc
--- a/src/node/address.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/node/address.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -1,5 +1,6 @@
 #include "ns3/assert.h"
 #include "address.h"
+#include <string.h>
 #include <iostream>
 #include <iomanip>
 
diff -r 9042f35c445e src/node/mac48-address.cc
--- a/src/node/mac48-address.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/node/mac48-address.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -22,6 +22,7 @@
 #include "ns3/assert.h"
 #include <iomanip>
 #include <iostream>
+#include <string.h>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/node/mac64-address.cc
--- a/src/node/mac64-address.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/node/mac64-address.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -22,6 +22,7 @@
 #include "ns3/assert.h"
 #include <iomanip>
 #include <iostream>
+#include <string.h>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/node/socket.cc
--- a/src/node/socket.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/node/socket.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -25,6 +25,7 @@
 #include "node.h"
 #include "socket.h"
 #include "socket-factory.h"
+#include <limits>
 
 NS_LOG_COMPONENT_DEFINE ("Socket");
 
diff -r 9042f35c445e src/routing/global-routing/global-route-manager-impl.cc
--- a/src/routing/global-routing/global-route-manager-impl.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/routing/global-routing/global-route-manager-impl.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -1425,6 +1425,7 @@ GlobalRouteManagerImpl::SPFVertexAddPare
 
 #include "ns3/test.h"
 #include "ns3/simulator.h"
+#include <stdlib.h>
 
 namespace ns3 {
 
diff -r 9042f35c445e src/simulator/time.cc
--- a/src/simulator/time.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/src/simulator/time.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -72,7 +72,10 @@ TimeUnit<1>::TimeUnit(const std::string&
   std::string::size_type n = s.find_first_not_of("0123456789.");
   if (n != std::string::npos)
   { // Found non-numeric
-    double r = atof(s.substr(0, n).c_str());
+    std::istringstream iss;
+    iss.str (s.substr(0, n));
+    double r;
+    iss >> r;
     std::string trailer = s.substr(n, std::string::npos);
     if (trailer == std::string("s"))
     {
@@ -113,7 +116,11 @@ TimeUnit<1>::TimeUnit(const std::string&
   }
   //else
   //they didn't provide units, assume seconds
-  m_data = HighPrecision (atof(s.c_str()) * TimeStepPrecision::g_tsPrecFactor);
+  std::istringstream iss;
+  iss. str (s);
+  double v;
+  iss >> v;
+  m_data = HighPrecision (v * TimeStepPrecision::g_tsPrecFactor);
 }
 
 double 
diff -r 9042f35c445e utils/bench-packets.cc
--- a/utils/bench-packets.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/utils/bench-packets.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <stdlib.h>
 
 using namespace ns3;
 
@@ -261,7 +262,9 @@ int main (int argc, char *argv[])
       if (strncmp ("--n=", argv[0],strlen ("--n=")) == 0) 
         {
           char const *nAscii = argv[0] + strlen ("--n=");
-          n = atoi (nAscii);
+          std::istringstream iss;
+          iss.str (nAscii);
+          iss >> n;
         }
       argc--;
       argv++;
diff -r 9042f35c445e utils/bench-simulator.cc
--- a/utils/bench-simulator.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/utils/bench-simulator.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <fstream>
 #include <vector>
+#include <string.h>
 
 using namespace ns3;
 
diff -r 9042f35c445e utils/replay-simulation.cc
--- a/utils/replay-simulation.cc	Sun Jun 29 23:25:32 2008 -0700
+++ b/utils/replay-simulation.cc	Mon Jun 30 10:22:11 2008 -0700
@@ -24,6 +24,7 @@
 #include <deque>
 #include <fstream>
 #include <iostream>
+#include <string.h>
 
 using namespace ns3;