--- a/src/routing/olsr/olsr-header.h	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/routing/olsr/olsr-header.h	Mon Mar 17 14:49:52 2008 -0700
@@ -97,12 +97,10 @@
 public:  
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
-  static uint32_t GetUid (void);
   virtual void Print (std::ostream &os) const;
   virtual uint32_t GetSerializedSize (void) const;
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
-  virtual std::string GetName (void) const { return "OlsrPacket"; }
 };
 
 
@@ -204,12 +202,10 @@
 public:  
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
-  static uint32_t GetUid (void);
   virtual void Print (std::ostream &os) const;
   virtual uint32_t GetSerializedSize (void) const;
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
-  virtual std::string GetName (void) const { return "OlsrMessage"; }
 
   // 5.1.  MID Message Format
   //