126 files changed, 1623 insertions, 1420 deletions
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 08e9dd156..41b2b1382 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -66,7 +66,7 @@ gnunetinclude_HEADERS = \
  gnunet_hello_lib.h \
  gnunet_helper_lib.h \
  gnunet_identity_service.h \
-  gnunet_identity_provider_service.h \
+  gnunet_reclaim_service.h \
  gnunet_json_lib.h \
  gnunet_jsonapi_lib.h \
  gnunet_jsonapi_util.h \
diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 3e2c9e1fc..234ed502d 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -40,7 +38,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 struct GNUNET_DNS_Advertisement
 {
  /**
-   * Signature of the peer affirming that he is offering the service.
+   * Signature of the peer affirming that it is offering the service.
   */
  struct GNUNET_CRYPTO_EddsaSignature signature;
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index b7c358c3d..f0034d769 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2010 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index a709bd3f0..e0346c5c5 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012,2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_abe_lib.h b/src/include/gnunet_abe_lib.h
index f73ea2431..554d4488b 100644
--- a/src/include/gnunet_abe_lib.h
+++ b/src/include/gnunet_abe_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2018 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -89,7 +87,7 @@ GNUNET_ABE_cpabe_create_key (struct GNUNET_ABE_AbeMasterKey *key,
 * Delete a CP-ABE key.
 *
 * @param key the key to delete
- * @param delete_pub GNUNE_YES if the public key should also be freed (bug in gabe)
+ * @param delete_pub GNUNET_YES if the public key should also be freed (bug in gabe)
 * @return fresh private key; free using #GNUNET_free
 */
 void
diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h
index 9620d909e..b9c596178 100644
--- a/src/include/gnunet_applications.h
+++ b/src/include/gnunet_applications.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index f8d71bd8b..c68a118b5 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2009, 2016 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index 27f4a6f0f..d414d5f4c 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -2,20 +2,18 @@
 This file is part of GNUnet
 Copyright (C) 2009-2015 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
+ GNUnet is free software: you can redistribute it and/or modify it
- it under the terms of the GNU General Public License as published
+ under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation; either version 3, or (at your
+ by the Free Software Foundation, either version 3 of the License,
- option) any later version.
+ 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.
+ Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index f0d36ff6f..a9fd519d4 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -2,20 +2,18 @@
 This file is part of GNUnet.
 Copyright (C) 2010-2015 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
+ GNUnet is free software: you can redistribute it and/or modify it
- it under the terms of the GNU General Public License as published
+ under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation; either version 3, or (at your
+ by the Free Software Foundation, either version 3 of the License,
- option) any later version.
+ 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.
+ Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
 */
 /**
 * @file
diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 967d50dea..78610c48b 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2010 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 1cba819ad..1dd17b889 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h
index 3a3dfb2e2..efeb1fe0f 100644
--- a/src/include/gnunet_block_group_lib.h
+++ b/src/include/gnunet_block_group_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2010 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index d8ee68c21..c2b1e9e48 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2010 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index 3eb031573..4bdaec841 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2010,2013,2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h
index e2edbcc2c..276fe4dbc 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
@@ -153,7 +151,7 @@ typedef void *
 /**
- * Function called whenever an MQ-channel is destroyed, even if the destruction
+ * Function called whenever an MQ-channel is destroyed, unless the destruction
 * was requested by #GNUNET_CADET_channel_destroy.
 * It must NOT call #GNUNET_CADET_channel_destroy on the channel.
 *
@@ -279,7 +277,7 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
 /**
 * Destroy an existing channel.
 *
- * The existing end callback for the channel will be called immediately.
+ * The existing end callback for the channel will NOT be called.
 * Any pending outgoing messages will be sent but no incoming messages will be
 * accepted and no data callbacks will be called.
 *
@@ -427,7 +425,9 @@ typedef void
                        int tunnel,
                        int neighbor,
                        unsigned int n_paths,
-                        const struct GNUNET_PeerIdentity *paths);
+                        const struct GNUNET_PeerIdentity *paths,
+                        int offset,
+                        int finished_with_paths);
 /**
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 613349fdd..ea52736d5 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 0fb39575c..1b982cc15 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2006-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -26,6 +24,7 @@
 *
 * @author Christian Grothoff
 * @author Nils Durner
+ * @author Martin Schanzenbach
 *
 * @defgroup logging Logging
 * @see [Documentation](https://gnunet.org/logging)
@@ -114,6 +113,11 @@ extern "C"
 #endif
 /**
+ * wrap va_arg for enums
+ */
+#define GNUNET_VA_ARG_ENUM(va,X) ((enum X) va_arg (va, int))
+/**
 * @ingroup logging
 * define #GNUNET_EXTRA_LOGGING if using this header outside the GNUnet source
 * tree where gnunet_config.h is unavailable
@@ -592,7 +596,7 @@ GNUNET_sh2s (const struct GNUNET_ShortHashCode *shc);
 * @return string
 */
 const char *
-GNUNET_h2s (const struct GNUNET_HashCode * hc);
+GNUNET_h2s (const struct GNUNET_HashCode *hc);
 /**
@@ -607,7 +611,7 @@ GNUNET_h2s (const struct GNUNET_HashCode * hc);
 * @return string
 */
 const char *
-GNUNET_h2s2 (const struct GNUNET_HashCode * hc);
+GNUNET_h2s2 (const struct GNUNET_HashCode *hc);
 /**
@@ -621,7 +625,71 @@ GNUNET_h2s2 (const struct GNUNET_HashCode * hc);
 * @return string
 */
 const char *
-GNUNET_h2s_full (const struct GNUNET_HashCode * hc);
+GNUNET_h2s_full (const struct GNUNET_HashCode *hc);
+/**
+ * Public key. Details in gnunet_util_crypto.h.
+ */
+struct GNUNET_CRYPTO_EddsaPublicKey;
+/**
+ * Public key. Details in gnunet_util_crypto.h.
+ */
+struct GNUNET_CRYPTO_EcdhePublicKey;
+/**
+ * @ingroup logging
+ * Convert a public key value to a string (for printing debug messages).
+ * This is one of the very few calls in the entire API that is
+ * NOT reentrant!
+ *
+ * @param hc the hash code
+ * @return string
+ */
+const char *
+GNUNET_p2s (const struct GNUNET_CRYPTO_EddsaPublicKey *p);
+/**
+ * @ingroup logging
+ * Convert a public key value to a string (for printing debug messages).
+ * This is one of the very few calls in the entire API that is
+ * NOT reentrant!
+ *
+ * @param hc the hash code
+ * @return string
+ */
+const char *
+GNUNET_p2s2 (const struct GNUNET_CRYPTO_EddsaPublicKey *p);
+/**
+ * @ingroup logging
+ * Convert a public key value to a string (for printing debug messages).
+ * This is one of the very few calls in the entire API that is
+ * NOT reentrant!
+ *
+ * @param hc the hash code
+ * @return string
+ */
+const char *
+GNUNET_e2s (const struct GNUNET_CRYPTO_EcdhePublicKey *p);
+/**
+ * @ingroup logging
+ * Convert a public key value to a string (for printing debug messages).
+ * This is one of the very few calls in the entire API that is
+ * NOT reentrant!
+ *
+ * @param hc the hash code
+ * @return string
+ */
+const char *
+GNUNET_e2s2 (const struct GNUNET_CRYPTO_EcdhePublicKey *p);
 /**
@@ -699,14 +767,14 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 * @ingroup logging
 * Use this for fatal errors that cannot be handled
 */
-#define GNUNET_assert(cond) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
+#define GNUNET_assert(cond) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d. Aborting.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
 /**
 * @ingroup logging
 * Use this for fatal errors that cannot be handled
 */
-#define GNUNET_assert_at(cond, f, l) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), f, l); GNUNET_abort_(); } } while(0)
+#define GNUNET_assert_at(cond, f, l) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d. Aborting.\n"), f, l); GNUNET_abort_(); } } while(0)
 /**
@@ -716,7 +784,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 * @param cond Condition to evaluate
 * @param comp Component string to use for logging
 */
-#define GNUNET_assert_from(cond, comp) do { if (! (cond)) { GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR, comp, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
+#define GNUNET_assert_from(cond, comp) do { if (! (cond)) { GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR, comp, _("Assertion failed at %s:%d. Aborting.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
 /**
@@ -1006,7 +1074,7 @@ GNUNET_ntoh_double (double d);
 * @param tsize the target size for the resulting vector, use 0 to
 *        free the vector (then, arr will be NULL afterwards).
 */
-#define GNUNET_array_grow(arr,size,tsize) GNUNET_xgrow_((void**)&arr, sizeof(arr[0]), &size, tsize, __FILE__, __LINE__)
+#define GNUNET_array_grow(arr,size,tsize) GNUNET_xgrow_((void**)&(arr), sizeof((arr)[0]), &size, tsize, __FILE__, __LINE__)
 /**
 * @ingroup memory
@@ -1021,7 +1089,7 @@ GNUNET_ntoh_double (double d);
 *        array size
 * @param element the element that will be appended to the array
 */
-#define GNUNET_array_append(arr,size,element) do { GNUNET_array_grow(arr,size,size+1); arr[size-1] = element; } while(0)
+#define GNUNET_array_append(arr,size,element) do { GNUNET_array_grow(arr,size,size+1); (arr)[size-1] = element; } while(0)
 /**
 * @ingroup memory
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 8a874da13..e3eefa18d 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2006, 2008, 2009 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index 957e88a80..eee9fc23b 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2012 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index 1c48298a0..f35b218d9 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index c77d82fd3..2de65b2f1 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2015 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index eedf4937b..68b92959c 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -2,20 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2013, 2014, 2016 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify
+  GNUnet is free software: you can redistribute it and/or modify it
-  it under the terms of the GNU General Public License as published
+  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation; either version 3, or (at your
+  by the Free Software Foundation, either version 3 of the License,
-  option) any later version.
+  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.
+  Affero General Public License for more details.
+ 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Affero General Public License
-  along with GNUnet; see the file COPYING.  If not, write to the
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index ace223c11..b38f38b69 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
@@ -220,7 +218,7 @@ enum GNUNET_CORE_KxState
  /**
   * No handshake yet.
   */
-  GNUNET_CORE_KX_STATE_DOWN,
+  GNUNET_CORE_KX_STATE_DOWN = 0,
  /**
   * We've sent our session key.
@@ -234,7 +232,7 @@ enum GNUNET_CORE_KxState
  /**
   * The other peer has confirmed our session key + PING with a PONG
-   * message encrypted with his session key (which we got).  Key
+   * message encrypted with their session key (which we got).  Key
   * exchange is done.
   */
  GNUNET_CORE_KX_STATE_UP,
diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_credential_service.h
index 7d6f9e973..bac9f408a 100644
--- a/src/include/gnunet_credential_service.h
+++ b/src/include/gnunet_credential_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2012-2014 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index f46afa6cc..8a591fa09 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -208,14 +206,15 @@ struct GNUNET_CRYPTO_EcdsaSignature
 /**
- * Public ECC key (always for Curve25519) encoded in a format suitable
+ * Public ECC key (always for curve Ed25519) encoded in a format
- * for network transmission and EdDSA signatures.
+ * suitable for network transmission and EdDSA signatures.
 */
 struct GNUNET_CRYPTO_EddsaPublicKey
 {
  /**
-   * Q consists of an x- and a y-value, each mod p (256 bits), given
+   * Point Q consists of a y-value mod p (256 bits); the x-value is
-   * here in affine coordinates and Ed25519 standard compact format.
+   * always positive. The point is stored in Ed25519 standard
+   * compact format.
   */
  unsigned char q_y[256 / 8];
@@ -727,6 +726,23 @@ GNUNET_CRYPTO_hash_context_abort (struct GNUNET_HashContext *hc);
 /**
+ * Calculate HMAC of a message (RFC 2104)
+ * TODO: Shouldn' this be the standard hmac function and
+ * the above be renamed?
+ *
+ * @param key secret key
+ * @param key_len secret key length
+ * @param plaintext input plaintext
+ * @param plaintext_len length of @a plaintext
+ * @param hmac where to store the hmac
+ */
+void
+GNUNET_CRYPTO_hmac_raw (const void *key, size_t key_len,
+                    const void *plaintext, size_t plaintext_len,
+                    struct GNUNET_HashCode *hmac);
+/**
 * @ingroup hash
 * Calculate HMAC of a message (RFC 2104)
 *
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index ec52299cb..2b2442a52 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -2,17 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify it under the
+  GNUnet is free software: you can redistribute it and/or modify it
-  terms of the GNU General Public License as published by the Free Software
+  under the terms of the GNU Affero General Public License as published
-  Foundation; either version 3, or (at your option) any later version.
+  by the Free Software Foundation, either version 3 of the License,
+  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
+  GNUnet is distributed in the hope that it will be useful, but
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  You should have received a copy of the GNU General Public License along with
+  Affero General Public License for more details.
-  GNUnet; see the file COPYING.  If not, If not, see
+ 
-  <http://www.gnu.org/licenses/>
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file src/include/gnunet_curl_lib.h
@@ -98,6 +99,17 @@ GNUNET_CURL_get_select_info (struct GNUNET_CURL_Context *ctx,
 /**
+ * Add custom request header.
+ *
+ * @param ctx cURL context.
+ * @param header header string; will be given to the context AS IS.
+ * @return #GNUNET_OK if no errors occurred, #GNUNET_SYSERR otherwise.
+ */
+int
+GNUNET_CURL_append_header (struct GNUNET_CURL_Context *ctx,
+                           const char *header);
+/**
 * Run the main event loop for the CURL interaction.
 *
 * @param ctx the library context
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index 39a312b17..3e0c97254 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2006, 2009, 2015 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -105,6 +103,7 @@ typedef int
 *
 * @param h handle to the datacache
 * @param key key to store data under
+ * @param how close is @a key to our pid?
 * @param data_size number of bytes in @a data
 * @param data data to store
 * @param type type of the value
@@ -116,6 +115,7 @@ typedef int
 int
 GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
                      const struct GNUNET_HashCode *key,
+                      uint32_t xor_distance,
                      size_t data_size,
                      const char *data,
                      enum GNUNET_BLOCK_Type type,
diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h
index 166c7bc3b..d423c039b 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2006, 2009, 2015 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -109,6 +107,7 @@ struct GNUNET_DATACACHE_PluginFunctions
   *
   * @param cls closure (internal context for the plugin)
   * @param key key to store the value under
+   * @param xor_distance how close is @a key to our PID?
   * @param size number of bytes in @a data
   * @param data data to store
   * @param type type of the value
@@ -119,6 +118,7 @@ struct GNUNET_DATACACHE_PluginFunctions
   */
  ssize_t (*put) (void *cls,
                  const struct GNUNET_HashCode *key,
+                  uint32_t xor_distance,
                  size_t size,
                  const char *data,
                  enum GNUNET_BLOCK_Type type,
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index 36a3fbec2..9c35a1577 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2009, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index f851385c5..013842115 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h
index 9356f66cb..1f6a4ebfa 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -2,16 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2017 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify it under the
+  GNUnet is free software: you can redistribute it and/or modify it
-  terms of the GNU General Public License as published by the Free Software
+  under the terms of the GNU Affero General Public License as published
-  Foundation; either version 3, or (at your option) any later version.
+  by the Free Software Foundation, either version 3 of the License,
+  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
+  GNUnet is distributed in the hope that it will be useful, but
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  You should have received a copy of the GNU General Public License along with
+  Affero General Public License for more details.
-  GNUnet; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file include/gnunet_db_lib.h
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index a4c63889e..89e436ffb 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2004-2013, 2016 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index be2885460..b7376b99b 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2012 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
@@ -709,6 +707,18 @@ GNUNET_DISK_directory_remove (const char *filename);
 /**
+ * Remove the directory given under @a option in
+ * section [PATHS] in configuration under @a cfg_filename
+ *
+ * @param cfg_filename configuration file to parse
+ * @param option option with the dir name to purge
+ */
+void
+GNUNET_DISK_purge_cfg_dir (const char *cfg_filename,
+                           const char *option);
+/**
 * Implementation of "mkdir -p"
 *
 * @param dir the directory to create
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index 017d5a039..ac50624f2 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2012 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index 3a2f785d3..0fc6ac19c 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2010-2014 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
@@ -33,7 +31,6 @@
 #define GNUNET_DNSPARSER_LIB_H
 #include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
 /**
 * Maximum length of a label in DNS.
@@ -85,6 +82,7 @@
 #define GNUNET_DNSPARSER_TYPE_OPENPGPKEY 61
 #define GNUNET_DNSPARSER_TYPE_TKEY 249
 #define GNUNET_DNSPARSER_TYPE_TSIG 250
+#define GNUNET_DNSPARSER_TYPE_ALL 255
 #define GNUNET_DNSPARSER_TYPE_URI 256
 #define GNUNET_DNSPARSER_TYPE_TA 32768
@@ -843,6 +841,58 @@ GNUNET_DNSPARSER_parse_srv (const char *udp_payload,
                            size_t udp_payload_length,
                            size_t *off);
+/* ***************** low-level duplication API ******************** */
+/**
+ * Duplicate (deep-copy) the given DNS record
+ *
+ * @param r the record
+ * @return the newly allocated record
+ */
+struct GNUNET_DNSPARSER_Record *
+GNUNET_DNSPARSER_duplicate_record (const struct GNUNET_DNSPARSER_Record *r);
+/**
+ * Duplicate (deep-copy) the given DNS record
+ *
+ * @param r the record
+ * @return the newly allocated record
+ */
+struct GNUNET_DNSPARSER_SoaRecord *
+GNUNET_DNSPARSER_duplicate_soa_record (const struct GNUNET_DNSPARSER_SoaRecord *r);
+/**
+ * Duplicate (deep-copy) the given DNS record
+ *
+ * @param r the record
+ * @return the newly allocated record
+ */
+struct GNUNET_DNSPARSER_CertRecord *
+GNUNET_DNSPARSER_duplicate_cert_record (const struct GNUNET_DNSPARSER_CertRecord *r);
+/**
+ * Duplicate (deep-copy) the given DNS record
+ *
+ * @param r the record
+ * @return the newly allocated record
+ */
+struct GNUNET_DNSPARSER_MxRecord *
+GNUNET_DNSPARSER_duplicate_mx_record (const struct GNUNET_DNSPARSER_MxRecord *r);
+/**
+ * Duplicate (deep-copy) the given DNS record
+ *
+ * @param r the record
+ * @return the newly allocated record
+ */
+struct GNUNET_DNSPARSER_SrvRecord *
+GNUNET_DNSPARSER_duplicate_srv_record (const struct GNUNET_DNSPARSER_SrvRecord *r);
 /* ***************** low-level deallocation API ******************** */
 /**
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 41e30d044..ad44be846 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2012, 2018 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
@@ -31,8 +29,7 @@
 #ifndef GNUNET_DNSSTUB_LIB_H
 #define GNUNET_DNSSTUB_LIB_H
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
 /**
 * Opaque handle to the stub resolver.
diff --git a/src/include/gnunet_dv_service.h b/src/include/gnunet_dv_service.h
index bc5927517..aa8d6af61 100644
--- a/src/include/gnunet_dv_service.h
+++ b/src/include/gnunet_dv_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2013, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index e56091c55..544af904b 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2009, 2011, 2015 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h
index 2e111780e..038c4b480 100644
--- a/src/include/gnunet_friends_lib.h
+++ b/src/include/gnunet_friends_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2013 Christian Grothoff
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index cbad374b5..2030c942c 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2004--2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index e38925f14..5372170d9 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -287,6 +285,23 @@ GNUNET_GETOPT_option_uint (char shortName,
 /**
+ * Allow user to specify an uint16_t.
+ *
+ * @param shortName short name of the option
+ * @param name long name of the option
+ * @param argumentHelp help text for the option argument
+ * @param description long help text for the option
+ * @param[out] val set to the value specified at the command line
+ */
+struct GNUNET_GETOPT_CommandLineOption
+GNUNET_GETOPT_option_uint16 (char shortName,
+                             const char *name,
+                             const char *argumentHelp,
+                             const char *description,
+                             uint16_t *val);
+/**
 * Allow user to specify an `unsigned long long`.
 *
 * @param shortName short name of the option
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index ff3110406..b6fac6111 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2012-2014, 2017 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
@@ -152,8 +150,9 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
 * Cancel pending lookup request
 *
 * @param lr the lookup request to cancel
+ * @return closure from the lookup result processor
 */
-void
+void *
 GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr);
@@ -200,8 +199,9 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
 * Cancel pending lookup request
 *
 * @param ltr the lookup request to cancel
+ * @return closure from the lookup result processor
 */
-void
+void *
 GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr);
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index 38346ada3..693cc6cdb 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -134,6 +132,16 @@ extern "C"
 #define GNUNET_GNSRECORD_TYPE_ABE_MASTER 65551
 /**
+ * Record type for reclaim OIDC clients
+ */
+#define GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT 65552
+/**
+ * Record type for reclaim OIDC redirect URIs
+ */
+#define GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT 65553
+/**
 * Flags that can be set for a record.
 */
 enum GNUNET_GNSRECORD_Flags
@@ -411,9 +419,9 @@ GNUNET_GNSRECORD_number_to_typename (uint32_t type);
 *
 * @param rd_count number of records in the @a rd array
 * @param rd array of #GNUNET_GNSRECORD_Data with @a rd_count elements
- * @return the required size to serialize
+ * @return the required size to serialize, -1 on error
 */
-size_t
+ssize_t
 GNUNET_GNSRECORD_records_get_size (unsigned int rd_count,
                                   const struct GNUNET_GNSRECORD_Data *rd);
@@ -501,10 +509,10 @@ GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
 /**
- * Convert an absolute domain name in the ".zkey" pTLD to the
+ * Convert an absolute domain name to the
 * respective public key.
 *
- * @param zkey string "X.zkey" where X is the public
+ * @param zkey string "X" where X is the public
 *         key in an encoding suitable for DNS labels.
 * @param pkey set to a public key on the eliptic curve
 * @return #GNUNET_SYSERR if @a zkey has the wrong syntax
diff --git a/src/include/gnunet_gnsrecord_plugin.h b/src/include/gnunet_gnsrecord_plugin.h
index e3e1a98eb..6b2fd8b45 100644
--- a/src/include/gnunet_gnsrecord_plugin.h
+++ b/src/include/gnunet_gnsrecord_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index dc2450248..2a961e524 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index 60b3ff681..3f17706e4 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011, 2012 Christian Grothoff
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index a303e6778..ec2a7ff8e 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index 49120982a..781d5698b 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -2,16 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify it under the
+  GNUnet is free software: you can redistribute it and/or modify it
-  terms of the GNU General Public License as published by the Free Software
+  under the terms of the GNU Affero General Public License as published
-  Foundation; either version 3, or (at your option) any later version.
+  by the Free Software Foundation, either version 3 of the License,
+  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
+  GNUnet is distributed in the hope that it will be useful, but
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  You should have received a copy of the GNU General Public License along with
+  Affero General Public License for more details.
-  GNUnet; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file gnunet_json_lib.h
@@ -24,6 +26,7 @@
 #define GNUNET_JSON_LIB_H
 #include "gnunet_util_lib.h"
+#include "gnunet_gnsrecord_lib.h"
 #include <jansson.h>
@@ -316,6 +319,17 @@ GNUNET_JSON_spec_rsa_signature (const char *name,
                                struct GNUNET_CRYPTO_RsaSignature **sig);
+/**
+ * JSON Specification for GNS Records.
+ *
+ * @param gnsrecord_object struct of GNUNET_GNSRECORD_Data to fill
+ * @return JSON Specification
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_gnsrecord_data (struct GNUNET_GNSRECORD_Data **gnsrecord_object);
 /* ****************** Generic generator interface ******************* */
@@ -391,6 +405,16 @@ GNUNET_JSON_from_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *pk);
 json_t *
 GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *sig);
+/**
+ * Convert Gns record to JSON.
+ *
+ * @param rname name of record
+ * @param rd record data
+ * @return corresponding JSON encoding
+ */
+json_t *
+GNUNET_JSON_from_gns_record (const char* rname,
+                                const struct GNUNET_GNSRECORD_Data *rd);
 /* ******************* Helpers for MHD upload handling ******************* */
@@ -477,7 +501,6 @@ GNUNET_JSON_getopt (char shortName,
                    const char *description,
                    json_t **json);
 #endif
 /* end of gnunet_json_lib.h */
diff --git a/src/include/gnunet_jsonapi_lib.h b/src/include/gnunet_jsonapi_lib.h
index 2f6b810f0..1dc89621b 100644
--- a/src/include/gnunet_jsonapi_lib.h
+++ b/src/include/gnunet_jsonapi_lib.h
@@ -2,16 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify it under the
+  GNUnet is free software: you can redistribute it and/or modify it
-  terms of the GNU General Public License as published by the Free Software
+  under the terms of the GNU Affero General Public License as published
-  Foundation; either version 3, or (at your option) any later version.
+  by the Free Software Foundation, either version 3 of the License,
+  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
+  GNUnet is distributed in the hope that it will be useful, but
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  You should have received a copy of the GNU General Public License along with
+  Affero General Public License for more details.
-  GNUnet; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file gnunet_jsonapi_lib.h
diff --git a/src/include/gnunet_jsonapi_util.h b/src/include/gnunet_jsonapi_util.h
index 4289a5062..02c82e844 100644
--- a/src/include/gnunet_jsonapi_util.h
+++ b/src/include/gnunet_jsonapi_util.h
@@ -2,16 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify it under the
+  GNUnet is free software: you can redistribute it and/or modify it
-  terms of the GNU General Public License as published by the Free Software
+  under the terms of the GNU Affero General Public License as published
-  Foundation; either version 3, or (at your option) any later version.
+  by the Free Software Foundation, either version 3 of the License,
+  or (at your option) any later version.
-  GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY
+  GNUnet is distributed in the hope that it will be useful, but
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  WITHOUT ANY WARRANTY; without even the implied warranty of
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Affero 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, If not, see <http://www.gnu.org/licenses/>
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file gnunet_jsonapi_util.h
diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h
index e36821b3e..3e7c1e487 100644
--- a/src/include/gnunet_load_lib.h
+++ b/src/include/gnunet_load_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2010 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h
index 625ac403a..dfad5f56a 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -2,20 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2013 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify
+  GNUnet is free software: you can redistribute it and/or modify it
-  it under the terms of the GNU General Public License as published
+  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation; either version 3, or (at your
+  by the Free Software Foundation, either version 3 of the License,
-  option) any later version.
+  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.
+  Affero General Public License for more details.
+ 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Affero General Public License
-  along with GNUnet; see the file COPYING.  If not, write to the
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index ecee1b223..226b3389f 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -135,6 +133,26 @@ struct GNUNET_MQ_Envelope;
 /**
+ * Obtain message contained in envelope.
+ *
+ * @param env the envelope
+ * @return message contained in the envelope
+ */
+const struct GNUNET_MessageHeader *
+GNUNET_MQ_env_get_msg (const struct GNUNET_MQ_Envelope *env);
+/**
+ * Return next envelope in queue.
+ *
+ * @param env a queued envelope
+ * @return next one, or NULL
+ */
+const struct GNUNET_MQ_Envelope *
+GNUNET_MQ_env_next (const struct GNUNET_MQ_Envelope *env);
+/**
 * Implementation of the #GNUNET_MQ_msg_nested_mh macro.
 *
 * @param mhp pointer to the message header pointer that will be changed to allocate at
@@ -320,6 +338,24 @@ GNUNET_MQ_copy_handlers (const struct GNUNET_MQ_MessageHandler *handlers);
 /**
+ * Copy an array of handlers, appending AGPL handler.
+ *
+ * Useful if the array has been delared in local memory and needs to be
+ * persisted for future use.
+ *
+ * @param handlers Array of handlers to be copied. Can be NULL (nothing done).
+ * @param agpl_handler function to call for AGPL handling
+ * @param agpl_cls closure for @a agpl_handler
+ * @return A newly allocated array of handlers.
+ *         Needs to be freed with #GNUNET_free.
+ */
+struct GNUNET_MQ_MessageHandler *
+GNUNET_MQ_copy_handlers2 (const struct GNUNET_MQ_MessageHandler *handlers,
+                          GNUNET_MQ_MessageCallback agpl_handler,
+                          void *agpl_cls);
+/**
 * Count the handlers in a handler array.
 *
 * @param handlers Array of handlers to be counted.
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index fe6524eb3..2716f4dce 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2013, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index 5645207dd..541bdd90d 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index f8ea01490..655885c69 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index 6a1e5b3ac..baa5a3ee1 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h
index fd28e6f9d..5ef41bf4d 100644
--- a/src/include/gnunet_namecache_plugin.h
+++ b/src/include/gnunet_namecache_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h
index 2c4ca29c3..ab9461f45 100644
--- a/src/include/gnunet_namecache_service.h
+++ b/src/include/gnunet_namecache_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index e15068222..5ab6ec706 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013, 2018 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index b8c7ea810..7ab619c51 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013, 2018 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h
index a369c49e0..a58834335 100644
--- a/src/include/gnunet_nat_auto_service.h
+++ b/src/include/gnunet_nat_auto_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2007-2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index e75845207..eb08515a2 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2007-2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h
index 48a01a498..b911d5632 100644
--- a/src/include/gnunet_nc_lib.h
+++ b/src/include/gnunet_nc_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 2c344749f..0d3599c13 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h
index 90f74a7ff..5ca173e13 100644
--- a/src/include/gnunet_nse_service.h
+++ b/src/include/gnunet_nse_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2011 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 #ifndef GNUNET_NSE_SERVICE_H_
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index d170570a4..ad3c873b9 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index b3800f286..98469a156 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -558,7 +556,7 @@ GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc,
 /**
- * Retrieve the status of a process, waiting on him if dead.
+ * Retrieve the status of a process, waiting on it if dead.
 * Nonblocking version.
 *
 * @param proc pointer to process structure
@@ -588,7 +586,7 @@ GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc);
 /**
- * Retrieve the status of a process, waiting on him if dead.
+ * Retrieve the status of a process, waiting on it if dead.
 * Blocking version.
 *
 * @param proc pointer to process structure
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index 78d54a4a8..9c1813c47 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2006, 2009 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index b5c2153ac..ca3028973 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2009, 2010 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h
index 1d731f2cc..aef183670 100644
--- a/src/include/gnunet_peerstore_plugin.h
+++ b/src/include/gnunet_peerstore_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h
index c636447c2..261d2d34f 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C)
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index 9e3e72a21..52e0dee51 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index ed295b500..ca615cffc 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -2,16 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2016, 2017 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify it under the
+  GNUnet is free software: you can redistribute it and/or modify it
-  terms of the GNU General Public License as published by the Free Software
+  under the terms of the GNU Affero General Public License as published
-  Foundation; either version 3, or (at your option) any later version.
+  by the Free Software Foundation, either version 3 of the License,
+  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
+  GNUnet is distributed in the hope that it will be useful, but
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  You should have received a copy of the GNU General Public License along with
+  Affero General Public License for more details.
-  GNUnet; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file include/gnunet_pq_lib.h
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index 65be7ab3d..088ce1fae 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 1ef00cfc8..0081138e0 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1,21 +1,19 @@
 /*
     This file is part of GNUnet.
-     Copyright (C) 2001--2015 GNUnet e.V.
+     Copyright (C) 2001--2018 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -66,6 +64,11 @@ extern "C"
 */
 #define GNUNET_MESSAGE_TYPE_DUMMY 2
+/**
+ * Another dummy messages for testing / benchmarking.
+ */
+#define GNUNET_MESSAGE_TYPE_DUMMY2 3
 /*******************************************************************************
 * RESOLVER message types
 ******************************************************************************/
@@ -81,6 +84,21 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE 5
 /*******************************************************************************
+ * AGPL source code download
+ * *****************************************************************************/
+/**
+ * Message to request source code link.
+ */
+#define GNUNET_MESSAGE_TYPE_REQUEST_AGPL 6
+/**
+ * Source code link.
+ */
+#define GNUNET_MESSAGE_TYPE_RESPONSE_AGPL 7
+/*******************************************************************************
 * ARM message types
 ******************************************************************************/
@@ -247,6 +265,12 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_DV_BOX 53
+/**
+ * Experimental message type.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_XU_MESSAGE 55
 /*******************************************************************************
 * Transport-UDP message types
 ******************************************************************************/
@@ -2632,35 +2656,35 @@ extern "C"
 *
 * IDENTITY PROVIDER MESSAGE TYPES
 */
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE 961
+#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE 961
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE 962
+#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE_RESPONSE 962
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START 963
+#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START 963
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP 964
+#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP 964
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT 965
+#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT 965
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT 966
+#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT 966
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET 967
+#define GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET 967
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT 968
+#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT 968
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET 969
+#define GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET 969
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT 970
+#define GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT 970
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET 971
+#define GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET 971
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT 972
+#define GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT 972
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START 973
+#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START 973
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP 974
+#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP 974
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT 975
+#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT 975
 /**************************************************
 *
@@ -2676,6 +2700,11 @@ extern "C"
 /******************************************************************************/
+/******************************************************************************/
+/*********************************** ZKLAIM ***********************************/
+#define GNUNET_MESSAGE_TYPE_ZKLAIM_CREATE 990
+#define GNUNET_MESSAGE_TYPE_ZKLAIM_RESULT_CODE 991
 /******************************************************************************/
 /***********************************  CADET  **********************************/
diff --git a/src/include/gnunet_psyc_env.h b/src/include/gnunet_psyc_env.h
index 0b319e6ef..e03171529 100644
--- a/src/include/gnunet_psyc_env.h
+++ b/src/include/gnunet_psyc_env.h
@@ -2,20 +2,18 @@
 * This file is part of GNUnet.
 * Copyright (C) 2013 GNUnet e.V.
 *
- * GNUnet is free software; you can redistribute it and/or modify
+ * GNUnet is free software: you can redistribute it and/or modify it
- * it under the terms of the GNU General Public License as published
+ * under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3, or (at your
+ * by the Free Software Foundation, either version 3 of the License,
- * option) any later version.
+ * 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.
+ * Affero General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with GNUnet; see the file COPYING.  If not, write to the
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_psyc_message.h b/src/include/gnunet_psyc_message.h
index e6337d093..05cfc011e 100644
--- a/src/include/gnunet_psyc_message.h
+++ b/src/include/gnunet_psyc_message.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index a37ea1b9b..053fe4495 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -137,7 +135,7 @@ enum GNUNET_PSYC_ChannelFlags
 enum GNUNET_PSYC_Policy
 {
  /**
-   * Anyone can join the channel, without announcing his presence;
+   * Anyone can join the channel, without announcing their presence;
   * all messages are always public and can be distributed freely.
   * Joins may be announced, but this is not required.
   */
diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h
index 56a7fb636..096794559 100644
--- a/src/include/gnunet_psyc_slicer.h
+++ b/src/include/gnunet_psyc_slicer.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_psyc_util_lib.h b/src/include/gnunet_psyc_util_lib.h
index 74218417e..b70752ea2 100644
--- a/src/include/gnunet_psyc_util_lib.h
+++ b/src/include/gnunet_psyc_util_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h
index b8dd0cc98..276d60638 100644
--- a/src/include/gnunet_psycstore_plugin.h
+++ b/src/include/gnunet_psycstore_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h
index b1be5246e..7d52259f0 100644
--- a/src/include/gnunet_psycstore_service.h
+++ b/src/include/gnunet_psycstore_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_identity_attribute_lib.h b/src/include/gnunet_reclaim_attribute_lib.h
index 8879ba925..9b928328e 100644
--- a/src/include/gnunet_identity_attribute_lib.h
+++ b/src/include/gnunet_reclaim_attribute_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -27,8 +25,8 @@
 * @defgroup identity-provider  Identity Provider service
 * @{
 */
-#ifndef GNUNET_IDENTITY_ATTRIBUTE_LIB_H
+#ifndef GNUNET_RECLAIM_ATTRIBUTE_LIB_H
-#define GNUNET_IDENTITY_ATTRIBUTE_LIB_H
+#define GNUNET_RECLAIM_ATTRIBUTE_LIB_H
 #ifdef __cplusplus
 extern "C"
@@ -44,19 +42,25 @@ extern "C"
 /**
 * No value attribute.
 */
-#define GNUNET_IDENTITY_ATTRIBUTE_TYPE_NONE 0
+#define GNUNET_RECLAIM_ATTRIBUTE_TYPE_NONE 0
 /**
 * String attribute.
 */
-#define GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING 1
+#define GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING 1
+/**
+ * ZKlaim attribute.
+ */
+#define GNUNET_RECLAIM_ATTRIBUTE_TYPE_ZKLAIM 2
 /**
 * An attribute.
 */
-struct GNUNET_IDENTITY_ATTRIBUTE_Claim
+struct GNUNET_RECLAIM_ATTRIBUTE_Claim
 {
  /**
   * The name of the attribute. Note "name" must never be individually
@@ -88,35 +92,35 @@ struct GNUNET_IDENTITY_ATTRIBUTE_Claim
 };
-struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList
+struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList
 {
  /**
   * List head
   */
-  struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *list_head;
+  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *list_head;
  /**
   * List tail
   */
-  struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *list_tail;
+  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *list_tail;
 };
-struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry
+struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry
 {
  /**
   * DLL
   */
-  struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *prev;
+  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *prev;
  /**
   * DLL
   */
-  struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *next;
+  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *next;
  /**
   * The attribute claim
   */
-  struct GNUNET_IDENTITY_ATTRIBUTE_Claim *claim;
+  struct GNUNET_RECLAIM_ATTRIBUTE_Claim *claim;
 };
 /**
@@ -128,8 +132,8 @@ struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry
 * @param data_size the attribute value size
 * @return the new attribute
 */
-struct GNUNET_IDENTITY_ATTRIBUTE_Claim *
+struct GNUNET_RECLAIM_ATTRIBUTE_Claim *
-GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name,
+GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char* attr_name,
                                     uint32_t type,
                                     const void* data,
                                     size_t data_size);
@@ -143,13 +147,13 @@ GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name,
 * @return the required buffer size
 */
 size_t
-GNUNET_IDENTITY_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs);
+GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
 void
-GNUNET_IDENTITY_ATTRIBUTE_list_destroy (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs);
+GNUNET_RECLAIM_ATTRIBUTE_list_destroy (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
 void
-GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs,
+GNUNET_RECLAIM_ATTRIBUTE_list_add (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
                                    const char* attr_name,
                                    uint32_t type,
                                    const void* data,
@@ -164,7 +168,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *
 * @return length of serialized data
 */
 size_t
-GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs,
+GNUNET_RECLAIM_ATTRIBUTE_list_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
                     char *result);
 /**
@@ -175,8 +179,8 @@ GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE
 *
 * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller
 */
-struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *
+struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *
-GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (const char* data,
+GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char* data,
                            size_t data_size);
@@ -188,7 +192,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (const char* data,
 * @return the required buffer size
 */
 size_t
-GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr);
+GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr);
@@ -201,7 +205,7 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRI
 * @return length of serialized data
 */
 size_t
-GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr,
+GNUNET_RECLAIM_ATTRIBUTE_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
                     char *result);
 /**
@@ -212,12 +216,12 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Clai
 *
 * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
 */
-struct GNUNET_IDENTITY_ATTRIBUTE_Claim *
+struct GNUNET_RECLAIM_ATTRIBUTE_Claim *
-GNUNET_IDENTITY_ATTRIBUTE_deserialize (const char* data,
+GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char* data,
                       size_t data_size);
-struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList*
+struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList*
-GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs);
+GNUNET_RECLAIM_ATTRIBUTE_list_dup (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
 /**
 * Convert a type name to the corresponding number
@@ -226,7 +230,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim
 * @return corresponding number, UINT32_MAX on error
 */
 uint32_t
-GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename);
+GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename);
 /**
 * Convert human-readable version of a 'claim' of an attribute to the binary
@@ -239,7 +243,7 @@ GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename);
 * @return #GNUNET_OK on success
 */
 int
-GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type,
+GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type,
                                           const char *s,
                                           void **data,
                                           size_t *data_size);
@@ -253,7 +257,7 @@ GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type,
 * @return NULL on error, otherwise human-readable representation of the claim
 */
 char *
-GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type,
+GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type,
                                           const void* data,
                                           size_t data_size);
@@ -264,7 +268,7 @@ GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type,
 * @return corresponding typestring, NULL on error
 */
 const char*
-GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type);
+GNUNET_RECLAIM_ATTRIBUTE_number_to_typename (uint32_t type);
 #if 0                           /* keep Emacsens' auto-indent happy */
@@ -275,9 +279,9 @@ GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type);
 #endif
-/* ifndef GNUNET_IDENTITY_ATTRIBUTE_LIB_H */
+/* ifndef GNUNET_RECLAIM_ATTRIBUTE_LIB_H */
 #endif
 /** @} */ /* end of group identity */
-/* end of gnunet_identity_attribute_lib.h */
+/* end of gnunet_reclaim_attribute_lib.h */
diff --git a/src/include/gnunet_identity_attribute_plugin.h b/src/include/gnunet_reclaim_attribute_plugin.h
index edeed57fd..cf0bb141a 100644
--- a/src/include/gnunet_identity_attribute_plugin.h
+++ b/src/include/gnunet_reclaim_attribute_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -28,11 +26,11 @@
 * Plugin API for the idp database backend
 * @{
 */
-#ifndef GNUNET_IDENTITY_ATTRIBUTE_PLUGIN_H
+#ifndef GNUNET_RECLAIM_ATTRIBUTE_PLUGIN_H
-#define GNUNET_IDENTITY_ATTRIBUTE_PLUGIN_H
+#define GNUNET_RECLAIM_ATTRIBUTE_PLUGIN_H
 #include "gnunet_util_lib.h"
-#include "gnunet_identity_attribute_lib.h"
+#include "gnunet_reclaim_attribute_lib.h"
 #ifdef __cplusplus
 extern "C"
@@ -53,7 +51,7 @@ extern "C"
 * @param data_size number of bytes in @a data
 * @return NULL on error, otherwise human-readable representation of the value
 */
-typedef char * (*GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction) (void *cls,
+typedef char * (*GNUNET_RECLAIM_ATTRIBUTE_ValueToStringFunction) (void *cls,
                                                          uint32_t type,
                                                          const void *data,
                                                          size_t data_size);
@@ -71,7 +69,7 @@ typedef char * (*GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction) (void *cls,
 * @param data_size set to number of bytes in @a data
 * @return #GNUNET_OK on success
 */
-typedef int (*GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction) (void *cls,
+typedef int (*GNUNET_RECLAIM_ATTRIBUTE_StringToValueFunction) (void *cls,
                                                       uint32_t type,
                                                       const char *s,
                                                       void **data,
@@ -86,7 +84,7 @@ typedef int (*GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction) (void *cls,
 * @param typename name to convert
 * @return corresponding number, UINT32_MAX on error
 */
-typedef uint32_t (*GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction) (void *cls,
+typedef uint32_t (*GNUNET_RECLAIM_ATTRIBUTE_TypenameToNumberFunction) (void *cls,
                                                               const char *typename);
@@ -98,7 +96,7 @@ typedef uint32_t (*GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction) (void *cl
 * @param type number of a type to convert
 * @return corresponding typestring, NULL on error
 */
-typedef const char * (*GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction) (void *cls,
+typedef const char * (*GNUNET_RECLAIM_ATTRIBUTE_NumberToTypenameFunction) (void *cls,
                                                                   uint32_t type);
@@ -106,7 +104,7 @@ typedef const char * (*GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction) (void
 * Each plugin is required to return a pointer to a struct of this
 * type as the return value from its entry point.
 */
-struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions
+struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions
 {
  /**
@@ -117,22 +115,22 @@ struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions
  /**
   * Conversion to string.
   */
-  GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction value_to_string;
+  GNUNET_RECLAIM_ATTRIBUTE_ValueToStringFunction value_to_string;
  /**
   * Conversion to binary.
   */
-  GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction string_to_value;
+  GNUNET_RECLAIM_ATTRIBUTE_StringToValueFunction string_to_value;
  /**
   * Typename to number.
   */
-  GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction typename_to_number;
+  GNUNET_RECLAIM_ATTRIBUTE_TypenameToNumberFunction typename_to_number;
  /**
   * Number to typename.
   */
-  GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction number_to_typename;
+  GNUNET_RECLAIM_ATTRIBUTE_NumberToTypenameFunction number_to_typename;
 };
diff --git a/src/include/gnunet_identity_provider_plugin.h b/src/include/gnunet_reclaim_plugin.h
index 4b5098d58..c400af64c 100644
--- a/src/include/gnunet_identity_provider_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -24,15 +22,15 @@
 * @file
 * Plugin API for the idp database backend
 *
- * @defgroup identity-provider-plugin  IdP service plugin API
+ * @defgroup reclaim-plugin  IdP service plugin API
 * Plugin API for the idp database backend
 * @{
 */
-#ifndef GNUNET_IDENTITY_PROVIDER_PLUGIN_H
+#ifndef GNUNET_RECLAIM_PLUGIN_H
-#define GNUNET_IDENTITY_PROVIDER_PLUGIN_H
+#define GNUNET_RECLAIM_PLUGIN_H
 #include "gnunet_util_lib.h"
-#include "gnunet_identity_provider_service.h"
+#include "gnunet_reclaim_service.h"
 #ifdef __cplusplus
 extern "C"
@@ -49,15 +47,15 @@ extern "C"
 * @param cls closure
 * @param ticket the ticket
 */
-typedef void (*GNUNET_IDENTITY_PROVIDER_TicketIterator) (void *cls,
+typedef void (*GNUNET_RECLAIM_TicketIterator) (void *cls,
-                                                 const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
+                                                 const struct GNUNET_RECLAIM_Ticket *ticket,
-             const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs);
+             const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
 /**
 * @brief struct returned by the initialization function of the plugin
 */
-struct GNUNET_IDENTITY_PROVIDER_PluginFunctions
+struct GNUNET_RECLAIM_PluginFunctions
 {
  /**
@@ -73,8 +71,8 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions
   * @return #GNUNET_OK on success, else #GNUNET_SYSERR
   */
  int (*store_ticket) (void *cls,
-                        const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
+                        const struct GNUNET_RECLAIM_Ticket *ticket,
-      const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs);
+      const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
  /**
   * Delete a ticket from the database.
@@ -84,7 +82,7 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions
   * @return #GNUNET_OK on success, else #GNUNET_SYSERR
   */
  int (*delete_ticket) (void *cls,
-                        const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket);
+                        const struct GNUNET_RECLAIM_Ticket *ticket);
@@ -103,11 +101,11 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions
                          const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
        int audience,
                          uint64_t offset,
-                          GNUNET_IDENTITY_PROVIDER_TicketIterator iter, void *iter_cls);
+                          GNUNET_RECLAIM_TicketIterator iter, void *iter_cls);
  int (*get_ticket_attributes) (void* cls,
-                                const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
+                                const struct GNUNET_RECLAIM_Ticket *ticket,
-                                GNUNET_IDENTITY_PROVIDER_TicketIterator iter,
+                                GNUNET_RECLAIM_TicketIterator iter,
                                void *iter_cls);
 };
diff --git a/src/include/gnunet_identity_provider_service.h b/src/include/gnunet_reclaim_service.h
index bc666a216..7e668cd62 100644
--- a/src/include/gnunet_identity_provider_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -24,11 +22,11 @@
 * @file
 * Identity provider service; implements identity provider for GNUnet
 *
- * @defgroup identity-provider  Identity Provider service
+ * @defgroup reclaim  Identity Provider service
 * @{
 */
-#ifndef GNUNET_IDENTITY_PROVIDER_SERVICE_H
+#ifndef GNUNET_RECLAIM_SERVICE_H
-#define GNUNET_IDENTITY_PROVIDER_SERVICE_H
+#define GNUNET_RECLAIM_SERVICE_H
 #ifdef __cplusplus
 extern "C"
@@ -39,27 +37,27 @@ extern "C"
 #endif
 #include "gnunet_util_lib.h"
-#include "gnunet_identity_attribute_lib.h"
+#include "gnunet_reclaim_attribute_lib.h"
 /**
 * Version number of GNUnet Identity Provider API.
 */
-#define GNUNET_IDENTITY_PROVIDER_VERSION 0x00000000
+#define GNUNET_RECLAIM_VERSION 0x00000000
 /**
 * Handle to access the identity service.
 */
-struct GNUNET_IDENTITY_PROVIDER_Handle;
+struct GNUNET_RECLAIM_Handle;
 /**
 * Handle for a token.
 */
-struct GNUNET_IDENTITY_PROVIDER_Token;
+struct GNUNET_RECLAIM_Token;
 /**
 * The ticket
 */
-struct GNUNET_IDENTITY_PROVIDER_Ticket
+struct GNUNET_RECLAIM_Ticket
 {
  /**
   * The ticket issuer
@@ -80,7 +78,7 @@ struct GNUNET_IDENTITY_PROVIDER_Ticket
 /**
 * Handle for an operation with the identity provider service.
 */
-struct GNUNET_IDENTITY_PROVIDER_Operation;
+struct GNUNET_RECLAIM_Operation;
 /**
@@ -89,8 +87,8 @@ struct GNUNET_IDENTITY_PROVIDER_Operation;
 * @param cfg Configuration to contact the identity provider service.
 * @return handle to communicate with identity provider service
 */
-struct GNUNET_IDENTITY_PROVIDER_Handle *
+struct GNUNET_RECLAIM_Handle *
-GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
 /**
 * Continuation called to notify client about result of the
@@ -103,7 +101,7 @@ GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 * @param emsg NULL on success, otherwise an error message
 */
 typedef void
-(*GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus) (void *cls,
+(*GNUNET_RECLAIM_ContinuationWithStatus) (void *cls,
                                            int32_t success,
                                            const char *emsg);
@@ -120,12 +118,12 @@ typedef void
 * @param cont_cls closure for @a cont
 * @return handle to abort the request
 */
-struct GNUNET_IDENTITY_PROVIDER_Operation *
+struct GNUNET_RECLAIM_Operation *
-GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+GNUNET_RECLAIM_attribute_store (struct GNUNET_RECLAIM_Handle *h,
                                          const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
-                                          const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr,
+                                          const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
                                          const struct GNUNET_TIME_Relative *exp_interval,
-                                          GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cont,
+                                          GNUNET_RECLAIM_ContinuationWithStatus cont,
                                          void *cont_cls);
@@ -137,19 +135,19 @@ GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle
 * @param attr the attribute
 */
 typedef void
-(*GNUNET_IDENTITY_PROVIDER_AttributeResult) (void *cls,
+(*GNUNET_RECLAIM_AttributeResult) (void *cls,
                                   const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-                                   const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr);
+                                   const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr);
 /**
 * List all attributes for a local identity. 
- * This MUST lock the `struct GNUNET_IDENTITY_PROVIDER_Handle`
+ * This MUST lock the `struct GNUNET_RECLAIM_Handle`
- * for any other calls than #GNUNET_IDENTITY_PROVIDER_get_attributes_next() and
+ * for any other calls than #GNUNET_RECLAIM_get_attributes_next() and
- * #GNUNET_IDENTITY_PROVIDER_get_attributes_stop. @a proc will be called once
+ * #GNUNET_RECLAIM_get_attributes_stop. @a proc will be called once
 * immediately, and then again after
- * #GNUNET_IDENTITY_PROVIDER_get_attributes_next() is invoked.
+ * #GNUNET_RECLAIM_get_attributes_next() is invoked.
 *
 * On error (disconnect), @a error_cb will be invoked.
 * On normal completion, @a finish_cb proc will be
@@ -168,36 +166,36 @@ typedef void
 * @param finish_cb_cls closure for @a finish_cb
 * @return an iterator handle to use for iteration
 */
-struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *
+struct GNUNET_RECLAIM_AttributeIterator *
-GNUNET_IDENTITY_PROVIDER_get_attributes_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+GNUNET_RECLAIM_get_attributes_start (struct GNUNET_RECLAIM_Handle *h,
                                               const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
                                               GNUNET_SCHEDULER_TaskCallback error_cb,
                                               void *error_cb_cls,
-                                               GNUNET_IDENTITY_PROVIDER_AttributeResult proc,
+                                               GNUNET_RECLAIM_AttributeResult proc,
                                               void *proc_cls,
                                               GNUNET_SCHEDULER_TaskCallback finish_cb,
                                               void *finish_cb_cls);
 /**
- * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_get_attributes_start
+ * Calls the record processor specified in #GNUNET_RECLAIM_get_attributes_start
 * for the next record.
 *
 * @param it the iterator
 */
 void
-GNUNET_IDENTITY_PROVIDER_get_attributes_next (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it);
+GNUNET_RECLAIM_get_attributes_next (struct GNUNET_RECLAIM_AttributeIterator *it);
 /**
 * Stops iteration and releases the idp handle for further calls.  Must
 * be called on any iteration that has not yet completed prior to calling
- * #GNUNET_IDENTITY_PROVIDER_disconnect.
+ * #GNUNET_RECLAIM_disconnect.
 *
 * @param it the iterator
 */
 void
-GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it);
+GNUNET_RECLAIM_get_attributes_stop (struct GNUNET_RECLAIM_AttributeIterator *it);
 /**
@@ -209,12 +207,12 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_At
 * @param ticket the ticket
 */
 typedef void
-(*GNUNET_IDENTITY_PROVIDER_TicketCallback)(void *cls,
+(*GNUNET_RECLAIM_TicketCallback)(void *cls,
-                            const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket);
+                            const struct GNUNET_RECLAIM_Ticket *ticket);
 /**
 * Issues a ticket to another identity. The identity may use
- * GNUNET_IDENTITY_PROVIDER_ticket_consume to consume the ticket
+ * GNUNET_RECLAIM_ticket_consume to consume the ticket
 * and retrieve the attributes specified in the AttributeList.
 *
 * @param h the identity provider to use
@@ -225,12 +223,12 @@ typedef void
 * @param cb_cls the callback closure
 * @return handle to abort the operation
 */
-struct GNUNET_IDENTITY_PROVIDER_Operation *
+struct GNUNET_RECLAIM_Operation *
-GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+GNUNET_RECLAIM_ticket_issue (struct GNUNET_RECLAIM_Handle *h,
                                       const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss,
                                       const struct GNUNET_CRYPTO_EcdsaPublicKey *rp,
-                                       const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs,
+                                       const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
-                                       GNUNET_IDENTITY_PROVIDER_TicketCallback cb,
+                                       GNUNET_RECLAIM_TicketCallback cb,
                                       void *cb_cls);
 /**
@@ -244,11 +242,11 @@ GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h
 * @param cb_cls the callback closure
 * @return handle to abort the operation
 */
-struct GNUNET_IDENTITY_PROVIDER_Operation *
+struct GNUNET_RECLAIM_Operation *
-GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+GNUNET_RECLAIM_ticket_revoke (struct GNUNET_RECLAIM_Handle *h,
                                        const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-                                        const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
+                                        const struct GNUNET_RECLAIM_Ticket *ticket,
-                                        GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cb,
+                                        GNUNET_RECLAIM_ContinuationWithStatus cb,
                                        void *cb_cls);
@@ -264,11 +262,11 @@ GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle *
 * @param cb_cls the callback closure
 * @return handle to abort the operation
 */
-struct GNUNET_IDENTITY_PROVIDER_Operation *
+struct GNUNET_RECLAIM_Operation *
-GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+GNUNET_RECLAIM_ticket_consume (struct GNUNET_RECLAIM_Handle *h,
                                         const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-                                         const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
+                                         const struct GNUNET_RECLAIM_Ticket *ticket,
-                                         GNUNET_IDENTITY_PROVIDER_AttributeResult cb,
+                                         GNUNET_RECLAIM_AttributeResult cb,
                                         void *cb_cls);
 /**
@@ -288,12 +286,12 @@ GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle
 * @param finish_cb_cls closure for @a finish_cb
 * @return an iterator handle to use for iteration
 */
-struct GNUNET_IDENTITY_PROVIDER_TicketIterator *
+struct GNUNET_RECLAIM_TicketIterator *
-GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+GNUNET_RECLAIM_ticket_iteration_start (struct GNUNET_RECLAIM_Handle *h,
                                                 const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
                                                 GNUNET_SCHEDULER_TaskCallback error_cb,
                                                 void *error_cb_cls,
-                                                 GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
+                                                 GNUNET_RECLAIM_TicketCallback proc,
                                                 void *proc_cls,
                                                 GNUNET_SCHEDULER_TaskCallback finish_cb,
                                                 void *finish_cb_cls);
@@ -315,34 +313,34 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER
 * @param finish_cb_cls closure for @a finish_cb
 * @return an iterator handle to use for iteration
 */
-struct GNUNET_IDENTITY_PROVIDER_TicketIterator *
+struct GNUNET_RECLAIM_TicketIterator *
-GNUNET_IDENTITY_PROVIDER_ticket_iteration_start_rp (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+GNUNET_RECLAIM_ticket_iteration_start_rp (struct GNUNET_RECLAIM_Handle *h,
                                                    const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
                                                    GNUNET_SCHEDULER_TaskCallback error_cb,
                                                    void *error_cb_cls,
-                                                    GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
+                                                    GNUNET_RECLAIM_TicketCallback proc,
                                                    void *proc_cls,
                                                    GNUNET_SCHEDULER_TaskCallback finish_cb,
                                                    void *finish_cb_cls);
 /**
- * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_ticket_iteration_start
+ * Calls the record processor specified in #GNUNET_RECLAIM_ticket_iteration_start
 * for the next record.
 *
 * @param it the iterator
 */
 void
-GNUNET_IDENTITY_PROVIDER_ticket_iteration_next (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it);
+GNUNET_RECLAIM_ticket_iteration_next (struct GNUNET_RECLAIM_TicketIterator *it);
 /**
 * Stops iteration and releases the idp handle for further calls.  Must
 * be called on any iteration that has not yet completed prior to calling
- * #GNUNET_IDENTITY_PROVIDER_disconnect.
+ * #GNUNET_RECLAIM_disconnect.
 *
 * @param it the iterator
 */
 void
-GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it);
+GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it);
 /**
 * Disconnect from identity provider service.
@@ -350,7 +348,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_
 * @param h identity provider service to disconnect
 */
 void
-GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h);
+GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h);
 /**
@@ -362,7 +360,7 @@ GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h);
 * @param op operation to cancel
 */
 void
-GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op);
+GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op);
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
@@ -372,9 +370,9 @@ GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op);
 #endif
-/* ifndef GNUNET_IDENTITY_PROVIDER_SERVICE_H */
+/* ifndef GNUNET_RECLAIM_SERVICE_H */
 #endif
 /** @} */ /* end of group identity */
-/* end of gnunet_identity_provider_service.h */
+/* end of gnunet_reclaim_service.h */
diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h
index 97063df61..e321bd442 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2012, 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Maximilian Szengel
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h
index daa571d6f..2d2508c17 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h
index 41b85401d..392ef6880 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2010-2015 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index 424dbb1fc..4aad82575 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -2,20 +2,18 @@
   This file is part of GNUnet.
   Copyright (C) 2012-2015 GNUnet e.V.
-   GNUnet is free software; you can redistribute it and/or modify
+   GNUnet is free software: you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published
+   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation; either version 3, or (at your
+   by the Free Software Foundation, either version 3 of the License,
-   option) any later version.
+   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.
+   Affero General Public License for more details.
+  
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
-   along with GNUnet; see the file COPYING.  If not, write to the
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
   */
 /**
 * @author Martin Schanzenbach
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h
index beb203142..f9c0237d3 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2013 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public Licerevocation as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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 Licerevocation for more details.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public Licerevocation
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 #ifndef GNUNET_REVOCATION_SERVICE_H_
diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h
index 8267e28b2..b0c8c9867 100644
--- a/src/include/gnunet_rps_service.h
+++ b/src/include/gnunet_rps_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C)
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h
index 21e00ca10..729d58648 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet.
      Copyright (C) 2013, 2014 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index f9b2736e4..314ede6a0 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2009-2016 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h
index f77fd33d2..a3f44222e 100644
--- a/src/include/gnunet_secretsharing_service.h
+++ b/src/include/gnunet_secretsharing_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2013 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
@@ -250,7 +248,7 @@ GNUNET_SECRETSHARING_encrypt (const struct GNUNET_SECRETSHARING_PublicKey *publi
 * published the same value, it will be decrypted.
 *
 * When the operation is canceled, the decrypt_cb is not called anymore, but the calling
- * peer may already have irrevocably contributed his share for the decryption of the value.
+ * peer may already have irrevocably contributed its share for the decryption of the value.
 *
 * @param cfg configuration to use
 * @param share our secret share to use for decryption
@@ -275,7 +273,7 @@ GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg,
 * Cancel a decryption.
 *
 * The decrypt_cb is not called anymore, but the calling
- * peer may already have irrevocably contributed his share for the decryption of the value.
+ * peer may already have irrevocably contributed its share for the decryption of the value.
 *
 * @param dh to cancel
 */
diff --git a/src/include/gnunet_sensor_service.h b/src/include/gnunet_sensor_service.h
index 06aecd248..c141def27 100644
--- a/src/include/gnunet_sensor_service.h
+++ b/src/include/gnunet_sensor_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C)
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_sensor_util_lib.h b/src/include/gnunet_sensor_util_lib.h
index 63a6fc10f..df7fa474b 100644
--- a/src/include/gnunet_sensor_util_lib.h
+++ b/src/include/gnunet_sensor_util_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C)
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_sensordashboard_service.h b/src/include/gnunet_sensordashboard_service.h
index bd4acb271..3521847cb 100644
--- a/src/include/gnunet_sensordashboard_service.h
+++ b/src/include/gnunet_sensordashboard_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C)
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index dda827c95..be52cce44 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2013, 2016, 2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index 0c14aa945..278784301 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2013, 2014 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h
index 08c72fb3a..199270b4e 100644
--- a/src/include/gnunet_signal_lib.h
+++ b/src/include/gnunet_signal_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 03bc4575e..829f8be7e 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -136,7 +134,7 @@ extern "C"
 /**
 * Accept state in regex DFA.  Peer affirms that
- * he offers the matching service.
+ * it offers the matching service.
 */
 #define GNUNET_SIGNATURE_PURPOSE_REGEX_ACCEPT 18
@@ -153,12 +151,12 @@ extern "C"
 /**
 * Signature for the first round of distributed key generation.
 */
-#define GNUNET_SIGNATURE_PURPOSE_SECRETSHARING_DKG1 22
+#define GNUNET_SIGNATURE_PURPOSE_SECRETSHARING_DKG1 21
 /**
 * Signature for the second round of distributed key generation.
 */
-#define GNUNET_SIGNATURE_PURPOSE_SECRETSHARING_DKG2 23
+#define GNUNET_SIGNATURE_PURPOSE_SECRETSHARING_DKG2 22
 /**
 * Signature for cooperatice decryption.
@@ -183,7 +181,7 @@ extern "C"
 /**
 * Signature for a GNUid Ticket
 */
-#define GNUNET_SIGNATURE_PURPOSE_GNUID_TICKET 27
+#define GNUNET_SIGNATURE_PURPOSE_RECLAIM_CODE_SIGN 27
 /**
 * Signature for a GNUnet credential
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index e9c7f309c..238166f96 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h
index 21bc917ac..13c0a70c7 100644
--- a/src/include/gnunet_socks.h
+++ b/src/include/gnunet_socks.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h
index b8890a9d7..0cee7de57 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -2,20 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2013 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify
+  GNUnet is free software: you can redistribute it and/or modify it
-  it under the terms of the GNU General Public License as published
+  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation; either version 3, or (at your
+  by the Free Software Foundation, either version 3 of the License,
-  option) any later version.
+  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.
+  Affero General Public License for more details.
+ 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Affero General Public License
-  along with GNUnet; see the file COPYING.  If not, write to the
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index f3adbc4c2..d5aa839bd 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -2,16 +2,18 @@
  This file is part of GNUnet
  Copyright (C) 2017 GNUnet e.V.
-  GNUnet is free software; you can redistribute it and/or modify it under the
+  GNUnet is free software: you can redistribute it and/or modify it
-  terms of the GNU General Public License as published by the Free Software
+  under the terms of the GNU Affero General Public License as published
-  Foundation; either version 3, or (at your option) any later version.
+  by the Free Software Foundation, either version 3 of the License,
+  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
+  GNUnet is distributed in the hope that it will be useful, but
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  You should have received a copy of the GNU General Public License along with
+  Affero General Public License for more details.
-  GNUnet; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file include/gnunet_sq_lib.h
@@ -446,6 +448,125 @@ void
 GNUNET_SQ_cleanup_result (struct GNUNET_SQ_ResultSpec *rs);
+/* ******************** sq_prepare.c functions ************** */
+/**
+ * Information needed to run a list of SQL statements using
+ * #GNUNET_SQ_exec_statements().
+ */
+struct GNUNET_SQ_PrepareStatement {
+  /**
+   * Actual SQL statement.
+   */
+  const char *sql;
+  /**
+   * Where to store handle?
+   */
+  sqlite3_stmt **pstmt;
+};
+/**
+ * Terminator for executable statement list.
+ */
+#define GNUNET_SQ_PREPARE_END { NULL, NULL }
+/**
+ * Create a `struct GNUNET_SQ_PrepareStatement`
+ *
+ * @param sql actual SQL statement
+ * @param pstmt where to store the handle
+ * @return initialized struct
+ */
+struct GNUNET_SQ_PrepareStatement
+GNUNET_SQ_make_prepare (const char *sql,
+                        sqlite3_stmt **pstmt);
+/**
+ * Prepare all statements given in the (NULL,NULL)-terminated
+ * array at @a ps
+ *
+ * @param dbh database handle
+ * @param ps array of statements to prepare
+ * @return #GNUNET_OK on success
+ */
+int
+GNUNET_SQ_prepare (sqlite3 *dbh,
+                   const struct GNUNET_SQ_PrepareStatement *ps);
+/* ******************** sq_exec.c functions ************** */
+/**
+ * Information needed to run a list of SQL statements using
+ * #GNUNET_SQ_exec_statements().
+ */
+struct GNUNET_SQ_ExecuteStatement {
+  /**
+   * Actual SQL statement.
+   */
+  const char *sql;
+  /**
+   * Should we ignore errors?
+   */
+  int ignore_errors;
+};
+/**
+ * Terminator for executable statement list.
+ */
+#define GNUNET_SQ_EXECUTE_STATEMENT_END { NULL, GNUNET_SYSERR }
+/**
+ * Create a `struct GNUNET_SQ_ExecuteStatement` where errors are fatal.
+ *
+ * @param sql actual SQL statement
+ * @return initialized struct
+ */
+struct GNUNET_SQ_ExecuteStatement
+GNUNET_SQ_make_execute (const char *sql);
+/**
+ * Create a `struct GNUNET_SQ_ExecuteStatement` where errors should
+ * be tolerated.
+ *
+ * @param sql actual SQL statement
+ * @return initialized struct
+ */
+struct GNUNET_SQ_ExecuteStatement
+GNUNET_SQ_make_try_execute (const char *sql);
+/**
+ * Request execution of an array of statements @a es from Postgres.
+ *
+ * @param dbh database to execute the statements over
+ * @param es #GNUNET_PQ_PREPARED_STATEMENT_END-terminated array of prepared
+ *            statements.
+ * @return #GNUNET_OK on success (modulo statements where errors can be ignored)
+ *         #GNUNET_SYSERR on error
+ */
+int
+GNUNET_SQ_exec_statements (sqlite3 *dbh,
+                           const struct GNUNET_SQ_ExecuteStatement *es);
 #endif  /* GNUNET_SQ_LIB_H_ */
 /* end of include/gnunet_sq_lib.h */
diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h
index 2765a07a9..c14d1419d 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2009-2013, 2016 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 897f9f161..c1d76ef71 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -341,7 +339,9 @@ GNUNET_STRINGS_string_to_data (const char *enc,
 * @return the size of the output
 */
 size_t
-GNUNET_STRINGS_base64_encode (const char *data, size_t len, char **output);
+GNUNET_STRINGS_base64_encode (const void *in,
+                              size_t len,
+                              char **output);
 /**
@@ -356,7 +356,7 @@ GNUNET_STRINGS_base64_encode (const char *data, size_t len, char **output);
 size_t
 GNUNET_STRINGS_base64_decode (const char *data,
                              size_t len,
-                              char **output);
+                              void **output);
 /**
diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h
index 4d7c3f7cb..1c267bb0c 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2008--2013 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 1c8d83ff9..4b8d63ad2 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2008--2013 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index e09068444..a2dc86fc4 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 224edc03e..2fc20d2cd 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001-2013 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h
index aa8cc1ba1..62822ddc3 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_transport_core_service.h b/src/include/gnunet_transport_core_service.h
index bbb5bafbf..5fbfcee21 100644
--- a/src/include/gnunet_transport_core_service.h
+++ b/src/include/gnunet_transport_core_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @author Christian Grothoff
diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h
index 6d4d0306c..a21358a9c 100644
--- a/src/include/gnunet_transport_hello_service.h
+++ b/src/include/gnunet_transport_hello_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_transport_manipulation_service.h b/src/include/gnunet_transport_manipulation_service.h
index 8c1789636..068b41dc0 100644
--- a/src/include/gnunet_transport_manipulation_service.h
+++ b/src/include/gnunet_transport_manipulation_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2014, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h
index a12cc4ed7..b9d024d59 100644
--- a/src/include/gnunet_transport_monitor_service.h
+++ b/src/include/gnunet_transport_monitor_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index a07f8d163..1f7b46baa 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2009-2014 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 94d190f9f..f600057e0 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 7bef0a6be..8de627141 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2010-2013 Christian Grothoff
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -32,7 +30,8 @@
 #ifndef GNUNET_TUN_LIB_H
 #define GNUNET_TUN_LIB_H
-#include "gnunet_util_lib.h"
+#include "gnunet_common.h"
+#include "gnunet_crypto_lib.h"
 /* see http://www.iana.org/assignments/ethernet-numbers */
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index a9bd6c33f..091d3ba58 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2009 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
@@ -52,6 +50,14 @@ extern "C"
 */
 #define GNUNET_MIN_MESSAGE_SIZE sizeof (struct GNUNET_MessageHeader)
+/**
+ * NOTE: You MUST adjust this URL to point to the location of a
+ * publicly accessible repository (or TGZ) containing the sources of
+ * THIS release. Otherwise, you are violating the Affero GPL if you make
+ * this service available to anyone but yourself.
+ */
+#define GNUNET_AGPL_URL "https://gnunet.org/git/gnunet.git#" PACKAGE_VERSION
 #include "gnunet_crypto_lib.h"
 #include "gnunet_bandwidth_lib.h"
@@ -72,6 +78,9 @@ extern "C"
 #include "gnunet_service_lib.h"
 #include "gnunet_signal_lib.h"
 #include "gnunet_strings_lib.h"
+#include "gnunet_tun_lib.h"
+#include "gnunet_dnsstub_lib.h"
+#include "gnunet_dnsparser_lib.h"
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_util_taler_wallet_lib.h b/src/include/gnunet_util_taler_wallet_lib.h
index de0c8c343..0ed68437d 100644
--- a/src/include/gnunet_util_taler_wallet_lib.h
+++ b/src/include/gnunet_util_taler_wallet_lib.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2009, 2015 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h
index feb5578ba..29f5aeb0f 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2012 GNUnet e.V.
-      GNUnet is free software; you can redistribute it and/or modify
+      GNUnet is free software: you can redistribute it and/or modify it
-      it under the terms of the GNU General Public License as published
+      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation; either version 3, or (at your
+      by the Free Software Foundation, either version 3 of the License,
-      option) any later version.
+      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.
+      Affero General Public License for more details.
+     
-      You should have received a copy of the GNU General Public License
+      You should have received a copy of the GNU Affero General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-      Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/platform.h b/src/include/platform.h
index 6095d0258..4a165ded6 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2012 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/include/winproc.h b/src/include/winproc.h
index a5352fc59..d1438c5f4 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2003, 2004, 2005 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**