fix FTBFS issues

45 files changed, 196 insertions, 176 deletions

diff --git a/AUTHORS b/AUTHORS
index eb41b69..61acf7c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
+Gabor (tgx) Toth
 Christian Grothoff
diff --git a/bin/pogen.sh b/bin/pogen.sh
new file mode 100755
index 0000000..453e0b1
--- /dev/null
+++ b/bin/pogen.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# This script is in the public domain.
+find src -name "*.c" | grep -v \# | grep -v /test_ | grep -v /perf_  | grep -v _old | grep -v chat | grep -v .libs/ | sort  > po/POTFILES.in
+grep -l _\( `find src -name "*.h"` | grep -v "platform.h" | grep -v _old | grep -v chat | sort >> po/POTFILES.in
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6fb7e2c..125afcb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,16 @@
-# List of source files which contain translatable strings.
-src/ext/gnunet-ext.c
+src/multicast/gnunet-multicast.c
+src/multicast/gnunet-service-multicast.c
+src/multicast/multicast_api.c
+src/psyc/gnunet-service-psyc.c
+src/psyc/psyc_api.c
+src/psycstore/gnunet-service-psycstore.c
+src/psycstore/plugin_psycstore_mysql.c
+src/psycstore/plugin_psycstore_postgres.c
+src/psycstore/plugin_psycstore_sqlite.c
+src/psycstore/psycstore_api.c
+src/psycutil/psyc_env.c
+src/psycutil/psyc_message.c
+src/psycutil/psyc_slicer.c
+src/social/gnunet-service-social.c
+src/social/gnunet-social.c
+src/social/social_api.c
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index 58fca0b..2932514 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -41,8 +41,8 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_util_lib.h"
-#include "gnunet_transport_service.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_transport_service.h>
 
 /**
  * Version number of GNUnet-multicast API.
diff --git a/src/include/gnunet_psyc_message.h b/src/include/gnunet_psyc_message.h
index d0cf9cc..7718055 100644
--- a/src/include/gnunet_psyc_message.h
+++ b/src/include/gnunet_psyc_message.h
@@ -41,7 +41,7 @@ extern "C"
 #endif
 
 
-#include "gnunet_util_lib.h"
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psyc_service.h"
 
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 3a3131e..6d4a971 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -98,7 +98,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_util_lib.h"
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_multicast_service.h"
 //Mingw work around
 #ifdef MINGW
diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h
index 87f66d7..f8efd4b 100644
--- a/src/include/gnunet_psyc_slicer.h
+++ b/src/include/gnunet_psyc_slicer.h
@@ -42,7 +42,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_util_lib.h"
+#include <gnunet/gnunet_util_lib.h>
 
 
 /**
diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h
index fac549f..d253825 100644
--- a/src/include/gnunet_psycstore_plugin.h
+++ b/src/include/gnunet_psycstore_plugin.h
@@ -31,7 +31,7 @@
 #ifndef GNUNET_PSYCSTORE_PLUGIN_H
 #define GNUNET_PSYCSTORE_PLUGIN_H
 
-#include "gnunet_util_lib.h"
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psycstore_service.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h
index 92516f4..ea77f76 100644
--- a/src/include/gnunet_psycstore_service.h
+++ b/src/include/gnunet_psycstore_service.h
@@ -40,7 +40,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_util_lib.h"
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_multicast_service.h"
 #include "gnunet_psyc_service.h"
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 7faa336..068d827 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -226,10 +226,10 @@ extern "C"
 #endif
 
 #include <stdint.h>
-#include "gnunet_util_lib.h"
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_util_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_namestore_service.h"
+#include <gnunet/gnunet_identity_service.h>
+#include <gnunet/gnunet_namestore_service.h>
 #include "gnunet_psyc_service.h"
 
 
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index 61a9f8b..0650199 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -1,6 +1,6 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/src/include \
+  $(GNUNET_CPPFLAGS)
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libgnunetmulticast.la
 libgnunetmulticast_la_SOURCES = \
   multicast_api.c multicast.h
 libgnunetmulticast_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL) $(XLIB)
 libgnunetmulticast_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -38,15 +38,15 @@ libexec_PROGRAMS = \
 gnunet_multicast_SOURCES = \
  gnunet-multicast.c
 gnunet_multicast_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL)
 
 gnunet_service_multicast_SOURCES = \
  gnunet-service-multicast.c
 gnunet_service_multicast_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  -lgnunetutil \
+  -lgnunetcadet \
+  -lgnunetstatistics \
   $(GN_LIBINTL)
 
 check_PROGRAMS = \
@@ -63,17 +63,17 @@ test_multicast_SOURCES = \
  test_multicast.c
 test_multicast_LDADD = \
   libgnunetmulticast.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 test_multicast_multipeer_star_SOURCES = \
   test_multicast_multipeer.c
 test_multicast_multipeer_star_LDADD = \
   libgnunetmulticast.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettestbed \
+  -lgnunetutil
 test_multicast_multipeer_line_SOURCES = \
   test_multicast_multipeer.c
 test_multicast_multipeer_line_LDADD = \
   libgnunetmulticast.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettestbed \
+  -lgnunetutil
diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c
index 63e1d52..ffac36d 100644
--- a/src/multicast/gnunet-multicast.c
+++ b/src/multicast/gnunet-multicast.c
@@ -23,8 +23,8 @@
  * @brief multicast for writing a tool
  * @author Christian Grothoff
  */
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 /* #include "gnunet_multicast_service.h" */
 
 /**
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index 18c3661..98e4665 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -23,12 +23,12 @@
  * @brief program that does multicast
  * @author Christian Grothoff
  */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_signatures.h"
-#include "gnunet_applications.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_cadet_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_signatures.h>
+#include <gnunet/gnunet_applications.h>
+#include <gnunet/gnunet_statistics_service.h>
+#include <gnunet/gnunet_cadet_service.h>
 #include "gnunet_multicast_service.h"
 #include "multicast.h"
 
diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h
index 8a3ca14..c4b7ce1 100644
--- a/src/multicast/multicast.h
+++ b/src/multicast/multicast.h
@@ -27,7 +27,7 @@
 #ifndef MULTICAST_H
 #define MULTICAST_H
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_multicast_service.h"
 
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index e5e8302..31d0a02 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -25,8 +25,8 @@
  * @author Gabor X Toth
  */
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_multicast_service.h"
 #include "multicast.h"
 
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c
index 70efdcb..b03c529 100644
--- a/src/multicast/test_multicast.c
+++ b/src/multicast/test_multicast.c
@@ -26,11 +26,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_multicast_service.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c
index ea99602..009a0a1 100644
--- a/src/multicast/test_multicast_2peers.c
+++ b/src/multicast/test_multicast_2peers.c
@@ -27,11 +27,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testbed_service.h>
 #include "gnunet_multicast_service.h"
 
 #define NUM_PEERS 2
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c
index 9b44e05..95f42f4 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -26,11 +26,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testbed_service.h>
 #include "gnunet_multicast_service.h"
 
 #define PEERS_REQUESTED 12
diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 511e3e3..61094f1 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -1,5 +1,6 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include \
+  $(GNUNET_CPPFLAGS)
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetpsyc.la
 libgnunetpsyc_la_SOURCES = \
   psyc_api.c psyc.h
 libgnunetpsyc_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetpsyc_la_LDFLAGS = \
@@ -38,8 +39,8 @@ libexec_PROGRAMS = \
 gnunet_service_psyc_SOURCES = \
   gnunet-service-psyc.c
 gnunet_service_psyc_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  -lgnunetutil \
+  -lgnunetstatistics \
   $(top_builddir)/src/multicast/libgnunetmulticast.la \
   $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
@@ -63,15 +64,9 @@ test_psyc_SOURCES = \
 test_psyc_LDADD = \
   libgnunetpsyc.la \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-#test_psyc2_SOURCES = \
-#  test_psyc2.c
-#test_psyc2_LDADD = \
-#  libgnunetpsyc.la \
-#  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
+
 
 EXTRA_DIST = \
   test_psyc.conf
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index 6f2f7a9..6934b31 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.c
@@ -26,11 +26,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_statistics_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_constants.h>
+#include <gnunet/gnunet_protocols.h>
+#include <gnunet/gnunet_statistics_service.h>
 #include "gnunet_multicast_service.h"
 #include "gnunet_psycstore_service.h"
 #include "gnunet_psyc_service.h"
diff --git a/src/psyc/psyc.h b/src/psyc/psyc.h
index 74bbf3e..c901db0 100644
--- a/src/psyc/psyc.h
+++ b/src/psyc/psyc.h
@@ -27,7 +27,7 @@
 #ifndef PSYC_H
 #define PSYC_H
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_psyc_service.h"
 
 
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index 37ea112..3ee3fc7 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -32,8 +32,8 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_multicast_service.h"
 #include "gnunet_psyc_service.h"
 #include "gnunet_psyc_util_lib.h"
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index b6e27bb..bd5a3b4 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.c
@@ -27,11 +27,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psyc_service.h"
 
diff --git a/src/psyc/test_psyc2.c b/src/psyc/test_psyc2.c
index c6e7237..2b141e3 100644
--- a/src/psyc/test_psyc2.c
+++ b/src/psyc/test_psyc2.c
@@ -24,11 +24,11 @@
  * @author xrs
  */
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testbed_service.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psyc_service.h"
 
diff --git a/src/psyc/test_psyc_api_join.c b/src/psyc/test_psyc_api_join.c
index 419fa11..ffa1e16 100644
--- a/src/psyc/test_psyc_api_join.c
+++ b/src/psyc/test_psyc_api_join.c
@@ -32,11 +32,11 @@
  * - main can not contain GNUNET_log()
  */
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testbed_service.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psyc_service.h"
 #include "psyc_test_lib.h"
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index 557bb42..f3b4545 100644
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -1,5 +1,6 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include \
+  $(GNUNET_CPPFLAGS)
 
 plugindir = $(libdir)/gnunet
 
@@ -47,7 +48,7 @@ libgnunetpsycstore_la_SOURCES = \
   psycstore_api.c \
   psycstore.h
 libgnunetpsycstore_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL) $(XLIB)
 libgnunetpsycstore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -61,9 +62,9 @@ libexec_PROGRAMS = \
 gnunet_service_psycstore_SOURCES = \
  gnunet-service-psycstore.c
 gnunet_service_psycstore_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
+  -lgnunetstatistics \
+  -lgnunetutil \
   $(GN_LIBINTL)
 
 plugin_LTLIBRARIES = \
@@ -76,10 +77,11 @@ libgnunet_plugin_psycstore_mysql_la_SOURCES = \
   plugin_psycstore_mysql.c
 libgnunet_plugin_psycstore_mysql_la_LIBADD = \
   libgnunetpsycstore.la  \
-  $(top_builddir)/src/my/libgnunetmy.la \
-  $(top_builddir)/src/mysql/libgnunetmysql.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  -lgnunetmy \
+  -lgnunetmysql \
+  -lgnunetstatistics \
+  -lgnunetutil \
+  $(XLIBS) \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_mysql_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -88,9 +90,10 @@ libgnunet_plugin_psycstore_postgres_la_SOURCES = \
   plugin_psycstore_postgres.c
 libgnunet_plugin_psycstore_postgres_la_LIBADD = \
   libgnunetpsycstore.la  \
-  $(top_builddir)/src/pq/libgnunetpq.la  \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \
+  -lgnunetpq \
+  -lgnunetstatistics \
+  -lgnunetutil \
+  $(XLIBS) -lpq \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_postgres_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
@@ -102,8 +105,9 @@ libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
   plugin_psycstore_sqlite.c
 libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
   libgnunetpsycstore.la  \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  -lgnunetstatistics \
+  -lgnunetutil \
+  $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -128,8 +132,8 @@ test_psycstore_SOURCES = \
  test_psycstore.c
 test_psycstore_LDADD = \
   libgnunetpsycstore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 
 EXTRA_DIST = \
   test_psycstore.conf
@@ -138,18 +142,17 @@ EXTRA_DIST = \
 test_plugin_psycstore_sqlite_SOURCES = \
  test_plugin_psycstore.c
 test_plugin_psycstore_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 
 test_plugin_psycstore_mysql_SOURCES = \
  test_plugin_psycstore.c
 test_plugin_psycstore_mysql_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 
 test_plugin_psycstore_postgres_SOURCES = \
  test_plugin_psycstore.c
 test_plugin_psycstore_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
+ -lgnunettesting \
+ -lgnunetutil
diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c
index 9aebd3e..2852fda 100644
--- a/src/psycstore/gnunet-service-psycstore.c
+++ b/src/psycstore/gnunet-service-psycstore.c
@@ -27,11 +27,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_statistics_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_constants.h>
+#include <gnunet/gnunet_protocols.h>
+#include <gnunet/gnunet_statistics_service.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psycstore_service.h"
 #include "gnunet_psycstore_plugin.h"
diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c
index c36b6f7..598a367 100644
--- a/src/psycstore/plugin_psycstore_mysql.c
+++ b/src/psycstore/plugin_psycstore_mysql.c
@@ -26,11 +26,11 @@
  * @author Christophe Genevey
  */
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_psycstore_plugin.h"
 #include "gnunet_psycstore_service.h"
 #include "gnunet_multicast_service.h"
-#include "gnunet_crypto_lib.h"
+#include <gnunet/gnunet_crypto_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "psycstore.h"
 #include "gnunet_my_lib.h"
diff --git a/src/psycstore/plugin_psycstore_postgres.c b/src/psycstore/plugin_psycstore_postgres.c
index 33c9960..2dcafd4 100644
--- a/src/psycstore/plugin_psycstore_postgres.c
+++ b/src/psycstore/plugin_psycstore_postgres.c
@@ -28,14 +28,14 @@
  * @author Jeffrey Burdges
  */
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_psycstore_plugin.h"
 #include "gnunet_psycstore_service.h"
 #include "gnunet_multicast_service.h"
-#include "gnunet_crypto_lib.h"
+#include <gnunet/gnunet_crypto_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "psycstore.h"
-#include "gnunet_pq_lib.h"
+#include <gnunet/gnunet_pq_lib.h>
 
 /**
  * After how many ms "busy" should a DB operation fail for good?  A
diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c
index 24de383..982f2ec 100644
--- a/src/psycstore/plugin_psycstore_sqlite.c
+++ b/src/psycstore/plugin_psycstore_sqlite.c
@@ -30,11 +30,11 @@
  *        thus it can only store 63 bits of the uint64_t's.
  */
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_psycstore_plugin.h"
 #include "gnunet_psycstore_service.h"
 #include "gnunet_multicast_service.h"
-#include "gnunet_crypto_lib.h"
+#include <gnunet/gnunet_crypto_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "psycstore.h"
 #include <sqlite3.h>
diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index 9a1c06a..dde714e 100644
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -27,7 +27,7 @@
 #ifndef GNUNET_PSYCSTORE_H
 #define GNUNET_PSYCSTORE_H
 
-#include "gnunet_common.h"
+#include <gnunet/gnunet_common.h>
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c
index ab4cd0f..6fe3af1 100644
--- a/src/psycstore/psycstore_api.c
+++ b/src/psycstore/psycstore_api.c
@@ -27,10 +27,10 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_constants.h>
+#include <gnunet/gnunet_protocols.h>
 #include "gnunet_psycstore_service.h"
 #include "gnunet_multicast_service.h"
 #include "psycstore.h"
diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c
index ff4eac8..b074ec1 100644
--- a/src/psycstore/test_plugin_psycstore.c
+++ b/src/psycstore/test_plugin_psycstore.c
@@ -28,9 +28,9 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psycstore_plugin.h"
 #include "gnunet_psycstore_service.h"
 #include "gnunet_multicast_service.h"
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c
index ca50904..76494a8 100644
--- a/src/psycstore/test_psycstore.c
+++ b/src/psycstore/test_psycstore.c
@@ -27,10 +27,10 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psycstore_service.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
diff --git a/src/psycutil/Makefile.am b/src/psycutil/Makefile.am
index 2732c3a..75f9f4e 100644
--- a/src/psycutil/Makefile.am
+++ b/src/psycutil/Makefile.am
@@ -1,5 +1,6 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include \
+  $(GNUNET_CPPFLAGS)
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -21,7 +22,7 @@ libgnunetpsycutil_la_SOURCES = \
   psyc_message.c \
   psyc_slicer.c
 libgnunetpsycutil_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL) $(XLIB)
 libgnunetpsycutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -41,5 +42,5 @@ test_psyc_env_SOURCES = \
  test_psyc_env.c
 test_psyc_env_LDADD = \
   libgnunetpsycutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
diff --git a/src/psycutil/psyc_env.c b/src/psycutil/psyc_env.c
index fc4b8eb..0e550ac 100644
--- a/src/psycutil/psyc_env.c
+++ b/src/psycutil/psyc_env.c
@@ -26,8 +26,8 @@
  * PSYC and Social messages.
  */
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_env.h"
 
 /**
diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c
index a03eff4..50ee8a9 100644
--- a/src/psycutil/psyc_message.c
+++ b/src/psycutil/psyc_message.c
@@ -26,8 +26,8 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psyc_service.h"
 
diff --git a/src/psycutil/psyc_slicer.c b/src/psycutil/psyc_slicer.c
index 9b25d8a..05639e2 100644
--- a/src/psycutil/psyc_slicer.c
+++ b/src/psycutil/psyc_slicer.c
@@ -27,8 +27,8 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_util_lib.h"
 
 #define LOG(kind,...) GNUNET_log_from (kind, "psyc-util-slicer",__VA_ARGS__)
diff --git a/src/psycutil/test_psyc_env.c b/src/psycutil/test_psyc_env.c
index 432e155..186f5ac 100644
--- a/src/psycutil/test_psyc_env.c
+++ b/src/psycutil/test_psyc_env.c
@@ -25,9 +25,9 @@
  * Tests for the environment library.
  */
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psyc_util_lib.h"
 
 struct GNUNET_PSYC_Modifier mods[] = {
diff --git a/src/social/Makefile.am b/src/social/Makefile.am
index 94a9ba1..bb125a8 100644
--- a/src/social/Makefile.am
+++ b/src/social/Makefile.am
@@ -1,5 +1,6 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include \
+  $(GNUNET_CPPFLAGS)
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetsocial.la
 libgnunetsocial_la_SOURCES = \
   social_api.c social.h
 libgnunetsocial_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetsocial_la_LDFLAGS = \
@@ -41,18 +42,18 @@ gnunet_social_SOURCES = \
 gnunet_social_LDADD = \
   libgnunetsocial.la \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunetutil
 
 gnunet_service_social_SOURCES = \
  gnunet-service-social.c
 gnunet_service_social_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  -lgnunetutil \
+  -lgnunetstatistics \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(top_builddir)/src/psyc/libgnunetpsyc.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  -lgnunetidentity \
+  -lgnunetgns \
+  -lgnunetnamestore \
   $(GN_LIBINTL)
 
 
@@ -70,10 +71,10 @@ test_social_SOURCES = \
  test_social.c
 test_social_LDADD = \
   libgnunetsocial.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunettesting \
+  -lgnunetutil \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la
+  -lgnunetidentity
 
 EXTRA_DIST = \
   test_social.conf
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index 33fabae..cda96e5 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -27,14 +27,14 @@
 #include <inttypes.h>
 #include <strings.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_statistics_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_constants.h>
+#include <gnunet/gnunet_protocols.h>
+#include <gnunet/gnunet_identity_service.h>
+#include <gnunet/gnunet_namestore_service.h>
+#include <gnunet/gnunet_gns_service.h>
+#include <gnunet/gnunet_statistics_service.h>
 #include "gnunet_psyc_service.h"
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_social_service.h"
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index 14701bf..d89b3d8 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -26,8 +26,8 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_social_service.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
diff --git a/src/social/social.h b/src/social/social.h
index 73f73f6..a6d325e 100644
--- a/src/social/social.h
+++ b/src/social/social.h
@@ -27,7 +27,7 @@
 #ifndef SOCIAL_H
 #define SOCIAL_H
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_social_service.h"
 
 enum MessageState
diff --git a/src/social/social_api.c b/src/social/social_api.c
index 9b96580..11f1eab 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -28,8 +28,8 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_service.h"
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_social_service.h"
diff --git a/src/social/test_social.c b/src/social/test_social.c
index feac3c5..3538ac8 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -25,14 +25,14 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_social_service.h"
-#include "gnunet_identity_service.h"
+#include <gnunet/gnunet_identity_service.h>
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)