--- a/apps/dtnrespond/dtnrespond.c	Thu Jun 30 15:32:09 2011 +0100
+++ b/apps/dtnrespond/dtnrespond.c	Wed Aug 03 14:35:09 2011 +0100
@@ -35,10 +35,6 @@
 #define COUNTER_MAX_DIGITS 9
 
 #define DTN_BPQ_BLOCK_TYPE 0xC8
-#define DTN_BPQ_BLOCK_FLAGS 0x00
-
-#define DTN_BPQ_KIND_QUERY 0x00
-#define DTN_BPQ_KIND_RESPONSE 0x01
 
 // Find the maximum commandline length
 #ifdef __FreeBSD__
@@ -727,7 +723,7 @@
     dtn_set_payload(&response_payload, DTN_PAYLOAD_FILE, pathname, strlen(pathname)); 
 
     // set the bpq block data
-    response_bpq_block_data.kind = DTN_BPQ_KIND_RESPONSE;
+    response_bpq_block_data.kind = BPQ_BLOCK_KIND_RESPONSE;
     response_bpq_block_data.matching_rule = query_bpq_block_data->matching_rule;
     response_bpq_block_data.query.query_len = query_bpq_block_data->query.query_len;
     response_bpq_block_data.query.query_val = query_bpq_block_data->query.query_val;
@@ -747,7 +743,7 @@
 
     // set the bpq block
     response_bpq_block.type = DTN_BPQ_BLOCK_TYPE;
-    response_bpq_block.flags = DTN_BPQ_BLOCK_FLAGS;
+    response_bpq_block.flags = BLOCK_FLAG_REPLICATE;
     response_bpq_block.data.data_len = buf_len;
     response_bpq_block.data.data_val = buf;