From 0623b3c91e906b0579befd5d3ffc05c32b2a0342 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Tue, 17 Apr 2018 09:07:35 +0300
Subject: [PATCH] gconf, gsettings: fix config.h includes

config.h should be included by all .c files and none of the .h files.
---
 src/modules/gconf/module-gconf.c         | 6 +++++-
 src/modules/gsettings/module-gsettings.c | 6 +++++-
 src/modules/stdin-util.c                 | 2 --
 src/modules/stdin-util.h                 | 4 ----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index e5ddf0dfc..c0f4dde56 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -17,7 +17,9 @@
   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "../stdin-util.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -26,6 +28,8 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/start-child.h>
 
+#include "../stdin-util.h"
+
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("GConf Adapter");
 PA_MODULE_VERSION(PACKAGE_VERSION);
diff --git a/src/modules/gsettings/module-gsettings.c b/src/modules/gsettings/module-gsettings.c
index 7df933d61..330eca1d7 100644
--- a/src/modules/gsettings/module-gsettings.c
+++ b/src/modules/gsettings/module-gsettings.c
@@ -17,7 +17,9 @@
   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "../stdin-util.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -26,6 +28,8 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/start-child.h>
 
+#include "../stdin-util.h"
+
 PA_MODULE_AUTHOR("Sylvain Baubeau");
 PA_MODULE_DESCRIPTION("GSettings Adapter");
 PA_MODULE_VERSION(PACKAGE_VERSION);
diff --git a/src/modules/stdin-util.c b/src/modules/stdin-util.c
index db394acb8..37bd1a4a6 100644
--- a/src/modules/stdin-util.c
+++ b/src/modules/stdin-util.c
@@ -17,8 +17,6 @@
   License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "stdin-util.h"
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/modules/stdin-util.h b/src/modules/stdin-util.h
index 6b97f238f..9177026ad 100644
--- a/src/modules/stdin-util.h
+++ b/src/modules/stdin-util.h
@@ -20,10 +20,6 @@
   License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <errno.h>
 #include <stdint.h>
 #include <sys/types.h>