diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index 7e66c344e72f6455761db75582558883187ee603..92be7e3afaf5a64a1ef3fc4c8d9abc0528d57889 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -31,6 +31,7 @@
  */
 
 #include "sdp.h"
+#include "sdpmedia.h"
 #include "global.h"
 #include "manager.h"
 #define ZRTP_VERSION "1.10"
diff --git a/sflphone-common/src/sip/sdp.h b/sflphone-common/src/sip/sdp.h
index 99c23a7413ad687f099ba097c7da75fb4df5bf67..7534d409ddd08490f98e1f23c886311fbe678b8c 100644
--- a/sflphone-common/src/sip/sdp.h
+++ b/sflphone-common/src/sip/sdp.h
@@ -41,11 +41,12 @@
 #include <pj/pool.h>
 #include <pj/assert.h>
 #include <vector>
-
-#include "sdpmedia.h"
-
+#include <string>
 #include <exception>
 
+#include "global.h" // FIXME: CodecOrder shouldn't be in global.h
+class sdpMedia;
+
 namespace sfl {
     class AudioCodec;
 }