--- a/src/internet-node/ipv4-header.cc	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/internet-node/ipv4-header.cc	Mon Mar 17 14:49:52 2008 -0700
@@ -28,32 +28,10 @@
 
 namespace ns3 {
 
-NS_HEADER_ENSURE_REGISTERED (Ipv4Header);
 NS_OBJECT_ENSURE_REGISTERED (Ipv4Header);
 
 bool Ipv4Header::m_calcChecksum = false;
 
-TypeId 
-Ipv4Header::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::Ipv4Header")
-    .SetParent<Header> ()
-    ;
-  return tid;
-}
-TypeId 
-Ipv4Header::GetInstanceTypeId (void) const
-{
-  return GetTypeId ();
-}
-
-uint32_t
-Ipv4Header::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<Ipv4Header> ("Ipv4Header.ns3");
-  return uid;
-}
-
 Ipv4Header::Ipv4Header ()
   : m_payloadSize (0),
     m_identification (0),
@@ -201,12 +179,20 @@
   return m_goodChecksum;
 }
 
-std::string 
-Ipv4Header::GetName (void) const
+
+TypeId 
+Ipv4Header::GetTypeId (void)
 {
-  return "IPV4";
+  static TypeId tid = TypeId ("ns3::Ipv4Header")
+    .SetParent<Header> ()
+    ;
+  return tid;
 }
-
+TypeId 
+Ipv4Header::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
 void 
 Ipv4Header::Print (std::ostream &os) const
 {