--- a/src/internet/model/ipv6-end-point.h	Fri Nov 16 22:27:18 2012 +0100
+++ b/src/internet/model/ipv6-end-point.h	Tue Nov 20 17:52:39 2012 -0500
@@ -25,6 +25,7 @@
 
 #include "ns3/ipv6-address.h"
 #include "ns3/callback.h"
+#include "ns3/ipv6-header.h"
 
 namespace ns3
 {
@@ -98,7 +99,7 @@
    * \brief Set the reception callback.
    * \param callback callback function
    */
-  void SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Address, Ipv6Address, uint16_t> callback);
+  void SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Header, uint16_t> callback);
 
   /**
    * \brief Set the ICMP callback.
@@ -119,7 +120,7 @@
    * \param dstAddr source address
    * \param port source port
    */
-  void ForwardUp (Ptr<Packet> p, Ipv6Address srcAddr, Ipv6Address dstAddr, uint16_t port);
+  void ForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t port);
 
   /**
    * \brief Function called from an L4Protocol implementation
@@ -141,7 +142,7 @@
    * \param daddr dest IPv6 address
    * \param sport source port
    */
-  void DoForwardUp (Ptr<Packet> p, Ipv6Address saddr, Ipv6Address daddr, uint16_t sport);
+  void DoForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t sport);
 
   /**
    * \brief ForwardIcmp wrapper.
@@ -177,7 +178,7 @@
   /**
    * \brief The RX callback.
    */
-  Callback<void, Ptr<Packet>, Ipv6Address, Ipv6Address, uint16_t> m_rxCallback;
+  Callback<void, Ptr<Packet>, Ipv6Header, uint16_t> m_rxCallback;
 
   /**
    * \brief The ICMPv6 callback.