*/
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_service_lib.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
#include "gnunet_transport_plugin.h"
};
-#define GNUNET_NETWORK_STRUCT_BEGIN
+GNUNET_NETWORK_STRUCT_BEGIN
struct TemplateAddress
{