diff --git a/backends/libcommuni/CMakeLists.txt b/backends/libcommuni/CMakeLists.txt
index 3334aae26315c02a164d4b5b1f66eaeb078f02e5..679981ed9e006004593c7b28e5474e7e5131b301 100644
--- a/backends/libcommuni/CMakeLists.txt
+++ b/backends/libcommuni/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 FILE(GLOB HEADERS *.h)
 QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+add_definitions(-DQT_NO_KEYWORDS)
 ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
 
 if (NOT WIN32)
diff --git a/backends/libcommuni/ircnetworkplugin.h b/backends/libcommuni/ircnetworkplugin.h
index cc8fca02f8f2072e47db565fa6a818ca44c0bcc7..ddb9e53f88983c78c8f9b5aa8d013306dbfcf615 100644
--- a/backends/libcommuni/ircnetworkplugin.h
+++ b/backends/libcommuni/ircnetworkplugin.h
@@ -57,7 +57,7 @@ class IRCNetworkPlugin : public QObject, public NetworkPlugin {
 			return m_config;
 		}
 
-	public slots:
+	public Q_SLOTS:
 		void readData();
 		void sendData(const std::string &string);
 
diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h
index e445505f6ef29aad829a9724ba6f21342795a44d..8584e20b8e57611db0b5eed3687242f237f95525 100644
--- a/include/Swiften/SwiftenCompat.h
+++ b/include/Swiften/SwiftenCompat.h
@@ -46,7 +46,6 @@
 #else
 #define SWIFTEN_UNIQUE_PTR std::auto_ptr
 #define SWIFTEN_SHRPTR_NAMESPACE boost
-#define BOOST_SIGNALS_NO_DEPRECATION_WARNING
 #include <boost/signals.hpp>
 #define SWIFTEN_SIGNAL_NAMESPACE boost
 #define SWIFTEN_SIGNAL_CONNECTION_NAMESPACE boost::signals