add missing includes, cleanup
Change-Id: Ifea313cc529a6c21c040b99748b2b5f502d021fe
diff --git a/include/ice_options.h b/include/ice_options.h
index 1bdc760..d3a9e83 100644
--- a/include/ice_options.h
+++ b/include/ice_options.h
@@ -1,10 +1,11 @@
#pragma once
+#include "ip_utils.h"
+
#include <functional>
#include <vector>
#include <string>
-
-#include "ip_utils.h"
+#include <memory>
namespace dhtnet {
diff --git a/include/ice_socket.h b/include/ice_socket.h
index 46f47b7..5e3c175 100644
--- a/include/ice_socket.h
+++ b/include/ice_socket.h
@@ -21,6 +21,7 @@
#include <memory>
#include <functional>
+#include <chrono>
#if defined(_MSC_VER)
#include <BaseTsd.h>
diff --git a/include/ice_transport.h b/include/ice_transport.h
index 8fc447d..7403e99 100644
--- a/include/ice_transport.h
+++ b/include/ice_transport.h
@@ -23,10 +23,12 @@
#include "ice_options.h"
#include "ip_utils.h"
+#include <msgpack.hpp>
+
#include <functional>
#include <memory>
-#include <msgpack.hpp>
#include <vector>
+#include <chrono>
extern "C" {
struct pj_ice_sess_cand;
diff --git a/include/ip_utils.h b/include/ip_utils.h
index f37e80a..cf88124 100644
--- a/include/ip_utils.h
+++ b/include/ip_utils.h
@@ -16,10 +16,6 @@
*/
#pragma once
-#ifdef HAVE_CONFIG
-#include <config.h>
-#endif
-
#include <sstream> // include before pjlib.h to fix macros issues with pjlib.h
extern "C" {
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index b47353b..9b73507 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -43,7 +43,7 @@
#include <algorithm>
#include <sstream>
#include <chrono>
-#include <thread>
+#include <memory>
#include <cerrno>
#include "pj/limits.h"
diff --git a/src/tracepoint/tracepoint-def.h b/src/tracepoint/tracepoint-def.h
index ed584c2..439a80d 100644
--- a/src/tracepoint/tracepoint-def.h
+++ b/src/tracepoint/tracepoint-def.h
@@ -1,7 +1,4 @@
#ifdef ENABLE_TRACEPOINTS
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
#undef LTTNG_UST_TRACEPOINT_PROVIDER
#define LTTNG_UST_TRACEPOINT_PROVIDER jami