Clean up improper #includes

We have a lot of broken #including going on around the tree.  This has
gone unnoticed due to our sloppy use of -I.

diff --git a/gio/fam/fam-helper.c b/gio/fam/fam-helper.c
index 840c49744eb9898ebaff6b023388ba2034be0b45..6cc7031d115207e4588b4a9fc2575ffcdd645a25 100644 (file)
--- a/gio/fam/fam-helper.c
+++ b/gio/fam/fam-helper.c
@@ -25,8 +25,8 @@
 #include "config.h"
 #include <fam.h>
 #include <gio/gfilemonitor.h>
+#include <gio/gfile.h>
 
-#include "gfile.h"
 #include "fam-helper.h"
 
 static FAMConnection* fam_connection = NULL;

diff --git a/gio/fam/fam-module.c b/gio/fam/fam-module.c
index 91d6d62c439e9d4dbb0e1b09700c2552ddb8f517..79e49155d1e41543f11ca30b0d14f10399d6e709 100644 (file)
--- a/gio/fam/fam-module.c
+++ b/gio/fam/fam-module.c
@@ -23,7 +23,7 @@
  *          Sebastian Dröge <slomo@circular-chaos.org>
  */
 
-#include "giomodule.h"
+#include <gio/giomodule.h>
 #include "gfamdirectorymonitor.h"
 #include "gfamfilemonitor.h"
 #include "fam-helper.h"

diff --git a/gio/fam/gfamdirectorymonitor.c b/gio/fam/gfamdirectorymonitor.c
index 831a2bc591dffb9005a1aa95a6e95eb679a0d9bb..72a75d2d2c77051028693f14800eb28e763ebc80 100644 (file)
--- a/gio/fam/gfamdirectorymonitor.c
+++ b/gio/fam/gfamdirectorymonitor.c
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "gfamdirectorymonitor.h"
-#include "giomodule.h"
+#include <gio/giomodule.h>
 
 #include "fam-helper.h"
 

diff --git a/gio/fam/gfamdirectorymonitor.h b/gio/fam/gfamdirectorymonitor.h
index 48192d12b78deca16b89bebe3abe6640981e9624..8945da1e2f156168edc91d4ca05451d5e3c5a0b4 100644 (file)
--- a/gio/fam/gfamdirectorymonitor.h
+++ b/gio/fam/gfamdirectorymonitor.h
@@ -28,8 +28,8 @@
 
 #include <glib-object.h>
 #include <string.h>
-#include "glocaldirectorymonitor.h"
-#include "giomodule.h"
+#include <gio/glocaldirectorymonitor.h>
+#include <gio/giomodule.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/fam/gfamfilemonitor.c b/gio/fam/gfamfilemonitor.c
index 1855047541176a6d3bdeedca67883e392645592b..47e207fec5045b1b15a8392ab0ad116d0174b43f 100644 (file)
--- a/gio/fam/gfamfilemonitor.c
+++ b/gio/fam/gfamfilemonitor.c
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "gfamfilemonitor.h"
-#include "giomodule.h"
+#include <gio/giomodule.h>
 
 #include "fam-helper.h"
 

diff --git a/gio/fam/gfamfilemonitor.h b/gio/fam/gfamfilemonitor.h
index 559384eb41898df114b16d9c47c142bb93a42eef..b1b101fca6f21ea665a04b15f0b1cebd0d18cc79 100644 (file)
--- a/gio/fam/gfamfilemonitor.h
+++ b/gio/fam/gfamfilemonitor.h
@@ -29,8 +29,8 @@
 #include <glib-object.h>
 #include <string.h>
 #include <gio/gfilemonitor.h>
-#include "glocalfilemonitor.h"
-#include "giomodule.h"
+#include <gio/glocalfilemonitor.h>
+#include <gio/giomodule.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/fen/fen-helper.c b/gio/fen/fen-helper.c
index f742d42dc12463cea23e2a60d58f1005552d2624..418d003c1709a2b02c52aeec217f4d9656b674cb 100644 (file)
--- a/gio/fen/fen-helper.c
+++ b/gio/fen/fen-helper.c
@@ -27,7 +27,7 @@
 #include "fen-helper.h"
 #include "fen-kernel.h"
 #ifdef GIO_COMPILATION
-#include "gfilemonitor.h"
+#include <gio/gfilemonitor.h>
 #else
 #include "gam_event.h"
 #include "gam_server.h"

diff --git a/gio/fen/fen-node.c b/gio/fen/fen-node.c
index 4e39775245032cae9be9a2c3134ee4c33e8946b6..5bbe6b8aca65e582b955f8858dc1e23d17e7a1bc 100644 (file)
--- a/gio/fen/fen-node.c
+++ b/gio/fen/fen-node.c
@@ -32,7 +32,7 @@
 #include "fen-dump.h"
 
 #ifdef GIO_COMPILATION
-#include "gfilemonitor.h"
+#include <gio/gfilemonitor.h>
 #else
 #include "gam_event.h"
 #include "gam_server.h"

diff --git a/gio/fen/gfendirectorymonitor.c b/gio/fen/gfendirectorymonitor.c
index c8a1e1294dac91f338e1dd0c149cc85871677fc7..055f52fbc64307854dcbcd87f0b943537620bcc9 100644 (file)
--- a/gio/fen/gfendirectorymonitor.c
+++ b/gio/fen/gfendirectorymonitor.c
@@ -31,7 +31,7 @@
 #include "config.h"
 
 #include "gfendirectorymonitor.h"
-#include "giomodule.h"
+#include <gio/giomodule.h>
 
 #include "fen-helper.h"
 

diff --git a/gio/fen/gfendirectorymonitor.h b/gio/fen/gfendirectorymonitor.h
index 9359e9fd485bba8480094137444c340f9f0f6205..a4d133db78dc670860cc6a49013eee1f4a3fa475 100644 (file)
--- a/gio/fen/gfendirectorymonitor.h
+++ b/gio/fen/gfendirectorymonitor.h
@@ -33,8 +33,8 @@
 
 #include <glib-object.h>
 #include <string.h>
-#include "glocaldirectorymonitor.h"
-#include "giomodule.h"
+#include <gio/glocaldirectorymonitor.h>
+#include <gio/giomodule.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/inotify/ginotifydirectorymonitor.c b/gio/inotify/ginotifydirectorymonitor.c
index 45bc5793388eedfc68d1a6dece553711f1be9533..13bdd52c1ee1c303d753dba1325ee278dccc9d2e 100644 (file)
--- a/gio/inotify/ginotifydirectorymonitor.c
+++ b/gio/inotify/ginotifydirectorymonitor.c
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "ginotifydirectorymonitor.h"
-#include "giomodule.h"
+#include <gio/giomodule.h>
 
 #define USE_INOTIFY 1
 #include "inotify-helper.h"

diff --git a/gio/inotify/ginotifydirectorymonitor.h b/gio/inotify/ginotifydirectorymonitor.h
index d5abb7115a65658e190891d7dcc0868cba1d87e9..c8cb9cab9baef0b6494e2d34c65d3927defd582f 100644 (file)
--- a/gio/inotify/ginotifydirectorymonitor.h
+++ b/gio/inotify/ginotifydirectorymonitor.h
@@ -28,8 +28,8 @@
 
 #include <glib-object.h>
 #include <string.h>
-#include "glocaldirectorymonitor.h"
-#include "giomodule.h"
+#include <gio/glocaldirectorymonitor.h>
+#include <gio/giomodule.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/tests/application.c b/gio/tests/application.c
index ea1dcc54e36189d5f375c45c06afccb7b28925ef..6aa95ae0fee5c545977b809be09f58121288247e 100644 (file)
--- a/gio/tests/application.c
+++ b/gio/tests/application.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <gio.h>
+#include <gio/gio.h>
 #include <gstdio.h>
 
 #include "gdbus-sessionbus.h"

diff --git a/gio/tests/gschema-compile.c b/gio/tests/gschema-compile.c
index 3ccad4c25ae512010031046e61487e5c932a3c64..9f1123c8e02726e1b0074d0f4d5f00d3f3dddd8a 100644 (file)
--- a/gio/tests/gschema-compile.c
+++ b/gio/tests/gschema-compile.c
@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <locale.h>
 #include <libintl.h>
-#include <gio.h>
+#include <gio/gio.h>
 #include <gstdio.h>
 
 typedef struct {

diff --git a/gio/tests/testapp.c b/gio/tests/testapp.c
index c583645a49ab74f1bc3f740e3fd380eda94034e8..413c1c61d73f78946e292ed68b4a3b4e7b763e60 100644 (file)
--- a/gio/tests/testapp.c
+++ b/gio/tests/testapp.c
@@ -1,4 +1,4 @@
-#include <gio.h>
+#include <gio/gio.h>
 #include <gstdio.h>
 #include <string.h>