diff --git a/elements/ethernet/arpfaker.cc b/elements/ethernet/arpfaker.cc
index 6dad007..dcee41a 100644
--- a/elements/ethernet/arpfaker.cc
+++ b/elements/ethernet/arpfaker.cc
@@ -72,7 +72,7 @@ ARPFaker::make_response(u_char tha[6], /* him */
   click_ether *e;
   click_ether_arp *ea;
   WritablePacket *q = Packet::make(sizeof(*e) + sizeof(*ea));
-  q->set_mac_header(q->data(), 14);
+  q->set_mac_header_anno(q->data(), 14);
   memset(q->data(), '\0', q->length());
   e = (click_ether *) q->data();
   ea = (click_ether_arp *) (e + 1);
diff --git a/elements/ethernet/arpquerier.cc b/elements/ethernet/arpquerier.cc
index 4c432f1..5ba5da5 100644
--- a/elements/ethernet/arpquerier.cc
+++ b/elements/ethernet/arpquerier.cc
@@ -187,7 +187,7 @@ ARPQuerier::send_query_for(Packet *p)
     }
   
     click_ether *e = (click_ether *) q->data();
-    q->set_ether_header(e);
+    q->set_ether_header_anno(e);
     memset(e->ether_dhost, 0xff, 6);
     memcpy(e->ether_shost, _my_en.data(), 6);
     e->ether_type = htons(ETHERTYPE_ARP);
diff --git a/elements/ethernet/arpresponder.cc b/elements/ethernet/arpresponder.cc
index b4f0675..6b0cad2 100644
--- a/elements/ethernet/arpresponder.cc
+++ b/elements/ethernet/arpresponder.cc
@@ -124,7 +124,7 @@ ARPResponder::make_response(u_char tha[6], /* him */
     memset(q->data(), '\0', q->length());
   
     click_ether *e = (click_ether *) q->data();
-    q->set_ether_header(e);
+    q->set_ether_header_anno(e);
     memcpy(e->ether_dhost, tha, 6);
     memcpy(e->ether_shost, sha, 6);
     e->ether_type = htons(ETHERTYPE_ARP);
diff --git a/elements/ethernet/checkarpheader.cc b/elements/ethernet/checkarpheader.cc
index 7dbdd3b..97aa5aa 100644
--- a/elements/ethernet/checkarpheader.cc
+++ b/elements/ethernet/checkarpheader.cc
@@ -99,7 +99,7 @@ CheckARPHeader::simple_action(Packet *p)
 	   || (ap->ar_pro == htons(ETHERTYPE_IP6) && ap->ar_pln != 16))
       return drop(BAD_PRO, p);
   
-  p->set_network_header((const unsigned char *) ap, hlen);
+  p->set_network_header_anno((const unsigned char *) ap, hlen);
   return p;
 }
 
diff --git a/elements/ethernet/etherpausesource.cc b/elements/ethernet/etherpausesource.cc
index b0196c7..d2f9163 100644
--- a/elements/ethernet/etherpausesource.cc
+++ b/elements/ethernet/etherpausesource.cc
@@ -60,7 +60,7 @@ EtherPauseSource::configure(Vector<String> &conf, ErrorHandler *errh)
     if (!(q = Packet::make(64)))
 	return errh->error("out of memory!"), -ENOMEM;
 
-    q->set_mac_header(q->data(), sizeof(click_ether));
+    q->set_mac_header_anno(q->data(), sizeof(click_ether));
     click_ether *ethh = q->ether_header();
     memcpy(ethh->ether_dhost, &dst, 6);
     memcpy(ethh->ether_shost, &src, 6);
@@ -141,7 +141,7 @@ EtherPauseSource::rewrite_packet(const void *data, uint32_t offset, uint32_t siz
     if (WritablePacket *q = Packet::make(64)) {
 	memcpy(q->data(), _packet->data(), 64);
 	memcpy(q->data() + offset, data, size);
-	q->set_mac_header(q->data(), sizeof(click_ether));
+	q->set_mac_header_anno(q->data(), sizeof(click_ether));
 	_packet->kill();
 	_packet = q;
 	return 0;
diff --git a/elements/icmp/icmperror.cc b/elements/icmp/icmperror.cc
index 2c61bfa..e18b96b 100644
--- a/elements/icmp/icmperror.cc
+++ b/elements/icmp/icmperror.cc
@@ -243,7 +243,7 @@ ICMPError::simple_action(Packet *p)
     nip->ip_hl = (sizeof(click_ip) + olen + 3) >> 2;
   } else
     nip->ip_hl = sizeof(click_ip) >> 2;
-  q->set_ip_header(nip, nip->ip_hl << 2);
+  q->set_ip_header_anno(nip, nip->ip_hl << 2);
 
   // now, prepare ICMP header
   icp = q->icmp_header();
diff --git a/elements/icmp/icmppingencap.cc b/elements/icmp/icmppingencap.cc
index 5214b63..38142f0 100644
--- a/elements/icmp/icmppingencap.cc
+++ b/elements/icmp/icmppingencap.cc
@@ -104,7 +104,7 @@ ICMPPingEncap::simple_action(Packet *p)
 	icmp->icmp_cksum = click_in_cksum((const unsigned char *)icmp, q->length() - sizeof(click_ip));
 
 	q->set_dst_ip_anno(IPAddress(_dst));
-	q->set_ip_header(ip, sizeof(click_ip));
+	q->set_ip_header_anno(ip, sizeof(click_ip));
 
 	_ip_id += (_ip_id == 0xFFFF ? 2 : 1);
 	return q;
diff --git a/elements/icmp/icmpsendpings.cc b/elements/icmp/icmpsendpings.cc
index 72eb628..4ba1b95 100644
--- a/elements/icmp/icmpsendpings.cc
+++ b/elements/icmp/icmpsendpings.cc
@@ -142,7 +142,7 @@ ICMPPingSource::make_packet()
     icp->icmp_cksum = click_in_cksum((const unsigned char *)icp, sizeof(click_icmp_sequenced) + _data.length());
     
     q->set_dst_ip_anno(IPAddress(_dst));
-    q->set_ip_header(nip, sizeof(click_ip));
+    q->set_ip_header_anno(nip, sizeof(click_ip));
     q->timestamp_anno().set_now();
 
     if (_receiver)
diff --git a/elements/ip/checkipheader.cc b/elements/ip/checkipheader.cc
index a1a0392..5b5d886 100644
--- a/elements/ip/checkipheader.cc
+++ b/elements/ip/checkipheader.cc
@@ -247,7 +247,7 @@ CheckIPHeader::simple_action(Packet *p)
    * We now do this in the IP routing table.
    */
   
-  p->set_ip_header(ip, hlen);
+  p->set_ip_header_anno(ip, hlen);
 
   // shorten packet according to IP length field -- 7/28/2000
   if (plen > len)
diff --git a/elements/ip/ipencap.cc b/elements/ip/ipencap.cc
index 045f8a4..54baf32 100644
--- a/elements/ip/ipencap.cc
+++ b/elements/ip/ipencap.cc
@@ -155,7 +155,7 @@ IPEncap::simple_action(Packet *p_in)
   update_cksum(ip, 2);
   update_cksum(ip, 4);
   
-  p->set_ip_header(ip, sizeof(click_ip));
+  p->set_ip_header_anno(ip, sizeof(click_ip));
   
   return p;
 }
diff --git a/elements/ip/ipfragmenter.cc b/elements/ip/ipfragmenter.cc
index 914ea3a..1deeb57 100644
--- a/elements/ip/ipfragmenter.cc
+++ b/elements/ip/ipfragmenter.cc
@@ -129,7 +129,7 @@ IPFragmenter::fragment(Packet *p_in)
 
 	WritablePacket *q = Packet::make(out_hlen + out_dlen);
 	if (q) {
-	    q->set_network_header(q->data(), out_hlen);
+	    q->set_network_header_anno(q->data(), out_hlen);
 	    click_ip *qip = q->ip_header();
 	    
 	    memcpy(qip, ip, sizeof(click_ip));
diff --git a/elements/ip/ipinputcombo.cc b/elements/ip/ipinputcombo.cc
index c11a0a7..8d02e0b 100644
--- a/elements/ip/ipinputcombo.cc
+++ b/elements/ip/ipinputcombo.cc
@@ -120,7 +120,7 @@ IPInputCombo::smaction(Packet *p)
    * We now do this in the IP routing table.
    */
 
-  p->set_ip_header(ip, hlen);
+  p->set_ip_header_anno(ip, hlen);
 
   // shorten packet according to IP length field -- 7/28/2000
   if (p->length() > len)
diff --git a/elements/ip/ipreassembler.cc b/elements/ip/ipreassembler.cc
index 627ef2c..565c0fd 100644
--- a/elements/ip/ipreassembler.cc
+++ b/elements/ip/ipreassembler.cc
@@ -191,7 +191,7 @@ IPReassembler::make_queue(Packet *p, WritablePacket **q_pprev)
     _mem_used += IPH_MEM_USED + p_lastoff;
 
     // copy IP header and annotations if appropriate
-    q->set_ip_header((click_ip *)q->data(), hl);
+    q->set_ip_header_anno((click_ip *)q->data(), hl);
     memcpy(q->ip_header(), iph, hl);
     click_ip *q_iph = q->ip_header();
     q_iph->ip_off = (iph->ip_off & ~htons(IP_OFFMASK)); // leave MF, DF, RF
@@ -330,7 +330,7 @@ IPReassembler::simple_action(Packet *p)
 	    q = q->push(hl - q->network_header_length());
 	else
 	    q->pull(q->network_header_length() - hl);
-	q->set_ip_header((click_ip *)(q->transport_header() - hl), hl);
+	q->set_ip_header_anno((click_ip *)(q->transport_header() - hl), hl);
 	memcpy(q->ip_header(), p->ip_header(), hl);
 	q->ip_header()->ip_off = old_ip_off;
 	//q->copy_annotations(p); XXX
diff --git a/elements/ip/markipheader.cc b/elements/ip/markipheader.cc
index 4588587..7bcf1c4 100644
--- a/elements/ip/markipheader.cc
+++ b/elements/ip/markipheader.cc
@@ -42,7 +42,7 @@ Packet *
 MarkIPHeader::simple_action(Packet *p)
 {
   const click_ip *ip = reinterpret_cast<const click_ip *>(p->data() + _offset);
-  p->set_ip_header(ip, ip->ip_hl << 2);
+  p->set_ip_header_anno(ip, ip->ip_hl << 2);
   return p;
 }
 
diff --git a/elements/ip/ripsend.cc b/elements/ip/ripsend.cc
index 0a8ab28..4b55dd1 100644
--- a/elements/ip/ripsend.cc
+++ b/elements/ip/ripsend.cc
@@ -91,7 +91,7 @@ RIPSend::run_timer(Timer *)
   ipp->ip_ttl = 200;
   ipp->ip_sum = click_in_cksum((unsigned char *) ipp, sizeof(*ipp));
   
-  p->set_ip_header(ipp, sizeof(click_ip));
+  p->set_ip_header_anno(ipp, sizeof(click_ip));
   
   output(0).push(p);
 
diff --git a/elements/local/bufconv.cc b/elements/local/bufconv.cc
index 7860066..f083532 100644
--- a/elements/local/bufconv.cc
+++ b/elements/local/bufconv.cc
@@ -112,7 +112,7 @@ BufferConverter::oput(const String &s)
   if (ss.length() > dlen)
     _obuf += ss.substring(dlen, ss.length()-dlen);
 
-  q->set_ip_header(ip, ip->ip_hl << 2);
+  q->set_ip_header_anno(ip, ip->ip_hl << 2);
   output(0).push(q);
 }
 
diff --git a/elements/local/forceip.cc b/elements/local/forceip.cc
index c30a42d..af91c57 100644
--- a/elements/local/forceip.cc
+++ b/elements/local/forceip.cc
@@ -53,7 +53,7 @@ ForceIP::simple_action(Packet *p_in)
   ip->ip_sum = 0;
   ip->ip_sum = click_in_cksum((unsigned char *)ip, ip->ip_hl << 2);
 
-  p->set_ip_header(ip, hlen);
+  p->set_ip_header_anno(ip, hlen);
   
   return p;
 }
diff --git a/elements/local/tcpack.cc b/elements/local/tcpack.cc
index 1c667a8..5819537 100644
--- a/elements/local/tcpack.cc
+++ b/elements/local/tcpack.cc
@@ -197,7 +197,7 @@ TCPAck::send_ack()
   tcp->th_sum = htons(0);
   tcp->th_urp = htons(0);
 
-  q->set_ip_header(ip, ip->ip_hl << 2);
+  q->set_ip_header_anno(ip, ip->ip_hl << 2);
   output(2).push(q);
 }
 
diff --git a/elements/local/tcpconn.cc b/elements/local/tcpconn.cc
index a032f4d..0761341 100644
--- a/elements/local/tcpconn.cc
+++ b/elements/local/tcpconn.cc
@@ -217,7 +217,7 @@ TCPConn::send_syn()
   tcp->th_sum = htons(0);
   tcp->th_urp = htons(0);
 
-  q->set_ip_header(ip, ip->ip_hl << 2);
+  q->set_ip_header_anno(ip, ip->ip_hl << 2);
   output(2).push(q);
 }
 
diff --git a/elements/local/webgen.cc b/elements/local/webgen.cc
index be96bea..023134d 100644
--- a/elements/local/webgen.cc
+++ b/elements/local/webgen.cc
@@ -426,7 +426,7 @@ WebGen::tcp_output (WritablePacket *p,
   ip->ip_off = 0;
   ip->ip_ttl = 250;
   p->set_dst_ip_anno (IPAddress (ip->ip_dst));
-  p->set_ip_header (ip, sizeof (click_ip));
+  p->set_ip_header_anno (ip, sizeof (click_ip));
 
   click_tcp *th = (click_tcp *) (ip + 1);
 
diff --git a/elements/tcpudp/dynudpipencap.cc b/elements/tcpudp/dynudpipencap.cc
index fe9783d..7940780 100644
--- a/elements/tcpudp/dynudpipencap.cc
+++ b/elements/tcpudp/dynudpipencap.cc
@@ -101,7 +101,7 @@ DynamicUDPIPEncap::simple_action(Packet *p_in)
 #endif
   
   p->set_dst_ip_anno(IPAddress(_daddr));
-  p->set_ip_header(ip, sizeof(click_ip));
+  p->set_ip_header_anno(ip, sizeof(click_ip));
 
   // set up UDP header
   udp->uh_sport = htons(_sport);
diff --git a/elements/tcpudp/tcpipsend.cc b/elements/tcpudp/tcpipsend.cc
index b088cb0..4e0aeb8 100644
--- a/elements/tcpudp/tcpipsend.cc
+++ b/elements/tcpudp/tcpipsend.cc
@@ -79,7 +79,7 @@ TCPIPSend::make_packet(unsigned int saddr, unsigned int daddr,
   memset(q->data(), '\0', q->length());
   ip = (struct click_ip *) q->data();
   tcp = (struct click_tcp *) (ip + 1);
-  q->set_ip_header(ip, sizeof(click_ip));
+  q->set_ip_header_anno(ip, sizeof(click_ip));
   
   // IP fields
   ip->ip_v = 4;
diff --git a/elements/tcpudp/udpipencap.cc b/elements/tcpudp/udpipencap.cc
index 15e12a2..a0e05d4 100644
--- a/elements/tcpudp/udpipencap.cc
+++ b/elements/tcpudp/udpipencap.cc
@@ -113,7 +113,7 @@ UDPIPEncap::simple_action(Packet *p_in)
   ip->ip_sum = click_in_cksum((unsigned char *)ip, sizeof(click_ip));
 #endif
   
-  p->set_ip_header(ip, sizeof(click_ip));
+  p->set_ip_header_anno(ip, sizeof(click_ip));
 
   // set up UDP header
   udp->uh_sport = _sport;
diff --git a/elements/userlevel/fakepcap.cc b/elements/userlevel/fakepcap.cc
index 19359ce..8696a32 100644
--- a/elements/userlevel/fakepcap.cc
+++ b/elements/userlevel/fakepcap.cc
@@ -316,13 +316,13 @@ fake_pcap_force_ip(Packet *&p, int dlt)
     if (iph->ip_v == 4) {
 	if (iph->ip_hl >= 5
 	    && reinterpret_cast<const uint8_t*>(iph) + (iph->ip_hl << 2) <= end_data) {
-	    p->set_ip_header(iph, iph->ip_hl << 2);
+	    p->set_ip_header_anno(iph, iph->ip_hl << 2);
 	    p->set_dst_ip_anno(iph->ip_dst);
 	    return true;
 	}
     } else if (iph->ip_v == 6) {
 	if (reinterpret_cast<const uint8_t*>(iph) + sizeof(click_ip6) <= end_data) {
-	    p->set_ip6_header(reinterpret_cast<const click_ip6*>(iph));
+	    p->set_ip6_header_anno(reinterpret_cast<const click_ip6*>(iph));
 	    return true;
 	}
     }
diff --git a/elements/userlevel/fromdevice.cc b/elements/userlevel/fromdevice.cc
index 0b73fe9..5428d7f 100644
--- a/elements/userlevel/fromdevice.cc
+++ b/elements/userlevel/fromdevice.cc
@@ -349,7 +349,7 @@ FromDevice_get_packet(u_char* clientdata,
 
     // set annotations
     p->set_timestamp_anno(Timestamp::make_usec(pkthdr->ts.tv_sec, pkthdr->ts.tv_usec));
-    p->set_mac_header(p->data());
+    p->set_mac_header_anno(p->data());
     SET_EXTRA_LENGTH_ANNO(p, pkthdr->len - length);
 
     if (!fd->_force_ip || fake_pcap_force_ip(p, fd->_datalink))
diff --git a/elements/userlevel/fromdump.cc b/elements/userlevel/fromdump.cc
index 8444b60..6f27b3f 100644
--- a/elements/userlevel/fromdump.cc
+++ b/elements/userlevel/fromdump.cc
@@ -400,7 +400,7 @@ FromDump::read_packet(ErrorHandler *errh)
     SET_EXTRA_LENGTH_ANNO(p, len - caplen);
     _ff.shift_pos(skiplen);
 
-    p->set_mac_header(p->data());
+    p->set_mac_header_anno(p->data());
     _packet = p;
     return true;
 }
diff --git a/include/click/packet.hh b/include/click/packet.hh
index e2a7ac8..f92a2d7 100644
--- a/include/click/packet.hh
+++ b/include/click/packet.hh
@@ -246,8 +246,8 @@ class Packet { public:
     inline int mac_header_offset() const;
     inline uint32_t mac_header_length() const;
     inline int mac_length() const;
-    inline void set_mac_header(const unsigned char *p);
-    inline void set_mac_header(const unsigned char *p, uint32_t len);
+    inline void set_mac_header_anno(const unsigned char *p);
+    inline void set_mac_header_anno(const unsigned char *p, uint32_t len);
     inline void clear_mac_header();
 
     inline bool has_network_header() const;
@@ -255,9 +255,9 @@ class Packet { public:
     inline int network_header_offset() const;
     inline uint32_t network_header_length() const;
     inline int network_length() const;
-    inline void set_network_header(const unsigned char *p, uint32_t len);
+    inline void set_network_header_anno(const unsigned char *p, uint32_t len);
     inline void set_network_header_length(uint32_t len);
-    inline void clear_network_header();
+    inline void clear_network_header_anno();
 
     inline bool has_transport_header() const;
     inline const unsigned char *transport_header() const;
@@ -267,18 +267,18 @@ class Packet { public:
 
     // CONVENIENCE HEADER ANNOTATIONS
     inline const click_ether *ether_header() const;
-    inline void set_ether_header(const click_ether *ethh);
+    inline void set_ether_header_anno(const click_ether *ethh);
 
     inline const click_ip *ip_header() const;
     inline int ip_header_offset() const;
     inline uint32_t ip_header_length() const;
-    inline void set_ip_header(const click_ip *iph, uint32_t len);
+    inline void set_ip_header_anno(const click_ip *iph, uint32_t len);
 
     inline const click_ip6 *ip6_header() const;
     inline int ip6_header_offset() const;
     inline uint32_t ip6_header_length() const;
-    inline void set_ip6_header(const click_ip6 *ip6h);
-    inline void set_ip6_header(const click_ip6 *ip6h, uint32_t len);
+    inline void set_ip6_header_anno(const click_ip6 *ip6h);
+    inline void set_ip6_header_anno(const click_ip6 *ip6h, uint32_t len);
 
     inline const click_icmp *icmp_header() const;
     inline const click_tcp *tcp_header() const;
@@ -1538,7 +1538,7 @@ Packet::set_dst_ip_anno(IPAddress a)
 /** @brief Set the MAC header pointer.
  * @param p new header pointer */
 inline void
-Packet::set_mac_header(const unsigned char *p)
+Packet::set_mac_header_anno(const unsigned char *p)
 {
     assert(p >= buffer() && p <= end_buffer());
 #if CLICK_LINUXMODULE	/* Linux kernel module */
@@ -1557,7 +1557,7 @@ Packet::set_mac_header(const unsigned char *p)
  * @param len new MAC header length
  * @post mac_header() == @a p and network_header() == @a p + @a len */
 inline void
-Packet::set_mac_header(const unsigned char *p, uint32_t len)
+Packet::set_mac_header_anno(const unsigned char *p, uint32_t len)
 {
     assert(p >= buffer() && p + len <= end_buffer());
 #if CLICK_LINUXMODULE	/* Linux kernel module */
@@ -1580,9 +1580,9 @@ Packet::set_mac_header(const unsigned char *p, uint32_t len)
  * @post mac_header_length() == 14
  * @post (void *) network_header() == (void *) (@a ethh + 1) */
 inline void
-Packet::set_ether_header(const click_ether *ethh)
+Packet::set_ether_header_anno(const click_ether *ethh)
 {
-    set_mac_header(reinterpret_cast<const unsigned char *>(ethh), 14);
+    set_mac_header_anno(reinterpret_cast<const unsigned char *>(ethh), 14);
 }
 
 /** @brief Unset the MAC header pointer.
@@ -1624,7 +1624,7 @@ Packet::push_mac_header(uint32_t len)
 	/* nada */;
     else
 	return 0;
-    q->set_mac_header(q->data(), len);
+    q->set_mac_header_anno(q->data(), len);
     return q;
 }
 
@@ -1633,7 +1633,7 @@ Packet::push_mac_header(uint32_t len)
  * @param len new network header length
  * @post network_header() == @a p and transport_header() == @a p + @a len */
 inline void
-Packet::set_network_header(const unsigned char *p, uint32_t len)
+Packet::set_network_header_anno(const unsigned char *p, uint32_t len)
 {
     assert(p >= buffer() && p + len <= end_buffer());
 #if CLICK_LINUXMODULE	/* Linux kernel module */
@@ -1678,9 +1678,9 @@ Packet::set_network_header_length(uint32_t len)
  * @post network_header_length() == @a len
  * @post (char *) transport_header() == (char *) @a iph + @a len */
 inline void
-Packet::set_ip_header(const click_ip *iph, uint32_t len)
+Packet::set_ip_header_anno(const click_ip *iph, uint32_t len)
 {
-    set_network_header(reinterpret_cast<const unsigned char *>(iph), len);
+    set_network_header_anno(reinterpret_cast<const unsigned char *>(iph), len);
 }
 
 /** @brief Set the network header pointer to an IPv6 header.
@@ -1690,9 +1690,9 @@ Packet::set_ip_header(const click_ip *iph, uint32_t len)
  * @post network_header_length() == @a len
  * @post (char *) transport_header() == (char *) @a ip6h + @a len */
 inline void
-Packet::set_ip6_header(const click_ip6 *ip6h, uint32_t len)
+Packet::set_ip6_header_anno(const click_ip6 *ip6h, uint32_t len)
 {
-    set_network_header(reinterpret_cast<const unsigned char *>(ip6h), len);
+    set_network_header_anno(reinterpret_cast<const unsigned char *>(ip6h), len);
 }
 
 /** @brief Set the network header pointer to an IPv6 header.
@@ -1701,16 +1701,16 @@ Packet::set_ip6_header(const click_ip6 *ip6h, uint32_t len)
  * @post network_header_length() == 40
  * @post (char *) transport_header() == (char *) (@a ip6h + 1) */
 inline void
-Packet::set_ip6_header(const click_ip6 *ip6h)
+Packet::set_ip6_header_anno(const click_ip6 *ip6h)
 {
-    set_ip6_header(ip6h, 40);
+    set_ip6_header_anno(ip6h, 40);
 }
 
 /** @brief Unset the network header pointer.
  * @post has_network_header() == false
  * Does not affect the MAC or transport header pointers. */
 inline void
-Packet::clear_network_header()
+Packet::clear_network_header_anno()
 {
 #if CLICK_LINUXMODULE	/* Linux kernel module */
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && NET_SKBUFF_DATA_USES_OFFSET
@@ -1863,7 +1863,7 @@ Packet::clear_annotations(bool all)
 	set_timestamp_anno(Timestamp());
 
 	clear_mac_header();
-	clear_network_header();
+	clear_network_header_anno();
 	clear_transport_header();
 
 	set_next(0);