diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97c041a92..bf9a4fc78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,9 @@ option(ENABLE_VCARD "Turn on compilation of vcard4 support." YES)
 option(CXX_WRAPPER "Build the C++ wrapper for Liblinphone." OFF)
 
 
+set(CMAKE_CXX_STANDARD 11)
+
+
 macro(apply_compile_flags SOURCE_FILES)
 	if(${SOURCE_FILES})
 		set(options "")
diff --git a/daemon/commands/register-info.cc b/daemon/commands/register-info.cc
index f9750e587..67e6ad12f 100644
--- a/daemon/commands/register-info.cc
+++ b/daemon/commands/register-info.cc
@@ -17,6 +17,8 @@ along with this library; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include <stdexcept>
+#include <string>
 #include "register-info.h"
 
 class RegisterInfoResponse: public Response {
diff --git a/daemon/commands/register-info.h b/daemon/commands/register-info.h
index 25228b836..e6b437a57 100644
--- a/daemon/commands/register-info.h
+++ b/daemon/commands/register-info.h
@@ -20,6 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #ifndef LINPHONE_DAEMON_COMMAND_REGISTER_INFO_H_
 #define LINPHONE_DAEMON_COMMAND_REGISTER_INFO_H_
 
+#include <string>
 #include "daemon.h"
 
 class RegisterInfoCommand: public DaemonCommand {