diff --git a/src/edge_management.c b/src/edge_management.c
index 42b78fa..3741b04 100644
--- a/src/edge_management.c
+++ b/src/edge_management.c
@@ -16,11 +16,33 @@
  *
  */
 
-#include "n2n.h"
-#include "edge_utils_win32.h"
+#include "n2n.h"           // for n2n_edge_t, peer_info, getTraceLevel, N2N_...
+// FIXME: if this headers is sorted alphabetically, the test_integration_edge
+// fails with what looks like a struct rearrangement involving eee->stats
 
-#include "strbuf.h"
-#include "management.h"
+#include <errno.h>         // for errno
+#include <stdint.h>        // for uint32_t
+#include <stdio.h>         // for snprintf, size_t, NULL
+#include <string.h>        // for memcmp, memcpy, strerror, strncpy
+#include <sys/types.h>     // for ssize_t
+#include <time.h>          // for time, time_t
+#include "config.h"        // for PACKAGE_VERSION
+#include "management.h"    // for mgmt_req_t, send_reply, send_json_1str
+#include "n2n_define.h"    // for N2N_PKT_BUF_SIZE, N2N_EVENT_DEBUG, N2N_EVE...
+#include "n2n_typedefs.h"  // for n2n_edge_t, peer_info, n2n_edge_conf_t
+#include "sn_selection.h"  // for sn_selection_criterion_str, selection_crit...
+#include "strbuf.h"        // for strbuf_t, STRBUF_INIT
+#include "uthash.h"        // for UT_hash_handle, HASH_ITER
+
+#ifdef WIN32
+#include <winsock.h>
+#include <ws2tcpip.h>
+#include "edge_utils_win32.h"
+#else
+#include <arpa/inet.h>     // for inet_ntoa
+#include <netinet/in.h>    // for in_addr, htonl, in_addr_t
+#include <sys/socket.h>    // for sendto, recvfrom, sockaddr_storage
+#endif
 
 size_t event_debug (strbuf_t *buf, char *tag, int data0, void *data1) {
     traceEvent(TRACE_DEBUG, "Unexpected call to event_debug");