diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c52f90f5..24d225847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ else()
 	find_package(Belr REQUIRED)
 endif()
 find_package(XML2 REQUIRED)
-find_package(LibXsd)
+find_package(LibXsd REQUIRED)
 find_package(Soci)
 find_package(Zlib)
 if(ENABLE_TUNNEL)
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 61a84cb91..88c78b589 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -158,6 +158,7 @@ set(LIBS
 	${ORTP_LIBRARIES}
 	${XML2_LIBRARIES}
 	${BELR_LIBRARIES}
+	${LIBXSD_LIBRARIES}
 )
 if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	list(APPEND LIBS "Ws2_32")
@@ -168,9 +169,6 @@ endif()
 if(ZLIB_FOUND)
 	list(APPEND LIBS ${ZLIB_LIBRARIES})
 endif()
-if(LIBXSD_FOUND)
-	list(APPEND LIBS ${LIBXSD_LIBRARIES})
-endif()
 if(SOCI_FOUND)
 	list(APPEND LIBS ${SOCI_LIBRARIES})
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3210f9861..4b064d20e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,19 +89,14 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 	xml/conference-info.cpp
 	xml/xml.cpp
 )
-if(LIBXSD_FOUND)
-	ADD_XSD_WRAPPERS(xml/xml "XML XSD - xml.xsd")
-	ADD_XSD_WRAPPERS(xml/conference-info "Conference info XSD - conference-info.xsd")
-endif()
 
-set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS})
+ADD_XSD_WRAPPERS(xml/xml "XML XSD - xml.xsd")
+ADD_XSD_WRAPPERS(xml/conference-info "Conference info XSD - conference-info.xsd")
+
+set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS} ${LIBXSD_INCLUDE_DIRS})
 set(LINPHONE_CXX_OBJECTS_DEFINITIONS "-DLIBLINPHONE_EXPORTS")
 set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS})
 
-if(LIBXSD_FOUND)
-	list(APPEND LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${LIBXSD_INCLUDE_DIRS})
-endif()
-
 if(SOCI_FOUND)
 	list(APPEND LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${SOCI_INCLUDE_DIRS} ${SOCI_MYSQL_INCLUDES})
 	add_definitions(-DSOCI_ENABLED)