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 840c497..6cc7031 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 91d6d62..79e4915 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 831a2bc..72a75d2 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 48192d1..8945da1 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 1855047..47e207f 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 559384e..b1b101f 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 f742d42..418d003 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 4e39775..5bbe6b8 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 c8a1e12..055f52f 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 9359e9f..a4d133d 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 45bc579..13bdd52 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 d5abb71..c8cb9ca 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 ea1dcc5..6aa95ae 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 3ccad4c..9f1123c 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 c583645..413c1c6 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>