2 files changed, 5 insertions, 1 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 236dec7c4..4d682c60d 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -54,13 +54,17 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_transport_tcp_la_SOURCES = \
   plugin_transport_tcp.c
 libgnunet_plugin_transport_tcp_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/resolver/libgnunetresolver.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_tcp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_template_la_SOURCES = \
   plugin_transport_template.c
+libgnunet_plugin_transport_template_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 6c4e94e04..ea22b9f12 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -255,7 +255,7 @@ stop_arm (struct PeerContext *p)
 #if START_ARM
   if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  waitpid (p->arm_pid, NULL, 0);
+  GNUNET_OS_process_wait(p->arm_pid);
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }