diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b7ae4088f13a013d787c83b4dda9027deee4bb7..efcb79a01aed83cc18c1130d5fd4e33f9a6bd7e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,6 @@ option(ENABLE_SMSTOOLS3 "Build SMSTools3 plugin" ON)
 option(ENABLE_SKYPE "Build Skype plugin" ON)
 option(ENABLE_SWIFTEN "Build Swiften plugin" ON)
 option(ENABLE_TWITTER "Build Twitter plugin" ON)
-option(ENABLE_YAHOO2 "Build Libyahoo2 plugin" ON)
 
 option(ENABLE_DOCS "Build Docs" ON)
 # option(ENABLE_LOG "Build with logging using Log4cxx" ON)
@@ -77,7 +76,6 @@ if(NOT SWIFTEN_FOUND)
 endif()
 
 # FIND BOOST
-set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 if (WIN32)
 	set(Boost_USE_STATIC_LIBS      ON)
 	set(Boost_USE_MULTITHREADED      ON)
@@ -115,6 +113,7 @@ endif()
 # FIND SQLITE3
 if (ENABLE_SQLITE3)
 	if (MSVC)
+		set(SQLITE3_FOUND 1)
 		ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps)
 	else()
 		if (WIN32)
@@ -219,10 +218,6 @@ set(dbus_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(dbus)
 endif()
 
-# if(ENABLE_YAHOO2)
-# 	set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
-# 	find_package(yahoo2)
-# endif()
 
 ####### Miscallanous ######
 
@@ -253,16 +248,6 @@ if(ENABLE_TESTS)
 	endif()
 endif()
 
-if (APPLE)
-        FIND_LIBRARY(IOKIT_FRAMEWORK IOKit)
-        FIND_LIBRARY(SECURITY_FRAMEWORK Security)
-        FIND_LIBRARY(APPKIT_FRAMEWORK AppKit)
-        FIND_LIBRARY(SYSTEMCONFIGURATION_FRAMEWORK SystemConfiguration)
-        FIND_LIBRARY(SECURITYINTERFACE_FRAMEWORK SecurityInterface)
-        MARK_AS_ADVANCED(IOKIT_FRAMEWORK APPKIT_FRAMEWORK SYSTEMCONFIGURATION_FRAMEWORK SECURITY_FRAMEWORK SECURITYINTERFACE_FRAMEWORK)
-        SET (APPLE_FRAMEWORKS ${IOKIT_FRAMEWORK} ${APPKIT_FRAMEWORK} ${SYSTEMCONFIGURATION_FRAMEWORK} ${SECURITY_FRAMEWORK} ${SECURITYINTERFACE_FRAMEWORK})
-endif()
-
 message("  Supported features")
 message("-----------------------")
 
@@ -361,7 +346,7 @@ if (PROTOBUF_FOUND)
 	endif()
 
 	if(IRC_FOUND)
-		ADD_DEFINITIONS(-DCOMMUNI_SHARED)
+		ADD_DEFINITIONS(-DIRC_SHARED)
 		message("IRC plugin        : yes")
 		include_directories(${QT_QTNETWORK_INCLUDE_DIR})
 		include_directories(${IRC_INCLUDE_DIR})
@@ -405,18 +390,6 @@ if (PROTOBUF_FOUND)
 		message("Skype plugin      : no (does not run on Win32)")
 	endif()
 
-#  	if(YAHOO2_FOUND)
-# 		message("Libyahoo2 plugin  : yes")
-#  		include_directories(${YAHOO2_INCLUDE_DIR})
-# 	else()
-		if(ENABLE_YAHOO2)
-			set(YAHOO2_FOUND 1)
-			message("Libyahoo2 plugin  : yes")
-		else(ENABLE_YAHOO2)
-			message("Libyahoo2 plugin  : no (user disabled)")
-		endif()
-#  	endif()
-
 	if(ENABLE_SWIFTEN)
 		message("Swiften plugin    : yes")
 	else()
@@ -453,6 +426,10 @@ if (WIN32)
 	ADD_DEFINITIONS(-DBOOST_THREAD_USE_LIB)
 endif()
 
+# We cannot use boost:signals2, because Swiften does not use them,
+# for now, just ignore the deprecation warning.
+ADD_DEFINITIONS(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING)
+
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	if (CMAKE_COMPILER_IS_GNUCXX)
 		ADD_DEFINITIONS(-O0)