61 files changed, 717 insertions, 717 deletions

diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index 8e43c2377..77f778c95 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -63,7 +63,7 @@ struct RegexAcceptBlock
    * The key of the state.
    */
   struct GNUNET_HashCode key;
-  
+
   /**
    * Public key of the peer signing.
    */
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 7c35b0b20..e1f44620f 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -180,7 +180,7 @@ struct GNUNET_ARM_Handle;
  * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected,
  *                  GNUNET_SYSERR if there was an error.
  */
-typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, 
+typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls,
                                                      int connected);
 
 
@@ -195,9 +195,9 @@ typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls,
  * @param service service name
  * @param result result of the operation
  */
-typedef void (*GNUNET_ARM_ResultCallback) (void *cls, 
-                                           enum GNUNET_ARM_RequestStatus rs, 
-                                           const char *service, 
+typedef void (*GNUNET_ARM_ResultCallback) (void *cls,
+                                           enum GNUNET_ARM_RequestStatus rs,
+                                           const char *service,
                                            enum GNUNET_ARM_Result result);
 
 
@@ -212,9 +212,9 @@ typedef void (*GNUNET_ARM_ResultCallback) (void *cls,
  * @param count number of strings in the list
  * @param list list of running services
  */
-typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls, 
-                                                enum GNUNET_ARM_RequestStatus rs, 
-                                                unsigned int count, 
+typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls,
+                                                enum GNUNET_ARM_RequestStatus rs,
+                                                unsigned int count,
                                                 const char *const*list);
 
 
@@ -231,7 +231,7 @@ typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls,
  */
 struct GNUNET_ARM_Handle *
 GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    GNUNET_ARM_ConnectionStatusCallback conn_status, 
+                    GNUNET_ARM_ConnectionStatusCallback conn_status,
                     void *cls);
 
 
@@ -274,7 +274,7 @@ GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
  */
 void
 GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
-                                 const char *service_name, 
+                                 const char *service_name,
                                  struct GNUNET_TIME_Relative timeout,
                                  GNUNET_ARM_ResultCallback cont, void *cont_cls);
 
@@ -291,9 +291,9 @@ GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
  */
 void
 GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
-                                  const char *service_name, 
+                                  const char *service_name,
                                   enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                                  struct GNUNET_TIME_Relative timeout, 
+                                  struct GNUNET_TIME_Relative timeout,
                                   GNUNET_ARM_ResultCallback cont,
                                   void *cont_cls);
 
@@ -312,8 +312,8 @@ struct GNUNET_ARM_MonitorHandle;
  * @param service service name
  * @param status status of the service
  */
-typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls, 
-                                                  const char *service, 
+typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls,
+                                                  const char *service,
                                                   enum GNUNET_ARM_ServiceStatus status);
 
 
@@ -330,7 +330,7 @@ typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls,
  */
 struct GNUNET_ARM_MonitorHandle *
 GNUNET_ARM_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    GNUNET_ARM_ServiceStatusCallback cont, 
+                    GNUNET_ARM_ServiceStatusCallback cont,
                     void *cont_cls);
 
 
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index a9ac0c1cd..261288396 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -93,7 +93,7 @@ GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h, const char *what,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h, 
+GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
                     const char *file, int line,
                     void *result, size_t len);
 
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 38ad78686..5f3bbda96 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -88,7 +88,7 @@ enum GNUNET_BLOCK_Type
    * Block for testing.
    */
   GNUNET_BLOCK_TYPE_TEST = 8,
-  
+
   /**
    * Type of a block representing any type of search result
    * (universal).  Implemented in the context of #2564, replaces
@@ -132,7 +132,7 @@ enum GNUNET_BLOCK_EvaluationResult
    * Valid result, and there may be more.
    */
   GNUNET_BLOCK_EVALUATION_OK_MORE = 0,
-  
+
   /**
    * Last possible valid result.
    */
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index aadfdb5a4..91f278d38 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -51,7 +51,7 @@
  * @param reply_block_size number of bytes in @a reply_block
  * @return characterization of result
  */
-typedef enum GNUNET_BLOCK_EvaluationResult 
+typedef enum GNUNET_BLOCK_EvaluationResult
 (*GNUNET_BLOCK_EvaluationFunction) (void *cls,
                                     enum GNUNET_BLOCK_Type type,
                                     const struct GNUNET_HashCode *query,
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 37f152d97..687083ad4 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -128,7 +128,7 @@ GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *client,
                                      size_t size,
                                      struct GNUNET_TIME_Relative timeout,
                                      int auto_retry,
-                                     GNUNET_CONNECTION_TransmitReadyNotify notify, 
+                                     GNUNET_CONNECTION_TransmitReadyNotify notify,
                                      void *notify_cls);
 
 
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index d599b87e9..450a45a7e 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -217,7 +217,7 @@ extern "C"
 /**
  * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32
  */
-#define GNUNET_NETWORK_STRUCT_BEGIN 
+#define GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32;
@@ -307,9 +307,9 @@ GNUNET_get_log_skip ();
 
 #if !defined(GNUNET_CULL_LOGGING)
 int
-GNUNET_get_log_call_status (int caller_level, 
+GNUNET_get_log_call_status (int caller_level,
                             const char *comp,
-                            const char *file, 
+                            const char *file,
                             const char *function, int line);
 #endif
 
@@ -403,7 +403,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp,
  * @param option name of missing option
  */
 void
-GNUNET_log_config_missing (enum GNUNET_ErrorType kind, 
+GNUNET_log_config_missing (enum GNUNET_ErrorType kind,
                            const char *section,
                            const char *option);
 
@@ -418,7 +418,7 @@ GNUNET_log_config_missing (enum GNUNET_ErrorType kind,
  * @param required what is required that is invalid about the option
  */
 void
-GNUNET_log_config_invalid (enum GNUNET_ErrorType kind, 
+GNUNET_log_config_invalid (enum GNUNET_ErrorType kind,
                            const char *section,
                            const char *option,
                            const char *required);
@@ -651,7 +651,7 @@ GNUNET_htonll (uint64_t n);
  * @param d the value in network byte order
  * @return the same value in host byte order
  */
-double 
+double
 GNUNET_hton_double (double d);
 
 /**
@@ -659,7 +659,7 @@ GNUNET_hton_double (double d);
  * @param d the value in network byte order
  * @return the same value in host byte order
  */
-double 
+double
 GNUNET_ntoh_double (double d);
 
 /* ************************* allocation functions ****************** */
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 05ba8a2db..08cf1558a 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -22,7 +22,7 @@
  * @file include/gnunet_configuration_lib.h
  * @brief configuration API
  * @author Christian Grothoff
- * @defgroup configuration Configuration management 
+ * @defgroup configuration Configuration management
  * @{
  */
 #ifndef GNUNET_CONFIGURATION_LIB_H
@@ -324,9 +324,9 @@ GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle *cfg, 
+GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                        const char *section,
-                                       const char *option, 
+                                       const char *option,
                                        char **value);
 
 
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index fc1255506..b7085a801 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -95,7 +95,7 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * GNUNET_CONSENSUS_destroy instead.
  *
  * @param cls
- * @param success GNUNET_OK on success, GNUNET_SYSERR if 
+ * @param success GNUNET_OK on success, GNUNET_SYSERR if
  *        the insertion and thus the consensus failed for good
  */
 typedef void (*GNUNET_CONSENSUS_InsertDoneCallback) (void *cls,
@@ -111,7 +111,7 @@ typedef void (*GNUNET_CONSENSUS_InsertDoneCallback) (void *cls,
  *
  * @param consensus handle for the consensus session
  * @param element the element to be inserted
- * @param idc function called when we are done with this element and it 
+ * @param idc function called when we are done with this element and it
  *            is thus allowed to call GNUNET_CONSENSUS_insert again
  * @param idc_cls closure for 'idc'
  */
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index 5f37f8922..730a3d6d7 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -119,7 +119,7 @@ extern "C"
 
 /**
  * Largest block that can be stored in the DHT.
- */ 
+ */
 #define GNUNET_CONSTANTS_MAX_BLOCK_SIZE (62 * 1024)
 
 
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 39176e93b..00540d9ea 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -612,10 +612,10 @@ typedef int (*GNUNET_CONTAINER_HashMapIterator) (void *cls,
  * @param len initial size (map will grow as needed)
  * @param do_not_copy_keys #GNUNET_NO is always safe and should be used by default;
  *                         #GNUNET_YES means that on 'put', the 'key' does not have
- *                         to be copied as the destination of the pointer is 
+ *                         to be copied as the destination of the pointer is
  *                         guaranteed to be life as long as the value is stored in
- *                         the hashmap.  This can significantly reduce memory 
- *                         consumption, but of course is also a recipie for 
+ *                         the hashmap.  This can significantly reduce memory
+ *                         consumption, but of course is also a recipie for
  *                         heap corruption if the assumption is not true.  Only
  *                         use this if (1) memory use is important in this case and
  *                         (2) you have triple-checked that the invariant holds
@@ -649,7 +649,7 @@ GNUNET_CONTAINER_multihashmap_destroy (struct GNUNET_CONTAINER_MultiHashMap *map
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap *map, 
+GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap *map,
                                    const struct GNUNET_HashCode *key);
 
 
@@ -667,7 +667,7 @@ GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap *m
  */
 int
 GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map,
-                                      const struct GNUNET_HashCode *key, 
+                                      const struct GNUNET_HashCode *key,
                                       const void *value);
 
 /**
@@ -680,7 +680,7 @@ GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map,
  * @return number of values removed
  */
 int
-GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap *map, 
+GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap *map,
                                           const struct GNUNET_HashCode *key);
 
 
@@ -711,7 +711,7 @@ GNUNET_CONTAINER_multihashmap_contains (const struct GNUNET_CONTAINER_MultiHashM
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multihashmap_contains_value (const struct GNUNET_CONTAINER_MultiHashMap *map, 
+GNUNET_CONTAINER_multihashmap_contains_value (const struct GNUNET_CONTAINER_MultiHashMap *map,
                                               const struct GNUNET_HashCode *key,
                                               const void *value);
 
@@ -782,7 +782,7 @@ GNUNET_CONTAINER_multihashmap_iterator_create (const struct GNUNET_CONTAINER_Mul
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Retrieve the next element from the hash map at the iterator's
  * position.  If there are no elements left, #GNUNET_NO is returned,
  * and @a key and @a value are not modified.  This operation is only
@@ -798,12 +798,12 @@ GNUNET_CONTAINER_multihashmap_iterator_create (const struct GNUNET_CONTAINER_Mul
  */
 int
 GNUNET_CONTAINER_multihashmap_iterator_next (struct GNUNET_CONTAINER_MultiHashMapIterator *iter,
-                                             struct GNUNET_HashCode *key, 
+                                             struct GNUNET_HashCode *key,
                                              const void **value);
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Destroy a multihashmap iterator.
  *
  * @param iter the iterator to destroy
@@ -813,7 +813,7 @@ GNUNET_CONTAINER_multihashmap_iterator_destroy (struct GNUNET_CONTAINER_MultiHas
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Iterate over all entries in the map that match a particular key.
  *
  * @param map the map
@@ -856,10 +856,10 @@ typedef int (*GNUNET_CONTAINER_PeerMapIterator) (void *cls,
  * @param len initial size (map will grow as needed)
  * @param do_not_copy_keys #GNUNET_NO is always safe and should be used by default;
  *                         #GNUNET_YES means that on 'put', the 'key' does not have
- *                         to be copied as the destination of the pointer is 
+ *                         to be copied as the destination of the pointer is
  *                         guaranteed to be life as long as the value is stored in
- *                         the hashmap.  This can significantly reduce memory 
- *                         consumption, but of course is also a recipie for 
+ *                         the hashmap.  This can significantly reduce memory
+ *                         consumption, but of course is also a recipie for
  *                         heap corruption if the assumption is not true.  Only
  *                         use this if (1) memory use is important in this case and
  *                         (2) you have triple-checked that the invariant holds
@@ -893,7 +893,7 @@ GNUNET_CONTAINER_multipeermap_destroy (struct GNUNET_CONTAINER_MultiPeerMap *map
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multipeermap_get (const struct GNUNET_CONTAINER_MultiPeerMap *map, 
+GNUNET_CONTAINER_multipeermap_get (const struct GNUNET_CONTAINER_MultiPeerMap *map,
                                    const struct GNUNET_PeerIdentity *key);
 
 
@@ -911,7 +911,7 @@ GNUNET_CONTAINER_multipeermap_get (const struct GNUNET_CONTAINER_MultiPeerMap *m
  */
 int
 GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map,
-                                      const struct GNUNET_PeerIdentity * key, 
+                                      const struct GNUNET_PeerIdentity * key,
                                       const void *value);
 
 /**
@@ -924,7 +924,7 @@ GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map,
  * @return number of values removed
  */
 int
-GNUNET_CONTAINER_multipeermap_remove_all (struct GNUNET_CONTAINER_MultiPeerMap *map, 
+GNUNET_CONTAINER_multipeermap_remove_all (struct GNUNET_CONTAINER_MultiPeerMap *map,
                                           const struct GNUNET_PeerIdentity *key);
 
 
@@ -955,7 +955,7 @@ GNUNET_CONTAINER_multipeermap_contains (const struct GNUNET_CONTAINER_MultiPeerM
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multipeermap_contains_value (const struct GNUNET_CONTAINER_MultiPeerMap *map, 
+GNUNET_CONTAINER_multipeermap_contains_value (const struct GNUNET_CONTAINER_MultiPeerMap *map,
                                               const struct GNUNET_PeerIdentity * key,
                                               const void *value);
 
@@ -975,7 +975,7 @@ GNUNET_CONTAINER_multipeermap_contains_value (const struct GNUNET_CONTAINER_Mult
  */
 int
 GNUNET_CONTAINER_multipeermap_put (struct GNUNET_CONTAINER_MultiPeerMap *map,
-                                   const struct GNUNET_PeerIdentity *key, 
+                                   const struct GNUNET_PeerIdentity *key,
                                    void *value,
                                    enum GNUNET_CONTAINER_MultiHashMapOption opt);
 
@@ -1025,7 +1025,7 @@ GNUNET_CONTAINER_multipeermap_iterator_create (const struct GNUNET_CONTAINER_Mul
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Retrieve the next element from the hash map at the iterator's
  * position.  If there are no elements left, #GNUNET_NO is returned,
  * and @a key and @a value are not modified.  This operation is only
@@ -1041,12 +1041,12 @@ GNUNET_CONTAINER_multipeermap_iterator_create (const struct GNUNET_CONTAINER_Mul
  */
 int
 GNUNET_CONTAINER_multipeermap_iterator_next (struct GNUNET_CONTAINER_MultiPeerMapIterator *iter,
-                                             struct GNUNET_PeerIdentity *key, 
+                                             struct GNUNET_PeerIdentity *key,
                                              const void **value);
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Destroy a multipeermap iterator.
  *
  * @param iter the iterator to destroy
@@ -1056,7 +1056,7 @@ GNUNET_CONTAINER_multipeermap_iterator_destroy (struct GNUNET_CONTAINER_MultiPee
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Iterate over all entries in the map that match a particular key.
  *
  * @param map the map
@@ -1077,14 +1077,14 @@ GNUNET_CONTAINER_multipeermap_get_multiple (const struct GNUNET_CONTAINER_MultiP
 /* Version of multihashmap with 32 bit keys */
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Opaque handle for the 32-bit key HashMap.
  */
 struct GNUNET_CONTAINER_MultiHashMap32;
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Iterator over hash map entries.
  *
  * @param cls closure
@@ -1100,7 +1100,7 @@ typedef int (*GNUNET_CONTAINER_HashMapIterator32) (void *cls,
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Create a 32-bit key multi hash map.
  *
  * @param len initial size (map will grow as needed)
@@ -1111,7 +1111,7 @@ GNUNET_CONTAINER_multihashmap32_create (unsigned int len);
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Destroy a 32-bit key hash map.  Will not free any values
  * stored in the hash map!
  *
@@ -1123,7 +1123,7 @@ GNUNET_CONTAINER_multihashmap32_destroy (struct GNUNET_CONTAINER_MultiHashMap32
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Get the number of key-value pairs in the map.
  *
  * @param map the map
@@ -1135,7 +1135,7 @@ GNUNET_CONTAINER_multihashmap32_size (const struct
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Given a key find a value in the map matching the key.
  *
  * @param map the map
@@ -1146,13 +1146,13 @@ GNUNET_CONTAINER_multihashmap32_size (const struct
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multihashmap32_get (const struct 
+GNUNET_CONTAINER_multihashmap32_get (const struct
                                      GNUNET_CONTAINER_MultiHashMap32 *map,
                                      uint32_t key);
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Iterate over all entries in the map.
  *
  * @param map the map
@@ -1169,7 +1169,7 @@ GNUNET_CONTAINER_multihashmap32_iterate (const struct
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Remove the given key-value pair from the map.  Note that if the
  * key-value pair is in the map multiple times, only one of the pairs
  * will be removed.
@@ -1182,12 +1182,12 @@ GNUNET_CONTAINER_multihashmap32_iterate (const struct
  */
 int
 GNUNET_CONTAINER_multihashmap32_remove (struct GNUNET_CONTAINER_MultiHashMap32 *map,
-                                        uint32_t key, 
+                                        uint32_t key,
                                         const void *value);
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Remove all entries for the given key from the map.
  * Note that the values would not be "freed".
  *
@@ -1201,7 +1201,7 @@ GNUNET_CONTAINER_multihashmap32_remove_all (struct GNUNET_CONTAINER_MultiHashMap
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Check if the map contains any value under the given
  * key (including values that are NULL).
  *
@@ -1216,7 +1216,7 @@ GNUNET_CONTAINER_multihashmap32_contains (const struct GNUNET_CONTAINER_MultiHas
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Check if the map contains the given value under the given
  * key.
  *
@@ -1227,13 +1227,13 @@ GNUNET_CONTAINER_multihashmap32_contains (const struct GNUNET_CONTAINER_MultiHas
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multihashmap32_contains_value (const struct GNUNET_CONTAINER_MultiHashMap32 *map, 
+GNUNET_CONTAINER_multihashmap32_contains_value (const struct GNUNET_CONTAINER_MultiHashMap32 *map,
                                                 uint32_t key,
                                                 const void *value);
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Store a key-value pair in the map.
  *
  * @param map the map
@@ -1246,14 +1246,14 @@ GNUNET_CONTAINER_multihashmap32_contains_value (const struct GNUNET_CONTAINER_Mu
  *                       value already exists
  */
 int
-GNUNET_CONTAINER_multihashmap32_put (struct GNUNET_CONTAINER_MultiHashMap32 *map, 
-                                     uint32_t key, 
+GNUNET_CONTAINER_multihashmap32_put (struct GNUNET_CONTAINER_MultiHashMap32 *map,
+                                     uint32_t key,
                                      void *value,
                                      enum GNUNET_CONTAINER_MultiHashMapOption opt);
 
 
 /**
- * @ingroup hashmap 
+ * @ingroup hashmap
  * Iterate over all entries in the map that match a particular key.
  *
  * @param map the map
@@ -1264,7 +1264,7 @@ GNUNET_CONTAINER_multihashmap32_put (struct GNUNET_CONTAINER_MultiHashMap32 *map
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_MultiHashMap32 *map, 
+GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_MultiHashMap32 *map,
                                               uint32_t key,
                                               GNUNET_CONTAINER_HashMapIterator32 it,
                                               void *it_cls);
@@ -1276,7 +1276,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 /* To avoid mistakes: head->prev == tail->next == NULL     */
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element at the head of a DLL. Assumes that head, tail and
  * element are structs with prev and next fields.
  *
@@ -1297,7 +1297,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element at the tail of a DLL. Assumes that head, tail and
  * element are structs with prev and next fields.
  *
@@ -1318,7 +1318,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element into a DLL after the given other element.  Insert
  * at the head if the other element is NULL.
  *
@@ -1348,7 +1348,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element into a DLL before the given other element.  Insert
  * at the tail if the other element is NULL.
  *
@@ -1378,7 +1378,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Remove an element from a DLL. Assumes that head, tail and
  * element point to structs with prev and next fields.
  *
@@ -1410,7 +1410,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
    in multiple lists at the same time *********************** */
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element at the head of a MDLL. Assumes that head, tail and
  * element are structs with prev and next fields.
  *
@@ -1432,7 +1432,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element at the tail of a MDLL. Assumes that head, tail and
  * element are structs with prev and next fields.
  *
@@ -1454,7 +1454,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element into a MDLL after the given other element.  Insert
  * at the head if the other element is NULL.
  *
@@ -1485,7 +1485,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Insert an element into a MDLL before the given other element.  Insert
  * at the tail if the other element is NULL.
  *
@@ -1516,7 +1516,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult
 
 
 /**
- * @ingroup dll 
+ * @ingroup dll
  * Remove an element from a MDLL. Assumes
  * that head, tail and element are structs
  * with prev and next fields.
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index cb84fcc67..3ef3c2f3d 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -1,17 +1,17 @@
 /*
   This file is part of GNUnet
   (C) 2013 Christian Grothoff (and other contributing authors)
-  
+
   GNUnet is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published
   by the Free Software Foundation; either version 3, or (at your
   option) any later version.
-  
+
   GNUnet is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -25,7 +25,7 @@
  * @author Andreas Fuchs
  * @author Christian Grothoff
  *
- * 
+ *
  * NOTE: This API is deliberately deceptively simple; the idea
  * is that advanced features (such as answering machines) will
  * be done with a separate service (an answering machine service)
@@ -109,17 +109,17 @@ struct GNUNET_CONVERSATION_PhoneRecord
 enum GNUNET_CONVERSATION_EventCode
 {
   /**
-   * The phone is ringing, caller ID is provided in the varargs as 
+   * The phone is ringing, caller ID is provided in the varargs as
    * a `const char *`.  The caller ID will be a GNS name.
    */
   GNUNET_CONVERSATION_EC_RING,
 
   /**
-   * We are the caller and are now ringing the other party.  
+   * We are the caller and are now ringing the other party.
    * The varargs will be empty.
    */
   GNUNET_CONVERSATION_EC_RINGING,
-  
+
   /**
    * We are ready to talk, metadata about the call may be supplied
    * as a `const char *` in the varargs.
@@ -139,7 +139,7 @@ enum GNUNET_CONVERSATION_EventCode
    * client must no longer call #GNUNET_CONVERSATION_call_stop.
    */
   GNUNET_CONVERSATION_EC_BUSY,
-  
+
   /**
    * The conversation was terminated, a reason may be supplied as a
    * `const char *` in the varargs.  After this invocation, the
@@ -147,7 +147,7 @@ enum GNUNET_CONVERSATION_EventCode
    * client must no longer call #GNUNET_CONVERSATION_call_stop.
    */
   GNUNET_CONVERSATION_EC_TERMINATED
-  
+
 };
 
 
@@ -207,7 +207,7 @@ GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone,
 
 
 /**
- * Picks up a (ringing) phone.  This will connect the speaker 
+ * Picks up a (ringing) phone.  This will connect the speaker
  * to the microphone of the other party, and vice versa.
  *
  * @param phone phone to pick up
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index 19c2acbdf..64daadcea 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -281,7 +281,7 @@ GNUNET_CORE_iterate_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * expected to track which peers are connected based on the connect/disconnect
  * callbacks from #GNUNET_CORE_connect.  This function is NOT part of the
  * 'versioned', 'official' API.  This function returns
- * synchronously after looking in the CORE API cache. 
+ * synchronously after looking in the CORE API cache.
  *
  * @param h the core handle
  * @param pid the identity of the peer to check if it has been connected to us
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index eda23077b..c9cae17a2 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -202,7 +202,7 @@ struct GNUNET_PeerIdentity
  * Public ECC key (always for NIST P-521) encoded in a format suitable
  * for network transmission and encryption (ECDH).
  */
-struct GNUNET_CRYPTO_EccPublicEncryptKey 
+struct GNUNET_CRYPTO_EccPublicEncryptKey
 {
   /**
    * Q consists of an x- and a y-value, each mod p (256 bits),
@@ -397,7 +397,7 @@ GNUNET_CRYPTO_symmetric_create_session_key (struct GNUNET_CRYPTO_SymmetricSessio
 ssize_t
 GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len,
                                  const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
-                                 const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, 
+                                 const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
                                  void *result);
 
 
@@ -415,7 +415,7 @@ GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len,
 ssize_t
 GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size,
                                  const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
-                                 const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, 
+                                 const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
                                  void *result);
 
 
@@ -446,8 +446,8 @@ GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationV
 void
 GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
                                      const struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
-                                     const void *salt, 
-                                     size_t salt_len, 
+                                     const void *salt,
+                                     size_t salt_len,
                                      va_list argp);
 
 
@@ -653,7 +653,7 @@ GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode * hc,
  * @return Bit \a bit from hashcode \a code, -1 for invalid index
  */
 int
-GNUNET_CRYPTO_hash_get_bit (const struct GNUNET_HashCode *code, 
+GNUNET_CRYPTO_hash_get_bit (const struct GNUNET_HashCode *code,
                             unsigned int bit);
 
 
@@ -865,7 +865,7 @@ GNUNET_CRYPTO_ecc_public_sign_key_to_string (const struct GNUNET_CRYPTO_EccPubli
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecc_public_sign_key_from_string (const char *enc, 
+GNUNET_CRYPTO_ecc_public_sign_key_from_string (const char *enc,
                                                size_t enclen,
                                                struct GNUNET_CRYPTO_EccPublicSignKey *pub);
 
@@ -890,7 +890,7 @@ GNUNET_CRYPTO_ecc_public_encrypt_key_to_string (const struct GNUNET_CRYPTO_EccPu
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecc_public_encrypt_key_from_string (const char *enc, 
+GNUNET_CRYPTO_ecc_public_encrypt_key_from_string (const char *enc,
                                                   size_t enclen,
                                                   struct GNUNET_CRYPTO_EccPublicEncryptKey *pub);
 
@@ -939,7 +939,7 @@ GNUNET_CRYPTO_ecc_key_create (void);
 
 /**
  * @ingroup crypto
- * Clear memory that was used to store a private key. 
+ * Clear memory that was used to store a private key.
  *
  * @param pk location of the key
  */
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index 0099666d6..082173fff 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -140,7 +140,7 @@ typedef int (*PluginPut) (void *cls, const struct GNUNET_HashCode * key, uint32_
  * @param key key in the data store
  * @param count how many values are stored under this key in the datastore
  */
-typedef void (*PluginKeyProcessor) (void *cls, 
+typedef void (*PluginKeyProcessor) (void *cls,
                                     const struct GNUNET_HashCode *key,
                                     unsigned int count);
 
@@ -322,7 +322,7 @@ struct GNUNET_DATASTORE_PluginFunctions
    * Iterate over all keys in the database.
    */
   PluginGetKeys get_keys;
-  
+
 };
 
 
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 1370e6bd9..3e59f2b6d 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -165,7 +165,7 @@ typedef void (*GNUNET_DHT_PutContinuation)(void *cls,
  *        (size too big)
  */
 struct GNUNET_DHT_PutHandle *
-GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, 
+GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
                 const struct GNUNET_HashCode *key,
                 uint32_t desired_replication_level,
                 enum GNUNET_DHT_RouteOption options,
@@ -182,7 +182,7 @@ GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
  * go out over the network (we can't stop that); However, if the PUT
  * has not yet been sent to the service, cancelling the PUT will stop
  * this from happening (but there is no way for the user of this API
- * to tell if that is the case).  The only use for this API is to 
+ * to tell if that is the case).  The only use for this API is to
  * prevent a later call to 'cont' from #GNUNET_DHT_put (i.e. because
  * the system is shutting down).
  *
@@ -212,9 +212,9 @@ GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph);
 typedef void (*GNUNET_DHT_GetIterator) (void *cls,
                                         struct GNUNET_TIME_Absolute exp,
                                         const struct GNUNET_HashCode *key,
-                                        const struct GNUNET_PeerIdentity *get_path, 
+                                        const struct GNUNET_PeerIdentity *get_path,
                                         unsigned int get_path_length,
-                                        const struct GNUNET_PeerIdentity *put_path, 
+                                        const struct GNUNET_PeerIdentity *put_path,
                                         unsigned int put_path_length,
                                         enum GNUNET_BLOCK_Type type,
                                         size_t size, const void *data);
@@ -239,11 +239,11 @@ typedef void (*GNUNET_DHT_GetIterator) (void *cls,
  */
 struct GNUNET_DHT_GetHandle *
 GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle,
-                      enum GNUNET_BLOCK_Type type, 
+                      enum GNUNET_BLOCK_Type type,
                       const struct GNUNET_HashCode *key,
                       uint32_t desired_replication_level,
-                      enum GNUNET_DHT_RouteOption options, 
-                      const void *xquery, size_t xquery_size, 
+                      enum GNUNET_DHT_RouteOption options,
+                      const void *xquery, size_t xquery_size,
                       GNUNET_DHT_GetIterator iter, void *iter_cls);
 
 
@@ -297,7 +297,7 @@ typedef void (*GNUNET_DHT_MonitorGetCB) (void *cls,
                                          enum GNUNET_DHT_RouteOption options,
                                          enum GNUNET_BLOCK_Type type,
                                          uint32_t hop_count,
-                                         uint32_t desired_replication_level, 
+                                         uint32_t desired_replication_level,
                                          unsigned int path_length,
                                          const struct GNUNET_PeerIdentity *path,
                                          const struct GNUNET_HashCode * key);
@@ -346,7 +346,7 @@ typedef void (*GNUNET_DHT_MonitorPutCB) (void *cls,
                                          enum GNUNET_DHT_RouteOption options,
                                          enum GNUNET_BLOCK_Type type,
                                          uint32_t hop_count,
-                                         uint32_t desired_replication_level, 
+                                         uint32_t desired_replication_level,
                                          unsigned int path_length,
                                          const struct GNUNET_PeerIdentity *path,
                                          struct GNUNET_TIME_Absolute exp,
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 0a3abce49..369f09492 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -43,8 +43,8 @@ enum GNUNET_FILE_Type
 {
   /**
    * Handle represents a file.
-   */ 
-  GNUNET_DISK_HANLDE_TYPE_FILE, 
+   */
+  GNUNET_DISK_HANLDE_TYPE_FILE,
 
   /**
    * Handle represents a pipe.
@@ -157,7 +157,7 @@ enum GNUNET_DISK_MapType
    * Read-only memory map.
    */
   GNUNET_DISK_MAP_TYPE_READ = 1,
-  
+
   /**
    * Write-able memory map.
    */
@@ -328,7 +328,7 @@ GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, OFF_T offset,
  */
 int
 GNUNET_DISK_file_size (const char *filename, uint64_t *size,
-                       int include_symbolic_links, 
+                       int include_symbolic_links,
                        int single_file_mode);
 
 
@@ -348,7 +348,7 @@ GNUNET_DISK_file_size (const char *filename, uint64_t *size,
  * @return GNUNET_OK on success
  */
 int
-GNUNET_DISK_file_get_identifiers (const char *filename, 
+GNUNET_DISK_file_get_identifiers (const char *filename,
                                   uint64_t *dev,
                                   uint64_t *ino);
 
@@ -394,7 +394,7 @@ GNUNET_DISK_mkdtemp (const char *t);
  * @return IO handle on success, NULL on error
  */
 struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_file_open (const char *fn, 
+GNUNET_DISK_file_open (const char *fn,
                        enum GNUNET_DISK_OpenFlags flags,
                        enum GNUNET_DISK_AccessPermissions perm);
 
@@ -421,9 +421,9 @@ GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh,
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe (int blocking_read, 
-                  int blocking_write, 
-                  int inherit_read, 
+GNUNET_DISK_pipe (int blocking_read,
+                  int blocking_write,
+                  int inherit_read,
                   int inherit_write);
 
 
@@ -438,8 +438,8 @@ GNUNET_DISK_pipe (int blocking_read,
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe_from_fd (int blocking_read, 
-                          int blocking_write, 
+GNUNET_DISK_pipe_from_fd (int blocking_read,
+                          int blocking_write,
                           int fd[2]);
 
 
@@ -544,7 +544,7 @@ GNUNET_DISK_get_handle_from_native (FILE *fd);
  * @return the number of bytes read on success, #GNUNET_SYSERR on failure
  */
 ssize_t
-GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h, 
+GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h,
                        void *result,
                        size_t len);
 
@@ -575,7 +575,7 @@ GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h,
  */
 ssize_t
 GNUNET_DISK_fn_read (const char *fn,
-                     void *result, 
+                     void *result,
                      size_t len);
 
 
@@ -589,7 +589,7 @@ GNUNET_DISK_fn_read (const char *fn,
  */
 ssize_t
 GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h,
-                        const void *buffer, 
+                        const void *buffer,
                         size_t n);
 
 
@@ -603,7 +603,7 @@ GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h,
  */
 ssize_t
 GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h,
-                                 const void *buffer, 
+                                 const void *buffer,
                                  size_t n);
 
 
@@ -619,7 +619,7 @@ GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h,
  */
 ssize_t
 GNUNET_DISK_fn_write (const char *fn,
-                      const void *buffer, 
+                      const void *buffer,
                       size_t n,
                       enum GNUNET_DISK_AccessPermissions mode);
 
@@ -766,7 +766,7 @@ GNUNET_DISK_directory_create (const char *dir);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, 
+GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh,
                        OFF_T lock_start,
                        OFF_T lock_end, int excl);
 
@@ -780,7 +780,7 @@ GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, 
+GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh,
                          OFF_T unlock_start,
                          OFF_T unlock_end);
 
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index d9a43ff8b..581d7f044 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -20,7 +20,7 @@
 
 /**
  * @file include/gnunet_dns_service.h
- * @brief API to access the DNS service. 
+ * @brief API to access the DNS service.
  * @author Christian Grothoff
  */
 #ifndef GNUNET_DNS_SERVICE_H
@@ -41,7 +41,7 @@ struct GNUNET_DNS_RequestHandle;
 
 /**
  * Flags that specify when to call the client's handler.
- */ 
+ */
 enum GNUNET_DNS_Flags
 {
 
@@ -153,7 +153,7 @@ GNUNET_DNS_request_drop (struct GNUNET_DNS_RequestHandle *rh);
  * @param reply reply data
  */
 void
-GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh,            
+GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh,         
                            uint16_t reply_length,
                            const char *reply);
 
@@ -165,7 +165,7 @@ GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh,
  * @param flags when to call rh
  * @param rh function to call with DNS requests
  * @param rh_cls closure to pass to rh
- * @return DNS handle 
+ * @return DNS handle
  */
 struct GNUNET_DNS_Handle *
 GNUNET_DNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index c4b4546c8..68b6597ff 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -20,7 +20,7 @@
 
 /**
  * @file include/gnunet_dnsparser_lib.h
- * @brief API for helper library to parse DNS packets. 
+ * @brief API for helper library to parse DNS packets.
  * @author Philipp Toelke
  * @author Christian Grothoff
  */
@@ -64,7 +64,7 @@ struct GNUNET_DNSPARSER_Query
 
   /**
    * Name of the record that the query is for (0-terminated).
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use 'GNUNET_DNSPARSER_check_label' to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -89,7 +89,7 @@ struct GNUNET_DNSPARSER_Query
  */
 struct GNUNET_DNSPARSER_MxRecord
 {
-  
+
   /**
    * Preference for this entry (lower value is higher preference).
    */
@@ -97,7 +97,7 @@ struct GNUNET_DNSPARSER_MxRecord
 
   /**
    * Name of the mail server.
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use 'GNUNET_DNSPARSER_check_label' to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -120,11 +120,11 @@ struct GNUNET_DNSPARSER_MxRecord
  */
 struct GNUNET_DNSPARSER_SrvRecord
 {
-  
+
   /**
    * Service name without the underscore (!).  Note that RFC 6335 clarifies the
    * set of legal characters for service names.
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use 'GNUNET_DNSPARSER_check_label' to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -139,7 +139,7 @@ struct GNUNET_DNSPARSER_SrvRecord
 
   /**
    * Domain name for which the record is valid
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use 'GNUNET_DNSPARSER_check_label' to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -148,7 +148,7 @@ struct GNUNET_DNSPARSER_SrvRecord
 
   /**
    * Hostname offering the service.
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use 'GNUNET_DNSPARSER_check_label' to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -176,17 +176,17 @@ struct GNUNET_DNSPARSER_SrvRecord
 
 };
 
-  
+
 /**
  * Information from SOA records (RFC 1035).
  */
 struct GNUNET_DNSPARSER_SoaRecord
 {
-  
+
   /**
    * The domainname of the name server that was the
    * original or primary source of data for this zone.
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use #GNUNET_DNSPARSER_check_label to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -196,7 +196,7 @@ struct GNUNET_DNSPARSER_SoaRecord
   /**
    * A domainname which specifies the mailbox of the
    * person responsible for this zone.
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use 'GNUNET_DNSPARSER_check_label' to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -204,7 +204,7 @@ struct GNUNET_DNSPARSER_SoaRecord
   char *rname;
 
   /**
-   * The version number of the original copy of the zone.  
+   * The version number of the original copy of the zone.
    */
   uint32_t serial;
 
@@ -230,7 +230,7 @@ struct GNUNET_DNSPARSER_SoaRecord
    * from this zone.
    */
   uint32_t minimum_ttl;
-  
+
 };
 
 
@@ -260,7 +260,7 @@ struct GNUNET_DNSPARSER_Record
 
   /**
    * Name of the record that the query is for (0-terminated).
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use #GNUNET_DNSPARSER_check_label to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
@@ -270,23 +270,23 @@ struct GNUNET_DNSPARSER_Record
   /**
    * Payload of the record (which one of these is valid depends on the 'type').
    */
-  union 
+  union
   {
 
     /**
      * For NS, CNAME and PTR records, this is the uncompressed 0-terminated hostname.
-   * In UTF-8 format.  The library will convert from and to DNS-IDNA 
+   * In UTF-8 format.  The library will convert from and to DNS-IDNA
    * as necessary.  Use #GNUNET_DNSPARSER_check_label to test if an
    * individual label is well-formed.  If a given name is not well-formed,
    * creating the DNS packet will fail.
      */
     char *hostname;
-    
+
     /**
      * SOA data for SOA records.
      */
     struct GNUNET_DNSPARSER_SoaRecord *soa;
-    
+
     /**
      * MX data for MX records.
      */
@@ -370,7 +370,7 @@ struct GNUNET_DNSPARSER_Packet
 
   /**
    * Bitfield of DNS flags.
-   */ 
+   */
   struct GNUNET_TUN_DnsFlags flags;
 
   /**
@@ -411,7 +411,7 @@ GNUNET_DNSPARSER_check_name (const char *name);
  * processing and manipulation.
  *
  * @param udp_payload wire-format of the DNS packet
- * @param udp_payload_length number of bytes in @a udp_payload 
+ * @param udp_payload_length number of bytes in @a udp_payload
  * @return NULL on error, otherwise the parsed packet
  */
 struct GNUNET_DNSPARSER_Packet *
@@ -431,7 +431,7 @@ GNUNET_DNSPARSER_free_packet (struct GNUNET_DNSPARSER_Packet *p);
 /**
  * Given a DNS packet @a p, generate the corresponding UDP payload.
  * Note that we do not attempt to pack the strings with pointers
- * as this would complicate the code and this is about being 
+ * as this would complicate the code and this is about being
  * simple and secure, not fast, fancy and broken like bind.
  *
  * @param p packet to pack
@@ -645,7 +645,7 @@ GNUNET_DNSPARSER_parse_srv (const char *r_name,
 
 /**
  * Free the given DNS record.
- * 
+ *
  * @param r record to free
  */
 void
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 0269fac17..73db0a49b 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -31,12 +31,12 @@
 
 /**
  * Opaque handle to the stub resolver.
- */ 
+ */
 struct GNUNET_DNSSTUB_Context;
 
 /**
  * Opaque handle to a socket doing UDP requests.
- */ 
+ */
 struct GNUNET_DNSSTUB_RequestSocket;
 
 
diff --git a/src/include/gnunet_env_lib.h b/src/include/gnunet_env_lib.h
index 89c41d2c1..857ad45c2 100644
--- a/src/include/gnunet_env_lib.h
+++ b/src/include/gnunet_env_lib.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/** 
+/**
  * @file include/gnunet_env_lib.h
  * @brief Library providing operations for the @e environment of
  *        PSYC and Social messages, and for (de)serializing variable values.
@@ -38,38 +38,38 @@ extern "C"
 #endif
 
 
-/** 
+/**
  * Possible operations on PSYC state (persistent) and transient variables (per message).
  */
 enum GNUNET_ENV_Operator
 {
-  /** 
+  /**
    * Set value of a transient variable.
    */
   GNUNET_ENV_OP_SET = ':',
 
-  /** 
+  /**
    * Assign value for a persistent state variable.
    *
    * If an assigned value is NULL, the variable is deleted.
    */
   GNUNET_ENV_OP_ASSIGN = '=',
 
-  /** 
+  /**
    * Augment state variable.
    *
    * Used for appending strings, adding numbers, and adding new items to a list or dictionary.
    */
   GNUNET_ENV_OP_AUGMENT = '+',
 
-  /** 
+  /**
    * Diminish state variable.
    *
    * Used for subtracting numbers, and removing items from a list or dictionary.
    */
   GNUNET_ENV_OP_DIMINISH = '-',
 
-  /** 
+  /**
    * Update state variable.
    *
    * Used for modifying a single item of a list or dictionary.
@@ -78,7 +78,7 @@ enum GNUNET_ENV_Operator
 };
 
 
-/** 
+/**
  * PSYC variable types.
  */
 enum GNUNET_ENV_Type
@@ -90,26 +90,26 @@ enum GNUNET_ENV_Type
 };
 
 
-/** 
+/**
  * PSYC state modifier.
  */
 struct GNUNET_ENV_Modifier {
-  /** 
+  /**
    * State operation.
    */
   enum GNUNET_ENV_Operator oper;
 
-  /** 
+  /**
    * Variable name.
    */
   const char *name;
 
-  /** 
+  /**
    * Size of @a value.
    */
   size_t value_size;
 
-  /** 
+  /**
    * Value of variable.
    */
   const void *value;
@@ -126,7 +126,7 @@ struct GNUNET_ENV_Modifier {
 };
 
 
-/** 
+/**
  * Environment for a message.
  *
  * Contains modifiers.
@@ -134,16 +134,16 @@ struct GNUNET_ENV_Modifier {
 struct GNUNET_ENV_Environment;
 
 
-/** 
+/**
  * Create an environment.
- * 
+ *
  * @return A newly allocated environment.
  */
 struct GNUNET_ENV_Environment *
 GNUNET_ENV_environment_create ();
 
 
-/** 
+/**
  * Add a modifier to the environment.
  *
  * @param env The environment.
@@ -158,7 +158,7 @@ GNUNET_ENV_environment_add_mod (struct GNUNET_ENV_Environment *env,
                                 const void *value, size_t value_size);
 
 
-/** 
+/**
  * Iterator for modifiers in the environment.
  *
  * @param cls Closure.
@@ -171,7 +171,7 @@ typedef int
 (*GNUNET_ENV_Iterator) (void *cls, struct GNUNET_ENV_Modifier *mod);
 
 
-/** 
+/**
  * Iterate through all modifiers in the environment.
  *
  * @param env The environment.
@@ -183,7 +183,7 @@ GNUNET_ENV_environment_iterate (const struct GNUNET_ENV_Environment *env,
                                 GNUNET_ENV_Iterator it, void *it_cls);
 
 
-/** 
+/**
  * Get the number of modifiers in the environment.
  *
  * @param env The environment.
@@ -194,7 +194,7 @@ size_t
 GNUNET_ENV_environment_get_mod_count (const struct GNUNET_ENV_Environment *env);
 
 
-/** 
+/**
  * Destroy an environment.
  *
  * @param env The environment to destroy.
@@ -203,18 +203,18 @@ void
 GNUNET_ENV_environment_destroy (struct GNUNET_ENV_Environment *env);
 
 
-/** 
+/**
  * Get the type of variable.
  *
  * @param name Name of the variable.
- * 
+ *
  * @return Variable type.
  */
 enum GNUNET_ENV_Type
 GNUNET_ENV_var_get_type (char *name);
 
 
-/** 
+/**
  * Perform an operation on a variable.
  *
  * @param name Name of variable.
@@ -225,7 +225,7 @@ GNUNET_ENV_var_get_type (char *name);
  * @param args_size Size of @a args.
  * @param return_value Return value.
  * @param return_value_size Size of @a return_value.
- * 
+ *
  * @return #GNUNET_OK on success, else #GNUNET_SYSERR
  */
 int
@@ -234,7 +234,7 @@ GNUNET_ENV_operation (char *name, void *current_value, size_t current_value_size
                       void **return_value, size_t *return_value_size);
 
 
-/** 
+/**
  * Get the variable's value as an integer.
  *
  * @param size Size of value.
@@ -247,7 +247,7 @@ int
 GNUNET_ENV_value_to_number (size_t size, const void *value, int64_t *number);
 
 
-/** 
+/**
  * Get the variable's value as a list.
  *
  * @param size Size of value.
@@ -260,7 +260,7 @@ int
 GNUNET_ENV_value_to_list (size_t size, const void *value, struct GNUNET_CONTAINER_SList **list);
 
 
-/** 
+/**
  * Get the variable's value as a dictionary.
  *
  * @param size Size of value.
@@ -273,36 +273,36 @@ int
 GNUNET_ENV_value_to_dict (size_t size, const void *value, struct GNUNET_CONTAINER_MultiHashMap **dict);
 
 
-/** 
+/**
  * Create a PSYC variable value from an integer.
  *
  * @param number The number to convert.
  * @param[out] value_size Size of returned value.
- * 
+ *
  * @return A newly allocated value or NULL on error.
  */
 void *
 GNUNET_ENV_value_from_number (int64_t number, size_t *value_size);
 
 
-/** 
+/**
  * Create a PSYC variable value from a list.
  *
  * @param list The list to convert.
  * @param[out] value_size Size of returned value.
- * 
+ *
  * @return A newly allocated value or NULL on error.
  */
 void *
 GNUNET_ENV_value_from_list (struct GNUNET_CONTAINER_SList *list, size_t *value_size);
 
 
-/** 
+/**
  * Create a PSYC variable value from a dictionary.
  *
  * @param dict The dict to convert.
  * @param[out] value_size Size of returned value.
- * 
+ *
  * @return A newly allocated value or NULL on error.
  */
 void *
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index dbd885353..a13c3b91c 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -134,7 +134,7 @@ GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri);
  * @param is_mandatory is this keyword mandatory?
  */
 void
-GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri, 
+GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri,
                                const char *keyword,
                                int is_mandatory);
 
@@ -303,7 +303,7 @@ GNUNET_FS_uri_ksk_create (const char *keywords, char **emsg);
  *  if keywords is not legal (i.e. empty).
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_create_from_args (unsigned int argc, 
+GNUNET_FS_uri_ksk_create_from_args (unsigned int argc,
                                     const char **argv);
 
 
@@ -337,7 +337,7 @@ GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri);
  * @return an FS URI for the given namespace and identifier
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicSignKey *ns, 
+GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicSignKey *ns,
                           const char *id);
 
 
@@ -1698,7 +1698,7 @@ typedef int (*GNUNET_FS_FileInformationProcessor) (void *cls,
  * file information structures.
  *
  * @param s structure to get the filename for
- * @return NULL on error, otherwise filename that can be used 
+ * @return NULL on error, otherwise filename that can be used
  *         to read this fi-struct from disk.
  */
 const char *
@@ -2055,7 +2055,7 @@ struct GNUNET_FS_PublishSksContext;
 struct GNUNET_FS_PublishSksContext *
 GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
                        const struct GNUNET_CRYPTO_EccPrivateKey *ns,
-                       const char *identifier, 
+                       const char *identifier,
                        const char *update,
                        const struct GNUNET_CONTAINER_MetaData *meta,
                        const struct GNUNET_FS_Uri *uri,
@@ -2146,10 +2146,10 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc);
  * @param last_meta metadata associated with @a last_uri
  * @param next_id identifier that should be used for updates
  */
-typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls, 
+typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls,
                                                const char *last_id,
                                                const struct GNUNET_FS_Uri *last_uri,
-                                               const struct GNUNET_CONTAINER_MetaData *last_meta, 
+                                               const struct GNUNET_CONTAINER_MetaData *last_meta,
                                                const char *next_id);
 
 
@@ -2283,7 +2283,7 @@ enum GNUNET_FS_DownloadOptions
    * No options (use defaults for everything).
    */
   GNUNET_FS_DOWNLOAD_OPTION_NONE = 0,
-  
+
   /**
    * Only download from the local host, do not access remote systems (no P2P)
    */
@@ -2600,9 +2600,9 @@ enum GNUNET_FS_DirScannerProgressUpdateReason
  *                     #GNUNET_SYSERR if it is neither (or unknown)
  * @param reason kind of progress we are making
  */
-typedef void (*GNUNET_FS_DirScannerProgressCallback) (void *cls, 
+typedef void (*GNUNET_FS_DirScannerProgressCallback) (void *cls,
                                                       const char *filename,
-                                                      int is_directory, 
+                                                      int is_directory,
                                                       enum GNUNET_FS_DirScannerProgressUpdateReason reason);
 
 
@@ -2685,9 +2685,9 @@ struct GNUNET_FS_DirScanner;
  */
 struct GNUNET_FS_DirScanner *
 GNUNET_FS_directory_scan_start (const char *filename,
-                                int disable_extractor, 
+                                int disable_extractor,
                                 const char *ex,
-                                GNUNET_FS_DirScannerProgressCallback cb, 
+                                GNUNET_FS_DirScannerProgressCallback cb,
                                 void *cb_cls);
 
 
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index fde0a69ed..9c4c0c986 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -120,7 +120,7 @@ GNUNET_HELPER_stop (struct GNUNET_HELPER_Handle *h, int soft_kill);
 
 /**
  * Continuation function.
- * 
+ *
  * @param cls closure
  * @param result #GNUNET_OK on success,
  *               #GNUNET_NO if helper process died
@@ -145,12 +145,12 @@ struct GNUNET_HELPER_SendHandle;
  * @param cont continuation to run once the message is out (#GNUNET_OK on succees, #GNUNET_NO
  *             if the helper process died, #GNUNET_SYSERR during #GNUNET_HELPER_destroy).
  * @param cont_cls closure for @a cont
- * @return NULL if the message was dropped, 
+ * @return NULL if the message was dropped,
  *         otherwise handle to cancel @a cont (actual transmission may
  *         not be abortable)
  */
 struct GNUNET_HELPER_SendHandle *
-GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h, 
+GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
                     const struct GNUNET_MessageHeader *msg,
                     int can_drop,
                     GNUNET_HELPER_Continuation cont,
@@ -166,5 +166,5 @@ GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
 void
 GNUNET_HELPER_send_cancel (struct GNUNET_HELPER_SendHandle *sh);
 
-#endif 
+#endif
 /* end of include guard: GNUNET_HELPER_LIB_H */
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index 6c572e737..79d27fa02 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 
-/** 
+/**
  * @file include/gnunet_identity_service.h
  * @brief Identity service; implements identity management for GNUnet
  * @author Christian Grothoff
@@ -49,22 +49,22 @@ extern "C"
 #include "gnunet_util_lib.h"
 
 
-/** 
+/**
  * Version number of GNUnet Identity API.
  */
 #define GNUNET_IDENTITY_VERSION 0x00000000
 
-/** 
+/**
  * Handle to access the identity service.
  */
 struct GNUNET_IDENTITY_Handle;
 
-/** 
+/**
  * Handle for a ego.
  */
 struct GNUNET_IDENTITY_Ego;
 
-/** 
+/**
  * Handle for an operation with the identity service.
  */
 struct GNUNET_IDENTITY_Operation;
@@ -100,9 +100,9 @@ GNUNET_IDENTITY_ego_get_public_key (const struct GNUNET_IDENTITY_Ego *ego,
                                     struct GNUNET_CRYPTO_EccPublicSignKey *pk);
 
 
-/** 
+/**
  * Method called to inform about the egos of
- * this peer. 
+ * this peer.
  *
  * When used with #GNUNET_IDENTITY_connect, this function is
  * initially called for all egos and then again whenever a
@@ -116,11 +116,11 @@ GNUNET_IDENTITY_ego_get_public_key (const struct GNUNET_IDENTITY_Ego *ego,
  * @a ego does indicate an error (i.e. name is taken or no default
  * value is known).  If @a ego is non-NULL and if '*ctx'
  * is set in those callbacks, the value WILL be passed to a subsequent
- * call to the identity callback of #GNUNET_IDENTITY_connect (if 
+ * call to the identity callback of #GNUNET_IDENTITY_connect (if
  * that one was not NULL).
  *
  * When an identity is renamed, this function is called with the
- * (known) @a ego but the NEW @a name.  
+ * (known) @a ego but the NEW @a name.
  *
  * When an identity is deleted, this function is called with the
  * (known) ego and "NULL" for the @a name.  In this case,
@@ -141,7 +141,7 @@ typedef void (*GNUNET_IDENTITY_Callback)(void *cls,
                                          const char *name);
 
 
-/** 
+/**
  * Connect to the identity service.
  *
  * @param cfg Configuration to contact the identity service.
@@ -205,12 +205,12 @@ GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id,
  * Disconnect from identity service.
  *
  * @param h identity service to disconnect
- */ 
+ */
 void
 GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h);
 
 
-/** 
+/**
  * Create a new identity with the given name.
  *
  * @param id identity service to use
@@ -226,7 +226,7 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id,
                         void *cont_cls);
 
 
-/** 
+/**
  * Renames an existing identity.
  *
  * @param id identity service to use
@@ -244,7 +244,7 @@ GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id,
                         void *cb_cls);
 
 
-/** 
+/**
  * Delete an existing identity.
  *
  * @param id identity service to use
@@ -279,13 +279,13 @@ GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op);
  *
  * @param cls closure
  * @param ego NULL on error / ego not found
- */ 
+ */
 typedef void (*GNUNET_IDENTITY_EgoCallback)(void *cls,
                                             const struct GNUNET_IDENTITY_Ego *ego);
 
 /**
  * Handle for ego lookup.
- */ 
+ */
 struct GNUNET_IDENTITY_EgoLookup;
 
 
diff --git a/src/include/gnunet_lockmanager_service.h b/src/include/gnunet_lockmanager_service.h
index 7ec262d04..ecc2a8d50 100644
--- a/src/include/gnunet_lockmanager_service.h
+++ b/src/include/gnunet_lockmanager_service.h
@@ -87,7 +87,7 @@ enum GNUNET_LOCKMANAGER_Status
  *
  * @param cls the closure from GNUNET_LOCKMANAGER_lock call
  *
- * @param domain_name the locking domain of the lock 
+ * @param domain_name the locking domain of the lock
  *
  * @param lock the lock for which this status is relevant
  *
@@ -95,11 +95,11 @@ enum GNUNET_LOCKMANAGER_Status
  *          acquired; GNUNET_LOCKMANAGER_RELEASE when the acquired lock is
  *          lost.
  */
-typedef void 
+typedef void
 (*GNUNET_LOCKMANAGER_StatusCallback) (void *cls,
                                       const char *domain_name,
                                       uint32_t lock,
-                                      enum GNUNET_LOCKMANAGER_Status 
+                                      enum GNUNET_LOCKMANAGER_Status
                                       status);
 
 
diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h
index 9d2562de8..08748d87b 100644
--- a/src/include/gnunet_mesh_service.h
+++ b/src/include/gnunet_mesh_service.h
@@ -95,7 +95,7 @@ enum MeshTunnelOption
 /**
  * Functions with this signature are called whenever a message is
  * received.
- * 
+ *
  * Each time the function must call #GNUNET_MESH_receive_done on the tunnel
  * in order to receive the next message. This doesn't need to be immediate:
  * can be delayed if some processing is done on the message.
@@ -104,7 +104,7 @@ enum MeshTunnelOption
  * @param tunnel Connection to the other end.
  * @param tunnel_ctx Place to store local state associated with the tunnel.
  * @param message The actual message.
- * 
+ *
  * @return #GNUNET_OK to keep the tunnel open,
  *         #GNUNET_SYSERR to close it (signal serious error).
  */
@@ -164,8 +164,8 @@ typedef void *(GNUNET_MESH_InboundTunnelNotificationHandler) (void *cls,
 
 /**
  * Function called whenever a tunnel is destroyed.  Should clean up
- * any associated state. 
- * 
+ * any associated state.
+ *
  * It must NOT call #GNUNET_MESH_tunnel_destroy on the tunnel.
  *
  * @param cls closure (set from #GNUNET_MESH_connect)
@@ -182,7 +182,7 @@ typedef void (GNUNET_MESH_TunnelEndHandler) (void *cls,
  * Connect to the mesh service.
  *
  * @param cfg Configuration to use.
- * @param cls Closure for the various callbacks that follow (including 
+ * @param cls Closure for the various callbacks that follow (including
  *            handlers in the handlers array).
  * @param new_tunnel Function called when an *incoming* tunnel is created.
  *                   Can be NULL if no inbound tunnels are desired.
@@ -193,15 +193,15 @@ typedef void (GNUNET_MESH_TunnelEndHandler) (void *cls,
  * @param handlers Callbacks for messages we care about, NULL-terminated. Each
  *                 one must call #GNUNET_MESH_receive_done on the tunnel to
  *                 receive the next message.  Messages of a type that is not
- *                 in the handlers array are ignored if received. 
+ *                 in the handlers array are ignored if received.
  * @param ports NULL or 0-terminated array of port numbers for incoming tunnels.
  *              See @c new_tunnel.
- * 
+ *
  * @return handle to the mesh service NULL on error
  *         (in this case, init is never called)
  */
 struct GNUNET_MESH_Handle *
-GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, 
+GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                      void *cls,
                      GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel,
                      GNUNET_MESH_TunnelEndHandler cleaner,
@@ -234,7 +234,7 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle);
  * @return handle to the tunnel
  */
 struct GNUNET_MESH_Tunnel *
-GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, 
+GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h,
                            void *tunnel_ctx,
                            const struct GNUNET_PeerIdentity *peer,
                            uint32_t port,
@@ -244,7 +244,7 @@ GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h,
 
 /**
  * Destroy an existing tunnel.
- * 
+ *
  * The existing end callback for the tunnel will be called immediately.
  * Any pending outgoing messages will be sent but no incoming messages will be
  * accepted and no data callbacks will be called.
@@ -258,7 +258,7 @@ GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *tunnel);
 /**
  * Struct to retrieve info about a tunnel.
  */
-union GNUNET_MESH_TunnelInfo 
+union GNUNET_MESH_TunnelInfo
 {
 
   /**
@@ -332,7 +332,7 @@ GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle
 
 /**
  * Indicate readiness to receive the next message on a tunnel.
- * 
+ *
  * Should only be called once per handler called.
  *
  * @param tunnel Tunnel that will be allowed to call another handler.
diff --git a/src/include/gnunet_mesh_service_enc.h b/src/include/gnunet_mesh_service_enc.h
index b495d0754..af4eeaa5d 100644
--- a/src/include/gnunet_mesh_service_enc.h
+++ b/src/include/gnunet_mesh_service_enc.h
@@ -91,7 +91,7 @@ enum MeshOption
 /**
  * Functions with this signature are called whenever a message is
  * received.
- * 
+ *
  * Each time the function must call #GNUNET_MESH_receive_done on the channel
  * in order to receive the next message. This doesn't need to be immediate:
  * can be delayed if some processing is done on the message.
@@ -161,8 +161,8 @@ typedef void *(GNUNET_MESH_InboundChannelNotificationHandler) (void *cls,
 
 /**
  * Function called whenever a channel is destroyed.  Should clean up
- * any associated state. 
- * 
+ * any associated state.
+ *
  * It must NOT call #GNUNET_MESH_channel_destroy on the channel.
  *
  * @param cls closure (set from #GNUNET_MESH_connect)
@@ -180,7 +180,7 @@ typedef void (GNUNET_MESH_ChannelEndHandler) (void *cls,
  * Connect to the mesh service.
  *
  * @param cfg Configuration to use.
- * @param cls Closure for the various callbacks that follow (including 
+ * @param cls Closure for the various callbacks that follow (including
  *            handlers in the handlers array).
  * @param new_channel Function called when an *incoming* channel is created.
  *                    Can be NULL if no inbound channels are desired.
@@ -191,10 +191,10 @@ typedef void (GNUNET_MESH_ChannelEndHandler) (void *cls,
  * @param handlers Callbacks for messages we care about, NULL-terminated. Each
  *                 one must call #GNUNET_MESH_receive_done on the channel to
  *                 receive the next message.  Messages of a type that is not
- *                 in the handlers array are ignored if received. 
+ *                 in the handlers array are ignored if received.
  * @param ports NULL or 0-terminated array of port numbers for incoming channels.
  *              See @a new_channel.
- * 
+ *
  * @return handle to the mesh service NULL on error
  *         (in this case, init is never called)
  */
@@ -231,7 +231,7 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle);
  * @return handle to the channel
  */
 struct GNUNET_MESH_Channel *
-GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h, 
+GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h,
                             void *channel_ctx,
                             const struct GNUNET_PeerIdentity *peer,
                             uint32_t port,
@@ -241,7 +241,7 @@ GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h,
 
 /**
  * Destroy an existing channel.
- * 
+ *
  * The existing end callback for the channel will be called immediately.
  * Any pending outgoing messages will be sent but no incoming messages will be
  * accepted and no data callbacks will be called.
@@ -255,7 +255,7 @@ GNUNET_MESH_channel_destroy (struct GNUNET_MESH_Channel *channel);
 /**
  * Struct to retrieve info about a channel.
  */
-union GNUNET_MESH_ChannelInfo 
+union GNUNET_MESH_ChannelInfo
 {
 
   /**
@@ -329,7 +329,7 @@ GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle
 
 /**
  * Indicate readiness to receive the next message on a channel.
- * 
+ *
  * Should only be called once per handler called.
  *
  * @param channel Channel that will be allowed to call another handler.
diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h
index 241d58a6c..def8418b7 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -1,17 +1,17 @@
 /*
   This file is part of GNUnet
   (C) 2013 Christian Grothoff (and other contributing authors)
-  
+
   GNUnet is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published
   by the Free Software Foundation; either version 3, or (at your
   option) any later version.
-  
+
   GNUnet is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index fd28f3de6..17d8e8e56 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -143,22 +143,22 @@ struct GNUNET_MQ_Envelope;
 
 /**
  * Error codes for the queue.
- */ 
+ */
 enum GNUNET_MQ_Error
 {
   /**
    * FIXME: document!
-   */ 
+   */
   GNUNET_MQ_ERROR_READ = 1,
 
   /**
    * FIXME: document!
-   */ 
+   */
   GNUNET_MQ_ERROR_WRITE = 2,
 
   /**
    * FIXME: document!
-   */ 
+   */
   GNUNET_MQ_ERROR_TIMEOUT = 4
 };
 
@@ -193,7 +193,7 @@ typedef void
  * destruction of a message queue.
  * Implementations must not free @a mq, but should
  * take care of @a impl_state.
- * 
+ *
  * @param mq the message queue to destroy
  * @param impl_state state of the implementation
  */
@@ -203,7 +203,7 @@ typedef void
 
 /**
  * Implementation function that cancels the currently sent message.
- * 
+ *
  * @param mq message queue
  * @param impl_state state specific to the implementation
  */
@@ -239,7 +239,7 @@ typedef void
 struct GNUNET_MQ_MessageHandler
 {
   /**
-   * Callback, called every time a new message of 
+   * Callback, called every time a new message of
    * the specified type has been receied.
    */
   GNUNET_MQ_MessageCallback cb;
@@ -262,7 +262,7 @@ struct GNUNET_MQ_MessageHandler
 
 /**
  * Create a new envelope.
- * 
+ *
  * @param mhp message header to store the allocated message header in, can be NULL
  * @param size size of the message to allocate
  * @param type type of the message, will be set in the allocated message
@@ -286,12 +286,12 @@ GNUNET_MQ_discard (struct GNUNET_MQ_Envelope *mqm);
 /**
  * Send a message with the give message queue.
  * May only be called once per message.
- * 
+ *
  * @param mq message queue
  * @param ev the envelope with the message to send.
  */
 void
-GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq, 
+GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq,
                 struct GNUNET_MQ_Envelope *ev);
 
 
@@ -385,7 +385,7 @@ GNUNET_MQ_queue_for_callbacks (GNUNET_MQ_SendImpl send,
                                const struct GNUNET_MQ_MessageHandler *handlers,
                                GNUNET_MQ_ErrorHandler error_handler,
                                void *cls);
-                               
+
 
 
 /**
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index ec446a906..7a2421b4b 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 
-/** 
+/**
  * @file include/gnunet_multicast_service.h
  * @brief multicast service; establish tunnels to distant peers
  * @author Christian Grothoff
@@ -39,7 +39,7 @@ extern "C"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 
-/** 
+/**
  * Version number of GNUnet-multicast API.
  */
 #define GNUNET_MULTICAST_VERSION 0x00000000
@@ -49,12 +49,12 @@ extern "C"
  */
 #define GNUNET_MULTICAST_FRAGMENT_MAX_SIZE 63 * 1024
 
-/** 
+/**
  * Opaque handle for a multicast group member.
  */
 struct GNUNET_MULTICAST_Member;
 
-/** 
+/**
  * Handle for the origin of a multicast group.
  */
 struct GNUNET_MULTICAST_Origin;
@@ -72,7 +72,7 @@ enum GNUNET_MULTICAST_MessageFlags
    */
   GNUNET_MULTICAST_MESSAGE_LAST_FRAGMENT = 1 << 1,
 
-  /** 
+  /**
    * OR'ed flags if message is not fragmented.
    */
   GNUNET_MULTICAST_MESSAGE_NOT_FRAGMENTED
@@ -83,7 +83,7 @@ enum GNUNET_MULTICAST_MessageFlags
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
-/** 
+/**
  * Header of a multicast message fragment.
  *
  * This format is public as the replay mechanism must replay message fragments using the
@@ -93,12 +93,12 @@ GNUNET_NETWORK_STRUCT_BEGIN
 struct GNUNET_MULTICAST_MessageHeader
 {
 
-  /** 
+  /**
    * Header for all multicast message fragments from the origin.
    */
   struct GNUNET_MessageHeader header;
 
-  /** 
+  /**
    * Number of hops this message fragment has taken since the origin.
    *
    * Helpful to determine shortest paths to the origin among honest peers for
@@ -107,36 +107,36 @@ struct GNUNET_MULTICAST_MessageHeader
    */
   uint32_t hop_counter GNUNET_PACKED;
 
-  /** 
+  /**
    * ECC signature of the message fragment.
    *
    * Signature must match the public key of the multicast group.
    */
   struct GNUNET_CRYPTO_EccSignature signature;
 
-  /** 
+  /**
    * Purpose for the signature and size of the signed data.
    */
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
-  /** 
+  /**
    * Number of the message fragment, monotonically increasing.
    */
   uint64_t fragment_id GNUNET_PACKED;
 
-  /** 
+  /**
    * Byte offset of this @e fragment of the @e message.
    */
   uint64_t fragment_offset GNUNET_PACKED;
 
-  /** 
+  /**
    * Number of the message this fragment belongs to.
    *
    * Set in GNUNET_MULTICAST_origin_to_all().
    */
   uint64_t message_id GNUNET_PACKED;
 
-  /** 
+  /**
    * Counter that monotonically increases whenever a member parts the group.
    *
    * Set in GNUNET_MULTICAST_origin_to_all().
@@ -159,7 +159,7 @@ struct GNUNET_MULTICAST_MessageHeader
 GNUNET_NETWORK_STRUCT_END
 
 
-/** 
+/**
  * Handle that identifies a join request.
  *
  * Used to match calls to #GNUNET_MULTICAST_JoinCallback to the
@@ -168,7 +168,7 @@ GNUNET_NETWORK_STRUCT_END
 struct GNUNET_MULTICAST_JoinHandle;
 
 
-/** 
+/**
  * Function to call with the decision made for a join request.
  *
  * Must be called once and only once in response to an invocation of the
@@ -198,7 +198,7 @@ GNUNET_MULTICAST_join_decision (struct GNUNET_MULTICAST_JoinHandle *jh,
                                 const struct GNUNET_MessageHeader *join_response);
 
 
-/** 
+/**
  * Method called whenever another peer wants to join the multicast group.
  *
  * Implementations of this function must call GNUNET_MULTICAST_join_decision()
@@ -219,13 +219,13 @@ typedef void
                                   struct GNUNET_MULTICAST_JoinHandle *jh);
 
 
-/** 
+/**
  * Handle to pass back for the answer of a membership test.
  */
 struct GNUNET_MULTICAST_MembershipTestHandle;
 
 
-/** 
+/**
  * Call informing multicast about the decision taken for a membership test.
  *
  * @param mth Handle that was given for the query.
@@ -237,7 +237,7 @@ GNUNET_MULTICAST_membership_test_result (struct GNUNET_MULTICAST_MembershipTestH
                                          int result);
 
 
-/** 
+/**
  * Method called to test if a member was in the group at a particular time.
  *
  * It is called when a replay request is received to determine if the requested
@@ -259,14 +259,14 @@ typedef void
                                             struct GNUNET_MULTICAST_MembershipTestHandle *mth);
 
 
-/** 
+/**
  * Function called whenever a group member has transmitted a request
  * to the origin (other than joining or leaving).
  *
  * FIXME: need to distinguish between origin cancelling a message (some fragments
  * were sent, then the rest 'discarded') and the case where we got disconnected;
  * right now, both would mean 'msg' is NULL, but they could be quite different...
- * So the semantics from the receiver side of 
+ * So the semantics from the receiver side of
  * GNUNET_MULTICAST_member_to_origin_cancel() are not clear here.   Maybe we
  * should do something with the flags in this case?
  *
@@ -282,7 +282,7 @@ typedef void
                                      enum GNUNET_MULTICAST_MessageFlags flags);
 
 
-/** 
+/**
  * Function called whenever a group member is receiving a message fragment from
  * the origin.
  *
@@ -293,7 +293,7 @@ typedef void
  * FIXME: need to distinguish between origin cancelling a message (some fragments
  * were sent, then the rest 'discarded') and the case where we got disconnected;
  * right now, both would mean 'msg' is NULL, but they could be quite different...
- * So the semantics from the receiver side of 
+ * So the semantics from the receiver side of
  * GNUNET_MULTICAST_origin_to_all_cancel() are not clear here.
  *
  * @param cls Closure (set from GNUNET_MULTICAST_member_join())
@@ -306,11 +306,11 @@ typedef void
                                      const struct GNUNET_MessageHeader *msg);
 
 
-/** 
+/**
  * Function called with the result of an asynchronous operation.
  *
  * @see GNUNET_MULTICAST_replay_fragment()
- * 
+ *
  * @param result Result of the operation.
  */
 typedef void
@@ -318,13 +318,13 @@ typedef void
                                     int result);
 
 
-/** 
+/**
  * Opaque handle to a replay request from the multicast service.
  */
 struct GNUNET_MULTICAST_ReplayHandle;
 
 
-/** 
+/**
  * Functions with this signature are called whenever the multicast service needs
  * a message fragment to be replayed by fragment_id.
  *
@@ -346,7 +346,7 @@ typedef void
                                             uint64_t flags,
                                             struct GNUNET_MULTICAST_ReplayHandle *rh);
 
-/** 
+/**
  * Functions with this signature are called whenever the multicast service needs
  * a message fragment to be replayed by message_id and fragment_offset.
  *
@@ -371,18 +371,18 @@ typedef void
                                            struct GNUNET_MULTICAST_ReplayHandle *rh);
 
 
-/** 
+/**
  * Possible error codes during replay.
  */
 enum GNUNET_MULTICAST_ReplayErrorCode
 {
 
-  /** 
+  /**
    * Everything is fine.
    */
   GNUNET_MULTICAST_REC_OK = 0,
 
-  /** 
+  /**
    * Message fragment not found in the message store.
    *
    * Either discarded if it is too old, or not arrived yet if this member has
@@ -390,7 +390,7 @@ enum GNUNET_MULTICAST_ReplayErrorCode
    */
   GNUNET_MULTICAST_REC_NOT_FOUND = 1,
 
-  /** 
+  /**
    * Fragment ID counter was larger than the highest counter this
    * replay function has ever encountered; thus it is likely the
    * origin never sent it and we're at the HEAD of the multicast
@@ -400,12 +400,12 @@ enum GNUNET_MULTICAST_ReplayErrorCode
    */
   GNUNET_MULTICAST_REC_PAST_HEAD = 2,
 
-  /** 
+  /**
    * Access is denied to the requested fragment, membership test did not pass.
    */
   GNUNET_MULTICAST_REC_ACCESS_DENIED = 3,
 
-  /** 
+  /**
    * Internal error (i.e. database error).  Try some other peer.
    */
   GNUNET_MULTICAST_REC_INTERNAL_ERROR = 4
@@ -413,7 +413,7 @@ enum GNUNET_MULTICAST_ReplayErrorCode
 };
 
 
-/** 
+/**
  * Replay a message fragment for the multicast group.
  *
  * @param rh Replay handle identifying which replay operation was requested.
@@ -426,7 +426,7 @@ GNUNET_MULTICAST_replay_response (struct GNUNET_MULTICAST_ReplayHandle *rh,
                                   enum GNUNET_MULTICAST_ReplayErrorCode ec);
 
 
-/** 
+/**
  * Indicate the end of the replay session.
  *
  * Invalidates the replay handle.
@@ -448,7 +448,7 @@ typedef int
                                           void *data);
 
 
-/** 
+/**
  * Replay a message for the multicast group.
  *
  * @param rh Replay handle identifying which replay operation was requested.
@@ -461,7 +461,7 @@ GNUNET_MULTICAST_replay_response2 (struct GNUNET_MULTICAST_ReplayHandle *rh,
                                    void *notify_cls);
 
 
-/** 
+/**
  * Start a multicast group.
  *
  * Will advertise the origin in the P2P overlay network under the respective
@@ -501,7 +501,7 @@ GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                GNUNET_MULTICAST_MessageCallback message_cb,
                                void *cls);
 
-/** 
+/**
  * Function called to provide data for a transmission from the origin to all
  * members.
  *
@@ -526,14 +526,14 @@ typedef int
                                           void *data);
 
 
-/** 
+/**
  * Handle for a request to send a message to all multicast group members
  * (from the origin).
  */
 struct GNUNET_MULTICAST_OriginMessageHandle;
 
 
-/** 
+/**
  * Send a message to the multicast group.
  *
  * @param origin Handle to the multicast group.
@@ -553,7 +553,7 @@ GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin,
 
 
 
-/** 
+/**
  * Resume message transmission to multicast group.
  *
  * @param mh Request to cancel.
@@ -562,7 +562,7 @@ void
 GNUNET_MULTICAST_origin_to_all_resume (struct GNUNET_MULTICAST_OriginMessageHandle *mh);
 
 
-/** 
+/**
  * Cancel request for message transmission to multicast group.
  *
  * @param mh Request to cancel.
@@ -571,7 +571,7 @@ void
 GNUNET_MULTICAST_origin_to_all_cancel (struct GNUNET_MULTICAST_OriginMessageHandle *mh);
 
 
-/** 
+/**
  * Stop a multicast group.
  *
  * @param origin Multicast group to stop.
@@ -580,7 +580,7 @@ void
 GNUNET_MULTICAST_origin_stop (struct GNUNET_MULTICAST_Origin *origin);
 
 
-/** 
+/**
  * Join a multicast group.
  *
  * The entity joining is always the local peer.  Further information about the
@@ -636,13 +636,13 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               GNUNET_MULTICAST_MessageCallback message_cb,
                               void *cls);
 
-/** 
+/**
  * Handle for a replay request.
  */
 struct GNUNET_MULTICAST_MemberReplayHandle;
 
 
-/** 
+/**
  * Request a fragment to be replayed by fragment ID.
  *
  * Useful if messages below the @e max_known_fragment_id given when joining are
@@ -662,7 +662,7 @@ GNUNET_MULTICAST_member_replay_fragment (struct GNUNET_MULTICAST_Member *member,
                                          uint64_t flags);
 
 
-/** 
+/**
  * Request a message fr to be replayed.
  *
  * Useful if messages below the @e max_known_fragment_id given when joining are
@@ -686,7 +686,7 @@ GNUNET_MULTICAST_member_replay_message (struct GNUNET_MULTICAST_Member *member,
                                         void *result_cb_cls);
 
 
-/** 
+/**
  * Cancel a replay request.
  *
  * @param rh Request to cancel.
@@ -695,7 +695,7 @@ void
 GNUNET_MULTICAST_member_replay_cancel (struct GNUNET_MULTICAST_MemberReplayHandle *rh);
 
 
-/** 
+/**
  * Part a multicast group.
  *
  * Disconnects from all group members and invalidates the @a member handle.
@@ -709,7 +709,7 @@ void
 GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member);
 
 
-/** 
+/**
  * Function called to provide data for a transmission from a member to the origin.
  *
  * Note that returning #GNUNET_OK or #GNUNET_SYSERR (but not #GNUNET_NO)
@@ -733,15 +733,15 @@ typedef int
                                           void *data);
 
 
-/** 
+/**
  * Handle for a message to be delivered from a member to the origin.
  */
 struct GNUNET_MULTICAST_MemberRequestHandle;
 
 
-/** 
+/**
  * Send a message to the origin of the multicast group.
- * 
+ *
  * @param member Membership handle.
  * @param message_id Application layer ID for the message.  Opaque to multicast.
  * @param notify Callback to call to get the message.
@@ -755,7 +755,7 @@ GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member,
                                    void *notify_cls);
 
 
-/** 
+/**
  * Resume message transmission to origin.
  *
  * @param rh Request to cancel.
@@ -764,7 +764,7 @@ void
 GNUNET_MULTICAST_member_to_origin_resume (struct GNUNET_MULTICAST_MemberRequestHandle *rh);
 
 
-/** 
+/**
  * Cancel request for message transmission to origin.
  *
  * @param rh Request to cancel.
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index c61bdcab1..260de5982 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -76,7 +76,7 @@ GNUNET_MYSQL_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 /**
  * Destroy a mysql context.  Also frees all associated prepared statements.
- * 
+ *
  * @param mc context to destroy
  */
 void
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index 32d13e200..4d4821bcb 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -83,7 +83,7 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @param block block to cache
    * @return #GNUNET_OK on success, else #GNUNET_SYSERR
    */
-  int (*cache_block) (void *cls, 
+  int (*cache_block) (void *cls,
                       const struct GNUNET_NAMESTORE_Block *block);
 
 
@@ -97,7 +97,7 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @param iter_cls closure for @a iter
    * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
    */
-  int (*lookup_block) (void *cls, 
+  int (*lookup_block) (void *cls,
                        const struct GNUNET_HashCode *query,
                        GNUNET_NAMESTORE_BlockCallback iter, void *iter_cls);
 
@@ -114,7 +114,7 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @param rd array of records with data to store
    * @return #GNUNET_OK on success, else #GNUNET_SYSERR
    */
-  int (*store_records) (void *cls, 
+  int (*store_records) (void *cls,
                         const struct GNUNET_CRYPTO_EccPrivateKey *zone,
                         const char *label,
                         unsigned int rd_count,
@@ -132,7 +132,7 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @param iter_cls closure for @a iter
    * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
    */
-  int (*iterate_records) (void *cls, 
+  int (*iterate_records) (void *cls,
                           const struct GNUNET_CRYPTO_EccPrivateKey *zone,
                           uint64_t offset,
                           GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls);
@@ -149,7 +149,7 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @param iter_cls closure for @a iter
    * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
    */
-  int (*zone_to_name) (void *cls, 
+  int (*zone_to_name) (void *cls,
                        const struct GNUNET_CRYPTO_EccPrivateKey *zone,
                        const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone,
                        GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls);
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index adc1a7e1d..7e39adc49 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -144,7 +144,7 @@ typedef void (*GNUNET_NAMESTORE_ContinuationWithStatus) (void *cls,
  */
 enum GNUNET_NAMESTORE_RecordFlags
 {
-  
+
   /**
    * No special options.
    */
@@ -251,7 +251,7 @@ struct GNUNET_NAMESTORE_Block
    * of encrypted data that follow.
    */
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-  
+
   /**
    * Expiration time of the block.
    */
@@ -266,7 +266,7 @@ GNUNET_NETWORK_STRUCT_END
 
 /**
  * Store an item in the namestore.  If the item is already present,
- * it is replaced with the new record.  
+ * it is replaced with the new record.
  *
  * @param h handle to the namestore
  * @param block block to store
@@ -317,7 +317,7 @@ typedef void (*GNUNET_NAMESTORE_BlockProcessor) (void *cls,
 
 /**
  * Get a result for a particular key from the namestore.  The processor
- * will only be called once.  
+ * will only be called once.
  *
  * @param h handle to the namestore
  * @param derived_hash hash of zone key combined with name to lookup
@@ -328,7 +328,7 @@ typedef void (*GNUNET_NAMESTORE_BlockProcessor) (void *cls,
  * @return a handle that can be used to cancel
  */
 struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h, 
+GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h,
                                const struct GNUNET_HashCode *derived_hash,
                                GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls);
 
@@ -363,7 +363,7 @@ typedef void (*GNUNET_NAMESTORE_RecordMonitor) (void *cls,
  *         cancel
  */
 struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h, 
+GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
                                const struct GNUNET_CRYPTO_EccPrivateKey *zone,
                                const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone,
                                GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls);
@@ -444,7 +444,7 @@ struct GNUNET_NAMESTORE_ZoneMonitor;
 
 
 /**
- * Function called once the monitor has caught up with the current 
+ * Function called once the monitor has caught up with the current
  * state of the database.  Will be called AGAIN after each disconnect
  * (record monitor called with 'NULL' for zone_key) once we're again
  * in sync.
@@ -534,7 +534,7 @@ GNUNET_NAMESTORE_records_deserialize (size_t len,
 
 
 /**
- * Convert the binary value @a data of a record of 
+ * Convert the binary value @a data of a record of
  * type @a type to a human-readable string.
  *
  * @param type type of the record
@@ -587,7 +587,7 @@ GNUNET_NAMESTORE_number_to_typename (uint32_t type);
 
 /**
  * Test if a given record is expired.
- * 
+ *
  * @param rd record to test
  * @return #GNUNET_YES if the record is expired,
  *         #GNUNET_NO if not
@@ -619,11 +619,11 @@ GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EccPublicSignKey *z);
 
 /**
  * Convert public key to the respective absolute domain name in the
- * ".zkey" pTLD. 
+ * ".zkey" pTLD.
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
- * 
- * @param pkey a public key with a point on the eliptic curve 
+ *
+ * @param pkey a public key with a point on the eliptic curve
  * @return string "X.zkey" where X is the coordinates of the public
  *         key in an encoding suitable for DNS labels.
  */
@@ -634,10 +634,10 @@ GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey
 /**
  * Convert an absolute domain name in the ".zkey" pTLD to the
  * respective public key.
- * 
+ *
  * @param zkey string "X.zkey" where X is the public
  *         key in an encoding suitable for DNS labels.
- * @param pkey set to a public key on the eliptic curve 
+ * @param pkey set to a public key on the eliptic curve
  * @return #GNUNET_SYSERR if @a zkey has the wrong syntax
  */
 int
@@ -647,7 +647,7 @@ GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey,
 
 /**
  * Calculate the DHT query for a given @a label in a given @a zone.
- * 
+ *
  * @param zone private key of the zone
  * @param label label of the record
  * @param query hash to use for the query
@@ -660,7 +660,7 @@ GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EccPrivateKe
 
 /**
  * Calculate the DHT query for a given @a label in a given @a zone.
- * 
+ *
  * @param pub public key of the zone
  * @param label label of the record
  * @param query hash to use for the query
@@ -707,7 +707,7 @@ GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block);
  * @param label the name for the records
  * @param proc function to call with the result
  * @param proc_cls closure for @a proc
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the block was 
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if the block was
  *        not well-formed
  */
 int
@@ -722,7 +722,7 @@ GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block,
  * Compares if two records are equal
  *
  * @param a a record
- * @param b another record 
+ * @param b another record
  * @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not.
  */
 int
@@ -736,11 +736,11 @@ GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a,
  * expiration time.
  *
  * @param rd_count number of records given in @a rd
- * @param rd array of records 
+ * @param rd array of records
  * @return absolute expiration time
  */
 struct GNUNET_TIME_Absolute
-GNUNET_NAMESTORE_record_get_expiration_time (unsigned int rd_count, 
+GNUNET_NAMESTORE_record_get_expiration_time (unsigned int rd_count,
                                              const struct GNUNET_NAMESTORE_RecordData *rd);
 
 
diff --git a/src/include/gnunet_nat_lib.h b/src/include/gnunet_nat_lib.h
index 701fc56ae..e3a4749c6 100644
--- a/src/include/gnunet_nat_lib.h
+++ b/src/include/gnunet_nat_lib.h
@@ -284,7 +284,7 @@ struct GNUNET_NAT_AutoHandle *
 GNUNET_NAT_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                              GNUNET_NAT_AutoResultCallback cb,
                              void *cb_cls);
-                             
+                        
 
 /**
  * Abort autoconfiguration.
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 910be8c72..d24019f1a 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -126,7 +126,7 @@ GNUNET_NETWORK_socket_box_native (SOCKTYPE fd);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, 
+GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
                                     int doBlock);
 
 
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 9cf68df58..04fc1a406 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -32,7 +32,7 @@
  * processes using signals.  Because signals are not supported on W32
  * and Java (at least not nicely), we can alternatively use a pipe
  * to send signals to the child processes (if the child process is
- * a full-blown GNUnet process that supports reading signals from 
+ * a full-blown GNUnet process that supports reading signals from
  * a pipe, of course).  Naturally, this also only works for 'normal'
  * termination via signals, and not as a replacement for SIGKILL.
  * Thus using pipes to communicate signals should only be enabled if
@@ -72,7 +72,7 @@ enum GNUNET_OS_InheritStdioFlags
    * inherit stdin of the parent.
    */
   GNUNET_OS_INHERIT_STD_IN = 1,
-  
+
   /**
    * When this flag is set, the child process will
    * inherit stdout of the parent.
@@ -319,7 +319,7 @@ GNUNET_OS_start_process_vap (int pipe_control,
                              enum GNUNET_OS_InheritStdioFlags std_inheritance,
                              struct GNUNET_DISK_PipeHandle *pipe_stdin,
                              struct GNUNET_DISK_PipeHandle *pipe_stdout,
-                             const char *filename, 
+                             const char *filename,
                              char *const argv[]);
 
 
@@ -375,7 +375,7 @@ GNUNET_OS_start_process_va (int pipe_control,
 struct GNUNET_OS_Process *
 GNUNET_OS_start_process_v (int pipe_control,
                            enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                           const SOCKTYPE *lsocks, 
+                           const SOCKTYPE *lsocks,
                            const char *filename,
                            char *const argv[]);
 
@@ -482,7 +482,7 @@ GNUNET_OS_install_parent_control_handler (void *cls,
  *         GNUNET_NO if not SUID (but binary exists),
  *         GNUNET_SYSERR on error (no such binary or not executable)
  */
-int 
+int
 GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char * params);
 
 
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index b428f49a4..9608d3702 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -73,7 +73,7 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h);
 
 /**
  * Continuation called with a status result.
- * 
+ *
  * @param cls closure
  * @param emsg error message, NULL on success
  */
diff --git a/src/include/gnunet_postgres_lib.h b/src/include/gnunet_postgres_lib.h
index 8f7204748..183105cd7 100644
--- a/src/include/gnunet_postgres_lib.h
+++ b/src/include/gnunet_postgres_lib.h
@@ -46,7 +46,7 @@ extern "C"
  * @param ret return value from database operation to check
  * @param expected_status desired status
  * @param command description of the command that was run
- * @param args arguments given to the command 
+ * @param args arguments given to the command
  * @param filename name of the source file where the command was run
  * @param line line number in the source file
  * @return GNUNET_OK if the result is acceptable
@@ -66,7 +66,7 @@ GNUNET_POSTGRES_check_result_ (PGconn *dbh, PGresult * ret, int expected_status,
  * @param ret return value from database operation to check
  * @param expected_status desired status
  * @param command description of the command that was run
- * @param args arguments given to the command 
+ * @param args arguments given to the command
  * @return GNUNET_OK if the result is acceptable
  */
 #define GNUNET_POSTGRES_check_result(dbh,ret,expected_status,command,args) GNUNET_POSTGRES_check_result_(dbh,ret,expected_status,command,args,__FILE__,__LINE__)
@@ -78,7 +78,7 @@ GNUNET_POSTGRES_check_result_ (PGconn *dbh, PGresult * ret, int expected_status,
  * @param dbh database handle
  * @param sql statement to run
  * @param filename filename for error reporting
- * @param line code line for error reporting 
+ * @param line code line for error reporting
  * @return GNUNET_OK on success
  */
 int
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 5380e0987..068fb2f81 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -23,7 +23,7 @@
  * @brief constants for network protocols
  * @author Christian Grothoff
  * @defgroup protocols Types of messages used in GNUnet
- * @{ 
+ * @{
  */
 
 /*******************************************************************************
@@ -149,7 +149,7 @@ extern "C"
  ******************************************************************************/
 
 /**
- * Type of data messages from the plugin to the gnunet-wlan-helper 
+ * Type of data messages from the plugin to the gnunet-wlan-helper
  */
 #define GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER 39
 
@@ -843,7 +843,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY     266
 
 /**
- * Request the destruction of a whole tunnel 
+ * Request the destruction of a whole tunnel
  */
 #define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY         267
 
@@ -1888,7 +1888,7 @@ extern "C"
 
 /**
  * Result in response to regex search.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_REGEX_RESULT 622
 
 /*******************************************************************************
@@ -2187,7 +2187,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY 741
 
 /**
- * Mesh: audio data 
+ * Mesh: audio data
  */
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 742
 
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 4addfa4d9..e9f935de7 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 
-/** 
+/**
  * @file include/gnunet_psyc_service.h
  * @brief PSYC service; high-level access to the PSYC protocol
  *        note that clients of this API are NOT expected to
@@ -90,13 +90,13 @@ extern "C"
 #include "gnunet_multicast_service.h"
 
 
-/** 
+/**
  * Version number of GNUnet-PSYC API.
  */
 #define GNUNET_PSYC_VERSION 0x00000000
 
 
-/** 
+/**
  * Policy flags for a channel.
  */
 enum GNUNET_PSYC_ChannelFlags
@@ -113,7 +113,7 @@ enum GNUNET_PSYC_ChannelFlags
   GNUNET_PSYC_CHANNEL_RESTRICTED_HISTORY = 1 << 1,
 };
 
-/** 
+/**
  * PSYC channel policies.
  */
 enum GNUNET_PSYC_Policy
@@ -125,7 +125,7 @@ enum GNUNET_PSYC_Policy
    */
   GNUNET_PSYC_CHANNEL_ANONYMOUS = 0,
 
-  /** 
+  /**
    * The master must approve membership to the channel, messages must only be
    * distributed to current channel slaves.  This includes the channel
    * state as well as transient messages.
@@ -135,7 +135,7 @@ enum GNUNET_PSYC_Policy
     | GNUNET_PSYC_CHANNEL_RESTRICTED_HISTORY,
 
 #if IDEAS_FOR_FUTURE
-  /** 
+  /**
    * Anyone can freely join the channel (no approval required);
    * however, messages must only be distributed to current channel
    * slaves, so the master must still acknowledge that the slave
@@ -170,7 +170,7 @@ enum GNUNET_PSYC_MessageFlags
    */
   GNUNET_PSYC_MESSAGE_LAST_FRAGMENT = 1 << 1,
 
-  /** 
+  /**
    * OR'ed flags if message is not fragmented.
    */
   GNUNET_PSYC_MESSAGE_NOT_FRAGMENTED
@@ -274,7 +274,7 @@ struct GNUNET_PSYC_MessageData
   uint8_t status;
 };
 
-/** 
+/**
  * Handle that identifies a join request.
  *
  * Used to match calls to #GNUNET_PSYC_JoinCallback to the
@@ -283,7 +283,7 @@ struct GNUNET_PSYC_MessageData
 struct GNUNET_PSYC_JoinHandle;
 
 
-/** 
+/**
  * Method called from PSYC upon receiving a message indicating a call to a
  * @e method.
  *
@@ -316,7 +316,7 @@ typedef int
                        enum GNUNET_PSYC_MessageFlags flags);
 
 
-/** 
+/**
  * Method called from PSYC upon receiving a join request.
  *
  * @param cls Closure.
@@ -341,7 +341,7 @@ typedef int
                              struct GNUNET_PSYC_JoinHandle *jh);
 
 
-/** 
+/**
  * Function to call with the decision made for a join request.
  *
  * Must be called once and only once in response to an invocation of the
@@ -375,13 +375,13 @@ GNUNET_PSYC_join_decision (struct GNUNET_PSYC_JoinHandle *jh,
                            size_t data_size);
 
 
-/** 
+/**
  * Handle for the master of a PSYC channel.
  */
 struct GNUNET_PSYC_Master;
 
 
-/** 
+/**
  * Function called after the channel master started.
  *
  * @param cls Closure.
@@ -391,7 +391,7 @@ typedef void
 (*GNUNET_PSYC_MasterStartCallback) (void *cls, uint64_t max_message_id);
 
 
-/** 
+/**
  * Start a PSYC master channel.
  *
  * Will start a multicast group identified by the given ECC key.  Messages
@@ -429,7 +429,7 @@ GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                           void *cls);
 
 
-/** 
+/**
  * Function called to provide data for a transmission via PSYC.
  *
  * Note that returning #GNUNET_OK or #GNUNET_SYSERR (but not #GNUNET_NO)
@@ -459,13 +459,13 @@ typedef int
 enum GNUNET_PSYC_MasterTransmitFlags
 {
   GNUNET_PSYC_MASTER_TRANSMIT_NONE = 0,
-  /** 
+  /**
    * Whether this message should reset the channel state,
    * i.e. remove all previously stored state variables.
    */
   GNUNET_PSYC_MASTER_TRANSMIT_RESET_STATE = 1 << 0,
 
-  /** 
+  /**
    * Whether we need to increment the group generation counter after
    * transmitting this message.
    */
@@ -478,13 +478,13 @@ enum GNUNET_PSYC_MasterTransmitFlags
 };
 
 
-/** 
+/**
  * Handle for a pending PSYC transmission operation.
  */
 struct GNUNET_PSYC_MasterTransmitHandle;
 
 
-/** 
+/**
  * Send a message to call a method to all members in the PSYC channel.
  *
  * @param master Handle to the PSYC channel.
@@ -505,7 +505,7 @@ GNUNET_PSYC_master_transmit (struct GNUNET_PSYC_Master *master,
                              enum GNUNET_PSYC_MasterTransmitFlags flags);
 
 
-/** 
+/**
  * Resume transmission to the channel.
  *
  * @param th Handle of the request that is being resumed.
@@ -514,7 +514,7 @@ void
 GNUNET_PSYC_master_transmit_resume (struct GNUNET_PSYC_MasterTransmitHandle *th);
 
 
-/** 
+/**
  * Abort transmission request to channel.
  *
  * @param th Handle of the request that is being aborted.
@@ -523,7 +523,7 @@ void
 GNUNET_PSYC_master_transmit_cancel (struct GNUNET_PSYC_MasterTransmitHandle *th);
 
 
-/** 
+/**
  * Stop a PSYC master channel.
  *
  * @param master PSYC channel master to stop.
@@ -532,13 +532,13 @@ void
 GNUNET_PSYC_master_stop (struct GNUNET_PSYC_Master *master);
 
 
-/** 
+/**
  * Handle for a PSYC channel slave.
  */
 struct GNUNET_PSYC_Slave;
 
 
-/** 
+/**
  * Function called after the slave joined.
  *
  * @param cls Closure.
@@ -548,7 +548,7 @@ typedef void
 (*GNUNET_PSYC_SlaveJoinCallback) (void *cls, uint64_t max_message_id);
 
 
-/** 
+/**
  * Join a PSYC channel.
  *
  * The entity joining is always the local peer.  The user must immediately use
@@ -594,7 +594,7 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
                         size_t data_size);
 
 
-/** 
+/**
  * Part a PSYC channel.
  *
  * Will terminate the connection to the PSYC service.  Polite clients should
@@ -606,7 +606,7 @@ void
 GNUNET_PSYC_slave_part (struct GNUNET_PSYC_Slave *slave);
 
 
-/** 
+/**
  * Function called to provide data for a transmission to the channel master
  * (a.k.a. the @e host of the channel).
  *
@@ -638,13 +638,13 @@ enum GNUNET_PSYC_SlaveTransmitFlags
 };
 
 
-/** 
+/**
  * Handle for a pending PSYC transmission operation.
  */
 struct GNUNET_PSYC_SlaveTransmitHandle;
 
 
-/** 
+/**
  * Request a message to be sent to the channel master.
  *
  * @param slave Slave handle.
@@ -664,7 +664,7 @@ GNUNET_PSYC_slave_transmit (struct GNUNET_PSYC_Slave *slave,
                             enum GNUNET_PSYC_SlaveTransmitFlags flags);
 
 
-/** 
+/**
  * Resume transmission to the master.
  *
  * @param th Handle of the request that is being resumed.
@@ -673,7 +673,7 @@ void
 GNUNET_PSYC_slave_transmit_resume (struct GNUNET_PSYC_MasterTransmitHandle *th);
 
 
-/** 
+/**
  * Abort transmission request to master.
  *
  * @param th Handle of the request that is being aborted.
@@ -682,13 +682,13 @@ void
 GNUNET_PSYC_slave_transmit_cancel (struct GNUNET_PSYC_SlaveTransmitHandle *th);
 
 
-/** 
+/**
  * Handle to access PSYC channel operations for both the master and slaves.
  */
 struct GNUNET_PSYC_Channel;
 
 
-/** 
+/**
  * Convert a channel @a master to a @e channel handle to access the @e channel
  * APIs.
  *
@@ -699,7 +699,7 @@ struct GNUNET_PSYC_Channel *
 GNUNET_PSYC_master_get_channel (struct GNUNET_PSYC_Master *master);
 
 
-/** 
+/**
  * Convert @a slave to a @e channel handle to access the @e channel APIs.
  *
  * @param slave Slave handle.
@@ -709,7 +709,7 @@ struct GNUNET_PSYC_Channel *
 GNUNET_PSYC_slave_get_channel (struct GNUNET_PSYC_Slave *slave);
 
 
-/** 
+/**
  * Add a slave to the channel's membership list.
  *
  * Note that this will NOT generate any PSYC traffic, it will merely update the
@@ -738,7 +738,7 @@ GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *channel,
                                uint64_t effective_since);
 
 
-/** 
+/**
  * Remove a slave from the channel's membership list.
  *
  * Note that this will NOT generate any PSYC traffic, it will merely update the
@@ -766,7 +766,7 @@ GNUNET_PSYC_channel_slave_remove (struct GNUNET_PSYC_Channel *channel,
                                   uint64_t announced_at);
 
 
-/** 
+/**
  * Function called to inform a member about stored state values for a channel.
  *
  * @param cls Closure.
@@ -791,13 +791,13 @@ typedef void
 (*GNUNET_PSYC_FinishCallback) (void *cls);
 
 
-/** 
+/**
  * Handle to a story telling operation.
  */
 struct GNUNET_PSYC_Story;
 
 
-/** 
+/**
  * Request to be told the message history of the channel.
  *
  * Historic messages (but NOT the state at the time) will be replayed (given to
@@ -827,7 +827,7 @@ GNUNET_PSYC_channel_story_tell (struct GNUNET_PSYC_Channel *channel,
                                 void *cls);
 
 
-/** 
+/**
  * Abort story telling.
  *
  * This function must not be called from within method handlers (as given to
@@ -845,7 +845,7 @@ GNUNET_PSYC_channel_story_tell_cancel (struct GNUNET_PSYC_Story *story);
 struct GNUNET_PSYC_StateQuery;
 
 
-/** 
+/**
  * Retrieve the best matching channel state variable.
  *
  * If the requested variable name is not present in the state, the nearest
@@ -867,7 +867,7 @@ GNUNET_PSYC_channel_state_get (struct GNUNET_PSYC_Channel *channel,
                                void *cb_cls);
 
 
-/** 
+/**
  * Return all channel state variables whose name matches a given prefix.
  *
  * A name matches if it starts with the given @a name_prefix, thus requesting
@@ -890,7 +890,7 @@ GNUNET_PSYC_channel_state_get_prefix (struct GNUNET_PSYC_Channel *channel,
                                       void *cb_cls);
 
 
-/** 
+/**
  * Cancel a state query operation.
  *
  * @param query Handle for the operation to cancel.
diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h
index 5d5014fb3..8f8668043 100644
--- a/src/include/gnunet_psycstore_plugin.h
+++ b/src/include/gnunet_psycstore_plugin.h
@@ -49,7 +49,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
    */
   void *cls;
 
-  /** 
+  /**
    * Store join/leave events for a PSYC channel in order to be able to answer
    * membership test queries later.
    *
@@ -66,7 +66,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                        uint64_t effective_since,
                        uint64_t group_generation);
 
-  /** 
+  /**
    * Test if a member was admitted to the channel at the given message ID.
    *
    * @see GNUNET_PSYCSTORE_membership_test()
@@ -80,7 +80,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                       const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key,
                       uint64_t message_id);
 
-  /** 
+  /**
    * Store a message fragment sent to a channel.
    *
    * @see GNUNET_PSYCSTORE_fragment_store()
@@ -93,7 +93,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                      const struct GNUNET_MULTICAST_MessageHeader *message,
                      uint32_t psycstore_flags);
 
-  /** 
+  /**
    * Set additional flags for a given message.
    *
    * They are OR'd with any existing flags set.
@@ -111,7 +111,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                         uint64_t message_id,
                         uint64_t psycstore_flags);
 
-  /** 
+  /**
    * Retrieve a message fragment by fragment ID.
    *
    * @see GNUNET_PSYCSTORE_fragment_get()
@@ -125,7 +125,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                    GNUNET_PSYCSTORE_FragmentCallback cb,
                    void *cb_cls);
 
-  /** 
+  /**
    * Retrieve all fragments of a message.
    *
    * @see GNUNET_PSYCSTORE_message_get()
@@ -140,7 +140,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                   GNUNET_PSYCSTORE_FragmentCallback cb,
                   void *cb_cls);
 
-  /** 
+  /**
    * Retrieve a fragment of message specified by its message ID and fragment
    * offset.
    *
@@ -156,7 +156,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                            GNUNET_PSYCSTORE_FragmentCallback cb,
                            void *cb_cls);
 
-  /** 
+  /**
    * Retrieve the max. values of message counters for a channel.
    *
    * @see GNUNET_PSYCSTORE_counters_get()
@@ -170,7 +170,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                            uint64_t *max_message_id,
                            uint64_t *max_group_generation);
 
-  /** 
+  /**
    * Retrieve the max. values of state counters for a channel.
    *
    * @see GNUNET_PSYCSTORE_counters_get()
@@ -183,7 +183,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                          uint64_t *max_state_message_id);
 
 
-  /** 
+  /**
    * Begin modifying current state.
    *
    * @see GNUNET_PSYCSTORE_state_modify()
@@ -195,7 +195,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                          const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key,
                          uint64_t message_id, uint64_t state_delta);
 
-  /** 
+  /**
    * Set the current value of a state variable.
    *
    * The state modification process is started with state_modify_begin(),
@@ -212,7 +212,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                        const char *name, const void *value, size_t value_size);
 
 
-  /** 
+  /**
    * End modifying current state.
    *
    * @see GNUNET_PSYCSTORE_state_modify()
@@ -225,7 +225,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                        uint64_t message_id);
 
 
-  /** 
+  /**
    * Begin synchronizing state.
    *
    * @see GNUNET_PSYCSTORE_state_sync()
@@ -236,7 +236,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
   (*state_sync_begin) (void *cls,
                          const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key);
 
-  /** 
+  /**
    * Set the value of a state variable while synchronizing state.
    *
    * The state synchronization process is started with state_sync_begin(),
@@ -253,7 +253,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                      const char *name, const void *value, size_t value_size);
 
 
-  /** 
+  /**
    * End synchronizing state.
    *
    * @see GNUNET_PSYCSTORE_state_sync()
@@ -266,7 +266,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                      uint64_t message_id);
 
 
-  /** 
+  /**
    * Reset the state of a channel.
    *
    * Delete all state variables stored for the given channel.
@@ -289,7 +289,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                           const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key);
 
 
-  /** 
+  /**
    * Retrieve a state variable by name (exact match).
    *
    * @return #GNUNET_OK on success, else #GNUNET_SYSERR
@@ -301,7 +301,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                 GNUNET_PSYCSTORE_StateCallback cb,
                 void *cb_cls);
 
-  /** 
+  /**
    * Retrieve all state variables for a channel with the given prefix.
    *
    * @see GNUNET_PSYCSTORE_state_get_prefix()
@@ -316,7 +316,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions
                        void *cb_cls);
 
 
-  /** 
+  /**
    * Retrieve all signed state variables for a channel.
    *
    * @return #GNUNET_OK on success, else #GNUNET_SYSERR
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h
index 8032223c8..25d4339a3 100644
--- a/src/include/gnunet_psycstore_service.h
+++ b/src/include/gnunet_psycstore_service.h
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 
-/** 
+/**
  * @file include/gnunet_psycstore_service.h
  * @brief PSYCstore service; implements persistent storage for the PSYC service
  * @author Gabor X Toth
@@ -40,7 +40,7 @@ extern "C"
 #include "gnunet_multicast_service.h"
 #include "gnunet_psyc_service.h"
 
-/** 
+/**
  * Version number of GNUnet PSYCstore API.
  */
 #define GNUNET_PSYCSTORE_VERSION 0x00000000
@@ -67,13 +67,13 @@ enum GNUNET_PSYCSTORE_MessageFlags
 };
 
 
-/** 
+/**
  * Handle for a PSYCstore
  */
 struct GNUNET_PSYCSTORE_Handle;
 
 
-/** 
+/**
  * Connect to the PSYCstore service.
  *
  * @param cfg Configuration to use.
@@ -84,7 +84,7 @@ struct GNUNET_PSYCSTORE_Handle *
 GNUNET_PSYCSTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
-/** 
+/**
  * Disconnect from the PSYCstore service.
  *
  * @param h Handle for the connection.
@@ -93,15 +93,15 @@ void
 GNUNET_PSYCSTORE_disconnect (struct GNUNET_PSYCSTORE_Handle *h);
 
 
-/** 
+/**
  * Handle for an operation on the PSYCSTORE (useful to cancel the operation).
  */
 struct GNUNET_PSYCSTORE_OperationHandle;
 
 
-/** 
+/**
  * Function called with the result of an asynchronous operation.
- * 
+ *
  * @param result #GNUNET_SYSERR on error,
  *        #GNUNET_YES on success or if the peer was a member,
  *        #GNUNET_NO if the peer was not a member
@@ -112,7 +112,7 @@ typedef void
                                     const char *err_msg);
 
 
-/** 
+/**
  * Store join/leave events for a PSYC channel in order to be able to answer
  * membership test queries later.
  *
@@ -143,7 +143,7 @@ GNUNET_PSYCSTORE_membership_store (struct GNUNET_PSYCSTORE_Handle *h,
                                    void *rcb_cls);
 
 
-/** 
+/**
  * Test if a member was admitted to the channel at the given message ID.
  *
  * This is useful when relaying and replaying messages to check if a particular
@@ -173,7 +173,7 @@ GNUNET_PSYCSTORE_membership_test (struct GNUNET_PSYCSTORE_Handle *h,
                                   void *rcb_cls);
 
 
-/** 
+/**
  * Store a message fragment sent to a channel.
  *
  * @param h Handle for the PSYCstore.
@@ -183,7 +183,7 @@ GNUNET_PSYCSTORE_membership_test (struct GNUNET_PSYCSTORE_Handle *h,
  *        state modifiers.
  * @param rcb Callback to call with the result of the operation.
  * @param rcb_cls Closure for the callback.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -195,7 +195,7 @@ GNUNET_PSYCSTORE_fragment_store (struct GNUNET_PSYCSTORE_Handle *h,
                                  void *rcb_cls);
 
 
-/** 
+/**
  * Function called with one message fragment, as the result of a
  * GNUNET_PSYCSTORE_fragment_get() or GNUNET_PSYCSTORE_message_get() call.
  *
@@ -213,7 +213,7 @@ typedef int
                                       enum GNUNET_PSYCSTORE_MessageFlags psycstore_flags);
 
 
-/** 
+/**
  * Retrieve a message fragment by fragment ID.
  *
  * @param h Handle for the PSYCstore.
@@ -222,7 +222,7 @@ typedef int
  * @param fcb Callback to call with the retrieved fragment.
  * @param rcb Callback to call with the result of the operation.
  * @param cls Closure for the callbacks.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -234,7 +234,7 @@ GNUNET_PSYCSTORE_fragment_get (struct GNUNET_PSYCSTORE_Handle *h,
                                void *cls);
 
 
-/** 
+/**
  * Retrieve all fragments of a message.
  *
  * @param h Handle for the PSYCstore.
@@ -243,7 +243,7 @@ GNUNET_PSYCSTORE_fragment_get (struct GNUNET_PSYCSTORE_Handle *h,
  * @param fcb Callback to call with the retrieved fragments.
  * @param rcb Callback to call with the result of the operation.
  * @param cls Closure for the callbacks.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -255,7 +255,7 @@ GNUNET_PSYCSTORE_message_get (struct GNUNET_PSYCSTORE_Handle *h,
                               void *cls);
 
 
-/** 
+/**
  * Retrieve a fragment of message specified by its message ID and fragment
  * offset.
  *
@@ -266,7 +266,7 @@ GNUNET_PSYCSTORE_message_get (struct GNUNET_PSYCSTORE_Handle *h,
  * @param fcb Callback to call with the retrieved fragments.
  * @param rcb Callback to call with the result of the operation.
  * @param cls Closure for the callbacks.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -279,7 +279,7 @@ GNUNET_PSYCSTORE_message_get_fragment (struct GNUNET_PSYCSTORE_Handle *h,
                                        void *cls);
 
 
-/** 
+/**
  * Callback used to return the latest value of counters for the channel master.
  *
  * @see GNUNET_PSYCSTORE_counters_get()
@@ -299,7 +299,7 @@ typedef void
                                       uint64_t max_state_message_id);
 
 
-/** 
+/**
  * Retrieve latest values of counters for a channel.
  *
  * The current value of counters are needed
@@ -311,7 +311,7 @@ typedef void
  * @param channel_key Public key that identifies the channel.
  * @param ccb Callback to call with the result.
  * @param ccb_cls Closure for the callback.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -321,7 +321,7 @@ GNUNET_PSYCSTORE_counters_get (struct GNUNET_PSYCSTORE_Handle *h,
                                void *ccb_cls);
 
 
-/** 
+/**
  * Apply modifiers of a message to the current channel state.
  *
  * An error is returned if there are missing messages containing state
@@ -335,7 +335,7 @@ GNUNET_PSYCSTORE_counters_get (struct GNUNET_PSYCSTORE_Handle *h,
  * @param modifiers List of modifiers to apply.
  * @param rcb Callback to call with the result of the operation.
  * @param rcb_cls Closure for the callback.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -349,7 +349,7 @@ GNUNET_PSYCSTORE_state_modify (struct GNUNET_PSYCSTORE_Handle *h,
                                void *rcb_cls);
 
 
-/** 
+/**
  * Store synchronized state.
  *
  * @param h Handle for the PSYCstore.
@@ -359,7 +359,7 @@ GNUNET_PSYCSTORE_state_modify (struct GNUNET_PSYCSTORE_Handle *h,
  * @param modifiers Full state to store.
  * @param rcb Callback to call with the result of the operation.
  * @param rcb_cls Closure for the callback.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -373,7 +373,7 @@ GNUNET_PSYCSTORE_state_sync (struct GNUNET_PSYCSTORE_Handle *h,
 
 
 
-/** 
+/**
  * Reset the state of a channel.
  *
  * Delete all state variables stored for the given channel.
@@ -382,7 +382,7 @@ GNUNET_PSYCSTORE_state_sync (struct GNUNET_PSYCSTORE_Handle *h,
  * @param channel_key The channel we are interested in.
  * @param rcb Callback to call with the result of the operation.
  * @param rcb_cls Closure for the callback.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -393,7 +393,7 @@ GNUNET_PSYCSTORE_state_reset (struct GNUNET_PSYCSTORE_Handle *h,
                               void *rcb_cls);
 
 
-/** 
+/**
  * Update signed values of state variables in the state store.
  *
  * @param h Handle for the PSYCstore.
@@ -413,7 +413,7 @@ GNUNET_PSYCSTORE_state_hash_update (struct GNUNET_PSYCSTORE_Handle *h,
                                     void *rcb_cls);
 
 
-/** 
+/**
  * Function called with the value of a state variable.
  *
  * @param cls Closure.
@@ -430,7 +430,7 @@ typedef int
                                    const void *value, size_t value_size);
 
 
-/** 
+/**
  * Retrieve the best matching state variable.
  *
  * @param h Handle for the PSYCstore.
@@ -439,7 +439,7 @@ typedef int
  * @param scb Callback to return the matching state variable.
  * @param rcb Callback to call with the result of the operation.
  * @param cls Closure for the callbacks.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -451,7 +451,7 @@ GNUNET_PSYCSTORE_state_get (struct GNUNET_PSYCSTORE_Handle *h,
                             void *cls);
 
 
-/** 
+/**
  * Retrieve all state variables for a channel with the given prefix.
  *
  * @param h Handle for the PSYCstore.
@@ -460,7 +460,7 @@ GNUNET_PSYCSTORE_state_get (struct GNUNET_PSYCSTORE_Handle *h,
  * @param scb Callback to return matching state variables.
  * @param rcb Callback to call with the result of the operation.
  * @param cls Closure for the callbacks.
- * 
+ *
  * @return Handle that can be used to cancel the operation.
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
@@ -472,7 +472,7 @@ GNUNET_PSYCSTORE_state_get_prefix (struct GNUNET_PSYCSTORE_Handle *h,
                                    void *cls);
 
 
-/** 
+/**
  * Cancel an operation.
  *
  * @param op Handle for the operation to cancel.
diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h
index a3652be50..cd46979cb 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -59,7 +59,7 @@ struct GNUNET_REGEX_Search;
  * Announce this peer under the given regular expression.  Does
  * not free resources, must call #GNUNET_REGEX_announce_cancel for
  * that.
- * 
+ *
  * @param cfg configuration to use
  * @param regex Regular expression to announce.
  * @param refresh_delay after what delay should the announcement be repeated?
@@ -76,7 +76,7 @@ GNUNET_REGEX_announce (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 /**
  * Stop announcing the regex specified by the given handle.
- * 
+ *
  * @param a handle returned by a previous #GNUNET_REGEX_announce call.
  */
 void
@@ -122,7 +122,7 @@ GNUNET_REGEX_search (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 /**
  * Stop search and free all data used by a #GNUNET_REGEX_search call.
- * 
+ *
  * @param s Handle returned by a previous #GNUNET_REGEX_search call.
  */
 void
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h
index 31fd178ca..0a51e41ca 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -132,7 +132,7 @@ GNUNET_RESOLVER_local_fqdn_get (void);
  * Perform a reverse DNS lookup.
  *
  * @param sa host address
- * @param salen length of @a sa 
+ * @param salen length of @a sa
  * @param do_resolve use #GNUNET_NO to return numeric hostname
  * @param timeout how long to try resolving
  * @param callback function to call with hostnames
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h
index 7758ec97e..8809f9ece 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -53,7 +53,7 @@ struct GNUNET_REVOCATION_Query;
  * Callback to call with the result of a key revocation query.
  *
  * @param cls closure
- * @param is_valid #GNUNET_NO of the key is/was revoked, 
+ * @param is_valid #GNUNET_NO of the key is/was revoked,
  *                 #GNUNET_YES if the key is still valid,
  *                 #GNUNET_SYSERR if we had trouble querying the service
  *
diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h
index a398a3198..5f09f6a8a 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -66,7 +66,7 @@ typedef void (*GNUNET_SCALARPRODUCT_ContinuationWithStatus) (void *cls,
                                                              enum GNUNET_SCALARPRODUCT_ResponseStatus status);
 /**
  * Process a datum that was stored in the scalarproduct.
- * 
+ *
  * @param cls closure
  * @param status Status of the request
  * @param type result of the computation
@@ -77,7 +77,7 @@ typedef void (*GNUNET_SCALARPRODUCT_DatumProcessor) (void *cls,
 
 /**
  * Request by Alice's client for computing a scalar product
- * 
+ *
  * @param h handle to the master context
  * @param key Session key - unique to the requesting client
  * @param peer PeerID of the other peer
@@ -100,8 +100,8 @@ GNUNET_SCALARPRODUCT_request (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               void *cont_cls);
 
 /**
- * Used by Bob's client to cooperate with Alice, 
- * 
+ * Used by Bob's client to cooperate with Alice,
+ *
  * @param h handle to our configuration
  * @param key Session key - unique to the requesting client
  * @param elements Array of elements of the vector
@@ -119,7 +119,7 @@ GNUNET_SCALARPRODUCT_response (const struct GNUNET_CONFIGURATION_Handle *cfg,
 /**
  * Cancel an ongoing computation or revoke our collaboration offer.
  * Closes the connection to the service
- * 
+ *
  * @param h handel to terminate
  */
 void
@@ -128,7 +128,7 @@ GNUNET_SCALARPRODUCT_cancel (struct GNUNET_SCALARPRODUCT_ComputationHandle * h);
 /**
  * Cancel ALL ongoing computation or revoke our collaboration offer.
  * Closes ALL connections to the service
- * 
+ *
  */
 void
 GNUNET_SCALARPRODUCT_disconnect ();
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index dee6eab27..83d9d261a 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -536,7 +536,7 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay,
  *         only valid until "task" is started!
  */
 GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,                            
+GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
                              struct GNUNET_TIME_Relative delay,
                              const struct GNUNET_NETWORK_FDSet *rs,
                              const struct GNUNET_NETWORK_FDSet *ws,
diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h
index 0195a2898..d1097450f 100644
--- a/src/include/gnunet_server_lib.h
+++ b/src/include/gnunet_server_lib.h
@@ -288,7 +288,7 @@ GNUNET_SERVER_client_persist_ (struct GNUNET_SERVER_Client *client);
  *                          serious error)
  */
 void
-GNUNET_SERVER_receive_done (struct GNUNET_SERVER_Client *client, 
+GNUNET_SERVER_receive_done (struct GNUNET_SERVER_Client *client,
                             int success);
 
 
@@ -326,7 +326,7 @@ GNUNET_SERVER_client_get_user_context_ (struct GNUNET_SERVER_Client *client,
  * @param ptr pointer to user context
  * @param size number of bytes in user context struct (for verification only)
  */
-void 
+void
 GNUNET_SERVER_client_set_user_context_ (struct GNUNET_SERVER_Client *client,
                                         void *ptr,
                                         size_t size);
@@ -500,7 +500,7 @@ GNUNET_SERVER_connect_notify (struct GNUNET_SERVER_Handle *server,
 
 /**
  * Ask the server to stop notifying us whenever a client disconnects.
- * Arguments must match exactly those given to 
+ * Arguments must match exactly those given to
  * #GNUNET_SERVER_disconnect_notify.  It is not necessary to call this
  * function during shutdown of the server; in fact, most applications
  * will never use this function.
@@ -517,7 +517,7 @@ GNUNET_SERVER_disconnect_notify_cancel (struct GNUNET_SERVER_Handle *server,
 
 /**
  * Ask the server to stop notifying us whenever a client connects.
- * Arguments must match exactly those given to 
+ * Arguments must match exactly those given to
  * #GNUNET_SERVER_connect_notify.  It is not necessary to call this
  * function during shutdown of the server; in fact, most applications
  * will never use this function.
@@ -693,7 +693,7 @@ GNUNET_SERVER_notification_context_add (struct GNUNET_SERVER_NotificationContext
 void
 GNUNET_SERVER_notification_context_unicast (struct GNUNET_SERVER_NotificationContext *nc,
                                             struct GNUNET_SERVER_Client *client,
-                                            const struct GNUNET_MessageHeader *msg, 
+                                            const struct GNUNET_MessageHeader *msg,
                                             int can_drop);
 
 
@@ -706,7 +706,7 @@ GNUNET_SERVER_notification_context_unicast (struct GNUNET_SERVER_NotificationCon
  */
 void
 GNUNET_SERVER_notification_context_broadcast (struct GNUNET_SERVER_NotificationContext *nc,
-                                              const struct GNUNET_MessageHeader *msg, 
+                                              const struct GNUNET_MessageHeader *msg,
                                               int can_drop);
 
 
@@ -811,7 +811,7 @@ typedef void (*GNUNET_SERVER_MstDestroyCallback) (void *cls, void *mst);
  * @param one_shot only call callback once, keep rest of message in buffer
  * @return #GNUNET_OK if we are done processing (need more data)
  *         #GNUNET_NO if one_shot was set and we have another message ready
- *         #GNUNET_SYSERR if the data stream is corrupt 
+ *         #GNUNET_SYSERR if the data stream is corrupt
  */
 typedef int (*GNUNET_SERVER_MstReceiveCallback) (void *cls, void *mst,
                                                  struct GNUNET_SERVER_Client *client,
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index 2d7b3064f..11dcff35e 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -119,10 +119,10 @@ enum GNUNET_SERVICE_Options
  *         if we shutdown nicely
  */
 int
-GNUNET_SERVICE_run (int argc, char *const *argv, 
+GNUNET_SERVICE_run (int argc, char *const *argv,
                     const char *service_name,
-                    enum GNUNET_SERVICE_Options options, 
-                    GNUNET_SERVICE_Main task, 
+                    enum GNUNET_SERVICE_Options options,
+                    GNUNET_SERVICE_Main task,
                     void *task_cls);
 
 
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index dbec108c2..920424b80 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -317,7 +317,7 @@ GNUNET_SET_prepare (const struct GNUNET_PeerIdentity *other_peer,
  * Wait for set operation requests for the given application ID.
  * If the connection to the set service is lost, the listener is
  * re-created transparently with exponential backoff.
- * 
+ *
  * @param cfg configuration to use for connecting to
  *            the set service
  * @param operation operation we want to listen for
@@ -351,7 +351,7 @@ GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh);
  * GNUNET_SET_listen, as the 'struct GNUNET_SET_Request' becomes invalid
  * afterwards.
  * Call GNUNET_SET_commit to provide the local set to use for the operation,
- * and to begin the exchange with the remote peer. 
+ * and to begin the exchange with the remote peer.
  *
  * @param request request to accept
  * @param result_mode specified how results will be returned,
@@ -375,7 +375,7 @@ GNUNET_SET_accept (struct GNUNET_SET_Request *request,
  * set information and call the result callback with the
  * result information.
  *
- * @param oh handle to the set operation 
+ * @param oh handle to the set operation
  * @param set the set to use for the operation
  * @return GNUNET_OK on success, GNUNET_SYSERR if the
  *         set is invalid (e.g. the set service crashed)
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index f53a2c28b..88a52b709 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 
-/** 
+/**
  * @file include/gnunet_social_service.h
  * @brief Social service; implements social functionality using the PSYC service.
  * @author Gabor X Toth
@@ -41,34 +41,34 @@ extern "C"
 #include "gnunet_multicast_service.h"
 
 
-/** 
+/**
  * Version number of GNUnet Social API.
  */
 #define GNUNET_SOCIAL_VERSION 0x00000000
 
 
-/** 
+/**
  * Handle for another user (who is likely pseudonymous) in the network.
  */
 struct GNUNET_SOCIAL_Nym;
 
-/** 
+/**
  * Handle for a place where social interactions happen.
  */
 struct GNUNET_SOCIAL_Place;
 
-/** 
+/**
  * Handle for a place that one of our egos hosts.
  */
 struct GNUNET_SOCIAL_Home;
 
-/** 
+/**
  * Handle to an implementation of try-and-slice.
  */
 struct GNUNET_SOCIAL_Slicer;
 
 
-/** 
+/**
  * Method called from SOCIAL upon receiving a message indicating a call
  * to a @e method.
  *
@@ -101,7 +101,7 @@ typedef int
                          enum GNUNET_PSYC_MessageFlags flags);
 
 
-/** 
+/**
  * Create a try-and-slice instance.
  *
  * @return A new try-and-slice construct.
@@ -110,7 +110,7 @@ struct GNUNET_SOCIAL_Slicer *
 GNUNET_SOCIAL_slicer_create (void);
 
 
-/** 
+/**
  * Add a method to the try-and-slice instance.
  *
  * A slicer processes messages and calls methods that match a message. A match
@@ -129,7 +129,7 @@ GNUNET_SOCIAL_slicer_add (struct GNUNET_SOCIAL_Slicer *slicer,
                           void *method_cls);
 
 
-/** 
+/**
  * Remove a registered method from the try-and-slice instance.
  *
  * @param slicer The try-and-slice instance.
@@ -141,7 +141,7 @@ GNUNET_SOCIAL_slicer_remove (struct GNUNET_SOCIAL_Slicer *slicer,
                              const char *method_name,
                              GNUNET_SOCIAL_Method method);
 
-/** 
+/**
  * Destroy a given try-and-slice instance.
  *
  * @param slicer slicer to destroy
@@ -150,7 +150,7 @@ void
 GNUNET_SOCIAL_slicer_destroy (struct GNUNET_SOCIAL_Slicer *slicer);
 
 
-/** 
+/**
  * Function called asking for nym to be admitted to the place.
  *
  * Should call either GNUNET_SOCIAL_home_admit() or
@@ -178,9 +178,9 @@ typedef void
                                      size_t data_size);
 
 
-/** 
+/**
  * Function called when a @a nym leaves the place.
- * 
+ *
  * This is also called if the @a nym was never given permission to enter
  * (i.e. the @a nym stopped asking to get in).
  *
@@ -196,7 +196,7 @@ typedef void
                                    GNUNET_PSYC_Modifier *variables);
 
 
-/** 
+/**
  * Enter a home where guests (nyms) can be hosted.
  *
  * A home is created upon first entering, and exists until
@@ -225,7 +225,7 @@ GNUNET_SOCIAL_home_enter (const struct GNUNET_CONFIGURATION_Handle *cfg,
                           void *cls);
 
 
-/** 
+/**
  * Admit @a nym to the @a home.
  *
  * The @a nym reference will remain valid until either the home is destroyed or
@@ -239,7 +239,7 @@ GNUNET_SOCIAL_home_admit (struct GNUNET_SOCIAL_Home *home,
                           struct GNUNET_SOCIAL_Nym *nym);
 
 
-/** 
+/**
  * Throw @a nym out of the @a home.
  *
  * The @a nym reference will remain valid until the
@@ -254,7 +254,7 @@ GNUNET_SOCIAL_home_eject (struct GNUNET_SOCIAL_Home *home,
                           struct GNUNET_SOCIAL_Nym *nym);
 
 
-/** 
+/**
  * Refuse @a nym entry into the @a home.
  *
  * @param home Home to disallow @a nym to enter.
@@ -273,7 +273,7 @@ GNUNET_SOCIAL_home_reject_entry (struct GNUNET_SOCIAL_Home *home,
                                  size_t data_size);
 
 
-/** 
+/**
  * Get the public key of a nym.
  *
  * Suitable, for example, to be used with GNUNET_NAMESTORE_zone_to_name().
@@ -286,9 +286,9 @@ GNUNET_SOCIAL_nym_get_key (struct GNUNET_SOCIAL_Nym *nym,
                            struct GNUNET_CRYPTO_EccPublicSignKey *nym_key);
 
 
-/** 
+/**
  * Obtain the private-public key pair of the home.
- * 
+ *
  * @param home Home to get the key of.
  * @param[out] home_key Set to the private-public key pair of the home.  The public part is suitable for storing in GNS within a "PLACE" record, along with peer IDs to join at.
  */
@@ -297,7 +297,7 @@ GNUNET_SOCIAL_home_get_key (struct GNUNET_SOCIAL_Home *home,
                             struct GNUNET_CRYPTO_EccPrivateKey *home_key);
 
 
-/** 
+/**
  * Advertise @a home under @a name in the GNS zone of the @e ego.
  *
  * @param home The home to advertise.
@@ -322,9 +322,9 @@ GNUNET_SOCIAL_home_advertise (struct GNUNET_SOCIAL_Home *home,
  */
 enum GNUNET_PSYC_AnnouncementFlags
 {
-  /** 
+  /**
    * Whether this announcement removes all objects from the home.
-   * 
+   *
    * New objects can be still added to the now empty home using the @e env
    * parameter of the same announcement.
    */
@@ -332,13 +332,13 @@ enum GNUNET_PSYC_AnnouncementFlags
 };
 
 
-/** 
+/**
  * Handle for an announcement request.
  */
 struct GNUNET_SOCIAL_Announcement;
 
 
-/** 
+/**
  * Send a message to all nyms that are present in the home.
  *
  * This function is restricted to the home owner.  Nyms can only send requests
@@ -362,7 +362,7 @@ GNUNET_SOCIAL_home_announce (struct GNUNET_SOCIAL_Home *home,
                              GNUNET_SOCIAL_AnnouncementFlags flags);
 
 
-/** 
+/**
  * Cancel announcement.
  *
  * @param a The announcement to cancel.
@@ -371,7 +371,7 @@ void
 GNUNET_SOCIAL_home_announce_cancel (struct GNUNET_SOCIAL_Announcement *a);
 
 
-/** 
+/**
  * Convert our home to a place so we can access it via the place API.
  *
  * @param home Handle for the home.
@@ -383,7 +383,7 @@ struct GNUNET_SOCIAL_Place *
 GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home, int keep_active);
 
 
-/** 
+/**
  * Leave a home.
 
  * Invalidates home handle.
@@ -394,7 +394,7 @@ GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home, int keep_active);
 void
 GNUNET_SOCIAL_home_leave (struct GNUNET_SOCIAL_Home *home);
 
-/** 
+/**
  * Request entry to a place (home hosted by someone else).
  *
  * @param cfg Configuration to contact the social service.
@@ -421,7 +421,7 @@ GNUNET_SOCIAL_place_enter (const struct GNUNET_CONFIGURATION_Handle *cfg,
                            size_t data_size,
                            struct GNUNET_SOCIAL_Slicer *slicer);
 
-/** 
+/**
  * Request entry to a place (home hosted by someone else).
  *
  * @param cfg Configuration to contact the social service.
@@ -453,14 +453,14 @@ GNUNET_SOCIAL_place_enter2 (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 struct GNUNET_SOCIAL_WatchHandle;
 
-/** 
+/**
  * Watch a place for changed objects.
  *
  * @param place Place to watch.
  * @param object_filter Object prefix to match.
  * @param state_cb Function to call when an object/state changes.
  * @param state_cb_cls Closure for callback.
- * 
+ *
  * @return Handle that can be used to cancel watching.
  */
 struct GNUNET_SOCIAL_WatchHandle *
@@ -470,7 +470,7 @@ GNUNET_SOCIAL_place_watch (struct GNUNET_SOCIAL_Place *place,
                            void *state_cb_cls);
 
 
-/** 
+/**
  * Cancel watching a place for changed objects.
  *
  * @param wh Watch handle to cancel.
@@ -482,14 +482,14 @@ GNUNET_SOCIAL_place_watch_cancel (struct GNUNET_SOCIAL_WatchHandle *wh);
 struct GNUNET_SOCIAL_LookHandle;
 
 
-/** 
+/**
  * Look at objects in the place with a matching name prefix.
  *
  * @param place The place to look its objects at.
  * @param name_prefix Look at objects with names beginning with this value.
  * @param state_cb Function to call for each object found.
  * @param state_cb_cls Closure for callback function.
- * 
+ *
  * @return Handle that can be used to stop looking at objects.
  */
 struct GNUNET_SOCIAL_LookHandle *
@@ -499,7 +499,7 @@ GNUNET_SOCIAL_place_look (struct GNUNET_SOCIAL_Place *place,
                           void *state_cb_cls);
 
 
-/** 
+/**
  * Stop looking at objects.
  *
  * @param lh Look handle to stop.
@@ -509,7 +509,7 @@ GNUNET_SOCIAL_place_look_cancel (struct GNUNET_SOCIAL_LookHandle *lh);
 
 
 
-/** 
+/**
  * Look at a particular object in the place.
  *
  * The best matching object is returned (its name might be less specific than
@@ -532,12 +532,12 @@ GNUNET_SOCIAL_place_look_at (struct GNUNET_SOCIAL_Place *place,
 enum GNUNET_SOCIAL_TalkFlags;
 
 
-/** 
+/**
  * A talk request.
  */
 struct GNUNET_SOCIAL_TalkRequest;
 
-/** 
+/**
  * Talk to the host of the place.
  *
  * @param place Place where we want to talk to the host.
@@ -558,7 +558,7 @@ GNUNET_SOCIAL_place_talk (struct GNUNET_SOCIAL_Place *place,
                           GNUNET_SOCIAL_TalkFlags flags);
 
 
-/** 
+/**
  * Cancel talking to the host of the place.
  *
  * @param tr Talk request to cancel.
@@ -567,12 +567,12 @@ void
 GNUNET_SOCIAL_place_talk_cancel (struct GNUNET_SOCIAL_TalkRequest *tr);
 
 
-/** 
+/**
  * A history lesson.
  */
 struct GNUNET_SOCIAL_HistoryLesson;
 
-/** 
+/**
  * Learn about the history of a place.
  *
  * Sends messages through the slicer function of the place where
@@ -580,7 +580,7 @@ struct GNUNET_SOCIAL_HistoryLesson;
  * The messages will have the #GNUNET_PSYC_MESSAGE_HISTORIC flag set.
  *
  * To get the latest message, use 0 for both the start and end message ID.
- * 
+ *
  * @param place Place we want to learn more about.
  * @param start_message_id First historic message we are interested in.
  * @param end_message_id Last historic message we are interested in (inclusive).
@@ -602,7 +602,7 @@ GNUNET_SOCIAL_place_get_history (struct GNUNET_SOCIAL_Place *place,
                                  void *finish_cb_cls);
 
 
-/** 
+/**
  * Stop processing messages from the history lesson.
  *
  * Must not be called after the finish callback of the history lesson is called.
@@ -613,11 +613,11 @@ void
 GNUNET_SOCIAL_place_get_history_cancel (struct GNUNET_SOCIAL_HistoryLesson *hist);
 
 
-/** 
+/**
  * Leave a place permanently.
  *
  * Notifies the owner of the place about leaving, and destroys the place handle.
- * 
+ *
  * @param place Place to leave permanently.
  * @param keep_active Keep place active after last application disconnected.
  */
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h
index bdb91d6a1..136b11e55 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -1,17 +1,17 @@
 /*
   This file is part of GNUnet
   (C) 2013 Christian Grothoff (and other contributing authors)
-  
+
   GNUnet is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published
   by the Free Software Foundation; either version 3, or (at your
   option) any later version.
-  
+
   GNUnet is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 1fe04da6b..cf56b2cce 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -123,8 +123,8 @@ GNUNET_STRINGS_conv (const char *input, size_t len,
  * @return the converted string (0-terminated)
  */
 char *
-GNUNET_STRINGS_to_utf8 (const char *input, 
-                        size_t len, 
+GNUNET_STRINGS_to_utf8 (const char *input,
+                        size_t len,
                         const char *charset);
 
 
@@ -137,8 +137,8 @@ GNUNET_STRINGS_to_utf8 (const char *input,
  *  string is returned.
  */
 char *
-GNUNET_STRINGS_from_utf8 (const char *input, 
-                          size_t len, 
+GNUNET_STRINGS_from_utf8 (const char *input,
+                          size_t len,
                           const char *charset);
 
 
@@ -150,7 +150,7 @@ GNUNET_STRINGS_from_utf8 (const char *input,
  * @param output output buffer
  */
 void
-GNUNET_STRINGS_utf8_tolower (const char* input, 
+GNUNET_STRINGS_utf8_tolower (const char* input,
                              char** output);
 
 
@@ -198,9 +198,9 @@ GNUNET_STRINGS_filename_expand (const char *fil);
  *         (or number of bytes that would have been written)
  */
 size_t
-GNUNET_STRINGS_buffer_fill (char *buffer, 
-                            size_t size, 
-                            unsigned int count, 
+GNUNET_STRINGS_buffer_fill (char *buffer,
+                            size_t size,
+                            unsigned int count,
                             ...);
 
 
@@ -237,7 +237,7 @@ GNUNET_STRINGS_absolute_time_to_string (struct GNUNET_TIME_Absolute t);
 /**
  * Give relative time in human-readable fancy format.
  * This is one of the very few calls in the entire API that is
- * NOT reentrant! 
+ * NOT reentrant!
  *
  * @param delta time in milli seconds
  * @param do_round are we allowed to round a bit?
@@ -279,9 +279,9 @@ GNUNET_STRINGS_get_short_name (const char *filename);
  * @return pointer to the next byte in 'out' or NULL on error.
  */
 char *
-GNUNET_STRINGS_data_to_string (const void *data, 
+GNUNET_STRINGS_data_to_string (const void *data,
                                size_t size,
-                               char *out, 
+                               char *out,
                                size_t out_size);
 
 
@@ -296,9 +296,9 @@ GNUNET_STRINGS_data_to_string (const void *data,
  * @return GNUNET_OK on success, GNUNET_SYSERR if result has the wrong encoding
  */
 int
-GNUNET_STRINGS_string_to_data (const char *enc, 
+GNUNET_STRINGS_string_to_data (const char *enc,
                                size_t enclen,
-                               void *out, 
+                               void *out,
                                size_t out_size);
 
 
@@ -319,7 +319,7 @@ GNUNET_STRINGS_string_to_data (const char *enc,
  *         (if they weren't NULL).
  */
 int
-GNUNET_STRINGS_parse_uri (const char *path, 
+GNUNET_STRINGS_parse_uri (const char *path,
                           char **scheme_part,
                           const char **path_part);
 
@@ -339,9 +339,9 @@ GNUNET_STRINGS_parse_uri (const char *path,
  * @return GNUNET_YES if 'filename' is absolute, GNUNET_NO otherwise.
  */
 int
-GNUNET_STRINGS_path_is_absolute (const char *filename, 
+GNUNET_STRINGS_path_is_absolute (const char *filename,
                                  int can_be_uri,
-                                 int *r_is_uri, 
+                                 int *r_is_uri,
                                  char **r_uri_scheme);
 
 
@@ -367,7 +367,7 @@ enum GNUNET_STRINGS_FilenameCheck
 
   /**
    * Check that the path is an absolute path.
-   */ 
+   */
   GNUNET_STRINGS_CHECK_IS_ABSOLUTE = 0x00000008
 };
 
@@ -375,7 +375,7 @@ enum GNUNET_STRINGS_FilenameCheck
 /**
  * Perform checks on 'filename'.  FIXME: some duplication with
  * "GNUNET_DISK_"-APIs.  We should unify those.
- * 
+ *
  * @param filename file to check
  * @param checks checks to perform
  * @return GNUNET_YES if all checks pass, GNUNET_NO if at least one of them
@@ -389,7 +389,7 @@ GNUNET_STRINGS_check_filename (const char *filename,
 /**
  * Tries to convert 'zt_addr' string to an IPv6 address.
  * The string is expected to have the format "[ABCD::01]:80".
- * 
+ *
  * @param zt_addr 0-terminated string. May be mangled by the function.
  * @param addrlen length of zt_addr (not counting 0-terminator).
  * @param r_buf a buffer to fill. Initially gets filled with zeroes,
@@ -398,7 +398,7 @@ GNUNET_STRINGS_check_filename (const char *filename,
  *         case the contents of r_buf are undefined.
  */
 int
-GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, 
+GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr,
                                 uint16_t addrlen,
                                 struct sockaddr_in6 *r_buf);
 
@@ -406,7 +406,7 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr,
 /**
  * Tries to convert 'zt_addr' string to an IPv4 address.
  * The string is expected to have the format "1.2.3.4:80".
- * 
+ *
  * @param zt_addr 0-terminated string. May be mangled by the function.
  * @param addrlen length of zt_addr (not counting 0-terminator).
  * @param r_buf a buffer to fill.
@@ -414,7 +414,7 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr,
  *         the contents of r_buf are undefined.
  */
 int
-GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr, 
+GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr,
                                 uint16_t addrlen,
                                 struct sockaddr_in *r_buf);
 
@@ -422,7 +422,7 @@ GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr,
 /**
  * Tries to convert 'addr' string to an IP (v4 or v6) address.
  * Will automatically decide whether to treat 'addr' as v4 or v6 address.
- * 
+ *
  * @param addr a string, may not be 0-terminated.
  * @param addrlen number of bytes in addr (if addr is 0-terminated,
  *        0-terminator should not be counted towards addrlen).
@@ -451,8 +451,8 @@ GNUNET_STRINGS_to_address_ip (const char *addr,
  * @return GNUNET_OK on success, GNUNET_SYSERR on failure
  */
 int
-GNUNET_STRINGS_get_utf8_args (int argc, 
-                              char *const *argv, 
+GNUNET_STRINGS_get_utf8_args (int argc,
+                              char *const *argv,
                               int *u8argc,
                               char *const **u8argv);
 
diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h
index 95783ea37..7e668ca1a 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -21,7 +21,7 @@
 /**
  * @file include/gnunet_testbed_logger_service.h
  * @brief API for submitting data to the testbed logger service
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #ifndef GNUNET_TESTBED_LOGGER_SERVICE_H
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index fa07cc63e..73dc88498 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -1108,7 +1108,7 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
  * @param nsuccess the number of successful overlay connects
  * @param nfailures the number of overlay connects which failed
  */
-typedef void (*GNUNET_TESTBED_TopologyCompletionCallback) (void *cls, 
+typedef void (*GNUNET_TESTBED_TopologyCompletionCallback) (void *cls,
                                                           unsigned int nsuccess,
                                                           unsigned int nfailures);
 
@@ -1277,7 +1277,7 @@ GNUNET_TESTBED_service_connect (void *op_cls,
  * cancels the operation, frees its resources and ensures the no event is
  * generated with respect to this operation. Note that however cancelling an
  * operation does NOT guarantee that the operation will be fully undone (or that
- * nothing ever happened). 
+ * nothing ever happened).
  *
  * This function MUST be called for every operation to fully remove the
  * operation from the operation queue.  After calling this function, if
@@ -1491,7 +1491,7 @@ enum GNUNET_TESTBED_BarrierStatus
    * Error status
    */
   GNUNET_TESTBED_BARRIERSTATUS_ERROR,
-  
+
 };
 
 
@@ -1518,7 +1518,7 @@ typedef void (*GNUNET_TESTBED_barrier_status_cb) (void *cls,
 
 /**
  * Initialise a barrier and call the given callback when the required percentage
- * of peers (quorum) reach the barrier.  
+ * of peers (quorum) reach the barrier.
  *
  * @param controller the handle to the controller
  * @param name identification name of the barrier
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index f182d8df5..3f5b260eb 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -46,7 +46,7 @@ extern "C"
 #endif
 
 /**
- * Size of each hostkey in the hostkey file (in BYTES). 
+ * Size of each hostkey in the hostkey file (in BYTES).
  */
 #define GNUNET_TESTING_HOSTKEYFILESIZE sizeof (struct GNUNET_CRYPTO_EccPrivateKey)
 
@@ -138,7 +138,7 @@ struct GNUNET_TESTING_System *
 GNUNET_TESTING_system_create_with_portrange (const char *testdir,
                                              const char *trusted_ip,
                                              const char *hostname,
-                                             const struct 
+                                             const struct
                                              GNUNET_TESTING_SharedService *
                                              shared_services,
                                              uint16_t lowport,
@@ -162,7 +162,7 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
  * faster peer startup.  This function can be used to
  * access the n-th key of those pre-created hostkeys; note
  * that these keys are ONLY useful for testing and not
- * secure as the private keys are part of the public 
+ * secure as the private keys are part of the public
  * GNUnet source code.
  *
  * This is primarily a helper function used internally
@@ -186,7 +186,7 @@ GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
  * @param system system to use for reservation tracking
  * @return 0 if no free port was available
  */
-uint16_t 
+uint16_t
 GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system);
 
 
@@ -226,14 +226,14 @@ GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
 
 /**
  * Configure a GNUnet peer.  GNUnet must be installed on the local
- * system and available in the PATH. 
+ * system and available in the PATH.
  *
  * @param system system to use to coordinate resource usage
  * @param cfg configuration to use; will be UPDATED (to reflect needed
  *            changes in port numbers and paths)
  * @param key_number number of the hostkey to use for the peer
  * @param id identifier for the daemon, will be set, can be NULL
- * @param emsg set to freshly allocated error message (set to NULL on success), 
+ * @param emsg set to freshly allocated error message (set to NULL on success),
  *          can be NULL
  * @return handle to the peer, NULL on error
  */
@@ -257,7 +257,7 @@ GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer,
 
 
 /**
- * Start the peer. 
+ * Start the peer.
  *
  * @param peer peer to start
  * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running)
@@ -319,7 +319,7 @@ GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer);
  * @param success GNUNET_YES if the peer is stopped; GNUNET_SYSERR upon any
  *          error
  */
-typedef void (*GNUNET_TESTING_PeerStopCallback) (void *cls, 
+typedef void (*GNUNET_TESTING_PeerStopCallback) (void *cls,
                                                  struct GNUNET_TESTING_Peer *
                                                  peer,
                                                  int success);
@@ -358,7 +358,7 @@ GNUNET_TESTING_peer_stop_async_cancel (struct GNUNET_TESTING_Peer *peer);
 /**
  * Signature of the 'main' function for a (single-peer) testcase that
  * is run using 'GNUNET_TESTING_peer_run'.
- * 
+ *
  * @param cls closure
  * @param cfg configuration of the peer that was started
  * @param peer identity of the peer that was created
@@ -424,14 +424,14 @@ GNUNET_TESTING_service_run (const char *testdir,
  * Sometimes we use the binary name to determine which specific
  * test to run.  In those cases, the string after the last "_"
  * in 'argv[0]' specifies a string that determines the configuration
- * file or plugin to use.  
+ * file or plugin to use.
  *
  * This function returns the respective substring, taking care
  * of issues such as binaries ending in '.exe' on W32.
  *
  * @param argv0 the name of the binary
  * @return string between the last '_' and the '.exe' (or the end of the string),
- *         NULL if argv0 has no '_' 
+ *         NULL if argv0 has no '_'
  */
 char *
 GNUNET_TESTING_get_testname_from_underscore (const char *argv0);
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 3e87309c6..4db73966c 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -483,7 +483,7 @@ GNUNET_TIME_set_offset (long long offset);
  *
  * @return the offset we currently skew the locale time by
  */
-long long 
+long long
 GNUNET_TIME_get_offset (void);
 
 
@@ -507,10 +507,10 @@ GNUNET_TIME_year_to_time (unsigned int year);
 /**
  * Convert an expiration time to the respective year (rounds)
  *
- * @param at absolute time 
+ * @param at absolute time
  * @return year a year (after 1970), 0 on error
  */
-unsigned int 
+unsigned int
 GNUNET_TIME_time_to_year (struct GNUNET_TIME_Absolute at);
 
 
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index c42c360d9..f835bdcd8 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -247,7 +247,7 @@ struct GNUNET_TRANSPORT_PluginEnvironment
    * Function that should be called by the transport plugin
    * whenever a message is received.  If this field is "NULL",
    * the plugin should load in 'stub' mode and NOT fully
-   * initialize and instead only return an API with the 
+   * initialize and instead only return an API with the
    * 'address_pretty_printer', 'address_to_string' and
    * 'string_to_address' functions.
    */
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index ff24cb542..17cec8d12 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -62,12 +62,12 @@ GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Header from Linux TUN interface.
- */ 
+ */
 struct GNUNET_TUN_Layer2PacketHeader
 {
   /**
    * Some flags (unused).
-   */ 
+   */
   uint16_t flags GNUNET_PACKED;
 
   /**
@@ -97,7 +97,7 @@ struct GNUNET_TUN_IPv4Header
    * Length of the packet, including this header.
    */
   uint16_t total_length GNUNET_PACKED;
-  
+
   /**
    * Unique random ID for matching up fragments.
    */
@@ -124,12 +124,12 @@ struct GNUNET_TUN_IPv4Header
 
   /**
    * Origin of the packet.
-   */ 
+   */
   struct in_addr source_address GNUNET_PACKED;
 
   /**
    * Destination of the packet.
-   */ 
+   */
   struct in_addr destination_address GNUNET_PACKED;
 } GNUNET_GCC_STRUCT_LAYOUT;
 
@@ -168,12 +168,12 @@ struct GNUNET_TUN_IPv6Header
 
   /**
    * Origin of the packet.
-   */ 
+   */
   struct in6_addr source_address GNUNET_PACKED;
 
   /**
    * Destination of the packet.
-   */ 
+   */
   struct in6_addr destination_address GNUNET_PACKED;
 } GNUNET_GCC_STRUCT_LAYOUT;
 
@@ -222,7 +222,7 @@ struct GNUNET_TUN_TcpHeader
   unsigned int reserved : 4 GNUNET_PACKED;
 #else
   #error byteorder undefined
-#endif        
+#endif
 
   /**
    * Flags (SYN, FIN, ACK, etc.)
@@ -316,108 +316,108 @@ struct GNUNET_TUN_DnsFlags
   /**
    * Set to 1 if recursion is desired (client -> server)
    */
-  unsigned int recursion_desired    : 1 GNUNET_PACKED;  
-  
+  unsigned int recursion_desired    : 1 GNUNET_PACKED;
+
   /**
    * Set to 1 if message is truncated
    */
-  unsigned int message_truncated    : 1 GNUNET_PACKED; 
-  
+  unsigned int message_truncated    : 1 GNUNET_PACKED;
+
   /**
    * Set to 1 if this is an authoritative answer
    */
   unsigned int authoritative_answer : 1 GNUNET_PACKED;
-  
+
   /**
    * See GNUNET_TUN_DNS_OPCODE_ defines.
    */
-  unsigned int opcode               : 4 GNUNET_PACKED;  
-  
+  unsigned int opcode               : 4 GNUNET_PACKED;
+
   /**
    * query:0, response:1
    */
-  unsigned int query_or_response    : 1 GNUNET_PACKED;  
-  
+  unsigned int query_or_response    : 1 GNUNET_PACKED;
+
   /**
    * See GNUNET_TUN_DNS_RETURN_CODE_ defines.
    */
-  unsigned int return_code          : 4 GNUNET_PACKED; 
-  
+  unsigned int return_code          : 4 GNUNET_PACKED;
+
   /**
    * See RFC 4035.
    */
-  unsigned int checking_disabled    : 1 GNUNET_PACKED; 
-  
+  unsigned int checking_disabled    : 1 GNUNET_PACKED;
+
   /**
    * Response has been cryptographically verified, RFC 4035.
    */
   unsigned int authenticated_data   : 1 GNUNET_PACKED;
-  
+
   /**
    * Always zero.
    */
   unsigned int zero                 : 1 GNUNET_PACKED;
-  
+
   /**
    * Set to 1 if recursion is available (server -> client)
    */
-  unsigned int recursion_available  : 1 GNUNET_PACKED; 
+  unsigned int recursion_available  : 1 GNUNET_PACKED;
 #elif __BYTE_ORDER == __BIG_ENDIAN
-  
+
   /**
    * query:0, response:1
    */
-  unsigned int query_or_response    : 1 GNUNET_PACKED;  
-  
+  unsigned int query_or_response    : 1 GNUNET_PACKED;
+
   /**
    * See GNUNET_TUN_DNS_OPCODE_ defines.
    */
-  unsigned int opcode               : 4 GNUNET_PACKED;  
-  
+  unsigned int opcode               : 4 GNUNET_PACKED;
+
   /**
    * Set to 1 if this is an authoritative answer
    */
   unsigned int authoritative_answer : 1 GNUNET_PACKED;
-  
+
   /**
    * Set to 1 if message is truncated
    */
-  unsigned int message_truncated    : 1 GNUNET_PACKED; 
-  
+  unsigned int message_truncated    : 1 GNUNET_PACKED;
+
   /**
    * Set to 1 if recursion is desired (client -> server)
    */
-  unsigned int recursion_desired    : 1 GNUNET_PACKED;  
+  unsigned int recursion_desired    : 1 GNUNET_PACKED;
+
 
- 
   /**
    * Set to 1 if recursion is available (server -> client)
    */
   unsigned int recursion_available  : 1 GNUNET_PACKED;
-  
+
   /**
    * Always zero.
    */
   unsigned int zero                 : 1 GNUNET_PACKED;
-  
+
   /**
    * Response has been cryptographically verified, RFC 4035.
    */
   unsigned int authenticated_data   : 1 GNUNET_PACKED;
-  
+
   /**
    * See RFC 4035.
    */
-  unsigned int checking_disabled    : 1 GNUNET_PACKED; 
-  
+  unsigned int checking_disabled    : 1 GNUNET_PACKED;
+
   /**
    * See GNUNET_TUN_DNS_RETURN_CODE_ defines.
-   */  
-  unsigned int return_code          : 4 GNUNET_PACKED; 
+   */
+  unsigned int return_code          : 4 GNUNET_PACKED;
 #else
   #error byteorder undefined
 #endif
-  
+
 } GNUNET_GCC_STRUCT_LAYOUT;
 
 
@@ -468,18 +468,18 @@ struct GNUNET_TUN_DnsSoaRecord
    * The version number of the original copy of the zone.   (NBO)
    */
   uint32_t serial GNUNET_PACKED;
-  
+
   /**
    * Time interval before the zone should be refreshed. (NBO)
    */
   uint32_t refresh GNUNET_PACKED;
-  
+
   /**
    * Time interval that should elapse before a failed refresh should
    * be retried. (NBO)
    */
   uint32_t retry GNUNET_PACKED;
- 
+
   /**
    * Time value that specifies the upper limit on the time interval
    * that can elapse before the zone is no longer authoritative. (NBO)
@@ -654,12 +654,12 @@ struct GNUNET_TUN_DnsRecordLine
  */
 struct GNUNET_TUN_IcmpHeader {
   uint8_t type;         
-  uint8_t code;          
+  uint8_t code;         
   uint16_t crc GNUNET_PACKED;
 
   union {
     /**
-     * ICMP Echo (request/reply) 
+     * ICMP Echo (request/reply)
      */
     struct {
       uint16_t  identifier GNUNET_PACKED;
@@ -667,7 +667,7 @@ struct GNUNET_TUN_IcmpHeader {
     } echo;
 
     /**
-     * ICMP Destination Unreachable (RFC 1191) 
+     * ICMP Destination Unreachable (RFC 1191)
      */
     struct ih_pmtu {
       uint16_t empty GNUNET_PACKED;
@@ -676,7 +676,7 @@ struct GNUNET_TUN_IcmpHeader {
     } destination_unreachable;
 
     /**
-     * ICMP Redirect 
+     * ICMP Redirect
      */ 
     struct in_addr redirect_gateway_address GNUNET_PACKED;      
 
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h
index fe21cff9b..c3f27fdce 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -20,7 +20,7 @@
 
 /**
  * @file include/gnunet_vpn_service.h
- * @brief API to access the VPN service. 
+ * @brief API to access the VPN service.
  * @author Christian Grothoff
  */
 #ifndef GNUNET_VPN_SERVICE_H
@@ -50,7 +50,7 @@ struct GNUNET_VPN_RedirectionRequest;
  *                will match 'result_af' from the request
  * @param address IP address (struct in_addr or struct in_addr6, depending on 'af')
  *                that the VPN allocated for the redirection;
- *                traffic to this IP will now be redirected to the 
+ *                traffic to this IP will now be redirected to the
  *                specified target peer; NULL on error
  */
 typedef void (*GNUNET_VPN_AllocationCallback)(void *cls,
@@ -124,7 +124,7 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
  *         anyway)
  */
 struct GNUNET_VPN_RedirectionRequest *
-GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh, 
+GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
                            int result_af,
                            int addr_af,
                            const void *addr,
@@ -137,7 +137,7 @@ GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
  * Connect to the VPN service
  *
  * @param cfg configuration to use
- * @return VPN handle 
+ * @return VPN handle
  */
 struct GNUNET_VPN_Handle *
 GNUNET_VPN_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
diff --git a/src/include/tap-windows.h b/src/include/tap-windows.h
index b97e22e26..4df4034a3 100644
--- a/src/include/tap-windows.h
+++ b/src/include/tap-windows.h
@@ -1,80 +1,80 @@
-/*

- *  TAP-Windows -- A kernel driver to provide virtual tap

- *                 device functionality on Windows.

- *

- *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.

- *

- *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,

- *  and is released under the GPL version 2 (see below).

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2

- *  as published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program (see the file COPYING included with this

- *  distribution); if not, write to the Free Software Foundation, Inc.,

- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-/**

- * @file include/tap-windows.h

- * @brief TAP32 virtual network driver defines

- * @attention This file is part of openvpn and for kept

- *            as a separate file to allow easier upgrading.

- */

-#ifndef __TAP_WIN_H

-#define __TAP_WIN_H

-

-/*

- * =============

- * TAP IOCTLs

- * =============

- */

-

-#define TAP_WIN_CONTROL_CODE(request,method) \

-  CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)

-

-/* Present in 8.1 */

-

-#define TAP_WIN_IOCTL_GET_MAC               TAP_WIN_CONTROL_CODE (1, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_GET_VERSION           TAP_WIN_CONTROL_CODE (2, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_GET_MTU               TAP_WIN_CONTROL_CODE (3, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_GET_INFO              TAP_WIN_CONTROL_CODE (4, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE (5, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_SET_MEDIA_STATUS      TAP_WIN_CONTROL_CODE (6, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ      TAP_WIN_CONTROL_CODE (7, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_GET_LOG_LINE          TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED)

-#define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT   TAP_WIN_CONTROL_CODE (9, METHOD_BUFFERED)

-

-/* Added in 8.2 */

-

-/* obsoletes TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT */

-#define TAP_WIN_IOCTL_CONFIG_TUN            TAP_WIN_CONTROL_CODE (10, METHOD_BUFFERED)

-

-/*

- * =================

- * Registry keys

- * =================

- */

-

-#define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"

-

-#define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"

-

-/*

- * ======================

- * Filesystem prefixes

- * ======================

- */

-

-#define USERMODEDEVICEDIR "\\\\.\\Global\\"

-#define SYSDEVICEDIR      "\\Device\\"

-#define USERDEVICEDIR     "\\DosDevices\\Global\\"

-#define TAP_WIN_SUFFIX    ".tap"

-

-#endif

+/*
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
+ *
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
+ *
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
+ *  and is released under the GPL version 2 (see below).
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program (see the file COPYING included with this
+ *  distribution); if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/**
+ * @file include/tap-windows.h
+ * @brief TAP32 virtual network driver defines
+ * @attention This file is part of openvpn and for kept
+ *            as a separate file to allow easier upgrading.
+ */
+#ifndef __TAP_WIN_H
+#define __TAP_WIN_H
+
+/*
+ * =============
+ * TAP IOCTLs
+ * =============
+ */
+
+#define TAP_WIN_CONTROL_CODE(request,method) \
+  CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)
+
+/* Present in 8.1 */
+
+#define TAP_WIN_IOCTL_GET_MAC               TAP_WIN_CONTROL_CODE (1, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_VERSION           TAP_WIN_CONTROL_CODE (2, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_MTU               TAP_WIN_CONTROL_CODE (3, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_INFO              TAP_WIN_CONTROL_CODE (4, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE (5, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_SET_MEDIA_STATUS      TAP_WIN_CONTROL_CODE (6, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ      TAP_WIN_CONTROL_CODE (7, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_LOG_LINE          TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT   TAP_WIN_CONTROL_CODE (9, METHOD_BUFFERED)
+
+/* Added in 8.2 */
+
+/* obsoletes TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT */
+#define TAP_WIN_IOCTL_CONFIG_TUN            TAP_WIN_CONTROL_CODE (10, METHOD_BUFFERED)
+
+/*
+ * =================
+ * Registry keys
+ * =================
+ */
+
+#define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
+
+#define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
+
+/*
+ * ======================
+ * Filesystem prefixes
+ * ======================
+ */
+
+#define USERMODEDEVICEDIR "\\\\.\\Global\\"
+#define SYSDEVICEDIR      "\\Device\\"
+#define USERDEVICEDIR     "\\DosDevices\\Global\\"
+#define TAP_WIN_SUFFIX    ".tap"
+
+#endif