--- a/servlib/bundling/BundleDaemon.h	Fri May 27 18:33:25 2011 +0100
+++ b/servlib/bundling/BundleDaemon.h	Mon May 30 19:36:18 2011 +0100
@@ -33,6 +33,7 @@
 #include "BundleProtocol.h"
 #include "BundleActions.h"
 #include "BundleStatusReport.h"
+#include "BPQBlock.h"
 
 namespace dtn {
 
@@ -411,12 +412,12 @@
     /**
      * Add BPQ bundle to the on-path cache
      */
-    bool accept_bpq_response(Bundle* bundle);
+    bool accept_bpq_response(Bundle* bundle, BPQBlock* bpq_block);
 
     /**
      * todo
      */
-    bool answer_bpq_query(Bundle* bundle);
+    bool answer_bpq_query(Bundle* bundle, BPQBlock* bpq_block);
 
     /**
      * Add the bundle to the pending list and (optionally) the
@@ -462,7 +463,7 @@
      * Check the bundle source and if it contains a QUERY_EXTENSION_BLOCK
      * if if does ...
      */
-    void handle_bpq_block(Bundle* b, BundleReceivedEvent* event);
+    bool handle_bpq_block(Bundle* b, BundleReceivedEvent* event);
 
 
     /**