--- ns-2.29.orig/diffusion/diffusion.cc	2005-10-20 00:45:22.000000000 -0400
+++ ns-2.29.orig/diffusion/diffusion.cc	2006-06-17 23:11:00.000000000 -0400
@@ -241,6 +241,13 @@ 
 }
 
 
+void XmitFailedCallback(Packet *pkt, void *data)
+{
+  DiffusionAgent *agent = (DiffusionAgent *)data;  // cast of trust
+  agent->xmitFailed(pkt);
+}
+
+
 void DiffusionAgent::Print_IOlist()
 {
 }
@@ -459,13 +466,6 @@ 
 }
 
 
-void XmitFailedCallback(Packet *pkt, void *data)
-{
-  DiffusionAgent *agent = (DiffusionAgent *)data;  // cast of trust
-  agent->xmitFailed(pkt);
-}
-
-
 void DiffusionAgent::xmitFailed(Packet *)
 {
   // For future use, if needed.
--- ns-2.29.orig/diffusion/omni_mcast.cc	2005-10-20 00:45:22.000000000 -0400
+++ ns-2.29.orig/diffusion/omni_mcast.cc	2006-06-17 23:17:48.000000000 -0400
@@ -80,6 +80,13 @@ 
 #include "dsr/path.h"
 #include "god.h"
 
+void OmniMcastXmitFailedCallback(Packet *pkt, void *data)
+{
+  OmniMcastAgent *agent = (OmniMcastAgent *)data;  // cast of trust
+  agent->xmitFailed(pkt);
+}
+
+
 static class OmniMcastClass : public TclClass {
 public:
   OmniMcastClass() : TclClass("Agent/OmniMcast") {}
@@ -419,13 +426,6 @@ 
 }
 
 
-void OmniMcastXmitFailedCallback(Packet *pkt, void *data)
-{
-  OmniMcastAgent *agent = (OmniMcastAgent *)data;  // cast of trust
-  agent->xmitFailed(pkt);
-}
-
-
 void OmniMcastAgent::xmitFailed(Packet *pkt)
 {
   // For future extension if needed.
--- ns-2.29.orig/dsr/dsragent.cc	2005-10-20 00:45:22.000000000 -0400
+++ ns-2.29.orig/dsr/dsragent.cc	2006-06-17 23:12:01.000000000 -0400
@@ -214,6 +214,21 @@ 
 
 */
 
+void
+XmitFailureCallback(Packet *pkt, void *data)
+{
+  DSRAgent *agent = (DSRAgent *)data; // cast of trust
+  agent->xmitFailed(pkt);
+}
+
+void
+XmitFlowFailureCallback(Packet *pkt, void *data)
+{
+  DSRAgent *agent = (DSRAgent *)data;
+  agent->xmitFlowFailed(pkt);
+}
+
+
 /*===========================================================================
   SendBuf management and helpers
 ---------------------------------------------------------------------------*/
@@ -2785,20 +2800,6 @@ 
   sendOutPacketWithRoute(p, true);
 }
 
-void
-XmitFailureCallback(Packet *pkt, void *data)
-{
-  DSRAgent *agent = (DSRAgent *)data; // cast of trust
-  agent->xmitFailed(pkt);
-}
-
-void
-XmitFlowFailureCallback(Packet *pkt, void *data)
-{
-  DSRAgent *agent = (DSRAgent *)data;
-  agent->xmitFlowFailed(pkt);
-}
-
 #if 0
 
 /* this is code that implements Route Reply holdoff to prevent route 
--- ns-2.29.orig/pgm/pgm-agent.cc	2005-10-20 00:45:23.000000000 -0400
+++ ns-2.29.orig/pgm/pgm-agent.cc	2006-06-17 23:32:25.000000000 -0400
@@ -304,7 +304,7 @@ 
 
   void print_stats();
 
-  void PgmAgent::trace_event(char *evType, double evTime);
+  void trace_event(char *evType, double evTime);
 
 #ifdef PGM_DEBUG
   void display_packet(Packet *pkt);
--- ns-2.29.orig/pgm/pgm-receiver.cc	2005-10-20 00:45:23.000000000 -0400
+++ ns-2.29.orig/pgm/pgm-receiver.cc	2006-06-17 23:35:55.000000000 -0400
@@ -183,7 +183,7 @@ 
   void print_stats();
   void display_packet(Packet *pkt); // For debugging.
 
-  void PgmReceiver::trace_event(char *evType, double evTime);
+  void trace_event(char *evType, double evTime);
 
   EventTrace * et_;  //Trace Object for Custom Event Trace
 
--- ns-2.29.orig/pgm/pgm-sender.cc	2005-10-20 00:45:23.000000000 -0400
+++ ns-2.29.orig/pgm/pgm-sender.cc	2006-06-17 23:28:19.000000000 -0400
@@ -186,7 +186,7 @@ 
 
   void display_packet(Packet *pkt); // For debugging.
 
-  void PgmSender::trace_event(char *evType, nsaddr_t daddr, double evTime); 
+  void trace_event(char *evType, nsaddr_t daddr, double evTime); 
 
   EventTrace * et_; 	//Trace Object for custom Event Traces
 
--- ns-2.29.orig/tcp/tcp-sack-rh.cc	2005-10-20 00:45:25.000000000 -0400
+++ ns-2.29.orig/tcp/tcp-sack-rh.cc	2006-06-17 23:24:00.000000000 -0400
@@ -65,7 +65,7 @@ 
 	virtual void estadjust();
 	virtual void rhclear();
 	virtual void computefack();
-	virtual void SackRHTcpAgent::newack(Packet* pkt);
+	virtual void newack(Packet* pkt);
  protected:
 	int fack_;	          /* the FACK state variable  */
 	int retran_data_;         /* the number of retransmitted packets in the pipe  */