59 files changed, 47 insertions, 30 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index c7d7b562a..e31709946 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,6 @@ SUBDIRS = \
   dns \
   namecache \
   namestore \
-  cadet \
   set \
   seti \
   setu \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index aac883508..a7cf2eb01 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -4,4 +4,5 @@ SUBDIRS = \
         statistics \
         core \
         nat \
-        nse
+        nse \
+        cadet
diff --git a/src/cli/cadet/.gitignore b/src/cli/cadet/.gitignore
new file mode 100644
index 000000000..bcd7158aa
--- /dev/null
+++ b/src/cli/cadet/.gitignore
@@ -0,0 +1 @@
+gnunet-cadet
diff --git a/src/cli/cadet/Makefile.am b/src/cli/cadet/Makefile.am
new file mode 100644
index 000000000..fc9caa12c
--- /dev/null
+++ b/src/cli/cadet/Makefile.am
@@ -0,0 +1,26 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+AM_CLFAGS = -g
+
+bin_PROGRAMS = \
+ gnunet-cadet
+
+gnunet_cadet_SOURCES = \
+  gnunet-cadet.c
+gnunet_cadet_LDADD = \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_cadet_LDFLAGS = \
+  $(GN_LIBINTL)
diff --git a/src/cadet/gnunet-cadet.c b/src/cli/cadet/gnunet-cadet.c
index 9b7538ae7..c77fb914c 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cli/cadet/gnunet-cadet.c
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_cadet_service.h"
-#include "cadet.h"
+#include "../../service/cadet/cadet.h" // FIXME Smell: this should not be shared like this.
 
 #define STREAM_BUFFER_SIZE 1024 // Pakets
 
diff --git a/src/contrib/service/rps/Makefile.am b/src/contrib/service/rps/Makefile.am
index 34532d67c..28aa3e050 100644
--- a/src/contrib/service/rps/Makefile.am
+++ b/src/contrib/service/rps/Makefile.am
@@ -62,7 +62,7 @@ gnunet_service_rps_LDADD = \
   libgnunetrps.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/nse/libgnunetnse.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 366c4a199..4fca1ee79 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -183,7 +183,7 @@ gnunet_service_conversation_LDADD = \
   libgnunetconversation.la \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(INTLLIBS)
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index c2dba0927..9864055e8 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -33,6 +33,6 @@ gnunet_daemon_exit_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/regex/libgnunetregex.la \
   $(GN_LIBINTL)
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 8616c0474..e923955b5 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -177,7 +177,7 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/lib/block/libgnunetblock.la \
  $(top_builddir)/src/datastore/libgnunetdatastore.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
  $(top_builddir)/src/service/core/libgnunetcore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
index 60b2314ac..e02414541 100644
--- a/src/messenger/Makefile.am
+++ b/src/messenger/Makefile.am
@@ -53,7 +53,7 @@ libgnunetmessenger_la_SOURCES = \
   messenger_api_room.c messenger_api_room.h
 libgnunetmessenger_la_LIBADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(XLIB) \
   $(LTLIBINTL)
@@ -93,7 +93,7 @@ gnunet_service_messenger_SOURCES = \
 gnunet_service_messenger_LDADD = \
   libgnunetmessenger.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(GN_LIBINTL)
 
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 8a171ec0e..98578d7dd 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -21,7 +21,7 @@ gnunet_daemon_pt_SOURCES = \
  gnunet-daemon-pt.c
 gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/vpn/libgnunetvpn.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/dns/libgnunetdns.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 9ad63b309..77a17ec20 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -38,7 +38,7 @@ gnunet_service_scalarproduct_alice_SOURCES = \
   gnunet-service-scalarproduct_alice.c
 gnunet_service_scalarproduct_alice_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lgcrypt \
@@ -49,7 +49,7 @@ gnunet_service_scalarproduct_bob_SOURCES = \
   gnunet-service-scalarproduct_bob.c
 gnunet_service_scalarproduct_bob_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lgcrypt \
@@ -60,7 +60,7 @@ gnunet_service_scalarproduct_ecc_alice_SOURCES = \
   gnunet-service-scalarproduct-ecc_alice.c
 gnunet_service_scalarproduct_ecc_alice_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lsodium \
@@ -72,7 +72,7 @@ gnunet_service_scalarproduct_ecc_bob_SOURCES = \
   gnunet-service-scalarproduct-ecc_bob.c
 gnunet_service_scalarproduct_ecc_bob_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lsodium \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 5c92e730e..6317053c1 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -9,4 +9,5 @@ SUBDIRS = \
         core \
         nse \
         identity \
-        rest
+        rest \
+        cadet
diff --git a/src/cadet/.gitignore b/src/service/cadet/.gitignore
index e72d81bd8..e72d81bd8 100644
--- a/src/cadet/.gitignore
+++ b/src/service/cadet/.gitignore
diff --git a/src/cadet/Makefile.am b/src/service/cadet/Makefile.am
index 217c4847e..6983c1f2d 100644
--- a/src/cadet/Makefile.am
+++ b/src/service/cadet/Makefile.am
@@ -20,9 +20,6 @@ AM_CLFAGS = -g
 libexec_PROGRAMS = \
  gnunet-service-cadet
 
-bin_PROGRAMS = \
- gnunet-cadet
-
 lib_LTLIBRARIES = \
   libgnunetcadet.la
 
@@ -42,14 +39,6 @@ libgnunetcadet_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  \
   -version-info 7:0:0
 
-gnunet_cadet_SOURCES = \
-  gnunet-cadet.c
-gnunet_cadet_LDADD = \
-  libgnunetcadet.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_cadet_LDFLAGS = \
-  $(GN_LIBINTL)
-
 gnunet_service_cadet_SOURCES = \
  gnunet-service-cadet.c gnunet-service-cadet.h \
  gnunet-service-cadet_channel.c gnunet-service-cadet_channel.h \
diff --git a/src/cadet/TODO b/src/service/cadet/TODO
index 06567b0ad..06567b0ad 100644
--- a/src/cadet/TODO
+++ b/src/service/cadet/TODO
diff --git a/src/cadet/cadet.conf.in b/src/service/cadet/cadet.conf.in
index 8f700951c..8f700951c 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/service/cadet/cadet.conf.in
diff --git a/src/cadet/cadet.h b/src/service/cadet/cadet.h
index e8caa7d35..e8caa7d35 100644
--- a/src/cadet/cadet.h
+++ b/src/service/cadet/cadet.h
diff --git a/src/cadet/cadet_api.c b/src/service/cadet/cadet_api.c
index 0bfb01868..0bfb01868 100644
--- a/src/cadet/cadet_api.c
+++ b/src/service/cadet/cadet_api.c
diff --git a/src/cadet/cadet_api_drop_message.c b/src/service/cadet/cadet_api_drop_message.c
index e172418c4..e172418c4 100644
--- a/src/cadet/cadet_api_drop_message.c
+++ b/src/service/cadet/cadet_api_drop_message.c
diff --git a/src/cadet/cadet_api_get_channel.c b/src/service/cadet/cadet_api_get_channel.c
index 05e2a8383..05e2a8383 100644
--- a/src/cadet/cadet_api_get_channel.c
+++ b/src/service/cadet/cadet_api_get_channel.c
diff --git a/src/cadet/cadet_api_get_path.c b/src/service/cadet/cadet_api_get_path.c
index f32a5e20b..f32a5e20b 100644
--- a/src/cadet/cadet_api_get_path.c
+++ b/src/service/cadet/cadet_api_get_path.c
diff --git a/src/cadet/cadet_api_helper.c b/src/service/cadet/cadet_api_helper.c
index 52aec6cc9..52aec6cc9 100644
--- a/src/cadet/cadet_api_helper.c
+++ b/src/service/cadet/cadet_api_helper.c
diff --git a/src/cadet/cadet_api_list_peers.c b/src/service/cadet/cadet_api_list_peers.c
index 52f59cc74..52f59cc74 100644
--- a/src/cadet/cadet_api_list_peers.c
+++ b/src/service/cadet/cadet_api_list_peers.c
diff --git a/src/cadet/cadet_api_list_tunnels.c b/src/service/cadet/cadet_api_list_tunnels.c
index dce12835f..dce12835f 100644
--- a/src/cadet/cadet_api_list_tunnels.c
+++ b/src/service/cadet/cadet_api_list_tunnels.c
diff --git a/src/cadet/cadet_protocol.h b/src/service/cadet/cadet_protocol.h
index 117a7922e..117a7922e 100644
--- a/src/cadet/cadet_protocol.h
+++ b/src/service/cadet/cadet_protocol.h
diff --git a/src/cadet/cadet_test_lib.c b/src/service/cadet/cadet_test_lib.c
index 9c7b9063d..9c7b9063d 100644
--- a/src/cadet/cadet_test_lib.c
+++ b/src/service/cadet/cadet_test_lib.c
diff --git a/src/cadet/cadet_test_lib.h b/src/service/cadet/cadet_test_lib.h
index 7d446801a..7d446801a 100644
--- a/src/cadet/cadet_test_lib.h
+++ b/src/service/cadet/cadet_test_lib.h
diff --git a/src/cadet/desirability_table.c b/src/service/cadet/desirability_table.c
index b4db7c2dd..b4db7c2dd 100644
--- a/src/cadet/desirability_table.c
+++ b/src/service/cadet/desirability_table.c
diff --git a/src/cadet/gnunet-service-cadet.c b/src/service/cadet/gnunet-service-cadet.c
index 620e43cc8..620e43cc8 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/service/cadet/gnunet-service-cadet.c
diff --git a/src/cadet/gnunet-service-cadet.h b/src/service/cadet/gnunet-service-cadet.h
index 8f2386d00..8f2386d00 100644
--- a/src/cadet/gnunet-service-cadet.h
+++ b/src/service/cadet/gnunet-service-cadet.h
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/service/cadet/gnunet-service-cadet_channel.c
index 78658c296..78658c296 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/service/cadet/gnunet-service-cadet_channel.c
diff --git a/src/cadet/gnunet-service-cadet_channel.h b/src/service/cadet/gnunet-service-cadet_channel.h
index b09de883f..b09de883f 100644
--- a/src/cadet/gnunet-service-cadet_channel.h
+++ b/src/service/cadet/gnunet-service-cadet_channel.h
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/service/cadet/gnunet-service-cadet_connection.c
index f01c1388e..f01c1388e 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/service/cadet/gnunet-service-cadet_connection.c
diff --git a/src/cadet/gnunet-service-cadet_connection.h b/src/service/cadet/gnunet-service-cadet_connection.h
index 54c845b13..54c845b13 100644
--- a/src/cadet/gnunet-service-cadet_connection.h
+++ b/src/service/cadet/gnunet-service-cadet_connection.h
diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/service/cadet/gnunet-service-cadet_core.c
index 68f7405c3..68f7405c3 100644
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/service/cadet/gnunet-service-cadet_core.c
diff --git a/src/cadet/gnunet-service-cadet_core.h b/src/service/cadet/gnunet-service-cadet_core.h
index 3438dcb31..3438dcb31 100644
--- a/src/cadet/gnunet-service-cadet_core.h
+++ b/src/service/cadet/gnunet-service-cadet_core.h
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/service/cadet/gnunet-service-cadet_dht.c
index 9a8082339..9a8082339 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/service/cadet/gnunet-service-cadet_dht.c
diff --git a/src/cadet/gnunet-service-cadet_dht.h b/src/service/cadet/gnunet-service-cadet_dht.h
index bcc27f5d2..bcc27f5d2 100644
--- a/src/cadet/gnunet-service-cadet_dht.h
+++ b/src/service/cadet/gnunet-service-cadet_dht.h
diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/service/cadet/gnunet-service-cadet_hello.c
index 135fde25a..135fde25a 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/service/cadet/gnunet-service-cadet_hello.c
diff --git a/src/cadet/gnunet-service-cadet_hello.h b/src/service/cadet/gnunet-service-cadet_hello.h
index 88c955bb9..88c955bb9 100644
--- a/src/cadet/gnunet-service-cadet_hello.h
+++ b/src/service/cadet/gnunet-service-cadet_hello.h
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/service/cadet/gnunet-service-cadet_paths.c
index 83b996e05..83b996e05 100644
--- a/src/cadet/gnunet-service-cadet_paths.c
+++ b/src/service/cadet/gnunet-service-cadet_paths.c
diff --git a/src/cadet/gnunet-service-cadet_paths.h b/src/service/cadet/gnunet-service-cadet_paths.h
index 0f3b4dd1a..0f3b4dd1a 100644
--- a/src/cadet/gnunet-service-cadet_paths.h
+++ b/src/service/cadet/gnunet-service-cadet_paths.h
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/service/cadet/gnunet-service-cadet_peer.c
index 03e8b8962..03e8b8962 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/service/cadet/gnunet-service-cadet_peer.c
diff --git a/src/cadet/gnunet-service-cadet_peer.h b/src/service/cadet/gnunet-service-cadet_peer.h
index 4c5ad4252..4c5ad4252 100644
--- a/src/cadet/gnunet-service-cadet_peer.h
+++ b/src/service/cadet/gnunet-service-cadet_peer.h
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/service/cadet/gnunet-service-cadet_tunnels.c
index c7e422926..c7e422926 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/service/cadet/gnunet-service-cadet_tunnels.c
diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/service/cadet/gnunet-service-cadet_tunnels.h
index e893955a0..e893955a0 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.h
+++ b/src/service/cadet/gnunet-service-cadet_tunnels.h
diff --git a/src/cadet/loopcheck.sh b/src/service/cadet/loopcheck.sh
index 9b867e95b..9b867e95b 100755
--- a/src/cadet/loopcheck.sh
+++ b/src/service/cadet/loopcheck.sh
diff --git a/src/cadet/meson.build b/src/service/cadet/meson.build
index a961c8e76..a961c8e76 100644
--- a/src/cadet/meson.build
+++ b/src/service/cadet/meson.build
diff --git a/src/cadet/profiler.conf b/src/service/cadet/profiler.conf
index 7ce283870..7ce283870 100644
--- a/src/cadet/profiler.conf
+++ b/src/service/cadet/profiler.conf
diff --git a/src/cadet/run_profiler.sh b/src/service/cadet/run_profiler.sh
index 4273dcd27..4273dcd27 100755
--- a/src/cadet/run_profiler.sh
+++ b/src/service/cadet/run_profiler.sh
diff --git a/src/cadet/small.dat b/src/service/cadet/small.dat
index c3805ee80..c3805ee80 100644
--- a/src/cadet/small.dat
+++ b/src/service/cadet/small.dat
diff --git a/src/cadet/test_cadet.conf b/src/service/cadet/test_cadet.conf
index 79c86bb59..79c86bb59 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/service/cadet/test_cadet.conf
diff --git a/src/cadet/test_cadet_local_mq.c b/src/service/cadet/test_cadet_local_mq.c
index 6f75dfd1f..6f75dfd1f 100644
--- a/src/cadet/test_cadet_local_mq.c
+++ b/src/service/cadet/test_cadet_local_mq.c
diff --git a/src/cadet/valgrind-cadet.supp b/src/service/cadet/valgrind-cadet.supp
index fecd5185b..fecd5185b 100644
--- a/src/cadet/valgrind-cadet.supp
+++ b/src/service/cadet/valgrind-cadet.supp
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 150da06e0..88d4d39ad 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -52,7 +52,7 @@ gnunet_service_set_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   libgnunetset.la \
   $(GN_LIBINTL)
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am
index 46e200516..c2d31df9c 100644
--- a/src/seti/Makefile.am
+++ b/src/seti/Makefile.am
@@ -40,7 +40,7 @@ gnunet_service_seti_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   libgnunetseti.la \
   $(GN_LIBINTL)
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am
index f826c9e2a..f7f8ed394 100644
--- a/src/setu/Makefile.am
+++ b/src/setu/Makefile.am
@@ -50,7 +50,7 @@ gnunet_service_setu_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   libgnunetsetu.la \
   $(GN_LIBINTL)
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 2f102a3fd..2f465731c 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -41,7 +41,7 @@ gnunet_service_vpn_SOURCES = \
 gnunet_service_vpn_LDADD = \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/regex/libgnunetregex.la \
   $(GN_LIBINTL)
 gnunet_service_vpn_CFLAGS = \