From ba0208b3a8076f8c3c545ba5716347ad446525f7 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 6 Aug 2010 13:05:18 -0400 Subject: [PATCH] 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. --- gio/fam/fam-helper.c | 2 +- gio/fam/fam-module.c | 2 +- gio/fam/gfamdirectorymonitor.c | 2 +- gio/fam/gfamdirectorymonitor.h | 4 ++-- gio/fam/gfamfilemonitor.c | 2 +- gio/fam/gfamfilemonitor.h | 4 ++-- gio/fen/fen-helper.c | 2 +- gio/fen/fen-node.c | 2 +- gio/fen/gfendirectorymonitor.c | 2 +- gio/fen/gfendirectorymonitor.h | 4 ++-- gio/inotify/ginotifydirectorymonitor.c | 2 +- gio/inotify/ginotifydirectorymonitor.h | 4 ++-- gio/tests/application.c | 2 +- gio/tests/gschema-compile.c | 2 +- gio/tests/testapp.c | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gio/fam/fam-helper.c b/gio/fam/fam-helper.c index 840c49744..6cc7031d1 100644 --- a/gio/fam/fam-helper.c +++ b/gio/fam/fam-helper.c @@ -25,8 +25,8 @@ #include "config.h" #include #include +#include -#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 91d6d62c4..79e49155d 100644 --- a/gio/fam/fam-module.c +++ b/gio/fam/fam-module.c @@ -23,7 +23,7 @@ * Sebastian Dröge */ -#include "giomodule.h" +#include #include "gfamdirectorymonitor.h" #include "gfamfilemonitor.h" #include "fam-helper.h" diff --git a/gio/fam/gfamdirectorymonitor.c b/gio/fam/gfamdirectorymonitor.c index 831a2bc59..72a75d2d2 100644 --- a/gio/fam/gfamdirectorymonitor.c +++ b/gio/fam/gfamdirectorymonitor.c @@ -26,7 +26,7 @@ #include "config.h" #include "gfamdirectorymonitor.h" -#include "giomodule.h" +#include #include "fam-helper.h" diff --git a/gio/fam/gfamdirectorymonitor.h b/gio/fam/gfamdirectorymonitor.h index 48192d12b..8945da1e2 100644 --- a/gio/fam/gfamdirectorymonitor.h +++ b/gio/fam/gfamdirectorymonitor.h @@ -28,8 +28,8 @@ #include #include -#include "glocaldirectorymonitor.h" -#include "giomodule.h" +#include +#include G_BEGIN_DECLS diff --git a/gio/fam/gfamfilemonitor.c b/gio/fam/gfamfilemonitor.c index 185504754..47e207fec 100644 --- a/gio/fam/gfamfilemonitor.c +++ b/gio/fam/gfamfilemonitor.c @@ -26,7 +26,7 @@ #include "config.h" #include "gfamfilemonitor.h" -#include "giomodule.h" +#include #include "fam-helper.h" diff --git a/gio/fam/gfamfilemonitor.h b/gio/fam/gfamfilemonitor.h index 559384eb4..b1b101fca 100644 --- a/gio/fam/gfamfilemonitor.h +++ b/gio/fam/gfamfilemonitor.h @@ -29,8 +29,8 @@ #include #include #include -#include "glocalfilemonitor.h" -#include "giomodule.h" +#include +#include G_BEGIN_DECLS diff --git a/gio/fen/fen-helper.c b/gio/fen/fen-helper.c index f742d42dc..418d003c1 100644 --- 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 #else #include "gam_event.h" #include "gam_server.h" diff --git a/gio/fen/fen-node.c b/gio/fen/fen-node.c index 4e3977524..5bbe6b8ac 100644 --- 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 #else #include "gam_event.h" #include "gam_server.h" diff --git a/gio/fen/gfendirectorymonitor.c b/gio/fen/gfendirectorymonitor.c index c8a1e1294..055f52fbc 100644 --- a/gio/fen/gfendirectorymonitor.c +++ b/gio/fen/gfendirectorymonitor.c @@ -31,7 +31,7 @@ #include "config.h" #include "gfendirectorymonitor.h" -#include "giomodule.h" +#include #include "fen-helper.h" diff --git a/gio/fen/gfendirectorymonitor.h b/gio/fen/gfendirectorymonitor.h index 9359e9fd4..a4d133db7 100644 --- a/gio/fen/gfendirectorymonitor.h +++ b/gio/fen/gfendirectorymonitor.h @@ -33,8 +33,8 @@ #include #include -#include "glocaldirectorymonitor.h" -#include "giomodule.h" +#include +#include G_BEGIN_DECLS diff --git a/gio/inotify/ginotifydirectorymonitor.c b/gio/inotify/ginotifydirectorymonitor.c index 45bc57933..13bdd52c1 100644 --- a/gio/inotify/ginotifydirectorymonitor.c +++ b/gio/inotify/ginotifydirectorymonitor.c @@ -26,7 +26,7 @@ #include "config.h" #include "ginotifydirectorymonitor.h" -#include "giomodule.h" +#include #define USE_INOTIFY 1 #include "inotify-helper.h" diff --git a/gio/inotify/ginotifydirectorymonitor.h b/gio/inotify/ginotifydirectorymonitor.h index d5abb7115..c8cb9cab9 100644 --- a/gio/inotify/ginotifydirectorymonitor.h +++ b/gio/inotify/ginotifydirectorymonitor.h @@ -28,8 +28,8 @@ #include #include -#include "glocaldirectorymonitor.h" -#include "giomodule.h" +#include +#include G_BEGIN_DECLS diff --git a/gio/tests/application.c b/gio/tests/application.c index ea1dcc54e..6aa95ae0f 100644 --- a/gio/tests/application.c +++ b/gio/tests/application.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include "gdbus-sessionbus.h" diff --git a/gio/tests/gschema-compile.c b/gio/tests/gschema-compile.c index 3ccad4c25..9f1123c8e 100644 --- a/gio/tests/gschema-compile.c +++ b/gio/tests/gschema-compile.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include typedef struct { diff --git a/gio/tests/testapp.c b/gio/tests/testapp.c index c583645a4..413c1c61d 100644 --- a/gio/tests/testapp.c +++ b/gio/tests/testapp.c @@ -1,4 +1,4 @@ -#include +#include #include #include -- 2.34.1