diff --git a/coreapi/friendlist.h b/coreapi/friendlist.h
index 3bea37738..e69cae707 100644
--- a/coreapi/friendlist.h
+++ b/coreapi/friendlist.h
@@ -22,8 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define LINPHONE_FRIENDLIST_H_
 
 
+#ifdef IN_LINPHONE
 #include "linphonefriend.h"
 #include "linphonepresence.h"
+#else
+#include "linphone/linphonefriend.h"
+#include "linphone/linphonepresence.h"
+#endif
 
 
 #ifdef __cplusplus
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 1e04bd01f..a801b7e1c 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1190,8 +1190,10 @@ LINPHONE_PUBLIC LinphoneAuthInfo * linphone_auth_info_new_from_config_file(LpCon
 
 #ifdef IN_LINPHONE
 #include "account_creator.h"
+#include "friendlist.h"
 #else
 #include "linphone/account_creator.h"
+#include "linphone/friendlist.h"
 #endif