-fix build system issues

9 files changed, 78 insertions, 69 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index dcaedc1e8..94345a5bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@ if HAVE_EXPERIMENTAL
   scalarproduct \
   multicast \
   env \
+  psycstore \
   psyc \
   $(CONSENSUS) \
   $(SECRETSHARING) \
@@ -77,7 +78,6 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 964fd0c26..60300f07c 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -10,7 +10,7 @@ pkgcfg_DATA = \
   ats.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -39,7 +39,7 @@ plugin_LTLIBRARIES = \
 
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
-  ats_api_performance.c  
+  ats_api_performance.c
 libgnunetats_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
@@ -55,7 +55,7 @@ libgnunet_plugin_ats_proportional_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
-  libgnunetats.la  
+  libgnunetats.la
 libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
@@ -138,7 +138,7 @@ TESTING_TESTS = \
  test_ats_solver_alternative_after_delete_address_ril \
  perf_ats_solver_proportional \
  $(GN_MLP_SOLVER_PERF) \
- perf_ats_solver_ril 
+ perf_ats_solver_ril
 endif
 
 check_PROGRAMS = \
@@ -157,7 +157,7 @@ test_ats_api_scheduling_init_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la      
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_SOURCES = \
  test_ats_api_scheduling_add_address.c \
@@ -166,7 +166,7 @@ test_ats_api_scheduling_add_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_inbound_SOURCES = \
  test_ats_api_scheduling_add_address_inbound.c \
@@ -175,7 +175,7 @@ test_ats_api_scheduling_add_address_inbound_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_duplicate_SOURCES = \
  test_ats_api_scheduling_add_address_duplicate.c \
@@ -184,7 +184,7 @@ test_ats_api_scheduling_add_address_duplicate_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_SOURCES = \
  test_ats_api_scheduling_destroy_address.c \
@@ -193,7 +193,7 @@ test_ats_api_scheduling_destroy_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_twice_SOURCES = \
  test_ats_api_scheduling_destroy_address_twice.c \
@@ -202,7 +202,7 @@ test_ats_api_scheduling_destroy_address_twice_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_session_SOURCES = \
  test_ats_api_scheduling_add_session.c test_ats_api_common.c
@@ -210,7 +210,7 @@ test_ats_api_scheduling_add_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_session_SOURCES = \
  test_ats_api_scheduling_destroy_session.c test_ats_api_common.c
@@ -218,7 +218,7 @@ test_ats_api_scheduling_destroy_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 # performance API tests
 
@@ -239,7 +239,7 @@ test_ats_api_performance_list_peer_addresses_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_api_performance_list_all_addresses_active_SOURCES = \
  test_ats_api_performance_list_all_addresses_active.c
 test_ats_api_performance_list_all_addresses_active_LDADD = \
@@ -257,16 +257,16 @@ test_ats_api_performance_monitor_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_api_performance_monitor_initial_callback_SOURCES = \
- test_ats_api_performance_monitor_initial_callback.c    
+ test_ats_api_performance_monitor_initial_callback.c
 test_ats_api_performance_monitor_initial_callback_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 # solver tests
 test_ats_solver_add_address_proportional_SOURCES = \
  test_ats_solver_add_address.c \
@@ -277,8 +277,8 @@ test_ats_solver_add_address_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_add_address_mlp_SOURCES = \
  test_ats_solver_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -288,8 +288,8 @@ test_ats_solver_add_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_add_address_ril_SOURCES = \
  test_ats_solver_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -299,7 +299,7 @@ test_ats_solver_add_address_ril_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-                        
+
 test_ats_solver_add_address_and_request_proportional_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -309,8 +309,8 @@ test_ats_solver_add_address_and_request_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_add_address_and_request_mlp_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -320,8 +320,8 @@ test_ats_solver_add_address_and_request_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_add_address_and_request_ril_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -342,8 +342,8 @@ test_ats_solver_request_and_add_address_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_request_and_add_address_mlp_SOURCES = \
  test_ats_solver_request_and_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -353,8 +353,8 @@ test_ats_solver_request_and_add_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_request_and_add_address_ril_SOURCES = \
  test_ats_solver_request_and_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -375,8 +375,8 @@ test_ats_solver_request_and_delete_address_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_request_and_delete_address_mlp_SOURCES = \
  test_ats_solver_request_and_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -386,8 +386,8 @@ test_ats_solver_request_and_delete_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_request_and_delete_address_ril_SOURCES = \
  test_ats_solver_request_and_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -418,8 +418,8 @@ test_ats_solver_preferences_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \
  test_ats_solver_alternative_after_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -429,7 +429,7 @@ test_ats_solver_alternative_after_delete_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_solver_preferences_mlp_SOURCES = \
  test_ats_solver_preferences.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -439,8 +439,8 @@ test_ats_solver_preferences_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_alternative_after_delete_address_ril_SOURCES = \
  test_ats_solver_alternative_after_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -457,7 +457,7 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
 #  $(GN_LIBGLPK) \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
+#  $(top_builddir)/src/ats/libgnunetats.la
 
 perf_ats_solver_mlp_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -465,7 +465,7 @@ perf_ats_solver_mlp_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la 
+  $(top_builddir)/src/ats/libgnunetats.la
 
 perf_ats_solver_proportional_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -473,7 +473,7 @@ perf_ats_solver_proportional_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la 
+  $(top_builddir)/src/ats/libgnunetats.la
 
 perf_ats_solver_ril_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -481,7 +481,7 @@ perf_ats_solver_ril_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la 
+  $(top_builddir)/src/ats/libgnunetats.la
 
 test_ats_solver_preferences_ril_SOURCES = \
  test_ats_solver_preferences.c \
@@ -492,7 +492,7 @@ test_ats_solver_preferences_ril_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_solver_convergence_ril_SOURCES = \
  test_ats_solver_convergence.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -505,6 +505,9 @@ test_ats_solver_convergence_ril_LDADD = \
 
 EXTRA_DIST = \
   ats.h \
+  plugin_ats_proportional.h \
+  plugin_ats_mlp.h \
+  plugin_ats_ril.h \
   test_ats_api.conf \
   test_ats_mlp.conf \
   test_ats_solver_default.conf \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index da5702653..e455ba45e 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -48,7 +48,8 @@ libgnunetspeaker_la_LDFLAGS = \
 
 libgnunetconversation_la_SOURCES = \
   conversation_api.c \
-  conversation_api_call.c
+  conversation_api_call.c \
+  conversation.h
 libgnunetconversation_la_LIBADD = \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 5b5783146..e55f0aca6 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -18,6 +18,7 @@ gnunetinclude_HEADERS = \
   gnunet_applications.h \
   gnunet_arm_service.h \
   gnunet_ats_service.h \
+  gnunet_ats_plugin.h \
   gnunet_bandwidth_lib.h \
   gnunet_bio_lib.h \
   gnunet_block_lib.h \
@@ -41,6 +42,7 @@ gnunetinclude_HEADERS = \
   gnunet_dnsstub_lib.h \
   gnunet_dns_service.h \
   gnunet_dv_service.h \
+  gnunet_env_lib.h \
   gnunet_fragmentation_lib.h \
   gnunet_friends_lib.h \
   gnunet_fs_service.h \
@@ -54,6 +56,7 @@ gnunetinclude_HEADERS = \
   gnunet_load_lib.h \
   gnunet_mesh_service.h \
   gnunet_microphone_lib.h \
+  gnunet_multicast_service.h \
   gnunet_mq_lib.h \
   gnunet_mysql_lib.h \
   gnunet_namecache_plugin.h \
@@ -68,6 +71,9 @@ gnunetinclude_HEADERS = \
   gnunet_peerinfo_service.h \
   gnunet_plugin_lib.h \
   gnunet_postgres_lib.h \
+  gnunet_psycstore_plugin.h \
+  gnunet_psycstore_service.h \
+  gnunet_psyc_service.h \
   gnunet_program_lib.h \
   gnunet_protocols.h \
   gnunet_resolver_service.h \
@@ -77,6 +83,7 @@ gnunetinclude_HEADERS = \
   gnunet_scheduler_lib.h \
   gnunet_server_lib.h \
   gnunet_service_lib.h \
+  gnunet_set_service.h \
   gnunet_signal_lib.h \
   gnunet_signatures.h \
   gnunet_speaker_lib.h \
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index a81ac4589..ffcee8c0e 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -63,13 +63,13 @@ gnunet_mesh_DEPENDENCIES = \
   libgnunetmesh.la
 
 gnunet_service_mesh_SOURCES = \
- gnunet-service-mesh_tunnel.c \
- gnunet-service-mesh_connection.c \
- gnunet-service-mesh_channel.c \
- gnunet-service-mesh_local.c \
- gnunet-service-mesh_peer.c \
- gnunet-service-mesh_dht.c \
- mesh_path.c \
+ gnunet-service-mesh_tunnel.c gnunet-service-mesh_tunnel.h \
+ gnunet-service-mesh_connection.c gnunet-service-mesh_connection.h \
+ gnunet-service-mesh_channel.c gnunet-service-mesh_channel.h \
+ gnunet-service-mesh_local.c gnunet-service-mesh_local.h \
+ gnunet-service-mesh_peer.c gnunet-service-mesh_peer.h \
+ gnunet-service-mesh_dht.c gnunet-service-mesh_dht.h \
+ mesh_path.c mesh_path.h \
  mesh_common.c \
  gnunet-service-mesh.c
 gnunet_service_mesh_CFLAGS = $(AM_CFLAGS)
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index a2ca25f94..124818ce4 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -8,7 +8,7 @@ pkgcfg_DATA = \
   set.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -43,11 +43,12 @@ gnunet_set_ibf_profiler_LDADD = \
   $(GN_LIBINTL)
 
 gnunet_service_set_SOURCES = \
- gnunet-service-set.c \
+ gnunet-service-set.c gnunet-service-set.h \
  gnunet-service-set_union.c \
  gnunet-service-set_intersection.c \
- ibf.c \
- strata_estimator.c
+ ibf.c ibf.h \
+ strata_estimator.c strata_estimator.h \
+ set_protocol.h
 gnunet_service_set_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
@@ -56,7 +57,7 @@ gnunet_service_set_LDADD = \
   $(GN_LIBINTL)
 
 libgnunetset_la_SOURCES = \
-  set_api.c
+  set_api.c set.h
 libgnunetset_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 57ea49a00..c52fc1f16 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -26,19 +26,15 @@ bin_PROGRAMS = \
   gnunet-testbed-profiler
 
 gnunet_service_testbed_SOURCES = \
-  gnunet-service-testbed.h \
-  gnunet-service-testbed.c \
-  gnunet-service-testbed_links.c \
+  gnunet-service-testbed.c gnunet-service-testbed.h \
+  gnunet-service-testbed_links.c gnunet-service-testbed_links.h \
   gnunet-service-testbed_peers.c \
   gnunet-service-testbed_cache.c \
   gnunet-service-testbed_oc.c \
   gnunet-service-testbed_cpustatus.c \
-  gnunet-service-testbed_meminfo.c \
-  gnunet-service-testbed_meminfo.h \
-  gnunet-service-testbed_barriers.c \
-  gnunet-service-testbed_barriers.h \
-  gnunet-service-testbed_connectionpool.c \
-  gnunet-service-testbed_connectionpool.h
+  gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \
+  gnunet-service-testbed_barriers.c gnunet-service-testbed_barriers.h \
+  gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h
 gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/core/libgnunetcore.la \
@@ -102,7 +98,7 @@ libgnunettestbed_la_SOURCES = \
   testbed_api_test.c \
   testbed_api_topology.c testbed_api_topology.h \
   testbed_api_sd.c testbed_api_sd.h \
-  testbed_api_barriers.c 
+  testbed_api_barriers.c testbed_api_barriers.h
 libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index c77d82812..7e3970aaa 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1936,7 +1936,7 @@ check_port (struct Plugin *plugin, uint16_t in_port)
  * traffic to a 3rd party that might try to man-in-the-middle our
  * traffic.
  *
- * @param cls closure, our 'struct Plugin*'
+ * @param cls closure, our `struct Plugin *`
  * @param addr pointer to the address
  * @param addrlen length of addr
  * @return #GNUNET_OK if this is a plausible address for this peer
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 5cd61ddcf..dcd2f9121 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -539,4 +539,5 @@ EXTRA_DIST = \
   test_program_data.conf \
   test_resolver_api_data.conf \
   test_service_data.conf \
-  test_speedup_data.conf
+  test_speedup_data.conf \
+  gnunet-qr.py.in