Include config.h and our corresponding header first in every source file

Putting the corresponding header first exposed a missing header inclusion
in text-helper.h; fix that by using the meta-header.

27 files changed, 49 insertions, 26 deletions

diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c
index a336edda..12beab2a 100644
--- a/lib/gibber/gibber-bytestream-direct.c
+++ b/lib/gibber/gibber-bytestream-direct.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "gibber-bytestream-direct.h"
 
 #include <stdlib.h>
diff --git a/lib/gibber/gibber-bytestream-iface.c b/lib/gibber/gibber-bytestream-iface.c
index fb7317a7..4bb5d96e 100644
--- a/lib/gibber/gibber-bytestream-iface.c
+++ b/lib/gibber/gibber-bytestream-iface.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "gibber-bytestream-iface.h"
 
 #include <glib.h>
diff --git a/lib/gibber/gibber-bytestream-muc.c b/lib/gibber/gibber-bytestream-muc.c
index a947eb55..ff37089c 100644
--- a/lib/gibber/gibber-bytestream-muc.c
+++ b/lib/gibber/gibber-bytestream-muc.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "gibber-bytestream-muc.h"
 
 #include <stdlib.h>
diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c
index 43e6b5b6..ca9214cc 100644
--- a/lib/gibber/gibber-bytestream-oob.c
+++ b/lib/gibber/gibber-bytestream-oob.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "gibber-bytestream-oob.h"
 
 #include <stdlib.h>
diff --git a/lib/gibber/gibber-debug.c b/lib/gibber/gibber-debug.c
index 47cc8742..69d24884 100644
--- a/lib/gibber/gibber-debug.c
+++ b/lib/gibber/gibber-debug.c
@@ -1,10 +1,10 @@
+#include "config.h"
+#include "gibber-debug.h"
 
 #include <stdarg.h>
 
 #include <glib.h>
 
-#include "gibber-debug.h"
-
 #ifdef ENABLE_DEBUG
 
 static DebugFlags flags = 0;
diff --git a/lib/gibber/gibber-fd-transport.c b/lib/gibber/gibber-fd-transport.c
index e23f1bc4..abdadbb3 100644
--- a/lib/gibber/gibber-fd-transport.c
+++ b/lib/gibber/gibber-fd-transport.c
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
+#include "config.h"
+#include "gibber-fd-transport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,7 +31,6 @@
 #endif
 
 #include "gibber-sockets.h"
-#include "gibber-fd-transport.h"
 
 #define DEBUG_FLAG DEBUG_NET
 #include "gibber-debug.h"
diff --git a/lib/gibber/gibber-file-transfer.c b/lib/gibber/gibber-file-transfer.c
index dc42ff1c..a08e8096 100644
--- a/lib/gibber/gibber-file-transfer.c
+++ b/lib/gibber/gibber-file-transfer.c
@@ -17,12 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-file-transfer.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "gibber-file-transfer.h"
 #include "gibber-oob-file-transfer.h"
 
 #define DEBUG_FLAG DEBUG_FILE_TRANSFER
diff --git a/lib/gibber/gibber-linklocal-transport.c b/lib/gibber/gibber-linklocal-transport.c
index 164af89c..456c6789 100644
--- a/lib/gibber/gibber-linklocal-transport.c
+++ b/lib/gibber/gibber-linklocal-transport.c
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
+#include "config.h"
+#include "gibber-linklocal-transport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,7 +31,6 @@
 #endif
 
 #include "gibber-sockets.h"
-#include "gibber-linklocal-transport.h"
 #include "gibber-util.h"
 
 #define DEBUG_FLAG DEBUG_NET
diff --git a/lib/gibber/gibber-listener.c b/lib/gibber/gibber-listener.c
index 67ea9563..3e3a5a5b 100644
--- a/lib/gibber/gibber-listener.c
+++ b/lib/gibber/gibber-listener.c
@@ -17,7 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
+#include "config.h"
+#include "gibber-listener.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +35,6 @@
 
 #include <glib.h>
 
-#include "gibber-listener.h"
 #include "gibber-fd-transport.h"
 #include "gibber-unix-transport.h"
 #include "gibber-util.h"
diff --git a/lib/gibber/gibber-muc-connection.c b/lib/gibber/gibber-muc-connection.c
index 31f006c6..4acd7e4d 100644
--- a/lib/gibber/gibber-muc-connection.c
+++ b/lib/gibber/gibber-muc-connection.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-muc-connection.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,8 +27,6 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "gibber-muc-connection.h"
-
 #include "gibber-sockets.h"
 #include "gibber-multicast-transport.h"
 #include "gibber-r-multicast-transport.h"
diff --git a/lib/gibber/gibber-multicast-transport.c b/lib/gibber/gibber-multicast-transport.c
index fd146d40..2d9ed0c6 100644
--- a/lib/gibber/gibber-multicast-transport.c
+++ b/lib/gibber/gibber-multicast-transport.c
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include <gibber-multicast-transport.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -25,8 +28,6 @@
 
 #include "gibber-sockets.h"
 
-#include <gibber-multicast-transport.h>
-
 #define DEBUG_FLAG DEBUG_NET
 #include <gibber-debug.h>
 
diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index 60497020..23c2bff4 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-oob-file-transfer.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +30,6 @@
 
 #include <wocky/wocky.h>
 
-#include "gibber-oob-file-transfer.h"
 #include "gibber-fd-transport.h"
 #include "gibber-util.h"
 
diff --git a/lib/gibber/gibber-r-multicast-causal-transport.c b/lib/gibber/gibber-r-multicast-causal-transport.c
index d4036286..1ec2f9f3 100644
--- a/lib/gibber/gibber-r-multicast-causal-transport.c
+++ b/lib/gibber/gibber-r-multicast-causal-transport.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-r-multicast-causal-transport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +30,6 @@
 #define DEBUG_FLAG DEBUG_RMULTICAST
 #include "gibber-debug.h"
 
-#include "gibber-r-multicast-causal-transport.h"
 #include "gibber-r-multicast-packet.h"
 #include "gibber-r-multicast-sender.h"
 
diff --git a/lib/gibber/gibber-r-multicast-packet.c b/lib/gibber/gibber-r-multicast-packet.c
index 5710b6dd..88b072a9 100644
--- a/lib/gibber/gibber-r-multicast-packet.c
+++ b/lib/gibber/gibber-r-multicast-packet.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-r-multicast-packet.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,8 +27,6 @@
 
 #include "gibber-sockets.h"
 
-#include "gibber-r-multicast-packet.h"
-
 #define PACKET_VERSION 1
 
 #define PACKET_PREFIX { 'C', 'l', 'i', 'q', 'u', 'e' }
diff --git a/lib/gibber/gibber-r-multicast-sender.c b/lib/gibber/gibber-r-multicast-sender.c
index 1090247b..66082465 100644
--- a/lib/gibber/gibber-r-multicast-sender.c
+++ b/lib/gibber/gibber-r-multicast-sender.c
@@ -18,12 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-r-multicast-sender.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "gibber-r-multicast-sender.h"
 #include "gibber-util.h"
 
 #define DEBUG_FLAG DEBUG_RMULTICAST_SENDER
diff --git a/lib/gibber/gibber-r-multicast-transport.c b/lib/gibber/gibber-r-multicast-transport.c
index 7c845ab9..122fcdd2 100644
--- a/lib/gibber/gibber-r-multicast-transport.c
+++ b/lib/gibber/gibber-r-multicast-transport.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-r-multicast-transport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,7 +28,6 @@
 #define DEBUG_FLAG DEBUG_RMULTICAST
 #include "gibber-debug.h"
 
-#include "gibber-r-multicast-transport.h"
 #include "gibber-r-multicast-packet.h"
 #include "gibber-r-multicast-sender.h"
 
diff --git a/lib/gibber/gibber-tcp-transport.c b/lib/gibber/gibber-tcp-transport.c
index efe2fc8a..58a74ae2 100644
--- a/lib/gibber/gibber-tcp-transport.c
+++ b/lib/gibber/gibber-tcp-transport.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include "gibber-tcp-transport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +32,6 @@
 #endif
 
 #include "gibber-sockets.h"
-#include "gibber-tcp-transport.h"
 
 #define DEBUG_FLAG DEBUG_NET
 #include "gibber-debug.h"
diff --git a/lib/gibber/gibber-transport.c b/lib/gibber/gibber-transport.c
index 522f0fb1..ee77f930 100644
--- a/lib/gibber/gibber-transport.c
+++ b/lib/gibber/gibber-transport.c
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "gibber-transport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "gibber-transport.h"
-
 #define DEBUG_FLAG DEBUG_TRANSPORT
 #include "gibber-debug.h"
 
diff --git a/lib/gibber/gibber-unix-transport.c b/lib/gibber/gibber-unix-transport.c
index 884bac6d..cb18787c 100644
--- a/lib/gibber/gibber-unix-transport.c
+++ b/lib/gibber/gibber-unix-transport.c
@@ -22,6 +22,9 @@
 /* needed for struct ucred */
 #define _GNU_SOURCE
 
+#include "config.h"
+#include "gibber-unix-transport.h"
+
 #include <glib.h>
 
 #ifdef G_OS_UNIX
@@ -38,7 +41,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "gibber-unix-transport.h"
 #include "gibber-util.h"
 
 #define DEBUG_FLAG DEBUG_NET
diff --git a/lib/gibber/gibber-util.c b/lib/gibber/gibber-util.c
index ff49ed10..cde25ba3 100644
--- a/lib/gibber/gibber-util.c
+++ b/lib/gibber/gibber-util.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gibber-util.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,8 +28,6 @@
 # include <unistd.h>
 #endif
 
-#include "gibber-util.h"
-
 void
 gibber_normalize_address (struct sockaddr_storage *addr)
 {
diff --git a/lib/gibber/tests/check-gibber-listener.c b/lib/gibber/tests/check-gibber-listener.c
index 3ca01407..8f991ba6 100644
--- a/lib/gibber/tests/check-gibber-listener.c
+++ b/lib/gibber/tests/check-gibber-listener.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c b/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c
index 0d9f7427..5ffe8284 100644
--- a/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c
+++ b/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/lib/gibber/tests/check-gibber-r-multicast-packet.c b/lib/gibber/tests/check-gibber-r-multicast-packet.c
index 5d5fcfd8..1ec49b0b 100644
--- a/lib/gibber/tests/check-gibber-r-multicast-packet.c
+++ b/lib/gibber/tests/check-gibber-r-multicast-packet.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/lib/gibber/tests/check-gibber-r-multicast-sender.c b/lib/gibber/tests/check-gibber-r-multicast-sender.c
index 7eb41943..00e4f5b2 100644
--- a/lib/gibber/tests/check-gibber-r-multicast-sender.c
+++ b/lib/gibber/tests/check-gibber-r-multicast-sender.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/gibber/tests/check-gibber-unix-transport.c b/lib/gibber/tests/check-gibber-unix-transport.c
index c3cfbed8..d6907c64 100644
--- a/lib/gibber/tests/check-gibber-unix-transport.c
+++ b/lib/gibber/tests/check-gibber-unix-transport.c
@@ -18,9 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #define _GNU_SOURCE
 
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/gibber/tests/test-r-multicast-transport-io.c b/lib/gibber/tests/test-r-multicast-transport-io.c
index 62a4e96d..e2be1306 100644
--- a/lib/gibber/tests/test-r-multicast-transport-io.c
+++ b/lib/gibber/tests/test-r-multicast-transport-io.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/lib/gibber/tests/test-transport.c b/lib/gibber/tests/test-transport.c
index b035a534..541ffd0e 100644
--- a/lib/gibber/tests/test-transport.c
+++ b/lib/gibber/tests/test-transport.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>