13 files changed, 28 insertions, 23 deletions
diff --git a/backends/evoldap-backend.c b/backends/evoldap-backend.c
index 67da2867..53d0ce9d 100644
--- a/backends/evoldap-backend.c
+++ b/backends/evoldap-backend.c
@@ -30,9 +30,9 @@
 #include <libxml/xpath.h>
 #include <glib.h>
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-backend.h>
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf.h"
+#include "gconf/gconf-backend.h"
+#include "gconf/gconf-internals.h"
 
 typedef struct
 {
diff --git a/backends/gconf-merge-tree.c b/backends/gconf-merge-tree.c
index 95334051..f1b6102d 100644
--- a/backends/gconf-merge-tree.c
+++ b/backends/gconf-merge-tree.c
@@ -20,7 +20,7 @@
  *     Mark McLoughlin <mark@skynet.ie>
  */
 
-#include <config.h>
+#include "config.h"
 #include <locale.h>
 
 #include "markup-tree.c"
diff --git a/backends/markup-backend.c b/backends/markup-backend.c
index 86ceb13f..d81809c8 100644
--- a/backends/markup-backend.c
+++ b/backends/markup-backend.c
@@ -17,10 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
-#include <gconf/gconf-backend.h>
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf.h>
+#include "config.h"
+#include "gconf/gconf-backend.h"
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf.h"
 
 #include <stdio.h>
 #include <time.h>
diff --git a/backends/markup-tree.c b/backends/markup-tree.c
index 61ead91b..72ed1a4c 100644
--- a/backends/markup-tree.c
+++ b/backends/markup-tree.c
@@ -18,9 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <glib.h>
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf-schema.h>
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf-schema.h"
 #include "markup-tree.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/backends/markup-tree.h b/backends/markup-tree.h
index 0d5d9d42..6f1d0ad8 100644
--- a/backends/markup-tree.h
+++ b/backends/markup-tree.h
@@ -21,7 +21,7 @@
 #define MARKUP_TREE_H
 
 #include <glib.h>
-#include <gconf/gconf-value.h>
+#include "gconf/gconf-value.h"
 
 typedef struct _MarkupTree  MarkupTree;
 typedef struct _MarkupDir   MarkupDir;
diff --git a/backends/xml-backend.c b/backends/xml-backend.c
index 30ff0019..140e3173 100644
--- a/backends/xml-backend.c
+++ b/backends/xml-backend.c
@@ -18,10 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
-#include <gconf/gconf-backend.h>
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf.h>
+#include "config.h"
+#include "gconf/gconf-backend.h"
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf.h"
 
 #include "xml-cache.h"
 
diff --git a/backends/xml-cache.c b/backends/xml-cache.c
index 4186628d..261ad55c 100644
--- a/backends/xml-cache.c
+++ b/backends/xml-cache.c
@@ -17,8 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-cache.h"
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/backends/xml-cache.h b/backends/xml-cache.h
index aa69e59c..ce49d43a 100644
--- a/backends/xml-cache.h
+++ b/backends/xml-cache.h
@@ -20,7 +20,7 @@
 #ifndef GCONF_XML_CACHE_H
 #define GCONF_XML_CACHE_H
 
-#include <gconf/gconf.h>
+#include "gconf/gconf.h"
 #include <libxml/tree.h>
 #include "xml-dir.h"
 
diff --git a/backends/xml-dir.c b/backends/xml-dir.c
index 9c32d8e9..5b1d5b30 100644
--- a/backends/xml-dir.c
+++ b/backends/xml-dir.c
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-dir.h"
 #include "xml-entry.h"
 
@@ -33,7 +34,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 
 /* This makes hash table safer when debugging */
 #ifndef GCONF_ENABLE_DEBUG
diff --git a/backends/xml-dir.h b/backends/xml-dir.h
index ebc27eeb..688e3fc1 100644
--- a/backends/xml-dir.h
+++ b/backends/xml-dir.h
@@ -20,7 +20,7 @@
 #ifndef GCONF_XML_DIR_H
 #define GCONF_XML_DIR_H
 
-#include <gconf/gconf.h>
+#include "gconf/gconf.h"
 #include <libxml/tree.h>
 
 /* Dir stores the information about a given directory */
diff --git a/backends/xml-entry.c b/backends/xml-entry.c
index ececb383..9d2ccaed 100644
--- a/backends/xml-entry.c
+++ b/backends/xml-entry.c
@@ -17,8 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-entry.h"
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 #include <stdlib.h>
 #include <string.h>
 #include <libxml/entities.h>
diff --git a/backends/xml-entry.h b/backends/xml-entry.h
index 6724fd8d..622b4858 100644
--- a/backends/xml-entry.h
+++ b/backends/xml-entry.h
@@ -20,7 +20,7 @@
 #ifndef GCONF_XML_ENTRY_H
 #define GCONF_XML_ENTRY_H
 
-#include <gconf/gconf.h>
+#include "gconf/gconf.h"
 #include <libxml/tree.h>
 
 /* Entry stores all the information about a given key */
diff --git a/backends/xml-test.c b/backends/xml-test.c
index b964a419..05973beb 100644
--- a/backends/xml-test.c
+++ b/backends/xml-test.c
@@ -17,11 +17,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-entry.h"
 #include "xml-dir.h"
 #include "xml-cache.h"
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf-backend.h>
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf-backend.h"
 #include <stdlib.h>
 #include <string.h>
 #include <libxml/entities.h>