diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 525feb3e8..e6d1440da 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gobject/tmpl/gtype.sgml (GTypeInterfaceCheckData):
+	Rename first parameter.
+
 	* glib/glib-sections.txt: Add GKeyFile section.
 
 2004-10-17  Matthias Clasen  <mclasen@redhat.com>
diff --git a/docs/reference/gobject/tmpl/gtype.sgml b/docs/reference/gobject/tmpl/gtype.sgml
index 2abff951b..0c0e56627 100644
--- a/docs/reference/gobject/tmpl/gtype.sgml
+++ b/docs/reference/gobject/tmpl/gtype.sgml
@@ -1442,7 +1442,7 @@ A callback called after an interface vtable is initialized.
 See g_type_add_interface_check().
 </para>
 
-@func_data: data passed to g_type_add_interface_check().
+@check_data: data passed to g_type_add_interface_check().
 @g_iface: the interface that has been initialized
 @Since: 2.4
 
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 5b569fda4..baaa21db2 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtype.h (GTypeInterfaceCheckFunc): Rename first parameter to 
+	check_data, since apparently the system headers on AIX leak a
+	macro named func_data.  (#155178, Andrea Campi)
+
 Wed Oct  6 02:12:44 2004    <timj@birnet.org>
 
 	* gtype.c (g_type_instance_get_private): applied patch from Jean-Yves 
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 7fac048aa..43926c7f5 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -219,7 +219,7 @@ typedef void   (*GInterfaceFinalizeFunc)     (gpointer         g_iface,
 					      gpointer         iface_data);
 typedef gboolean (*GTypeClassCacheFunc)	     (gpointer	       cache_data,
 					      GTypeClass      *g_class);
-typedef void     (*GTypeInterfaceCheckFunc)  (gpointer	       func_data,
+typedef void     (*GTypeInterfaceCheckFunc)  (gpointer	       check_data,
 					      gpointer         g_iface);
 typedef enum    /*< skip >*/
 {
@@ -399,7 +399,7 @@ void             g_type_class_unref_uncached    (gpointer            g_class);
 void             g_type_add_interface_check     (gpointer	         check_data,
 						 GTypeInterfaceCheckFunc check_func);
 void             g_type_remove_interface_check  (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc chec_func);
+						 GTypeInterfaceCheckFunc check_func);
 
 GTypeValueTable* g_type_value_table_peek        (GType		     type);