diff --git a/ChangeLog b/ChangeLog
index 3d469e8fb..a1e5daf5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-27  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/cogl/cogl.h: Add header and compiler guards.
+
 2007-03-27  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/glx/clutter-stage-glx.c: Remove the check in the
diff --git a/clutter/cogl/cogl.h b/clutter/cogl/cogl.h
index 40ec05126..863dc63af 100644
--- a/clutter/cogl/cogl.h
+++ b/clutter/cogl/cogl.h
@@ -23,8 +23,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __COGL_H__
+#define __COGL_H__
+
+#include <glib.h>
 #include <clutter/clutter.h>
 
+G_BEGIN_DECLS
+
 typedef void (*CoglFuncPtr) (void);
 
 CoglFuncPtr
@@ -57,3 +63,6 @@ cogl_rotatex (ClutterFixed angle, gint x, gint y, gint z);
 void
 cogl_rotate (gint angle, gint x, gint y, gint z);
 
+G_END_DECLS
+
+#endif /* __COGL_H__ */