--- a/src/applications/udp-client-server/udp-client.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/applications/udp-client-server/udp-client.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -35,7 +35,7 @@
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("UdpClient");
-NS_OBJECT_ENSURE_REGISTERED ( UdpClient);
+NS_OBJECT_ENSURE_REGISTERED (UdpClient);
 
 TypeId
 UdpClient::GetTypeId (void)

--- a/src/applications/udp-client-server/udp-server.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/applications/udp-client-server/udp-server.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -36,7 +36,7 @@
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("UdpServer");
-NS_OBJECT_ENSURE_REGISTERED ( UdpServer);
+NS_OBJECT_ENSURE_REGISTERED (UdpServer);
 
 
 TypeId

--- a/src/applications/udp-client-server/udp-trace-client.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/applications/udp-client-server/udp-trace-client.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -37,7 +37,7 @@
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
-NS_OBJECT_ENSURE_REGISTERED ( UdpTraceClient);
+NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient);
 
 struct UdpTraceClient::TraceEntry UdpTraceClient::g_defaultEntries[] = {
   {0, 534, 'I'},

--- a/src/common/jakes-propagation-loss-model.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/common/jakes-propagation-loss-model.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -31,6 +31,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel);
+
 class JakesPropagationLossModel::PathCoefficients 
 {
 public:
@@ -125,8 +127,6 @@
   return 10 * log10 (k);
 }
 
-NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel);
-
 const double JakesPropagationLossModel::PI = 3.14159265358979323846;
 
 TypeId

--- a/src/common/packet-burst.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/common/packet-burst.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -28,7 +28,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( PacketBurst);
+NS_OBJECT_ENSURE_REGISTERED (PacketBurst);
 
 TypeId
 PacketBurst::GetTypeId (void)

--- a/src/common/tag.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/common/tag.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -21,6 +21,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (Tag);
+
 TypeId 
 Tag::GetTypeId (void)
 {

--- a/src/contrib/flow-id-tag.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/contrib/flow-id-tag.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -21,6 +21,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (FlowIdTag);
+
 TypeId 
 FlowIdTag::GetTypeId (void)
 {

--- a/src/core/object-base.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/core/object-base.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -31,6 +31,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (ObjectBase);
+
 static TypeId
 GetObjectIid (void)
 {

--- a/src/devices/mesh/flame/flame-header.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/mesh/flame/flame-header.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -25,6 +25,9 @@
 
 namespace ns3 {
 namespace flame {
+
+NS_OBJECT_ENSURE_REGISTERED (FlameHeader);
+
 FlameHeader::FlameHeader () :
   m_cost (0), m_seqno (0), m_origDst (Mac48Address ()), m_origSrc (Mac48Address ())
 {
@@ -35,7 +38,7 @@
 TypeId
 FlameHeader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::FlameHeader")
+  static TypeId tid = TypeId ("ns3::flame::FlameHeader")
     .SetParent<Header> ()
     .AddConstructor<FlameHeader> ();
   return tid;

--- a/src/devices/mesh/flame/flame-protocol.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/mesh/flame/flame-protocol.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -40,6 +40,7 @@
 // FlameTag
 //-----------------------------------------------------------------------------
 NS_OBJECT_ENSURE_REGISTERED (FlameTag);
+NS_OBJECT_ENSURE_REGISTERED (FlameProtocol);
 
 TypeId
 FlameTag::GetTypeId ()

--- a/src/devices/spectrum/aloha-noack-mac-header.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/spectrum/aloha-noack-mac-header.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -26,6 +26,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader);
+
 TypeId
 AlohaNoackMacHeader::GetTypeId (void)
 {

--- a/src/devices/wifi/aarf-wifi-manager.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wifi/aarf-wifi-manager.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -27,7 +27,7 @@
 #define Min(a,b) ((a<b)?a:b)
 #define Max(a,b) ((a>b)?a:b)
 
-NS_LOG_COMPONENT_DEFINE ("ns3::AarfWifiManager");
+NS_LOG_COMPONENT_DEFINE ("AarfWifiManager");
 
 namespace ns3 {
 

--- a/src/devices/wifi/error-rate-model.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wifi/error-rate-model.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -21,6 +21,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel);
+
 TypeId ErrorRateModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ErrorRateModel")

--- a/src/devices/wifi/mgt-headers.h	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wifi/mgt-headers.h	Tue Jun 29 20:24:20 2010 -0400
@@ -215,7 +215,7 @@
 
   CategoryValue GetCategory ();
   ActionValue GetAction ();
-  static TypeId GetTypeId ();
+  static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId () const;
   virtual void Print (std::ostream &os) const;
   virtual uint32_t GetSerializedSize () const;

--- a/src/devices/wifi/qos-tag.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wifi/qos-tag.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -23,6 +23,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (QosTag);
+
 TypeId 
 QosTag::GetTypeId (void)
 {

--- a/src/devices/wifi/wifi-channel.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wifi/wifi-channel.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -35,6 +35,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (WifiChannel);
+
 TypeId 
 WifiChannel::GetTypeId (void)
 {

--- a/src/devices/wifi/wifi-information-element-vector.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wifi/wifi-information-element-vector.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -24,6 +24,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector);
+
 WifiInformationElementVector::WifiInformationElementVector () :
   m_maxSize (1500)
 {

--- a/src/devices/wifi/yans-wifi-channel.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wifi/yans-wifi-channel.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -34,6 +34,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel);
+
 TypeId 
 YansWifiChannel::GetTypeId (void)
 {

--- a/src/devices/wimax/bs-net-device.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/bs-net-device.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -48,7 +48,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( BaseStationNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice);
 
 TypeId BaseStationNetDevice::GetTypeId (void)
 {

--- a/src/devices/wimax/bs-scheduler-rtps.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/bs-scheduler-rtps.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -41,7 +41,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( BSSchedulerRtps);
+NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps);
 
 TypeId
 BSSchedulerRtps::GetTypeId (void)

--- a/src/devices/wimax/bs-scheduler-simple.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/bs-scheduler-simple.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -39,7 +39,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( BSSchedulerSimple);
+NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple);
 
 TypeId BSSchedulerSimple::GetTypeId (void)
 {

--- a/src/devices/wimax/bs-scheduler.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/bs-scheduler.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -38,7 +38,7 @@
 NS_LOG_COMPONENT_DEFINE ("BSScheduler");
 
 namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED ( BSScheduler);
+NS_OBJECT_ENSURE_REGISTERED (BSScheduler);
 
 TypeId
 BSScheduler::GetTypeId (void)

--- a/src/devices/wimax/bs-uplink-scheduler-mbqos.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/bs-uplink-scheduler-mbqos.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -33,7 +33,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerMBQoS);
+NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS);
 
 UplinkSchedulerMBQoS::UplinkSchedulerMBQoS ()
 {

--- a/src/devices/wimax/bs-uplink-scheduler-simple.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/bs-uplink-scheduler-simple.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -35,7 +35,7 @@
 NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerSimple");
 
 namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerSimple);
+NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple);
 
 UplinkSchedulerSimple::UplinkSchedulerSimple (void)
 {

--- a/src/devices/wimax/bs-uplink-scheduler.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/bs-uplink-scheduler.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -36,6 +36,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler);
+
 UplinkScheduler::UplinkScheduler (void)
   : m_bs (0),
     m_timeStampIrInterval (Seconds (0)),

--- a/src/devices/wimax/dl-mac-messages.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/dl-mac-messages.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -312,7 +312,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( Dcd);
+NS_OBJECT_ENSURE_REGISTERED (Dcd);
 
 Dcd::Dcd (void)
   : m_reserved (0),
@@ -544,7 +544,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( DlMap);
+NS_OBJECT_ENSURE_REGISTERED (DlMap);
 
 DlMap::DlMap (void)
   : m_dcdCount (0),

--- a/src/devices/wimax/mac-messages.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/mac-messages.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -29,7 +29,7 @@
 NS_LOG_COMPONENT_DEFINE ("MACMESSAGES");
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( ManagementMessageType);
+NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType);
 
 ManagementMessageType::ManagementMessageType (void)
   : m_type (~0)
@@ -106,7 +106,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( RngReq);
+NS_OBJECT_ENSURE_REGISTERED (RngReq);
 
 RngReq::RngReq (void)
   : m_reserved (0),
@@ -220,7 +220,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( RngRsp);
+NS_OBJECT_ENSURE_REGISTERED (RngRsp);
 
 RngRsp::RngRsp (void)
   : m_reserved (0),
@@ -497,6 +497,8 @@
 
 // ----------------------------------------------------------------------------------------------------------------------
 
+NS_OBJECT_ENSURE_REGISTERED (DsaReq);
+
 DsaReq::DsaReq (void)
   : m_transactionId (0),
     m_sfid (0),
@@ -629,6 +631,8 @@
 
 // ----------------------------------------------------------------------------------------------------------------------
 
+NS_OBJECT_ENSURE_REGISTERED (DsaRsp);
+
 DsaRsp::DsaRsp (void)
   : m_transactionId (0),
     m_confirmationCode (0),
@@ -767,6 +771,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
+NS_OBJECT_ENSURE_REGISTERED (DsaAck);
+
 DsaAck::DsaAck (void)
   : m_transactionId (0),
     m_confirmationCode (0)

--- a/src/devices/wimax/simple-ofdm-wimax-phy.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/simple-ofdm-wimax-phy.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -38,7 +38,7 @@
 NS_LOG_COMPONENT_DEFINE ("SimpleOfdmWimaxPhy");
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( SimpleOfdmWimaxPhy);
+NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy);
 
 TypeId SimpleOfdmWimaxPhy::GetTypeId (void)
 {

--- a/src/devices/wimax/ul-mac-messages.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/ul-mac-messages.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -25,7 +25,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( Ucd);
+NS_OBJECT_ENSURE_REGISTERED (Ucd);
 
 UcdChannelEncodings::UcdChannelEncodings (void)
   : m_bwReqOppSize (0),
@@ -577,7 +577,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( UlMap);
+NS_OBJECT_ENSURE_REGISTERED (UlMap);
 
 UlMap::UlMap (void)
   : m_reserved (0),

--- a/src/devices/wimax/wimax-connection.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/wimax-connection.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -27,7 +27,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( WimaxConnection);
+NS_OBJECT_ENSURE_REGISTERED (WimaxConnection);
 
 TypeId WimaxConnection::GetTypeId (void)
 {

--- a/src/devices/wimax/wimax-mac-header.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/wimax-mac-header.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -25,7 +25,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( MacHeaderType);
+NS_OBJECT_ENSURE_REGISTERED (MacHeaderType);
 
 MacHeaderType::MacHeaderType (void)
   : m_type (0)
@@ -92,7 +92,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( GenericMacHeader);
+NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader);
 
 GenericMacHeader::GenericMacHeader (void)
   : m_ht (0),
@@ -296,7 +296,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( BandwidthRequestHeader);
+NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader);
 
 BandwidthRequestHeader::BandwidthRequestHeader (void)
   : m_ht (1),
@@ -478,7 +478,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( GrantManagementSubheader);
+NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader);
 
 GrantManagementSubheader::GrantManagementSubheader (void)
   : m_si (0),
@@ -569,7 +569,7 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED ( FragmentationSubheader);
+NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader);
 
 FragmentationSubheader::FragmentationSubheader (void)
   : m_fc (0),

--- a/src/devices/wimax/wimax-mac-queue.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/wimax-mac-queue.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -31,7 +31,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( WimaxMacQueue);
+NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue);
 
 WimaxMacQueue::QueueElement::QueueElement (void)
   : m_packet (Create<Packet> ()),

--- a/src/devices/wimax/wimax-mac-to-mac-header.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/wimax-mac-to-mac-header.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -23,6 +23,9 @@
 #include "ns3/uinteger.h"
 #include "ns3/log.h"
 namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader);
+
 WimaxMacToMacHeader::WimaxMacToMacHeader (void)
   : m_len (0)
 {

--- a/src/devices/wimax/wimax-mac-to-mac-header.h	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/wimax-mac-to-mac-header.h	Tue Jun 29 20:24:20 2010 -0400
@@ -31,13 +31,13 @@
  */
 class WimaxMacToMacHeader : public Header
 {
-  static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
 public:
   WimaxMacToMacHeader ();
   ~WimaxMacToMacHeader ();
   WimaxMacToMacHeader (uint32_t len);
 
+  static TypeId GetTypeId (void);
+  virtual TypeId GetInstanceTypeId (void) const;
   uint32_t GetSerializedSize (void) const;
   void Serialize (Buffer::Iterator start) const;
   uint32_t Deserialize (Buffer::Iterator start);

--- a/src/devices/wimax/wimax-net-device.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/wimax-net-device.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -43,7 +43,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( WimaxNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice);
 
 uint32_t WimaxNetDevice::m_nrFrames = 0;
 uint8_t WimaxNetDevice::m_direction = ~0;

--- a/src/devices/wimax/wimax-phy.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/devices/wimax/wimax-phy.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -34,7 +34,7 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( WimaxPhy);
+NS_OBJECT_ENSURE_REGISTERED (WimaxPhy);
 
 TypeId WimaxPhy::GetTypeId (void)
 {

--- a/src/helper/canvas-location.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/helper/canvas-location.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -22,6 +22,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (CanvasLocation);
+
 TypeId 
 CanvasLocation::GetTypeId (void)
 {

--- a/src/internet-stack/ipv4-interface.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/internet-stack/ipv4-interface.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -34,6 +34,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface);
+
 TypeId 
 Ipv4Interface::GetTypeId (void)
 {

--- a/src/internet-stack/loopback-net-device.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/internet-stack/loopback-net-device.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -28,6 +28,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice);
+
 TypeId 
 LoopbackNetDevice::GetTypeId (void)
 {

--- a/src/internet-stack/ndisc-cache.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/internet-stack/ndisc-cache.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -32,6 +32,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("NdiscCache");
 
+NS_OBJECT_ENSURE_REGISTERED (NdiscCache);
+
 TypeId NdiscCache::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::NdiscCache")

--- a/src/internet-stack/nsc-sysctl.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/internet-stack/nsc-sysctl.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -142,6 +142,8 @@
     }
 }
 
+NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack);
+
 TypeId
 Ns3NscStack::Ns3NscStack::GetTypeId (void)
 {

--- a/src/mobility/mobility-model.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/mobility/mobility-model.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -25,6 +25,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (MobilityModel);
+
 TypeId 
 MobilityModel::GetTypeId (void)
 {

--- a/src/node/packet-socket.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/node/packet-socket.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -33,6 +33,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (PacketSocket);
+
 TypeId
 PacketSocket::GetTypeId (void)
 {

--- a/src/node/radiotap-header.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/node/radiotap-header.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -26,6 +26,8 @@
 NS_LOG_COMPONENT_DEFINE ("RadiotapHeader");  
 
 namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader);
  
 RadiotapHeader::RadiotapHeader()
   : m_length(8),
@@ -43,7 +45,7 @@
  
 TypeId RadiotapHeader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RadiotapHeader")
+  static TypeId tid = TypeId ("ns3::RadiotapHeader")
     .SetParent<Header> ()
     .AddConstructor<RadiotapHeader> ()
     ;

--- a/src/node/simple-channel.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/node/simple-channel.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -28,6 +28,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (SimpleChannel);
+
 TypeId 
 SimpleChannel::GetTypeId (void)
 {

--- a/src/node/simple-net-device.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/node/simple-net-device.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -30,6 +30,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice);
+
 TypeId 
 SimpleNetDevice::GetTypeId (void)
 {

--- a/src/node/socket.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/node/socket.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -344,6 +344,7 @@
   return m_address;
 }
 
+NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag);
 
 TypeId
 SocketAddressTag::GetTypeId (void)
@@ -396,6 +397,7 @@
   return m_ttl;
 }
 
+NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag);
 
 TypeId
 SocketIpTtlTag::GetTypeId (void)
@@ -452,6 +454,8 @@
   return m_dontFragment;
 }
 
+NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag);
+
 TypeId 
 SocketSetDontFragmentTag::GetTypeId (void)
 {

--- a/src/routing/aodv/aodv-packet.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/routing/aodv/aodv-packet.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -34,6 +34,8 @@
 namespace aodv
 {
 
+NS_OBJECT_ENSURE_REGISTERED (TypeHeader);
+
 TypeHeader::TypeHeader (MessageType t) :
   m_type (t), m_valid (true)
 {
@@ -143,6 +145,8 @@
 {
 }
 
+NS_OBJECT_ENSURE_REGISTERED (RreqHeader);
+
 TypeId
 RreqHeader::GetTypeId ()
 {
@@ -280,6 +284,8 @@
   m_lifeTime = uint32_t (lifeTime.GetMilliSeconds ());
 }
 
+NS_OBJECT_ENSURE_REGISTERED (RrepHeader);
+
 TypeId
 RrepHeader::GetTypeId ()
 {
@@ -421,6 +427,7 @@
 {
 }
 
+NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader);
 TypeId
 RrepAckHeader::GetTypeId ()
 {
@@ -485,6 +492,8 @@
 {
 }
 
+NS_OBJECT_ENSURE_REGISTERED (RerrHeader);
+
 TypeId
 RerrHeader::GetTypeId ()
 {

--- a/src/routing/static-routing/ipv6-static-routing.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/routing/static-routing/ipv6-static-routing.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -30,6 +30,7 @@
 {
 
 NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting");
+NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting);
 
 TypeId Ipv6StaticRouting::GetTypeId ()
 {

--- a/src/simulator/scheduler.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/simulator/scheduler.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -23,6 +23,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (Scheduler);
+
 Scheduler::~Scheduler ()
 {
 }

--- a/src/simulator/synchronizer.cc	Mon Jun 28 14:47:06 2010 -0400
+++ b/src/simulator/synchronizer.cc	Tue Jun 29 20:24:20 2010 -0400
@@ -20,10 +20,12 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (Synchronizer);
+
 TypeId 
 Synchronizer::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("Synchronizer")
+  static TypeId tid = TypeId ("ns3::Synchronizer")
     .SetParent<Object> ()
     ;
   return tid;