diff --git a/include/ice_options.h b/include/ice_options.h
index 1bdc760148132fee1a43b6f7b43b163e2e0b2b0d..d3a9e83f3fa3bcce7bb193451f3eb49e879df1f0 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 46f47b79f81bb3c6b69d2ee51f84a923f8c94687..5e3c1750ec784063cdd527c94cea34848cb63485 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 8fc447d0f96a2bdf48553ad4f9e21ada7908e3f5..7403e9912caf221fc9b53db9916ff658370730c4 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 f37e80a29bb8f8e48c044c06511578ad4934d9a1..cf88124b8a31d6f241b18b0fb49db7e0ce3321a4 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 b47353be4013eaf8cfaaf0cb33f6c1ca961df578..9b73507eb91052ad483c582fd5792b6d9b3ed70e 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 ed584c2957d474350dded927c3ad0b4a12790a1c..439a80d7e91d707ab83c06f39760a071ec3984f6 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