--- a/src/node/ethernet-header.h	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/node/ethernet-header.h	Mon Mar 17 14:49:52 2008 -0700
@@ -49,9 +49,6 @@
 class EthernetHeader : public Header 
 {
 public:
-  static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
-  static uint32_t GetUid (void);
 
   /**
    * \brief Construct a null ethernet header
@@ -105,8 +102,9 @@
    */
   uint32_t GetHeaderSize() const;
 
-  std::string GetName (void) const;
-  void Print (std::ostream &os) const;
+  static TypeId GetTypeId (void);
+  virtual TypeId GetInstanceTypeId (void) const;
+  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);