--- a/src/internet-node/udp-header.cc	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/internet-node/udp-header.cc	Mon Mar 17 14:49:52 2008 -0700
@@ -24,32 +24,10 @@
 
 namespace ns3 {
 
-NS_HEADER_ENSURE_REGISTERED (UdpHeader);
 NS_OBJECT_ENSURE_REGISTERED (UdpHeader);
 
 bool UdpHeader::m_calcChecksum = false;
 
-TypeId 
-UdpHeader::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::UdpHeader")
-    .SetParent<Header> ()
-    ;
-  return tid;
-}
-TypeId 
-UdpHeader::GetInstanceTypeId (void) const
-{
-  return GetTypeId ();
-}
-
-uint32_t
-UdpHeader::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<UdpHeader> ("UdpHeader.ns3");
-  return uid;
-}
-
 /* The magic values below are used only for debugging.
  * They can be used to easily detect memory corruption
  * problems so you can see the patterns in memory.
@@ -115,12 +93,19 @@
   m_initialChecksum = Ipv4ChecksumCalculate (0, buf, 12);
 }
 
-std::string 
-UdpHeader::GetName (void) const
+TypeId 
+UdpHeader::GetTypeId (void)
 {
-  return "UDP";
+  static TypeId tid = TypeId ("ns3::UdpHeader")
+    .SetParent<Header> ()
+    ;
+  return tid;
 }
-
+TypeId 
+UdpHeader::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
 void 
 UdpHeader::Print (std::ostream &os) const
 {