codegen: GType classes require including "glib-object.h"

Move the include at a better position to cover more cases.

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 55ad7f3fd7709e30c4c180e921a6957dc9a567b7..bb971c1c499d16d43a9ea8cf4d0c710e80450fe8 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -66,6 +66,8 @@ public class Vala.GTypeModule : GErrorModule {
                bool is_gsource = cl.base_class == gsource_type;
 
                if (is_gtypeinstance) {
+                       decl_space.add_include ("glib-object.h");
+
                        decl_space.add_type_declaration (new CCodeNewline ());
                        var macro = "(%s_get_type ())".printf (get_ccode_lower_case_name (cl, null));
                        decl_space.add_type_declaration (new CCodeMacroReplacement (get_ccode_type_id (cl), macro));
@@ -234,7 +236,6 @@ public class Vala.GTypeModule : GErrorModule {
                if (cl.base_class != null) {
                        instance_struct.add_field (get_ccode_name (cl.base_class), "parent_instance");
                } else if (is_fundamental) {
-                       decl_space.add_include ("glib-object.h");
                        instance_struct.add_field ("GTypeInstance", "parent_instance");
                        instance_struct.add_field ("volatile int", "ref_count");
                }