[gnome-color-manager/gnome-3-0] Revert accidental commit pending freeze thaw

[Kjartan Maraas <kmaraas src gnome org>]

commit 72809cba338671f5e961f843816df8cb90800c79
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Mar 30 12:42:17 2011 +0200

    Revert accidental commit pending freeze thaw

 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, 4 insertions(+), 8 deletions(-)
---
diff --git a/libcolor-glib/gcm-compat.h b/libcolor-glib/gcm-compat.h
index 8126237..3e30993 100644
--- a/libcolor-glib/gcm-compat.h
+++ b/libcolor-glib/gcm-compat.h
@@ -26,6 +26,8 @@
 #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 a2173ef..500a766 100644
--- a/libcolor-glib/gcm-debug.c
+++ b/libcolor-glib/gcm-debug.c
@@ -19,10 +19,6 @@
  * 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 c410135..ac42627 100644
--- a/libcolor-glib/gcm-debug.h
+++ b/libcolor-glib/gcm-debug.h
@@ -28,6 +28,8 @@
 
 #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 013b59d..a25c7fc 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -19,10 +19,6 @@
  * 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>