diff --git a/src/internet-node/arp-header.cc b/src/internet-node/arp-header.cc
index 7191b0299..3ac09fe0d 100644
--- a/src/internet-node/arp-header.cc
+++ b/src/internet-node/arp-header.cc
@@ -25,6 +25,12 @@
 
 namespace ns3 {
 
+const char *
+ArpHeader::GetUid (void)
+{
+  return "ArpHeader.ns3";
+}
+
 ArpHeader::~ArpHeader ()
 {}
 
diff --git a/src/internet-node/arp-header.h b/src/internet-node/arp-header.h
index 9f85579f5..9c0386b73 100644
--- a/src/internet-node/arp-header.h
+++ b/src/internet-node/arp-header.h
@@ -30,8 +30,11 @@ namespace ns3 {
 /**
  * \brief The packet header for an ARP packet
  */
-class ArpHeader : public Header {
- public:
+class ArpHeader : public Header 
+{
+public:
+  static const char *GetUid (void);
+
   virtual ~ArpHeader ();
 
   void SetRequest (MacAddress sourceHardwareAddress,
diff --git a/src/internet-node/ipv4-header.cc b/src/internet-node/ipv4-header.cc
index 44bc46fd2..60ed939c2 100644
--- a/src/internet-node/ipv4-header.cc
+++ b/src/internet-node/ipv4-header.cc
@@ -30,6 +30,12 @@ namespace ns3 {
 
 bool Ipv4Header::m_calcChecksum = false;
 
+const char *
+Ipv4Header::GetUid (void)
+{
+  return "Ipv4Header.ns3";
+}
+
 Ipv4Header::Ipv4Header ()
   : m_payloadSize (0),
     m_identification (0),
diff --git a/src/internet-node/ipv4-header.h b/src/internet-node/ipv4-header.h
index b45ed9f02..3d9a9b449 100644
--- a/src/internet-node/ipv4-header.h
+++ b/src/internet-node/ipv4-header.h
@@ -29,8 +29,10 @@ namespace ns3 {
 /**
  * \brief Packet header for IPv4
  */
-class Ipv4Header : public Header {
+class Ipv4Header : public Header 
+{
 public:
+  static const char *GetUid (void);
   /**
    * \brief Construct a null IPv4 header
    */
diff --git a/src/internet-node/udp-header.cc b/src/internet-node/udp-header.cc
index a7a95ca49..cc0591a2f 100644
--- a/src/internet-node/udp-header.cc
+++ b/src/internet-node/udp-header.cc
@@ -26,6 +26,12 @@ namespace ns3 {
 
 bool UdpHeader::m_calcChecksum = false;
 
+const char *
+UdpHeader::GetUid (void)
+{
+  return "UdpHeader.ns3";
+}
+
 /* 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.
diff --git a/src/internet-node/udp-header.h b/src/internet-node/udp-header.h
index 332614ba0..bc2d0d0e2 100644
--- a/src/internet-node/udp-header.h
+++ b/src/internet-node/udp-header.h
@@ -30,8 +30,11 @@ namespace ns3 {
 /**
  * \brief Packet header for UDP packets
  */
-class UdpHeader : public Header {
+class UdpHeader : public Header 
+{
 public:
+  static const char *GetUid (void);
+
   /**
    * \brief Constructor
    *
diff --git a/src/node/ethernet-header.cc b/src/node/ethernet-header.cc
index cc0649eab..bb7df999b 100644
--- a/src/node/ethernet-header.cc
+++ b/src/node/ethernet-header.cc
@@ -29,6 +29,12 @@ NS_DEBUG_COMPONENT_DEFINE ("EthernetHeader");
 
 namespace ns3 {
 
+const char *
+EthernetHeader::GetUid (void)
+{
+  return "EthernetHeader.ns3";
+}
+
 EthernetHeader::EthernetHeader (bool hasPreamble)
   : m_enPreambleSfd (hasPreamble),
     m_lengthType (0)
diff --git a/src/node/ethernet-header.h b/src/node/ethernet-header.h
index daa63d20d..c403b5ddc 100644
--- a/src/node/ethernet-header.h
+++ b/src/node/ethernet-header.h
@@ -45,8 +45,11 @@ namespace ns3 {
  * the packet. Eventually the class will be improved to also support
  * VLAN tags in packet headers.
  */
-class EthernetHeader : public Header {
+class EthernetHeader : public Header 
+{
 public:
+  static const char *GetUid (void);
+
   /**
    * \brief Construct a null ethernet header
    * \param hasPreamble if true, insert and remove an ethernet preamble from the
diff --git a/src/node/ethernet-trailer.cc b/src/node/ethernet-trailer.cc
index 6aa622b66..4eceea452 100644
--- a/src/node/ethernet-trailer.cc
+++ b/src/node/ethernet-trailer.cc
@@ -30,6 +30,12 @@ namespace ns3 {
 
 bool EthernetTrailer::m_calcFcs = false;
 
+const char *
+EthernetTrailer::GetUid (void)
+{
+  return "EthernetTrailer.ns3";
+}
+
 EthernetTrailer::EthernetTrailer ()
 {
   Init();
diff --git a/src/node/ethernet-trailer.h b/src/node/ethernet-trailer.h
index 7ec3e162d..4d75c911b 100644
--- a/src/node/ethernet-trailer.h
+++ b/src/node/ethernet-trailer.h
@@ -33,8 +33,11 @@ namespace ns3 {
  * ethernet packet. The actual FCS functionality is not yet coded and
  * so this acts more as a placeholder.
  */
-class EthernetTrailer : public Trailer {
+class EthernetTrailer : public Trailer 
+{
 public:
+  static const char *GetUid (void);
+
   /**
    * \brief Construct a null ethernet trailer
    */
diff --git a/src/node/llc-snap-header.cc b/src/node/llc-snap-header.cc
index ee37ffecf..1054dddaf 100644
--- a/src/node/llc-snap-header.cc
+++ b/src/node/llc-snap-header.cc
@@ -25,6 +25,12 @@
 
 namespace ns3 {
 
+const char *
+LlcSnapHeader::GetUid (void)
+{
+  return "LlcSnapHeader.ns3";
+}
+
 LlcSnapHeader::LlcSnapHeader ()
 {}
 
diff --git a/src/node/llc-snap-header.h b/src/node/llc-snap-header.h
index ad98cda7c..84404fa94 100644
--- a/src/node/llc-snap-header.h
+++ b/src/node/llc-snap-header.h
@@ -27,8 +27,11 @@
 
 namespace ns3 {
 
-class LlcSnapHeader : public Header {
- public:
+class LlcSnapHeader : public Header 
+{
+public:
+  static const char *GetUid (void);
+
   LlcSnapHeader ();
   virtual ~LlcSnapHeader ();