diff --git a/src/debug_utils.h b/src/debug_utils.h
index 25238219d8ae077068d5cc39e79875739f201e0e..ea3fcbdf35785676b914ffe45679830131fa4cda 100644
--- a/src/debug_utils.h
+++ b/src/debug_utils.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "config.h"
-
 #include "libav_deps.h"
 #include "media_io_handle.h"
 #include "system_codec_container.h"
diff --git a/src/im/instant_messaging.h b/src/im/instant_messaging.h
index d24c76694b38c59f7df0e7cad8762f08e80ff8e3..fcef32eca8d578dadd11349579b0cf4b11b8c417 100644
--- a/src/im/instant_messaging.h
+++ b/src/im/instant_messaging.h
@@ -28,7 +28,9 @@
 #include <list>
 #include <stdexcept>
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 extern "C" {
 struct pjsip_inv_session;
diff --git a/src/jami/tracepoint-def.h b/src/jami/tracepoint-def.h
index cb812f6eee1dab1c7c6b7f90667f2639c10749ae..ed584c2957d474350dded927c3ad0b4a12790a1c 100644
--- a/src/jami/tracepoint-def.h
+++ b/src/jami/tracepoint-def.h
@@ -1,6 +1,7 @@
-#include "config.h"
-
 #ifdef ENABLE_TRACEPOINTS
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #undef LTTNG_UST_TRACEPOINT_PROVIDER
 #define LTTNG_UST_TRACEPOINT_PROVIDER jami
diff --git a/src/media/media_buffer.h b/src/media/media_buffer.h
index 93062e90871f4ae4710fa3023d93fd5ea342f0d5..5af829a422edbdb8996b05179faded039e96b58a 100644
--- a/src/media/media_buffer.h
+++ b/src/media/media_buffer.h
@@ -20,7 +20,10 @@
 
 #pragma once
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "videomanager_interface.h"
 #include "observer.h"
 
diff --git a/src/media/media_decoder.h b/src/media/media_decoder.h
index 34c22e398c107356a33d304a91b3359ecff7cf50..df33e1953bf576ef051a36cda719e289d15b68b8 100644
--- a/src/media/media_decoder.h
+++ b/src/media/media_decoder.h
@@ -19,7 +19,9 @@
  */
 #pragma once
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "rational.h"
 #include "observer.h"
diff --git a/src/media/media_encoder.h b/src/media/media_encoder.h
index 9c309491e718ee869c366e5a7bbb2be7b3c16f35..422d11f7c67fca3a2a3e55c0cbfcb914090c76cd 100644
--- a/src/media/media_encoder.h
+++ b/src/media/media_encoder.h
@@ -19,10 +19,11 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
-#ifndef __MEDIA_ENCODER_H__
-#define __MEDIA_ENCODER_H__
+#pragma once
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #ifdef ENABLE_VIDEO
 #include "video/video_base.h"
@@ -183,5 +184,3 @@ protected:
 };
 
 } // namespace jami
-
-#endif // __MEDIA_ENCODER_H__
diff --git a/src/media/media_filter.h b/src/media/media_filter.h
index d9c6cc452f9a62647cb48298256ac12f243d89f0..1b46413bdda155f09b7e5483145a6541c90eec62 100644
--- a/src/media/media_filter.h
+++ b/src/media/media_filter.h
@@ -20,7 +20,10 @@
 
 #pragma once
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "media_stream.h"
 #include "noncopyable.h"
 
diff --git a/src/media/media_recorder.h b/src/media/media_recorder.h
index e3da21d57afbb31d1bb5ff4e5373aea9e66ac7ad..2f7cbf4edff2713393dfd9f1bd8b5c42cd6b9b9c 100644
--- a/src/media/media_recorder.h
+++ b/src/media/media_recorder.h
@@ -20,7 +20,9 @@
 
 #pragma once
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include "media_buffer.h"
 #include "media_encoder.h"
 #include "media_filter.h"
diff --git a/src/media/video/accel.cpp b/src/media/video/accel.cpp
index 314ca8696da914be609732877c59b97dbe2cc40b..b95f7bec0e0de5f7986b78afecea2e265dd57e1c 100644
--- a/src/media/video/accel.cpp
+++ b/src/media/video/accel.cpp
@@ -21,12 +21,15 @@
 
 #include <algorithm>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "media_buffer.h"
 #include "string_utils.h"
 #include "fileutils.h"
 #include "logger.h"
 #include "accel.h"
-#include "config.h"
 
 namespace jami {
 namespace video {