diff --git a/girepository/girnode-private.h b/girepository/girnode-private.h
index 6bb814e38..171d38a50 100644
--- a/girepository/girnode-private.h
+++ b/girepository/girnode-private.h
@@ -147,7 +147,7 @@ struct _GIIrNodeType
   uint8_t is_ghashtable : 1;
   uint8_t is_interface : 1;
   uint8_t is_error : 1;
-  int tag;
+  GITypeTag tag;
 
   char *unparsed; /* (owned) */
 
diff --git a/girepository/girparser.c b/girepository/girparser.c
index 52e6a92fa..e6f78b76f 100644
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -499,7 +499,7 @@ static IntegerAliasInfo integer_aliases[] = {
 
 typedef struct {
   const char *str;
-  int tag;
+  GITypeTag tag;
   gboolean pointer;
 } BasicTypeInfo;
 
diff --git a/girepository/girwriter.c b/girepository/girwriter.c
index 82db11774..b2bd6395d 100644
--- a/girepository/girwriter.c
+++ b/girepository/girwriter.c
@@ -221,7 +221,7 @@ write_type_info (const char *ns,
                  GITypeInfo  *info,
                  Xml         *file)
 {
-  int tag;
+  GITypeTag tag;
   GITypeInfo *type;
   gboolean is_pointer;