diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h
new file mode 100644
index 0000000000000000000000000000000000000000..21fca92b40c0253e9e97a61ba4c0f8e9998fc33c
--- /dev/null
+++ b/include/Swiften/SwiftenCompat.h
@@ -0,0 +1,44 @@
+/*
+ * Swift compatibility
+ * 
+ * Copyright (c) 2016, Vladimir Matena <vlada.matena@gmail.com>
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <Swiften/Version.h>
+
+/*
+ * Define macros for Swiften compatible shared pointer and signal namespaces.
+ *
+ * Using these it is possible to declare shared pointers and signals like this:
+ *
+ * SWIFTEN_SIGNAL_NAMESPACE::signal signal;
+ * SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Type> ptr;
+ *
+ * These are guaranteed to be the same implementation as Swift uses internally,
+ * thus can be used when passign/retrieveing data from/to swiften.
+ *
+ * This is due to Swift 4 moved from boost::shared_ptr to SWIFTEN_SHRPTR_NAMESPACE::shared_ptr
+ * and from boost::signals to boost::signals2 .
+ */
+
+#if (SWIFTEN_VERSION >= 0x040000)
+#define SWIFTEN_SHRPTR_NAMESPACE std
+#define SWIFTEN_SIGNAL_NAMESPACE boost::signals2
+#else
+#define SWIFTEN_SHRPTR_NAMESPACE boost
+#define SWIFTEN_SIGNAL_NAMESPACE boost::signals
+#endif