[gnome-color-manager/gnome-3-0] Remove #include <config.h> from headers to make sure it's not included more than once. Add it to a c

[Kjartan Maraas <kmaraas src gnome org>]

commit e700742b69d8ee0a7bdd2d0376bd0766255e971b
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Mar 29 12:46:53 2011 +0200

    Remove #include <config.h> from headers to make sure it's not included more than once. Add it to a couple .c files that didn't have it

 libcolor-glib/gcm-compat.h |    2 --
 libcolor-glib/gcm-debug.c  |    4 ++++
 libcolor-glib/gcm-debug.h  |    2 --
 src/gcm-self-test.c        |    4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/libcolor-glib/gcm-compat.h b/libcolor-glib/gcm-compat.h
index 3e30993..8126237 100644
--- a/libcolor-glib/gcm-compat.h
+++ b/libcolor-glib/gcm-compat.h
@@ -26,8 +26,6 @@
 #ifndef __GCM_COMPAT_H__
 #define __GCM_COMPAT_H__
 
-#include "config.h"
-
 /* only libusb 1.0.8 has libusb_strerror */
 #ifndef HAVE_NEW_USB
 #define	libusb_strerror(f1)				"unknown"
diff --git a/libcolor-glib/gcm-debug.c b/libcolor-glib/gcm-debug.c
index 500a766..a2173ef 100644
--- a/libcolor-glib/gcm-debug.c
+++ b/libcolor-glib/gcm-debug.c
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/libcolor-glib/gcm-debug.h b/libcolor-glib/gcm-debug.h
index ac42627..c410135 100644
--- a/libcolor-glib/gcm-debug.h
+++ b/libcolor-glib/gcm-debug.h
@@ -28,8 +28,6 @@
 
 #include <glib.h>
 
-#include "config.h"
-
 gboolean	 gcm_debug_is_verbose		(void);
 GOptionGroup	*gcm_debug_get_option_group	(void);
 void		 gcm_debug_setup		(gboolean	 enabled);
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index a25c7fc..013b59d 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib-object.h>
 #include <math.h>
 #include <glib/gstdio.h>