--- a/src/routing/aodv/aodv-packet.cc	Fri Feb 19 17:11:16 2010 -0800
+++ b/src/routing/aodv/aodv-packet.cc	Sun Feb 21 15:37:31 2010 -0500
@@ -40,9 +40,18 @@
 }
 
 TypeId
+TypeHeader::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::aodv::TypeHeader")
+      .SetParent<Header> ()
+      ;
+  return tid;
+}
+
+TypeId
 TypeHeader::GetInstanceTypeId () const
 {
-  return TypeId ();
+  return GetTypeId ();
 }
 
 uint32_t
@@ -135,9 +144,19 @@
 }
 
 TypeId
+RreqHeader::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::aodv::RreqHeader")
+      .SetParent<Header> ()
+      .AddConstructor<RreqHeader> ()
+      ;
+  return tid;
+}
+
+TypeId
 RreqHeader::GetInstanceTypeId () const
 {
-  return TypeId ();
+  return GetTypeId ();
 }
 
 uint32_t
@@ -262,9 +281,19 @@
 }
 
 TypeId
+RrepHeader::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::aodv::RrepHeader")
+      .SetParent<Header> ()
+      .AddConstructor<RrepHeader> ()
+      ;
+  return tid;
+}
+
+TypeId
 RrepHeader::GetInstanceTypeId () const
 {
-  return TypeId ();
+  return GetTypeId ();
 }
 
 uint32_t
@@ -393,9 +422,19 @@
 }
 
 TypeId
+RrepAckHeader::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::aodv::RrepAckHeader")
+      .SetParent<Header> ()
+      .AddConstructor<RrepAckHeader> ()
+      ;
+  return tid;
+}
+
+TypeId
 RrepAckHeader::GetInstanceTypeId () const
 {
-  return TypeId ();
+  return GetTypeId ();
 }
 
 uint32_t
@@ -447,9 +486,19 @@
 }
 
 TypeId
+RerrHeader::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::aodv::RerrHeader")
+      .SetParent<Header> ()
+      .AddConstructor<RerrHeader> ()
+      ;
+  return tid;
+}
+
+TypeId
 RerrHeader::GetInstanceTypeId () const
 {
-  return TypeId ();
+  return GetTypeId ();
 }
 
 uint32_t

--- a/src/routing/aodv/aodv-packet.h	Fri Feb 19 17:11:16 2010 -0800
+++ b/src/routing/aodv/aodv-packet.h	Sun Feb 21 15:37:31 2010 -0500
@@ -58,6 +58,7 @@
 
   ///\name Header serialization/deserialization
   //\{
+  static TypeId GetTypeId ();
   TypeId GetInstanceTypeId () const;
   uint32_t GetSerializedSize () const;
   void Serialize (Buffer::Iterator start) const;
@@ -109,6 +110,7 @@
 
   ///\name Header serialization/deserialization
   //\{
+  static TypeId GetTypeId ();
   TypeId GetInstanceTypeId () const;
   uint32_t GetSerializedSize () const;
   void Serialize (Buffer::Iterator start) const;
@@ -184,6 +186,7 @@
       Ipv4Address (), Time lifetime = MilliSeconds (0));
   ///\name Header serialization/deserialization
   //\{
+  static TypeId GetTypeId ();
   TypeId GetInstanceTypeId () const;
   uint32_t GetSerializedSize () const;
   void Serialize (Buffer::Iterator start) const;
@@ -248,6 +251,7 @@
 
   ///\name Header serialization/deserialization
   //\{
+  static TypeId GetTypeId ();
   TypeId GetInstanceTypeId () const;
   uint32_t GetSerializedSize () const;
   void Serialize (Buffer::Iterator start) const;
@@ -289,6 +293,7 @@
 
   ///\name Header serialization/deserialization
   //\{
+  static TypeId GetTypeId ();
   TypeId GetInstanceTypeId () const;
   uint32_t GetSerializedSize () const;
   void Serialize (Buffer::Iterator i) const;