--- a/src/node/llc-snap-header.cc	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/node/llc-snap-header.cc	Mon Mar 17 14:49:52 2008 -0700
@@ -25,30 +25,8 @@
 
 namespace ns3 {
 
-NS_HEADER_ENSURE_REGISTERED (LlcSnapHeader);
 NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader);
 
-TypeId 
-LlcSnapHeader::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::LlcSnapHeader")
-    .SetParent<Header> ()
-    ;
-  return tid;
-}
-TypeId 
-LlcSnapHeader::GetInstanceTypeId (void) const
-{
-  return GetTypeId ();
-}
-
-uint32_t
-LlcSnapHeader::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<LlcSnapHeader> ("LlcSnapHeader.ns3");
-  return uid;
-}
-
 LlcSnapHeader::LlcSnapHeader ()
 {}
 
@@ -69,12 +47,19 @@
   return 1 + 1 + 1 + 3 + 2;
 }
 
-std::string
-LlcSnapHeader::GetName (void) const
+TypeId 
+LlcSnapHeader::GetTypeId (void)
 {
-  return "LLCSNAP";
+  static TypeId tid = TypeId ("ns3::LlcSnapHeader")
+    .SetParent<Header> ()
+    ;
+  return tid;
 }
-
+TypeId 
+LlcSnapHeader::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
 void 
 LlcSnapHeader::Print (std::ostream &os) const
 {