Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

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"

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;
 }