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

bus/activation.c

@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "activation.h"
 #include "activation-exit-codes.h"
 #include "desktop-file.h"

bus/bus.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "bus.h"
 #include "activation.h"
 #include "connection.h"

bus/bus.h

@@ -24,8 +24,6 @@
 #ifndef BUS_BUS_H
 #define BUS_BUS_H
 
-#include <config.h>
-
 #include <dbus/dbus.h>
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-mainloop.h>

bus/config-loader-expat.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "config-parser.h"
 #include <dbus/dbus-internals.h>
 #include <expat.h>

bus/config-loader-libxml.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "config-parser.h"
 #include <dbus/dbus-internals.h>
 #include <libxml/xmlreader.h>

bus/config-parser-common.c

@@ -21,6 +21,7 @@
  *
  */
  
+#include <config.h>
 #include <dbus/dbus-internals.h>
 #include <string.h>
 

bus/config-parser-common.h

@@ -24,8 +24,6 @@
 #ifndef BUS_CONFIG_PARSER_COMMON_H
 #define BUS_CONFIG_PARSER_COMMON_H
 
-#include <config.h>
-
 typedef enum
 {
   ELEMENT_NONE,

bus/config-parser-trivial.c

@@ -22,6 +22,7 @@
  *
  */
  
+#include <config.h>
 #include "config-parser-common.h"
 #include "config-parser-trivial.h"
 #include "utils.h"

bus/config-parser-trivial.h

@@ -24,8 +24,6 @@
 #ifndef BUS_CONFIG_PARSER_TRIVIAL_H
 #define BUS_CONFIG_PARSER_TRIVIAL_H
 
-#include <config.h>
-
 #include <dbus/dbus.h>
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-list.h>

bus/config-parser.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "config-parser-common.h"
 #include "config-parser.h"
 #include "test.h"

bus/config-parser.h

@@ -24,8 +24,6 @@
 #ifndef BUS_CONFIG_PARSER_H
 #define BUS_CONFIG_PARSER_H
 
-#include <config.h>
-
 #include <dbus/dbus.h>
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-list.h>

bus/connection.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "connection.h"
 #include "dispatch.h"
 #include "policy.h"

bus/desktop-file.c

@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include <dbus/dbus-sysdeps.h>
 #include <dbus/dbus-internals.h>
 #include "desktop-file.h"

bus/dispatch.c

@@ -23,6 +23,7 @@
  *
  */
 
+#include <config.h>
 #include "dispatch.h"
 #include "connection.h"
 #include "driver.h"

bus/driver.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "activation.h"
 #include "connection.h"
 #include "driver.h"

bus/expirelist.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "expirelist.h"
 #include "test.h"
 #include <dbus/dbus-internals.h>

bus/main.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "bus.h"
 #include "driver.h"
 #include <dbus/dbus-internals.h>

bus/policy.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "policy.h"
 #include "services.h"
 #include "test.h"

bus/selinux.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-string.h>
 #ifndef DBUS_WIN

bus/services.c

@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include <dbus/dbus-hash.h>
 #include <dbus/dbus-list.h>
 #include <dbus/dbus-mempool.h>

bus/signals.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "signals.h"
 #include "services.h"
 #include "utils.h"

bus/test-launch-helper.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "test.h"
 #include "activation-helper.h"
 

bus/test-main.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "test.h"
 #include <stdio.h>
 #include <stdlib.h>

bus/test-system.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "test.h"
 #include <stdio.h>
 #include <stdlib.h>

bus/test.h

@@ -24,8 +24,6 @@
 #ifndef BUS_TEST_H
 #define BUS_TEST_H
 
-#include <config.h>
-
 #ifdef DBUS_BUILD_TESTS
 
 #include <dbus/dbus.h>

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>

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"

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"

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"

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"
 

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"

dbus/dbus-file-win.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-protocol.h"
 #include "dbus-string.h"
 #include "dbus-internals.h"

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"

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"

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>

dbus/dbus-keyring.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-keyring.h"
 #include "dbus-protocol.h"
 #include <dbus/dbus-string.h>

dbus/dbus-list.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-list.h"
 #include "dbus-mempool.h"

dbus/dbus-mainloop.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-mainloop.h"
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

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"

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

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"

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>
 

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"

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>
 

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"

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>
 

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"

dbus/dbus-marshal-validate.h

@@ -24,8 +24,6 @@
 #ifndef DBUS_MARSHAL_VALIDATE_H
 #define DBUS_MARSHAL_VALIDATE_H
 
-#include <config.h>
-
 /**
  * @addtogroup DBusMarshal
  *

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>

dbus/dbus-memory.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-memory.h"
 #include "dbus-internals.h"
 #include "dbus-sysdeps.h"

dbus/dbus-mempool.c

@@ -21,6 +21,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-mempool.h"
 #include "dbus-internals.h"
 

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>

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"

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"

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"

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"

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"

dbus/dbus-pipe-unix.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-protocol.h"
 #include "dbus-string.h"
 #include "dbus-internals.h"

dbus/dbus-pipe-win.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-protocol.h"
 #include "dbus-string.h"
 #include "dbus-internals.h"

dbus/dbus-pipe.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-pipe.h"
 
 /*

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>

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>
 

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"

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>

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"

dbus/dbus-server-unix.c

@@ -21,6 +21,7 @@
  *
  */