diff --git a/meson.build b/meson.build
index da4dc61c..b5112aab 100644
--- a/meson.build
+++ b/meson.build
@@ -64,7 +64,7 @@ top_inc = include_directories('.')
 
 cc = meson.get_compiler('c')
 
-config_h = configuration_data()
+config_data = configuration_data()
 
 # defines
 set_defines = [
@@ -79,11 +79,11 @@ set_defines = [
 ]
 
 foreach define: set_defines
-  config_h.set_quoted(define[0], define[1])
+  config_data.set_quoted(define[0], define[1])
 endforeach
 
 # Globally define_GNU_SOURCE and therefore enable the GNU extensions
-config_h.set('_GNU_SOURCE', true)
+config_data.set('_GNU_SOURCE', true)
 
 # functions
 check_functions = [
@@ -93,19 +93,17 @@ check_functions = [
 ]
 
 foreach func: check_functions
-  config_h.set('HAVE_' + func.to_upper(), cc.has_function(func))
+  config_data.set('HAVE_' + func.to_upper(), cc.has_function(func))
 endforeach
 
-# compiler flags
-common_c_flags = [
+compiler_common_flags = []
+compiler_c_flags = [
   # FIXME: this should go as 'c_std=c99' in project's default_options.
   #        https://github.com/mesonbuild/meson/issues/1889
   #        https://github.com/mesonbuild/meson/pull/6729
   '-std=c99',
-  '-DHAVE_CONFIG_H',
 ]
-compiler_flags = []
-compiler_c_flags = []
+compiler_cpp_flags = []
 
 if get_option('buildtype').contains('debug')
   compiler_c_flags += cc.get_supported_arguments([
@@ -121,8 +119,6 @@ if get_option('buildtype').contains('debug')
   ])
 endif
 
-add_project_arguments(common_c_flags + compiler_c_flags, language: 'c')
-
 glib_req_version = '>= 2.30.0'
 
 gio_dep = dependency('gio-2.0', version: glib_req_version)
@@ -151,13 +147,13 @@ if js_engine == 'duktape'
   libm_dep = cc.find_library('m')
   thread_dep = dependency('threads')
   func = 'pthread_condattr_setclock'
-  config_h.set('HAVE_' + func.to_upper(), cc.has_function(func, prefix : '#include <pthread.h>'))
+  config_data.set('HAVE_' + func.to_upper(), cc.has_function(func, prefix : '#include <pthread.h>'))
 elif js_engine == 'mozjs'
   js_dep = dependency('mozjs-115')
 
   _system = host_machine.system().to_lower()
   if _system.contains('freebsd')
-    config_h.set('__BSD_VISIBLE', 1)
+    config_data.set('__BSD_VISIBLE', 1)
   endif
 endif
 
@@ -172,12 +168,12 @@ endif
 
 # check OS
 host_system = host_machine.system()
-config_h.set('HAVE_' + host_system.to_upper(), true)
+config_data.set('HAVE_' + host_system.to_upper(), true)
 
 # Check whether setnetgrent has a return value
-config_h.set('HAVE_NETGROUP_H', cc.has_header('netgroup.h'))
+config_data.set('HAVE_NETGROUP_H', cc.has_header('netgroup.h'))
 
-if config_h.get('HAVE_SETNETGRENT', false)
+if config_data.get('HAVE_SETNETGRENT', false)
   setnetgrent_return_src = '''
     #include <stddef.h>
     #ifdef HAVE_NETGROUP_H
@@ -190,7 +186,7 @@ if config_h.get('HAVE_SETNETGRENT', false)
     };
   '''
 
-  config_h.set('HAVE_SETNETGRENT_RETURN', cc.compiles(setnetgrent_return_src, name: 'setnetgrent return support'))
+  config_data.set('HAVE_SETNETGRENT_RETURN', cc.compiles(setnetgrent_return_src, name: 'setnetgrent return support'))
 endif
 
 # Select wether to use logind, elogind or ConsoleKit for session tracking
@@ -214,11 +210,11 @@ if enable_logind
   endif
 
   func = 'sd_uid_get_display'
-  config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
+  config_data.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
   func = 'sd_pidfd_get_session'
-  config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
+  config_data.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
 endif
-config_h.set('HAVE_LIBSYSTEMD', enable_logind)
+config_data.set('HAVE_LIBSYSTEMD', enable_logind)
 
 systemd_dep = dependency('systemd').found()
 if systemd_dep
@@ -232,14 +228,14 @@ if systemd_dep
   )
 endif
 
-config_h.set('HAVE_PIDFD_OPEN', cc.get_define('SYS_pidfd_open', prefix: '#include <sys/syscall.h>') != '')
+config_data.set('HAVE_PIDFD_OPEN', cc.get_define('SYS_pidfd_open', prefix: '#include <sys/syscall.h>') != '')
 
 # User for running polkitd
 polkitd_user = get_option('polkitd_user')
-config_h.set_quoted('POLKITD_USER', polkitd_user)
+config_data.set_quoted('POLKITD_USER', polkitd_user)
 
 polkitd_uid = get_option('polkitd_uid')
-config_h.set('POLKITD_UID', polkitd_uid)
+config_data.set('POLKITD_UID', polkitd_uid)
 
 # Select which authentication framework to use
 auth_deps = []
@@ -265,7 +261,7 @@ if enable_pam
   # FIXME: Not necessary anymore?
   if cc.compiles(pam_strerror_src.format('pam_handle_t *pamh = 0; char *s = pam_strerror(pamh, PAM_SUCCESS);'))
     # FIXME: unused?
-    config_h.set('PAM_STRERROR_TWO_ARGS', true)
+    config_data.set('PAM_STRERROR_TWO_ARGS', true)
   else
     message('how to call pam_strerror: ' + cc.compiles(pam_strerror_src.format('char *s = pam_strerror(PAM_SUCCESS);')).to_string('1', 'unknown'))
   endif
@@ -286,7 +282,7 @@ if enable_pam
 elif auth_fw == 'shadow'
   auth_deps += cc.find_library('crypt')
 endif
-config_h.set('POLKIT_AUTHFW_' + auth_fw.to_upper(), true)
+config_data.set('POLKIT_AUTHFW_' + auth_fw.to_upper(), true)
 
 # FIXME: sigtimedwait is not used anywhere?
 '''
@@ -367,6 +363,16 @@ if enable_introspection
   dependency('gobject-introspection-1.0', version: '>= 0.6.2')
 endif
 
+configure_file(
+  output: 'config.h',
+  configuration: config_data,
+)
+
+compiler_common_flags += ['-include', 'config.h']
+
+add_project_arguments(compiler_common_flags + compiler_c_flags, language: 'c')
+add_project_arguments(compiler_common_flags + compiler_cpp_flags, language: 'cpp')
+
 content_files = files('COPYING')
 
 subdir('actions')
@@ -380,12 +386,6 @@ if enable_tests
   subdir('test')
 endif
 
-configure_file(
-  output: 'config.h',
-  configuration: config_h,
-)
-
-
 if not libs_only
   meson.add_install_script(
     'meson_post_install.py',
diff --git a/src/examples/cancel.c b/src/examples/cancel.c
index 02a8b632..2a4972ec 100644
--- a/src/examples/cancel.c
+++ b/src/examples/cancel.c
@@ -32,7 +32,6 @@
  * authentication dialog is removed.
  */
 
-#include "config.h"
 #include <polkit/polkit.h>
 
 static gboolean
diff --git a/src/examples/frobnicate.c b/src/examples/frobnicate.c
index 29e0cbfe..bbc87cce 100644
--- a/src/examples/frobnicate.c
+++ b/src/examples/frobnicate.c
@@ -19,8 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
-
 #include <glib.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/polkit/polkitactiondescription.c b/src/polkit/polkitactiondescription.c
index ed0655e3..939f3a1d 100644
--- a/src/polkit/polkitactiondescription.c
+++ b/src/polkit/polkitactiondescription.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include "polkitimplicitauthorization.h"
 #include "polkitactiondescription.h"
diff --git a/src/polkit/polkitauthority.c b/src/polkit/polkitauthority.c
index 08cb511f..f0986d77 100644
--- a/src/polkit/polkitauthority.c
+++ b/src/polkit/polkitauthority.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "polkitauthorizationresult.h"
 #include "polkitcheckauthorizationflags.h"
 #include "polkitauthority.h"
diff --git a/src/polkit/polkitauthorityfeatures.c b/src/polkit/polkitauthorityfeatures.c
index 16a91259..c56a697b 100644
--- a/src/polkit/polkitauthorityfeatures.c
+++ b/src/polkit/polkitauthorityfeatures.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "polkitcheckauthorizationflags.h"
 #include "polkitprivate.h"
 
diff --git a/src/polkit/polkitauthorizationresult.c b/src/polkit/polkitauthorizationresult.c
index 877a9a62..bb5a5471 100644
--- a/src/polkit/polkitauthorizationresult.c
+++ b/src/polkit/polkitauthorizationresult.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "polkitauthorizationresult.h"
 #include "polkitdetails.h"
 #include "polkitprivate.h"
diff --git a/src/polkit/polkitcheckauthorizationflags.c b/src/polkit/polkitcheckauthorizationflags.c
index 16a91259..c56a697b 100644
--- a/src/polkit/polkitcheckauthorizationflags.c
+++ b/src/polkit/polkitcheckauthorizationflags.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "polkitcheckauthorizationflags.h"
 #include "polkitprivate.h"
 
diff --git a/src/polkit/polkitdetails.c b/src/polkit/polkitdetails.c
index b16aadc5..0df24e8f 100644
--- a/src/polkit/polkitdetails.c
+++ b/src/polkit/polkitdetails.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include "polkitimplicitauthorization.h"
 #include "polkitdetails.h"
diff --git a/src/polkit/polkiterror.c b/src/polkit/polkiterror.c
index 89b90070..caf4c195 100644
--- a/src/polkit/polkiterror.c
+++ b/src/polkit/polkiterror.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "polkiterror.h"
 #include "polkitprivate.h"
 
diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c
index 793f17d5..f7a05685 100644
--- a/src/polkit/polkitidentity.c
+++ b/src/polkit/polkitidentity.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 
 #include "polkitidentity.h"
diff --git a/src/polkit/polkitimplicitauthorization.c b/src/polkit/polkitimplicitauthorization.c
index 7dffb3f9..35bd49aa 100644
--- a/src/polkit/polkitimplicitauthorization.c
+++ b/src/polkit/polkitimplicitauthorization.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 
 #include "polkitimplicitauthorization.h"
diff --git a/src/polkit/polkitpermission.c b/src/polkit/polkitpermission.c
index c53f2cb7..f3ffbb62 100644
--- a/src/polkit/polkitpermission.c
+++ b/src/polkit/polkitpermission.c
@@ -20,10 +20,6 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #ifdef HAVE_LIBSYSTEMD
 #  include <systemd/sd-login.h>
 #endif
diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
index 05c73c25..d4c27553 100644
--- a/src/polkit/polkitsubject.c
+++ b/src/polkit/polkitsubject.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include <stdio.h>
 
diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
index f4b3372c..7520372f 100644
--- a/src/polkit/polkitsystembusname.c
+++ b/src/polkit/polkitsystembusname.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include <gio/gunixfdlist.h>
 #include "polkitsystembusname.h"
diff --git a/src/polkit/polkittemporaryauthorization.c b/src/polkit/polkittemporaryauthorization.c
index 5e076785..08025171 100644
--- a/src/polkit/polkittemporaryauthorization.c
+++ b/src/polkit/polkittemporaryauthorization.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include "polkitimplicitauthorization.h"
 #include "polkittemporaryauthorization.h"
diff --git a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c
index fe01dcfb..9bb9e644 100644
--- a/src/polkit/polkitunixgroup.c
+++ b/src/polkit/polkitunixgroup.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include <grp.h>
 #include <errno.h>
diff --git a/src/polkit/polkitunixnetgroup.c b/src/polkit/polkitunixnetgroup.c
index 83f8d4a1..b854de9a 100644
--- a/src/polkit/polkitunixnetgroup.c
+++ b/src/polkit/polkitunixnetgroup.c
@@ -20,10 +20,6 @@
  * Author: Nikki VonHollen <vonhollen@google.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include <errno.h>
 #include "polkitunixnetgroup.h"
diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
index e05e5812..95786d01 100644
--- a/src/polkit/polkitunixprocess.c
+++ b/src/polkit/polkitunixprocess.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <sys/types.h>
 #ifdef HAVE_FREEBSD
 #include <sys/param.h>
diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
index c34f36a9..bfd52ac2 100644
--- a/src/polkit/polkitunixsession-systemd.c
+++ b/src/polkit/polkitunixsession-systemd.c
@@ -19,10 +19,6 @@
  * Author: Matthias Clasen
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "polkitunixsession.h"
diff --git a/src/polkit/polkitunixsession.c b/src/polkit/polkitunixsession.c
index 40817de5..5811c3ce 100644
--- a/src/polkit/polkitunixsession.c
+++ b/src/polkit/polkitunixsession.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include "polkitunixsession.h"
 #include "polkitsubject.h"
diff --git a/src/polkit/polkitunixuser.c b/src/polkit/polkitunixuser.c
index 234a6976..9a042600 100644
--- a/src/polkit/polkitunixuser.c
+++ b/src/polkit/polkitunixuser.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
diff --git a/src/polkitagent/polkitagenthelper-bsdauth.c b/src/polkitagent/polkitagenthelper-bsdauth.c
index b105180d..6aeb953b 100644
--- a/src/polkitagent/polkitagenthelper-bsdauth.c
+++ b/src/polkitagent/polkitagenthelper-bsdauth.c
@@ -23,7 +23,6 @@
  *          David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include "polkitagenthelperprivate.h"
 
 #include <stdio.h>
diff --git a/src/polkitagent/polkitagenthelper-pam.c b/src/polkitagent/polkitagenthelper-pam.c
index 3ea3a3f2..2054bcd1 100644
--- a/src/polkitagent/polkitagenthelper-pam.c
+++ b/src/polkitagent/polkitagenthelper-pam.c
@@ -19,7 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include "polkitagenthelperprivate.h"
 
 #include <stdio.h>
diff --git a/src/polkitagent/polkitagenthelper-shadow.c b/src/polkitagent/polkitagenthelper-shadow.c
index e8779154..f45d9aaf 100644
--- a/src/polkitagent/polkitagenthelper-shadow.c
+++ b/src/polkitagent/polkitagenthelper-shadow.c
@@ -22,7 +22,6 @@
  *          David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include "polkitagenthelperprivate.h"
 
 #include <stdio.h>
diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
index 1f32c0a1..7358b178 100644
--- a/src/polkitagent/polkitagenthelperprivate.c
+++ b/src/polkitagent/polkitagenthelperprivate.c
@@ -20,7 +20,6 @@
  *          Andrew Psaltis <ampsaltis@gmail.com>
  */
 
-#include "config.h"
 #include "polkitagenthelperprivate.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/src/polkitagent/polkitagentlistener.c b/src/polkitagent/polkitagentlistener.c
index ec271d52..deac5569 100644
--- a/src/polkitagent/polkitagentlistener.c
+++ b/src/polkitagent/polkitagentlistener.c
@@ -19,8 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
-
 #include <polkit/polkitprivate.h>
 
 #include "polkitagentlistener.h"
diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c
index 491d9dcf..d4a3f46f 100644
--- a/src/polkitagent/polkitagentsession.c
+++ b/src/polkitagent/polkitagentsession.c
@@ -49,7 +49,6 @@
  * be emitted with the @gained_authorization paramter set to %FALSE.
  */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/polkitagent/polkitagenttextlistener.c b/src/polkitagent/polkitagenttextlistener.c
index 2ce4098f..61fe6e23 100644
--- a/src/polkitagent/polkitagenttextlistener.c
+++ b/src/polkitagent/polkitagenttextlistener.c
@@ -19,8 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
-
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/polkitbackend/polkitbackendactionlookup.c b/src/polkitbackend/polkitbackendactionlookup.c
index 20747e79..e76f88df 100644
--- a/src/polkitbackend/polkitbackendactionlookup.c
+++ b/src/polkitbackend/polkitbackendactionlookup.c
@@ -19,7 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include <errno.h>
 #include <pwd.h>
 #include <string.h>
diff --git a/src/polkitbackend/polkitbackendactionpool.c b/src/polkitbackend/polkitbackendactionpool.c
index 3894fe91..429586b7 100644
--- a/src/polkitbackend/polkitbackendactionpool.c
+++ b/src/polkitbackend/polkitbackendactionpool.c
@@ -19,7 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include <errno.h>
 #include <pwd.h>
 #include <string.h>
diff --git a/src/polkitbackend/polkitbackendauthority.c b/src/polkitbackend/polkitbackendauthority.c
index c74216ef..c6a782c5 100644
--- a/src/polkitbackend/polkitbackendauthority.c
+++ b/src/polkitbackend/polkitbackendauthority.c
@@ -19,7 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include <errno.h>
 #include <pwd.h>
 #include <string.h>
diff --git a/src/polkitbackend/polkitbackendcommon.h b/src/polkitbackend/polkitbackendcommon.h
index 28342af5..1fcb47b0 100644
--- a/src/polkitbackend/polkitbackendcommon.h
+++ b/src/polkitbackend/polkitbackendcommon.h
@@ -26,7 +26,6 @@
 #ifndef __POLKIT_BACKEND_COMMON_H
 #define __POLKIT_BACKEND_COMMON_H
 
-#include "config.h"
 #include <sys/wait.h>
 #include <errno.h>
 #include <pwd.h>
diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
index 6290014e..ac0000dc 100644
--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
@@ -19,7 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include <errno.h>
 #include <pwd.h>
 #include <grp.h>
@@ -1488,10 +1487,10 @@ authentication_agent_generate_cookie (AuthenticationAgent *agent)
   GString *buf = g_string_new ("");
 
   g_string_append (buf, agent->cookie_prefix);
-  
+
   g_string_append_c (buf, '-');
   agent->cookie_serial++;
-  g_string_append_printf (buf, "%" G_GUINT64_FORMAT, 
+  g_string_append_printf (buf, "%" G_GUINT64_FORMAT,
                           agent->cookie_serial);
   g_string_append_c (buf, '-');
   append_rand_u128_str (buf, agent->cookie_pool);
@@ -1685,7 +1684,7 @@ authentication_agent_new (guint64      serial,
     g_rand_free (agent_private_rand);
 
     agent->cookie_prefix = g_string_free (cookie_prefix, FALSE);
-    
+
     /* And a newly seeded pool for per-session cookies */
     agent->cookie_pool = g_rand_new ();
   }
@@ -1787,7 +1786,7 @@ get_authentication_session_for_uid_and_cookie (PolkitBackendInteractiveAuthority
        * due to wrapping, that the cookie used is matched to the user
        * who called AuthenticationAgentResponse2.  See
        * http://lists.freedesktop.org/archives/polkit-devel/2015-June/000425.html
-       * 
+       *
        * Except if the legacy AuthenticationAgentResponse is invoked,
        * we don't know the uid and hence use -1.  Continue to support
        * the old behavior for backwards compatibility, although everyone
diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
index 3abd7c59..bfda4d34 100644
--- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
+++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
@@ -19,7 +19,6 @@
  * Author: Matthias Clasen
  */
 
-#include "config.h"
 #include <errno.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
index ed307559..c2cb5da8 100644
--- a/src/polkitbackend/polkitbackendsessionmonitor.c
+++ b/src/polkitbackend/polkitbackendsessionmonitor.c
@@ -19,7 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include <errno.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/src/polkitbackend/polkitd.c b/src/polkitbackend/polkitd.c
index d63aae27..0da298da 100644
--- a/src/polkitbackend/polkitd.c
+++ b/src/polkitbackend/polkitd.c
@@ -19,8 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
-
 #include <signal.h>
 #include <stdlib.h>
 
diff --git a/src/programs/pkaction.c b/src/programs/pkaction.c
index 6dd68776..817ecfe1 100644
--- a/src/programs/pkaction.c
+++ b/src/programs/pkaction.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c
index 1faf6334..7484f211 100644
--- a/src/programs/pkcheck.c
+++ b/src/programs/pkcheck.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
index 6477a318..61c91003 100644
--- a/src/programs/pkexec.c
+++ b/src/programs/pkexec.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -206,7 +202,7 @@ open_session (const gchar *user_to_auth,
       for (n = 0; envlist[n]; n++)
 	{
 	  const char *envitem = envlist[n];
-	  
+
 	  if (g_str_has_prefix (envitem, "XDG_RUNTIME_DIR="))
 	    {
 	      const char *eq = strchr (envitem, '=');
@@ -1035,7 +1031,7 @@ main (int argc, char *argv[])
 
   /* change to home directory */
   if (!opt_keep_cwd)
-    {  
+    {
       if (chdir (pw->pw_dir) != 0)
         {
           g_printerr ("Error changing to home directory %s: %s\n", pw->pw_dir, g_strerror (errno));
diff --git a/src/programs/pkttyagent.c b/src/programs/pkttyagent.c
index 4d04e9c5..488c0b07 100644
--- a/src/programs/pkttyagent.c
+++ b/src/programs/pkttyagent.c
@@ -19,10 +19,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c
index b187a2ff..707030e2 100644
--- a/test/polkitbackend/test-polkitbackendjsauthority.c
+++ b/test/polkitbackend/test-polkitbackendjsauthority.c
@@ -21,7 +21,6 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
-#include "config.h"
 #include "glib.h"
 
 #include <locale.h>