--- a/src/internet-node/arp-header.cc	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/internet-node/arp-header.cc	Mon Mar 17 14:49:52 2008 -0700
@@ -25,30 +25,8 @@
 
 namespace ns3 {
 
-NS_HEADER_ENSURE_REGISTERED (ArpHeader);
 NS_OBJECT_ENSURE_REGISTERED (ArpHeader);
 
-TypeId 
-ArpHeader::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::ArpHeader")
-    .SetParent<Header> ()
-    ;
-  return tid;
-}
-TypeId 
-ArpHeader::GetInstanceTypeId (void) const
-{
-  return GetTypeId ();
-}
-
-uint32_t
-ArpHeader::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<ArpHeader> ("ArpHeader.ns3");
-  return uid;
-}
-
 void 
 ArpHeader::SetRequest (Address sourceHardwareAddress,
                        Ipv4Address sourceProtocolAddress,
@@ -104,12 +82,20 @@
   return m_ipv4Dest;
 }
 
-std::string 
-ArpHeader::GetName (void) const
+
+TypeId 
+ArpHeader::GetTypeId (void)
 {
-  return "ARP";
+  static TypeId tid = TypeId ("ns3::ArpHeader")
+    .SetParent<Header> ()
+    ;
+  return tid;
 }
-
+TypeId 
+ArpHeader::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
 void 
 ArpHeader::Print (std::ostream &os) const
 {