Consistently include <config.h> in all C source files and never in header files.

72 files changed, 70 insertions, 26 deletions

diff --git a/dbus/dbus-auth-script.h b/dbus/dbus-auth-script.h
index 30cd5642..39e6c7c4 100644
--- a/dbus/dbus-auth-script.h
+++ b/dbus/dbus-auth-script.h
@@ -24,8 +24,6 @@
 #ifndef DBUS_AUTH_SCRIPT_H
 #define DBUS_AUTH_SCRIPT_H
 
-#include <config.h>
-
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-string.h>
diff --git a/dbus/dbus-auth-util.c b/dbus/dbus-auth-util.c
index 09ecdd47..776e8e27 100644
--- a/dbus/dbus-auth-util.c
+++ b/dbus/dbus-auth-util.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-test.h"
 #include "dbus-auth.h"
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 0c124830..3173f34f 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-auth.h"
 #include "dbus-string.h"
 #include "dbus-list.h"
diff --git a/dbus/dbus-credentials-util.c b/dbus/dbus-credentials-util.c
index dae6080d..02771966 100644
--- a/dbus/dbus-credentials-util.c
+++ b/dbus/dbus-credentials-util.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-test.h"
 #include "dbus-credentials.h"
diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
index 8fab7bbc..fd25c416 100644
--- a/dbus/dbus-dataslot.c
+++ b/dbus/dbus-dataslot.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-dataslot.h"
 #include "dbus-threads-internal.h"
 
diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c
index e8154ccc..5f27501c 100644
--- a/dbus/dbus-errors.c
+++ b/dbus/dbus-errors.c
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-errors.h"
 #include "dbus-internals.h"
 #include "dbus-string.h"
diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c
index 499237ea..2dfba00f 100644
--- a/dbus/dbus-file-win.c
+++ b/dbus/dbus-file-win.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-protocol.h"
 #include "dbus-string.h"
 #include "dbus-internals.h"
diff --git a/dbus/dbus-hash.c b/dbus/dbus-hash.c
index e9eba6e5..80a494a5 100644
--- a/dbus/dbus-hash.c
+++ b/dbus/dbus-hash.c
@@ -74,6 +74,7 @@
  * accordance with the terms specified in this license.
  */
 
+#include <config.h>
 #include "dbus-hash.h"
 #include "dbus-internals.h"
 #include "dbus-mempool.h"
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index a33d069a..1ab6731a 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-protocol.h"
 #include "dbus-marshal-basic.h"
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 01f62471..2b9b562c 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -27,8 +27,6 @@
 #ifndef DBUS_INTERNALS_H
 #define DBUS_INTERNALS_H
 
-#include <config.h>
-
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-errors.h>
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index 6dc1e129..031521c2 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-keyring.h"
 #include "dbus-protocol.h"
 #include <dbus/dbus-string.h>
diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
index e075ffe1..6a16ed60 100644
--- a/dbus/dbus-list.c
+++ b/dbus/dbus-list.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-list.h"
 #include "dbus-mempool.h"
diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
index a3833588..96ba599b 100644
--- a/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-mainloop.h"
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
index 00551354..1be5c7d0 100644
--- a/dbus/dbus-marshal-basic.c
+++ b/dbus/dbus-marshal-basic.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-marshal-basic.h"
 #include "dbus-signature.h"
diff --git a/dbus/dbus-marshal-basic.h b/dbus/dbus-marshal-basic.h
index fd87a80f..0c27fc9e 100644
--- a/dbus/dbus-marshal-basic.h
+++ b/dbus/dbus-marshal-basic.h
@@ -25,8 +25,6 @@
 #ifndef DBUS_MARSHAL_BASIC_H
 #define DBUS_MARSHAL_BASIC_H
 
-#include <config.h>
-
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #endif
diff --git a/dbus/dbus-marshal-byteswap.c b/dbus/dbus-marshal-byteswap.c
index c5e92b32..22d7e22b 100644
--- a/dbus/dbus-marshal-byteswap.c
+++ b/dbus/dbus-marshal-byteswap.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-marshal-byteswap.h"
 #include "dbus-marshal-basic.h"
 #include "dbus-signature.h"
diff --git a/dbus/dbus-marshal-byteswap.h b/dbus/dbus-marshal-byteswap.h
index 7c8ea7b6..be2dd758 100644
--- a/dbus/dbus-marshal-byteswap.h
+++ b/dbus/dbus-marshal-byteswap.h
@@ -24,7 +24,6 @@
 #ifndef DBUS_MARSHAL_BYTESWAP_H
 #define DBUS_MARSHAL_BYTESWAP_H
 
-#include <config.h>
 #include <dbus/dbus-protocol.h>
 #include <dbus/dbus-marshal-recursive.h>
 
diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c
index d9e9bb51..3f31d7a0 100644
--- a/dbus/dbus-marshal-header.c
+++ b/dbus/dbus-marshal-header.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus/dbus-shared.h"
 #include "dbus-marshal-header.h"
 #include "dbus-marshal-recursive.h"
diff --git a/dbus/dbus-marshal-header.h b/dbus/dbus-marshal-header.h
index 0f36efac..fd16c5f0 100644
--- a/dbus/dbus-marshal-header.h
+++ b/dbus/dbus-marshal-header.h
@@ -24,7 +24,6 @@
 #ifndef DBUS_MARSHAL_HEADER_H
 #define DBUS_MARSHAL_HEADER_H
 
-#include <config.h>
 #include <dbus/dbus-marshal-basic.h>
 #include <dbus/dbus-marshal-validate.h>
 
diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
index ccf0d22b..cb10854b 100644
--- a/dbus/dbus-marshal-recursive.c
+++ b/dbus/dbus-marshal-recursive.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-marshal-recursive.h"
 #include "dbus-marshal-basic.h"
 #include "dbus-signature.h"
diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h
index a743668d..97e5466b 100644
--- a/dbus/dbus-marshal-recursive.h
+++ b/dbus/dbus-marshal-recursive.h
@@ -24,7 +24,6 @@
 #ifndef DBUS_MARSHAL_RECURSIVE_H
 #define DBUS_MARSHAL_RECURSIVE_H
 
-#include <config.h>
 #include <dbus/dbus-protocol.h>
 #include <dbus/dbus-list.h>
 
diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
index bbaa9bdf..aa470fc8 100644
--- a/dbus/dbus-marshal-validate.c
+++ b/dbus/dbus-marshal-validate.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-marshal-validate.h"
 #include "dbus-marshal-recursive.h"
diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h
index 7a623d9e..5817de32 100644
--- a/dbus/dbus-marshal-validate.h
+++ b/dbus/dbus-marshal-validate.h
@@ -24,8 +24,6 @@
 #ifndef DBUS_MARSHAL_VALIDATE_H
 #define DBUS_MARSHAL_VALIDATE_H
 
-#include <config.h>
-
 /**
  * @addtogroup DBusMarshal
  *
diff --git a/dbus/dbus-md5.c b/dbus/dbus-md5.c
index 8405f360..af71d5c5 100644
--- a/dbus/dbus-md5.c
+++ b/dbus/dbus-md5.c
@@ -34,6 +34,7 @@
  * <ghost@aladdin.com>.
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-md5.h"
 #include <string.h>
diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index 0ceac666..b3ba067b 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-memory.h"
 #include "dbus-internals.h"
 #include "dbus-sysdeps.h"
diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index 2a41cb16..680586b7 100644
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-mempool.h"
 #include "dbus-internals.h"
 
diff --git a/dbus/dbus-message-private.h b/dbus/dbus-message-private.h
index 366c53aa..57888fa5 100644
--- a/dbus/dbus-message-private.h
+++ b/dbus/dbus-message-private.h
@@ -23,8 +23,6 @@
 #ifndef DBUS_MESSAGE_PRIVATE_H
 #define DBUS_MESSAGE_PRIVATE_H
 
-#include <config.h>
-
 #include <dbus/dbus-message.h>
 #include <dbus/dbus-message-internal.h>
 #include <dbus/dbus-string.h>
diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
index a56fcc49..94219f61 100644
--- a/dbus/dbus-message-util.c
+++ b/dbus/dbus-message-util.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-test.h"
 #include "dbus-message-private.h"
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 11a2eb13..3b5941b5 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-marshal-recursive.h"
 #include "dbus-marshal-validate.h"
diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index cf1424c3..3e5070f5 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 // major sections of this file are modified code from libassuan, (C) FSF
 #include "dbus-nonce.h"
 #include "dbus-internals.h"
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 4309d154..2f8dcbaa 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-object-tree.h"
 #include "dbus-connection-internal.h"
 #include "dbus-internals.h"
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index 43fad052..e1de656a 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-connection-internal.h"
 #include "dbus-pending-call-internal.h"
diff --git a/dbus/dbus-pipe-unix.c b/dbus/dbus-pipe-unix.c
index 79a826f5..f35024b5 100644
--- a/dbus/dbus-pipe-unix.c
+++ b/dbus/dbus-pipe-unix.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-protocol.h"
 #include "dbus-string.h"
 #include "dbus-internals.h"
diff --git a/dbus/dbus-pipe-win.c b/dbus/dbus-pipe-win.c
index 79865735..a07e572e 100644
--- a/dbus/dbus-pipe-win.c
+++ b/dbus/dbus-pipe-win.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-protocol.h"
 #include "dbus-string.h"
 #include "dbus-internals.h"
diff --git a/dbus/dbus-pipe.c b/dbus/dbus-pipe.c
index 59cf9346..60a58b54 100644
--- a/dbus/dbus-pipe.c
+++ b/dbus/dbus-pipe.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-pipe.h"
 
 /*
diff --git a/dbus/dbus-pipe.h b/dbus/dbus-pipe.h
index 75b7d2fe..cd575332 100644
--- a/dbus/dbus-pipe.h
+++ b/dbus/dbus-pipe.h
@@ -25,8 +25,6 @@
 #ifndef DBUS_PIPE_H
 #define DBUS_PIPE_H
 
-#include <config.h>
-
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-string.h>
diff --git a/dbus/dbus-resources.c b/dbus/dbus-resources.c
index 7c7aabd0..5f7001cc 100644
--- a/dbus/dbus-resources.c
+++ b/dbus/dbus-resources.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include <dbus/dbus-resources.h>
 #include <dbus/dbus-internals.h>
 
diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c
index 8ba6fb6b..e18cad71 100644
--- a/dbus/dbus-server-debug-pipe.c
+++ b/dbus/dbus-server-debug-pipe.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-server-debug-pipe.h"
 #include "dbus-transport-socket.h"
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h
index c05d2779..20836b53 100644
--- a/dbus/dbus-server-protected.h
+++ b/dbus/dbus-server-protected.h
@@ -23,7 +23,6 @@
 #ifndef DBUS_SERVER_PROTECTED_H
 #define DBUS_SERVER_PROTECTED_H
 
-#include <config.h>
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-threads-internal.h>
 #include <dbus/dbus-server.h>
diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
index 6a8717af..dbd72138 100644
--- a/dbus/dbus-server-socket.c
+++ b/dbus/dbus-server-socket.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-server-socket.h"
 #include "dbus-transport-socket.h"
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
index 597d0f8e..65c9668b 100644
--- a/dbus/dbus-server-unix.c
+++ b/dbus/dbus-server-unix.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-server-unix.h"
 #include "dbus-server-socket.h"
diff --git a/dbus/dbus-server-win.c b/dbus/dbus-server-win.c
index ca376692..5cfb73e7 100644
--- a/dbus/dbus-server-win.c
+++ b/dbus/dbus-server-win.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-server-win.h"
 #include "dbus-server-socket.h"
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index 974503bb..18fa8c4a 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -21,6 +21,7 @@
  *
  */ 
 
+#include <config.h>
 #include "dbus-server.h"
 #include "dbus-server-unix.h"
 #include "dbus-server-socket.h"
diff --git a/dbus/dbus-sha.c b/dbus/dbus-sha.c
index 04e353a0..d1827522 100644
--- a/dbus/dbus-sha.c
+++ b/dbus/dbus-sha.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-sha.h"
 #include "dbus-marshal-basic.h" /* for byteswap routines */
diff --git a/dbus/dbus-shell.c b/dbus/dbus-shell.c
index 57900d88..111d39df 100644
--- a/dbus/dbus-shell.c
+++ b/dbus/dbus-shell.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include <string.h>
 #include "dbus-internals.h"
 #include "dbus-list.h"
diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index b2d0a627..ddc0bcc3 100644
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -21,6 +21,8 @@
  *
  */
 
+#include <config.h>
+
 #include "dbus-signature.h"
 #include "dbus-marshal-recursive.h"
 #include "dbus-marshal-basic.h"
diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index de077892..6b9fdf57 100644
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
 
 //#define SPAWN_DEBUG
 
diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h
index 6687a76f..365d89a3 100644
--- a/dbus/dbus-string-private.h
+++ b/dbus/dbus-string-private.h
@@ -24,8 +24,6 @@
 #ifndef DBUS_STRING_PRIVATE_H
 #define DBUS_STRING_PRIVATE_H
 
-#include <config.h>
-
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 
diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c
index 666ffbd4..4d42bb0b 100644
--- a/dbus/dbus-string-util.c
+++ b/dbus/dbus-string-util.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-string.h"
 #define DBUS_CAN_USE_DBUS_STRING_PRIVATE 1
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
index 4d799f99..e2eb93b9 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-string.h"
 /* we allow a system header here, for speed/convenience */
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index cfb6f163..2f1ed31c 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -25,8 +25,6 @@
 #ifndef DBUS_STRING_H
 #define DBUS_STRING_H
 
-#include <config.h>
-
 #include <dbus/dbus-macros.h>
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-memory.h>
diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c
index 46e4204d..70737512 100644
--- a/dbus/dbus-sysdeps-pthread.c
+++ b/dbus/dbus-sysdeps-pthread.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-sysdeps.h"
 #include "dbus-threads.h"
diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c
index 4c4d22f3..55c0bf7b 100644
--- a/dbus/dbus-sysdeps-thread-win.c
+++ b/dbus/dbus-sysdeps-thread-win.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-sysdeps.h"
 #include "dbus-sysdeps-win.h"
diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h
index 96b44e29..81758e0f 100644
--- a/dbus/dbus-sysdeps-unix.h
+++ b/dbus/dbus-sysdeps-unix.h
@@ -25,7 +25,6 @@
 #ifndef DBUS_SYSDEPS_UNIX_H
 #define DBUS_SYSDEPS_UNIX_H
 
-#include <config.h>
 #include <dbus/dbus-sysdeps.h>
 
 #ifdef DBUS_WIN
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index eaf32703..94f580b1 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-sysdeps.h"
 #include "dbus-sysdeps-unix.h"
 #include "dbus-internals.h"
diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
index 2722b01e..7b2472f4 100644
--- a/dbus/dbus-sysdeps-util-win.c
+++ b/dbus/dbus-sysdeps-util-win.c
@@ -22,6 +22,8 @@
  *
  */
 
+#include <config.h>
+
 #define STRSAFE_NO_DEPRECATE
 
 #include "dbus-sysdeps.h"
diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c
index 67e19f7b..68669cf0 100644
--- a/dbus/dbus-sysdeps-util.c
+++ b/dbus/dbus-sysdeps-util.c
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-sysdeps.h"
 #include "dbus-internals.h"
 #include "dbus-string.h"
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index db149b86..bba8915f 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -26,6 +26,8 @@
  *
  */
 
+#include <config.h>
+
 #define STRSAFE_NO_DEPRECATE
 
 #ifndef DBUS_WINCE
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index c27f999e..f9c6fc55 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-sysdeps.h"
 #include "dbus-threads.h"
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index a656469a..bfcd0b87 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -25,8 +25,6 @@
 #ifndef DBUS_SYSDEPS_H
 #define DBUS_SYSDEPS_H
 
-#include <config.h>
-
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-file.h>
 #include <dbus/dbus-string.h>
diff --git a/dbus/dbus-test-main.c b/dbus/dbus-test-main.c
index 1bb7c904..a8a30f31 100644
--- a/dbus/dbus-test-main.c
+++ b/dbus/dbus-test-main.c
@@ -22,6 +22,7 @@
  */
 
 
+#include <config.h>
 #include "dbus-types.h"
 #include "dbus-test.h"
 #include <stdio.h>
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
index b425ae7b..37b68ba2 100644
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+#include <config.h>
 #include "dbus-threads.h"
 #include "dbus-internals.h"
 #include "dbus-threads-internal.h"
diff --git a/dbus/dbus-timeout.c b/dbus/dbus-timeout.c
index 0d92ca11..a1d6ce59 100644
--- a/dbus/dbus-timeout.c
+++ b/dbus/dbus-timeout.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-timeout.h"
 #include "dbus-list.h"
diff --git a/dbus/dbus-transport-protected.h b/dbus/dbus-transport-protected.h
index a3c8f3e4..44b9d785 100644
--- a/dbus/dbus-transport-protected.h
+++ b/dbus/dbus-transport-protected.h
@@ -23,8 +23,6 @@
 #ifndef DBUS_TRANSPORT_PROTECTED_H
 #define DBUS_TRANSPORT_PROTECTED_H
 
-#include <config.h>
-
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-transport.h>
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index 4f8c6cfc..849a1077 100644
--- a/dbus/dbus-transport-socket.c
+++ b/dbus/dbus-transport-socket.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-connection-internal.h"
 #include "dbus-nonce.h"
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index 2f2a3da5..6a713d10 100644
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-connection-internal.h"
 #include "dbus-transport-unix.h"
diff --git a/dbus/dbus-transport-win.c b/dbus/dbus-transport-win.c
index 1545c717..faaf1bd2 100644
--- a/dbus/dbus-transport-win.c
+++ b/dbus/dbus-transport-win.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-connection-internal.h"
 #include "dbus-transport-socket.h"
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index d8f34eef..bec4a5ac 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-transport-protected.h"
 #include "dbus-transport-unix.h"
 #include "dbus-transport-socket.h"
diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index f75d1bc0..8679f740 100644
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+#include <config.h>
 #define DBUS_USERDB_INCLUDES_PRIVATE 1
 #include "dbus-userdb.h"
 #include "dbus-test.h"
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index bfa4c435..4a317bab 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+#include <config.h>
 #define DBUS_USERDB_INCLUDES_PRIVATE 1
 #include "dbus-userdb.h"
 #include "dbus-hash.h"
diff --git a/dbus/dbus-uuidgen.c b/dbus/dbus-uuidgen.c
index 5c571e88..6d7c0aec 100644
--- a/dbus/dbus-uuidgen.c
+++ b/dbus/dbus-uuidgen.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+#include <config.h>
 #include "dbus-uuidgen.h"
 #include "dbus-internals.h"
 #include "dbus-string.h"
diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
index 484dbbe6..bd5ca8ff 100644
--- a/dbus/dbus-watch.c
+++ b/dbus/dbus-watch.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-watch.h"
 #include "dbus-list.h"