30 files changed, 24 insertions, 59 deletions

diff --git a/src/messenger/gnunet-messenger.c b/src/messenger/gnunet-messenger.c
index 40f3e1d32..9444fa12d 100644
--- a/src/messenger/gnunet-messenger.c
+++ b/src/messenger/gnunet-messenger.c
@@ -26,7 +26,6 @@
 #include "platform.h"
 #include <stdio.h>
 
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_messenger_service.h"
 
diff --git a/src/messenger/gnunet-service-messenger.h b/src/messenger/gnunet-service-messenger.h
index 253fbaadb..1db5c651c 100644
--- a/src/messenger/gnunet-service-messenger.h
+++ b/src/messenger/gnunet-service-messenger.h
@@ -28,11 +28,7 @@
 
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/messenger/gnunet-service-messenger_ego_store.h b/src/messenger/gnunet-service-messenger_ego_store.h
index dbe6c05b9..a5f8a69d8 100644
--- a/src/messenger/gnunet-service-messenger_ego_store.h
+++ b/src/messenger/gnunet-service-messenger_ego_store.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_EGO_STORE_H
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 #include "messenger_api_ego.h"
 
diff --git a/src/messenger/gnunet-service-messenger_handle.h b/src/messenger/gnunet-service-messenger_handle.h
index c596f4d3b..edcd2ccd0 100644
--- a/src/messenger/gnunet-service-messenger_handle.h
+++ b/src/messenger/gnunet-service-messenger_handle.h
@@ -28,11 +28,8 @@
 
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_mq_lib.h"
 
 #include "gnunet-service-messenger_service.h"
 #include "gnunet-service-messenger_member_session.h"
diff --git a/src/messenger/gnunet-service-messenger_list_handles.h b/src/messenger/gnunet-service-messenger_list_handles.h
index f41807d00..8c066519e 100644
--- a/src/messenger/gnunet-service-messenger_list_handles.h
+++ b/src/messenger/gnunet-service-messenger_list_handles.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 struct GNUNET_MESSENGER_SrvHandle;
 
diff --git a/src/messenger/gnunet-service-messenger_list_messages.h b/src/messenger/gnunet-service-messenger_list_messages.h
index e270209c8..5839f63ca 100644
--- a/src/messenger/gnunet-service-messenger_list_messages.h
+++ b/src/messenger/gnunet-service-messenger_list_messages.h
@@ -27,9 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
 
 struct GNUNET_MESSENGER_ListMessage
 {
diff --git a/src/messenger/gnunet-service-messenger_member_session.h b/src/messenger/gnunet-service-messenger_member_session.h
index fcde2c3de..9b4065d05 100644
--- a/src/messenger/gnunet-service-messenger_member_session.h
+++ b/src/messenger/gnunet-service-messenger_member_session.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_time_lib.h"
 
diff --git a/src/messenger/gnunet-service-messenger_member_store.h b/src/messenger/gnunet-service-messenger_member_store.h
index c3f6d478a..05b00f39a 100644
--- a/src/messenger/gnunet-service-messenger_member_store.h
+++ b/src/messenger/gnunet-service-messenger_member_store.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "messenger_api_message.h"
 
diff --git a/src/messenger/gnunet-service-messenger_message_handle.h b/src/messenger/gnunet-service-messenger_message_handle.h
index 62940e6b6..0a97cd840 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.h
+++ b/src/messenger/gnunet-service-messenger_message_handle.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 #include "gnunet-service-messenger_message_kind.h"
 
diff --git a/src/messenger/gnunet-service-messenger_message_kind.h b/src/messenger/gnunet-service-messenger_message_kind.h
index d07680dfc..102a70e33 100644
--- a/src/messenger/gnunet-service-messenger_message_kind.h
+++ b/src/messenger/gnunet-service-messenger_message_kind.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_time_lib.h"
 
diff --git a/src/messenger/gnunet-service-messenger_message_recv.h b/src/messenger/gnunet-service-messenger_message_recv.h
index b4304762b..8e5b02504 100644
--- a/src/messenger/gnunet-service-messenger_message_recv.h
+++ b/src/messenger/gnunet-service-messenger_message_recv.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 #include "gnunet-service-messenger_message_kind.h"
 
diff --git a/src/messenger/gnunet-service-messenger_message_send.h b/src/messenger/gnunet-service-messenger_message_send.h
index 8d782c5a6..4f4c6cfc2 100644
--- a/src/messenger/gnunet-service-messenger_message_send.h
+++ b/src/messenger/gnunet-service-messenger_message_send.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 #include "gnunet-service-messenger_message_kind.h"
 
diff --git a/src/messenger/gnunet-service-messenger_message_state.h b/src/messenger/gnunet-service-messenger_message_state.h
index af52b26b6..10e6a2c46 100644
--- a/src/messenger/gnunet-service-messenger_message_state.h
+++ b/src/messenger/gnunet-service-messenger_message_state.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 #include "messenger_api_message.h"
 #include "gnunet-service-messenger_list_messages.h"
diff --git a/src/messenger/gnunet-service-messenger_message_store.h b/src/messenger/gnunet-service-messenger_message_store.h
index 60efb1380..262d10555 100644
--- a/src/messenger/gnunet-service-messenger_message_store.h
+++ b/src/messenger/gnunet-service-messenger_message_store.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_STORE_H
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
 
 struct GNUNET_MESSENGER_MessageEntry
 {
diff --git a/src/messenger/gnunet-service-messenger_operation.h b/src/messenger/gnunet-service-messenger_operation.h
index 8d09ed1b7..b93282d24 100644
--- a/src/messenger/gnunet-service-messenger_operation.h
+++ b/src/messenger/gnunet-service-messenger_operation.h
@@ -28,9 +28,8 @@
 
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_scheduler_lib.h"
-#include "gnunet_strings_lib.h"
 #include "gnunet_time_lib.h"
 
 enum GNUNET_MESSENGER_OperationType
diff --git a/src/messenger/gnunet-service-messenger_operation_store.h b/src/messenger/gnunet-service-messenger_operation_store.h
index db315f251..16531758c 100644
--- a/src/messenger/gnunet-service-messenger_operation_store.h
+++ b/src/messenger/gnunet-service-messenger_operation_store.h
@@ -27,9 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_OPERATION_STORE_H
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_time_lib.h"
 
 struct GNUNET_MESSENGER_SrvRoom;
diff --git a/src/messenger/gnunet-service-messenger_room.h b/src/messenger/gnunet-service-messenger_room.h
index 6767d96cb..2e9382595 100644
--- a/src/messenger/gnunet-service-messenger_room.h
+++ b/src/messenger/gnunet-service-messenger_room.h
@@ -28,10 +28,8 @@
 
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
 
 #include "gnunet_messenger_service.h"
 #include "gnunet-service-messenger_basement.h"
diff --git a/src/messenger/gnunet-service-messenger_service.h b/src/messenger/gnunet-service-messenger_service.h
index 55e8b6c50..36df81141 100644
--- a/src/messenger/gnunet-service-messenger_service.h
+++ b/src/messenger/gnunet-service-messenger_service.h
@@ -28,9 +28,7 @@
 
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 
 #include "gnunet-service-messenger_ego_store.h"
diff --git a/src/messenger/gnunet-service-messenger_tunnel.h b/src/messenger/gnunet-service-messenger_tunnel.h
index 13cf924f9..2ffa2d04f 100644
--- a/src/messenger/gnunet-service-messenger_tunnel.h
+++ b/src/messenger/gnunet-service-messenger_tunnel.h
@@ -28,8 +28,7 @@
 
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 #include "gnunet-service-messenger_room.h"
 #include "gnunet-service-messenger_message_state.h"
diff --git a/src/messenger/messenger_api_contact.h b/src/messenger/messenger_api_contact.h
index 6619d8fa2..e2919bcc3 100644
--- a/src/messenger/messenger_api_contact.h
+++ b/src/messenger/messenger_api_contact.h
@@ -27,7 +27,7 @@
 #define GNUNET_MESSENGER_API_CONTACT_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 
 struct GNUNET_MESSENGER_Contact
diff --git a/src/messenger/messenger_api_contact_store.h b/src/messenger/messenger_api_contact_store.h
index 1cdd3197b..c74a67740 100644
--- a/src/messenger/messenger_api_contact_store.h
+++ b/src/messenger/messenger_api_contact_store.h
@@ -27,8 +27,7 @@
 #define GNUNET_MESSENGER_API_CONTACT_STORE_H
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 
 struct GNUNET_MESSENGER_Contact;
diff --git a/src/messenger/messenger_api_handle.h b/src/messenger/messenger_api_handle.h
index 8430f40d5..d246855ff 100644
--- a/src/messenger/messenger_api_handle.h
+++ b/src/messenger/messenger_api_handle.h
@@ -28,10 +28,8 @@
 
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_peer_lib.h"
 
 #include "gnunet_messenger_service.h"
 
diff --git a/src/messenger/messenger_api_list_tunnels.h b/src/messenger/messenger_api_list_tunnels.h
index e28935c3e..d2ceeafc2 100644
--- a/src/messenger/messenger_api_list_tunnels.h
+++ b/src/messenger/messenger_api_list_tunnels.h
@@ -27,8 +27,7 @@
 #define GNUNET_MESSENGER_API_LIST_TUNNELS_H
 
 #include "platform.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 struct GNUNET_MESSENGER_ListTunnel
 {
diff --git a/src/messenger/messenger_api_message.h b/src/messenger/messenger_api_message.h
index 209d80a4e..688c72994 100644
--- a/src/messenger/messenger_api_message.h
+++ b/src/messenger/messenger_api_message.h
@@ -27,9 +27,8 @@
 #define GNUNET_MESSENGER_API_MESSAGE_H
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
 #include "gnunet_signatures.h"
 
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/messenger_api_room.h b/src/messenger/messenger_api_room.h
index cf8ab782b..d5ffc5c4b 100644
--- a/src/messenger/messenger_api_room.h
+++ b/src/messenger/messenger_api_room.h
@@ -27,8 +27,7 @@
 #define GNUNET_MESSENGER_API_ROOM_H
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 #include "gnunet_messenger_service.h"
 
diff --git a/src/messenger/messenger_api_util.h b/src/messenger/messenger_api_util.h
index 0597b94a8..3d68505a8 100644
--- a/src/messenger/messenger_api_util.h
+++ b/src/messenger/messenger_api_util.h
@@ -28,9 +28,7 @@
 
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_messenger_service.h"
 
diff --git a/src/messenger/plugin_gnsrecord_messenger.c b/src/messenger/plugin_gnsrecord_messenger.c
index eff3f62c4..e09a0330d 100644
--- a/src/messenger/plugin_gnsrecord_messenger.c
+++ b/src/messenger/plugin_gnsrecord_messenger.c
@@ -25,7 +25,6 @@
  */
 
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/test_messenger.c b/src/messenger/test_messenger.c
index 30fa22db1..8758ce562 100644
--- a/src/messenger/test_messenger.c
+++ b/src/messenger/test_messenger.c
@@ -24,7 +24,6 @@
  */
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/test_messenger_anonymous.c b/src/messenger/test_messenger_anonymous.c
index 15895ae9b..13f2b6f0e 100644
--- a/src/messenger/test_messenger_anonymous.c
+++ b/src/messenger/test_messenger_anonymous.c
@@ -24,7 +24,6 @@
  */
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/testing_messenger_setup.c b/src/messenger/testing_messenger_setup.c
index ee278ea77..65cf12e73 100644
--- a/src/messenger/testing_messenger_setup.c
+++ b/src/messenger/testing_messenger_setup.c
@@ -27,7 +27,6 @@
 #include "testing_messenger_setup.h"
 
 #include <stdio.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_logger_service.h"
 #include "gnunet_testbed_service.h"