diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 96942b099..d0936136c 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -30,6 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "linphone/sipsetup.h"
 #endif
 
+#include "lpconfig.h"
+
 #define LINPHONE_IPADDR_SIZE 64
 #define LINPHONE_HOSTNAME_SIZE 128
 
@@ -48,10 +50,6 @@ struct _LinphoneCore;
  */
 typedef struct _LinphoneCore LinphoneCore;
 
-struct _LpConfig;
-
-typedef struct _LpConfig LpConfig;
-
 
 /**
  * Disable a sip transport
diff --git a/coreapi/lpconfig.h b/coreapi/lpconfig.h
index 869d572eb..f413bf7a6 100644
--- a/coreapi/lpconfig.h
+++ b/coreapi/lpconfig.h
@@ -24,9 +24,13 @@
  
 #ifndef LPCONFIG_H
 #define LPCONFIG_H
-#include "linphonecore.h" /*to get LINPHONE_PUBLIC, maybe we can include less stuff*/
+#include <mediastreamer2/mscommon.h>
 #include <ortp/port.h>
 
+#ifndef LINPHONE_PUBLIC
+	#define LINPHONE_PUBLIC MS2_PUBLIC
+#endif
+
 /**
  * The LpConfig object is used to manipulate a configuration file.
  *