diff --git a/lang/cpp/src/callbacks.cpp b/lang/cpp/src/callbacks.cpp
index 21c2a813..ab870d35 100644
--- a/lang/cpp/src/callbacks.cpp
+++ b/lang/cpp/src/callbacks.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "callbacks.h"
 #include "util.h"
 
diff --git a/lang/cpp/src/configuration.cpp b/lang/cpp/src/configuration.cpp
index b3b62d6f..eb0f668a 100644
--- a/lang/cpp/src/configuration.cpp
+++ b/lang/cpp/src/configuration.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "configuration.h"
 #include "error.h"
 #include "util.h"
diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 99e354df..20bb464a 100644
--- a/lang/cpp/src/context.cpp
+++ b/lang/cpp/src/context.cpp
@@ -21,10 +21,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <context.h>
 #include <eventloopinteractor.h>
 #include <trustitem.h>
diff --git a/lang/cpp/src/context_glib.cpp b/lang/cpp/src/context_glib.cpp
index db607aac..a11e7118 100644
--- a/lang/cpp/src/context_glib.cpp
+++ b/lang/cpp/src/context_glib.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <global.h>
 
 extern "C" GIOChannel *gpgme_get_fdptr(int);
diff --git a/lang/cpp/src/context_qt.cpp b/lang/cpp/src/context_qt.cpp
index e6d1f029..502a9cc2 100644
--- a/lang/cpp/src/context_qt.cpp
+++ b/lang/cpp/src/context_qt.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <global.h>
 
 extern "C" QIODevice *gpgme_get_fdptr(int);
diff --git a/lang/cpp/src/context_vanilla.cpp b/lang/cpp/src/context_vanilla.cpp
index 1d7d14d5..b7fbb999 100644
--- a/lang/cpp/src/context_vanilla.cpp
+++ b/lang/cpp/src/context_vanilla.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <global.h>
 
 GIOChannel *GpgME::getGIOChannel(int)
diff --git a/lang/cpp/src/data.cpp b/lang/cpp/src/data.cpp
index cf43b5bd..caaa88f0 100644
--- a/lang/cpp/src/data.cpp
+++ b/lang/cpp/src/data.cpp
@@ -20,10 +20,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "data_p.h"
 #include "context_p.h"
 #include <error.h>
diff --git a/lang/cpp/src/decryptionresult.cpp b/lang/cpp/src/decryptionresult.cpp
index ad1d1cb6..ff92235c 100644
--- a/lang/cpp/src/decryptionresult.cpp
+++ b/lang/cpp/src/decryptionresult.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <decryptionresult.h>
 #include "result_p.h"
 #include "util.h"
diff --git a/lang/cpp/src/defaultassuantransaction.cpp b/lang/cpp/src/defaultassuantransaction.cpp
index 7a52c153..0398336e 100644
--- a/lang/cpp/src/defaultassuantransaction.cpp
+++ b/lang/cpp/src/defaultassuantransaction.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "defaultassuantransaction.h"
 #include "error.h"
 #include "data.h"
diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index 72ed92f7..dab7ce34 100644
--- a/lang/cpp/src/editinteractor.cpp
+++ b/lang/cpp/src/editinteractor.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "editinteractor.h"
 #include "callbacks.h"
 #include "error.h"
diff --git a/lang/cpp/src/encryptionresult.cpp b/lang/cpp/src/encryptionresult.cpp
index 95dcb22e..8798e2fe 100644
--- a/lang/cpp/src/encryptionresult.cpp
+++ b/lang/cpp/src/encryptionresult.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <encryptionresult.h>
 #include "result_p.h"
 #include "util.h"
diff --git a/lang/cpp/src/engineinfo.cpp b/lang/cpp/src/engineinfo.cpp
index c4ad5300..afbc9a62 100644
--- a/lang/cpp/src/engineinfo.cpp
+++ b/lang/cpp/src/engineinfo.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "engineinfo.h"
 
 #include <gpgme.h>
diff --git a/lang/cpp/src/eventloopinteractor.cpp b/lang/cpp/src/eventloopinteractor.cpp
index 09710ad4..f71ed87b 100644
--- a/lang/cpp/src/eventloopinteractor.cpp
+++ b/lang/cpp/src/eventloopinteractor.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <eventloopinteractor.h>
 
 #include <context.h>
diff --git a/lang/cpp/src/exception.cpp b/lang/cpp/src/exception.cpp
index 7751c3ea..a33543fb 100644
--- a/lang/cpp/src/exception.cpp
+++ b/lang/cpp/src/exception.cpp
@@ -23,10 +23,6 @@
 */
 
 // -*- c++ -*-
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "exception.h"
 
 #include <gpgme.h>
diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
index 49e98def..51ae662f 100644
--- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
@@ -21,10 +21,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpgaddexistingsubkeyeditinteractor.h"
 
 #include "error.h"
diff --git a/lang/cpp/src/gpgadduserideditinteractor.cpp b/lang/cpp/src/gpgadduserideditinteractor.cpp
index 1f27c84f..9d90fc70 100644
--- a/lang/cpp/src/gpgadduserideditinteractor.cpp
+++ b/lang/cpp/src/gpgadduserideditinteractor.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpgadduserideditinteractor.h"
 
 #include "error.h"
diff --git a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp b/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
index e8524054..ee14e2c4 100644
--- a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
+++ b/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpgagentgetinfoassuantransaction.h"
 #include "error.h"
 #include "data.h"
diff --git a/lang/cpp/src/gpggencardkeyinteractor.cpp b/lang/cpp/src/gpggencardkeyinteractor.cpp
index cd226c27..d7181147 100644
--- a/lang/cpp/src/gpggencardkeyinteractor.cpp
+++ b/lang/cpp/src/gpggencardkeyinteractor.cpp
@@ -21,10 +21,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpggencardkeyinteractor.h"
 
 #include "error.h"
diff --git a/lang/cpp/src/gpgrevokekeyeditinteractor.cpp b/lang/cpp/src/gpgrevokekeyeditinteractor.cpp
index dfa3be16..5a9b8aeb 100644
--- a/lang/cpp/src/gpgrevokekeyeditinteractor.cpp
+++ b/lang/cpp/src/gpgrevokekeyeditinteractor.cpp
@@ -21,10 +21,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpgrevokekeyeditinteractor.h"
 
 #include "error.h"
diff --git a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp b/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
index 2409ef19..f55caf60 100644
--- a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
+++ b/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpgsetexpirytimeeditinteractor.h"
 #include "error.h"
 
diff --git a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp b/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
index e28951ba..b47be167 100644
--- a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
+++ b/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpgsetownertrusteditinteractor.h"
 #include "error.h"
 
diff --git a/lang/cpp/src/gpgsignkeyeditinteractor.cpp b/lang/cpp/src/gpgsignkeyeditinteractor.cpp
index 164cfc03..0ef6c859 100644
--- a/lang/cpp/src/gpgsignkeyeditinteractor.cpp
+++ b/lang/cpp/src/gpgsignkeyeditinteractor.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "gpgsignkeyeditinteractor.h"
 #include "error.h"
 #include "key.h"
diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp
index 0a7ad03d..12c09b22 100644
--- a/lang/cpp/src/importresult.cpp
+++ b/lang/cpp/src/importresult.cpp
@@ -22,11 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <importresult.h>
 #include "result_p.h"
 
diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
index 2465cf06..1b2b1c64 100644
--- a/lang/cpp/src/key.cpp
+++ b/lang/cpp/src/key.cpp
@@ -20,10 +20,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <key.h>
 
 #include "util.h"
diff --git a/lang/cpp/src/keygenerationresult.cpp b/lang/cpp/src/keygenerationresult.cpp
index 49342f42..19b7ac89 100644
--- a/lang/cpp/src/keygenerationresult.cpp
+++ b/lang/cpp/src/keygenerationresult.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <keygenerationresult.h>
 #include "result_p.h"
 
diff --git a/lang/cpp/src/keylistresult.cpp b/lang/cpp/src/keylistresult.cpp
index 6e6b001b..94aaf30e 100644
--- a/lang/cpp/src/keylistresult.cpp
+++ b/lang/cpp/src/keylistresult.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <keylistresult.h>
 #include "result_p.h"
 
diff --git a/lang/cpp/src/scdgetinfoassuantransaction.cpp b/lang/cpp/src/scdgetinfoassuantransaction.cpp
index 4a024905..a220c255 100644
--- a/lang/cpp/src/scdgetinfoassuantransaction.cpp
+++ b/lang/cpp/src/scdgetinfoassuantransaction.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "scdgetinfoassuantransaction.h"
 #include "error.h"
 #include "data.h"
diff --git a/lang/cpp/src/signingresult.cpp b/lang/cpp/src/signingresult.cpp
index c92a6e3e..cd86c463 100644
--- a/lang/cpp/src/signingresult.cpp
+++ b/lang/cpp/src/signingresult.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <signingresult.h>
 #include "result_p.h"
 #include "util.h"
diff --git a/lang/cpp/src/statusconsumerassuantransaction.cpp b/lang/cpp/src/statusconsumerassuantransaction.cpp
index 7adfac03..12b21fa7 100644
--- a/lang/cpp/src/statusconsumerassuantransaction.cpp
+++ b/lang/cpp/src/statusconsumerassuantransaction.cpp
@@ -21,10 +21,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "statusconsumerassuantransaction.h"
 
 #include "data.h"
diff --git a/lang/cpp/src/swdbresult.cpp b/lang/cpp/src/swdbresult.cpp
index 202a107f..24eb7050 100644
--- a/lang/cpp/src/swdbresult.cpp
+++ b/lang/cpp/src/swdbresult.cpp
@@ -20,10 +20,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "swdbresult.h"
 
 #include <istream>
diff --git a/lang/cpp/src/tofuinfo.cpp b/lang/cpp/src/tofuinfo.cpp
index f0132f7b..5cb56a6e 100644
--- a/lang/cpp/src/tofuinfo.cpp
+++ b/lang/cpp/src/tofuinfo.cpp
@@ -20,10 +20,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "tofuinfo.h"
 
 #include <istream>
diff --git a/lang/cpp/src/trustitem.cpp b/lang/cpp/src/trustitem.cpp
index 4302f657..62a7c54f 100644
--- a/lang/cpp/src/trustitem.cpp
+++ b/lang/cpp/src/trustitem.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <trustitem.h>
 
 #include <gpgme.h>
diff --git a/lang/cpp/src/util.cpp b/lang/cpp/src/util.cpp
index 9104435f..46baaee5 100644
--- a/lang/cpp/src/util.cpp
+++ b/lang/cpp/src/util.cpp
@@ -21,10 +21,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "util.h"
 
 #include <functional>
diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp
index 1c657721..f7f281e3 100644
--- a/lang/cpp/src/verificationresult.cpp
+++ b/lang/cpp/src/verificationresult.cpp
@@ -22,10 +22,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <verificationresult.h>
 #include <notation.h>
 #include "result_p.h"
diff --git a/lang/cpp/src/vfsmountresult.cpp b/lang/cpp/src/vfsmountresult.cpp
index 901ccfe2..c6fa18aa 100644
--- a/lang/cpp/src/vfsmountresult.cpp
+++ b/lang/cpp/src/vfsmountresult.cpp
@@ -23,10 +23,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include <vfsmountresult.h>
 #include "result_p.h"
 
diff --git a/lang/cpp/tests/run-getkey.cpp b/lang/cpp/tests/run-getkey.cpp
index c47da0b5..cde77bd2 100644
--- a/lang/cpp/tests/run-getkey.cpp
+++ b/lang/cpp/tests/run-getkey.cpp
@@ -29,10 +29,6 @@
     your version.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "context.h"
 #include "key.h"
 
diff --git a/lang/cpp/tests/run-keylist.cpp b/lang/cpp/tests/run-keylist.cpp
index b46a815a..788dba67 100644
--- a/lang/cpp/tests/run-keylist.cpp
+++ b/lang/cpp/tests/run-keylist.cpp
@@ -29,10 +29,6 @@
     your version.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "context.h"
 #include "key.h"
 #include "keylistresult.h"
diff --git a/lang/cpp/tests/run-verify.cpp b/lang/cpp/tests/run-verify.cpp
index 50131fb8..c6462b91 100644
--- a/lang/cpp/tests/run-verify.cpp
+++ b/lang/cpp/tests/run-verify.cpp
@@ -28,9 +28,6 @@
     you do not wish to do so, delete this exception statement from
     your version.
 */
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
 
 #include "context.h"
 #include "key.h"
diff --git a/lang/cpp/tests/run-wkdlookup.cpp b/lang/cpp/tests/run-wkdlookup.cpp
index 4a3966b0..2ca702e4 100644
--- a/lang/cpp/tests/run-wkdlookup.cpp
+++ b/lang/cpp/tests/run-wkdlookup.cpp
@@ -21,10 +21,6 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
 #include "context.h"
 #include "data.h"
 #include "defaultassuantransaction.h"