--- a/src/view/pgpcardwidget.cpp
+++ b/src/view/pgpcardwidget.cpp
@@ -56,14 +56,14 @@
 #include <Libkleo/KeyCache>
 #include <Libkleo/Formatting>
 
-#include <gpgme++/gpgmepp_version.h>
+#include <gpgmepp_version.h>
 #include <gpgme++/data.h>
 #include <gpgme++/context.h>
 
 #include <QGpgME/DataProvider>
 
 
-#if GPGMEPP_VERSION > 0x10801 // 1.8.1
+#if GPGME_VERSION_NUMBER > 0x10801 // 1.8.1
 // TODO remove ifdef once > 1.8.1 is required
 #include <gpgme++/gpggencardkeyinteractor.h>
 # define GPGME_CAN_GENCARDKEY
--- a/src/dialogs/updatenotification.cpp
+++ b/src/dialogs/updatenotification.cpp
@@ -53,8 +53,11 @@
 #include <QGpgME/CryptoConfig>
 #include <QGpgME/Protocol>
 
+#include <gpgme.h>
 #include <gpgme++/gpgmefw.h>
+#if GPGME_VERSION_NUMBER > 0x010801
 #include <gpgme++/swdbresult.h>
+#endif
 #include <gpgme++/error.h>
 
 using namespace Kleo;
--- a/src/commands/keytocardcommand.cpp
+++ b/src/commands/keytocardcommand.cpp
@@ -47,8 +47,9 @@
 
 #include <cassert>
 
-#include <gpgme++/gpgmepp_version.h>
-#if GPGMEPP_VERSION > 0x10801
+#include <gpgmepp_version.h>
+#include <gpgme.h>
+#if GPGME_VERSION_NUMBER > 0x10801
 # define GPGME_SUBKEY_HAS_KEYGRIP
 #endif