diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 5d912c4e2..fbc3b662c 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jul  6 00:46:43 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtypemodule.h: 
+	* gtypemodule.c: Fix the declarations of the new 
+	functions to return GType, not void. 
+	Also add missing includes.  (#145508, Morten Welinder)
+
 Tue Jul  6 00:46:43 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtypemodule.h: 
diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c
index bb3df5b0a..0c917c0d3 100644
--- a/gobject/gtypemodule.c
+++ b/gobject/gtypemodule.c
@@ -388,7 +388,7 @@ g_type_module_add_interface (GTypeModule          *module,
   module_interface_info->info = *interface_info;
 }
 
-void
+GType
 g_type_module_register_enum (GTypeModule      *module,
                              const gchar      *name,
                              const GEnumValue *const_static_values)
@@ -406,7 +406,7 @@ g_type_module_register_enum (GTypeModule      *module,
                                       G_TYPE_ENUM, name, &enum_type_info, 0);
 }
 
-void
+GType
 g_type_module_register_flags (GTypeModule      *module,
                              const gchar       *name,
                              const GFlagsValue *const_static_values)
diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index 863ea153f..ad2c6421b 100644
--- a/gobject/gtypemodule.h
+++ b/gobject/gtypemodule.h
@@ -24,6 +24,7 @@
 #define __G_TYPE_MODULE_H__
 
 #include <gobject/gobject.h>
+#include <gobject/genums.h>
 
 G_BEGIN_DECLS
 
@@ -79,10 +80,10 @@ void     g_type_module_add_interface  (GTypeModule          *module,
                                        GType                 instance_type,
                                        GType                 interface_type,
                                        const GInterfaceInfo *interface_info);
-void     g_type_module_register_enum  (GTypeModule          *module,
+GType    g_type_module_register_enum  (GTypeModule          *module,
                                        const gchar          *name,
                                        const GEnumValue     *const_static_values);
-void     g_type_module_register_flags (GTypeModule          *module,
+GType    g_type_module_register_flags (GTypeModule          *module,
                                        const gchar          *name,
                                        const GFlagsValue    *const_static_values);