Clean up gtypes a bit

26 files changed, 170 insertions, 170 deletions

diff --git a/pango/break-indic.c b/pango/break-indic.c
index 9f890cc0..17f9c124 100644
--- a/pango/break-indic.c
+++ b/pango/break-indic.c
@@ -111,7 +111,7 @@ break_indic (const char          *text,
 	     PangoLogAttr        *attrs,
 	     int                  attrs_len G_GNUC_UNUSED)
 {
-  const gchar *p, *next = NULL, *next_next;
+  const char *p, *next = NULL, *next_next;
   gunichar prev_wc, this_wc, next_wc, next_next_wc;
   gboolean is_conjunct = FALSE;
   int i;
diff --git a/pango/break.c b/pango/break.c
index 0fba0652..a4e60267 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -160,8 +160,8 @@ default_break (const char    *text,
    * before we start, and then never assign %FALSE to anything
    */
 
-  const gchar *next;
-  gint i;
+  const char *next;
+  int i;
 
   gunichar prev_wc;
   gunichar next_wc;
@@ -211,7 +211,7 @@ default_break (const char    *text,
     WB_WSegSpace,
   } WordBreakType;
   WordBreakType prev_prev_WB_type = WB_Other, prev_WB_type = WB_Other;
-  gint prev_WB_i = -1;
+  int prev_WB_i = -1;
 
   /* See Sentence_Break Property Values table of UAX#29 */
   typedef enum
@@ -233,7 +233,7 @@ default_break (const char    *text,
     SB_STerm_Close_Sp,
   } SentenceBreakType;
   SentenceBreakType prev_prev_SB_type = SB_Other, prev_SB_type = SB_Other;
-  gint prev_SB_i = -1;
+  int prev_SB_i = -1;
 
   /* Rule LB25 with Example 7 of Customization */
   typedef enum
@@ -250,8 +250,8 @@ default_break (const char    *text,
   gunichar last_word_letter = 0;
   gunichar base_character = 0;
 
-  gint last_sentence_start = -1;
-  gint last_non_space = -1;
+  int last_sentence_start = -1;
+  int last_non_space = -1;
 
   gboolean prev_space_or_hyphen;
 
diff --git a/pango/glyphstring.c b/pango/glyphstring.c
index c42133ca..00a93c19 100644
--- a/pango/glyphstring.c
+++ b/pango/glyphstring.c
@@ -57,7 +57,7 @@ pango_glyph_string_new (void)
  * Resize a glyph string to the given length.
  */
 void
-pango_glyph_string_set_size (PangoGlyphString *string, gint new_len)
+pango_glyph_string_set_size (PangoGlyphString *string, int new_len)
 {
   g_return_if_fail (new_len >= 0);
 
@@ -70,7 +70,7 @@ pango_glyph_string_set_size (PangoGlyphString *string, gint new_len)
       else
 	{
 	  const guint max_space =
-	    MIN (G_MAXINT, G_MAXSIZE / MAX (sizeof(PangoGlyphInfo), sizeof(gint)));
+	    MIN (G_MAXINT, G_MAXSIZE / MAX (sizeof(PangoGlyphInfo), sizeof(int)));
 
 	  guint more_space = (guint)string->space * 2;
 
@@ -90,7 +90,7 @@ pango_glyph_string_set_size (PangoGlyphString *string, gint new_len)
     }
 
   string->glyphs = g_realloc (string->glyphs, string->space * sizeof (PangoGlyphInfo));
-  string->log_clusters = g_realloc (string->log_clusters, string->space * sizeof (gint));
+  string->log_clusters = g_realloc (string->log_clusters, string->space * sizeof (int));
   string->num_glyphs = new_len;
 }
 
@@ -121,7 +121,7 @@ pango_glyph_string_copy (PangoGlyphString *string)
   new_string->glyphs = g_memdup2 (string->glyphs,
                                   string->space * sizeof (PangoGlyphInfo));
   new_string->log_clusters = g_memdup2 (string->log_clusters,
-                                        string->space * sizeof (gint));
+                                        string->space * sizeof (int));
 
   return new_string;
 }
diff --git a/pango/itemize.c b/pango/itemize.c
index 7dc00446..874c1d57 100644
--- a/pango/itemize.c
+++ b/pango/itemize.c
@@ -134,11 +134,11 @@ typedef struct _PangoWidthIter PangoWidthIter;
 
 struct _PangoWidthIter
 {
-        const gchar *text_start;
-        const gchar *text_end;
-        const gchar *start;
-        const gchar *end;
-        gboolean     upright;
+        const char *text_start;
+        const char *text_end;
+        const char *start;
+        const char *end;
+        gboolean upright;
 };
 
 static gboolean
diff --git a/pango/pango-attr-iterator.c b/pango/pango-attr-iterator.c
index 76205b8d..86c8d1aa 100644
--- a/pango/pango-attr-iterator.c
+++ b/pango/pango-attr-iterator.c
@@ -167,8 +167,8 @@ pango_attr_iterator_copy (PangoAttrIterator *iterator)
  */
 void
 pango_attr_iterator_range (PangoAttrIterator *iterator,
-                           gint              *start,
-                           gint              *end)
+                           int               *start,
+                           int               *end)
 {
   g_return_if_fail (iterator != NULL);
 
@@ -317,7 +317,7 @@ pango_attr_iterator_get_font (PangoAttrIterator     *iterator,
 {
   PangoFontMask mask = 0;
   gboolean have_language = FALSE;
-  gdouble scale = 0;
+  double scale = 0;
   gboolean have_scale = FALSE;
   int i;
 
diff --git a/pango/pango-attr-list.c b/pango/pango-attr-list.c
index c7ad4015..7e187206 100644
--- a/pango/pango-attr-list.c
+++ b/pango/pango-attr-list.c
@@ -512,8 +512,8 @@ pango_attr_list_update (PangoAttrList *list,
 void
 pango_attr_list_splice (PangoAttrList *list,
                         PangoAttrList *other,
-                        gint           pos,
-                        gint           len)
+                        int            pos,
+                        int            len)
 {
   guint i, p;
   guint upos, ulen;
diff --git a/pango/pango-color.c b/pango/pango-color.c
index b2d85562..a95f27b4 100644
--- a/pango/pango-color.c
+++ b/pango/pango-color.c
@@ -10,7 +10,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
@@ -110,7 +110,7 @@ pango_color_equal (const PangoColor *color1,
  * Return value: a newly-allocated text string that must
  *   be freed with [GLib.free]
  */
-gchar *
+char *
 pango_color_to_string (const PangoColor *color)
 {
   g_return_val_if_fail (color != NULL, NULL);
@@ -185,25 +185,25 @@ compare_xcolor_entries (const void *a, const void *b)
       int c1, c2;
       while (*s1 == ' ') s1++;
       while (*s2 == ' ') s1++;
-      c1 = (gint)(guchar) TOLOWER (*s1);
-      c2 = (gint)(guchar) TOLOWER (*s2);
+      c1 = (int)(guchar) TOLOWER (*s1);
+      c2 = (int)(guchar) TOLOWER (*s2);
       if (c1 != c2)
         return (c1 - c2);
       s1++; s2++;
     }
 
-  return ((gint) *s1) - ((gint) *s2);
+  return ((int) *s1) - ((int) *s2);
 }
 
 static gboolean
 find_color(const char *name,
-	   PangoColor *color)
+           PangoColor *color)
 {
   ColorEntry *found;
 
   found = bsearch (name, color_entries, G_N_ELEMENTS (color_entries),
-		   sizeof (ColorEntry),
-		   compare_xcolor_entries);
+                   sizeof (ColorEntry),
+                   compare_xcolor_entries);
   if (found == NULL)
     return FALSE;
 
diff --git a/pango/pango-emoji-private.h b/pango/pango-emoji-private.h
index 29878de5..fae2939e 100644
--- a/pango/pango-emoji-private.h
+++ b/pango/pango-emoji-private.h
@@ -31,10 +31,10 @@ typedef struct _PangoEmojiIter PangoEmojiIter;
 
 struct _PangoEmojiIter
 {
-  const gchar *text_start;
-  const gchar *text_end;
-  const gchar *start;
-  const gchar *end;
+  const char *text_start;
+  const char *text_end;
+  const char *start;
+  const char *end;
   gboolean is_emoji;
 
   unsigned char *types;
diff --git a/pango/pango-font-description.c b/pango/pango-font-description.c
index e46f4ad3..11fc3cf0 100644
--- a/pango/pango-font-description.c
+++ b/pango/pango-font-description.c
@@ -356,7 +356,7 @@ pango_font_description_get_stretch (const PangoFontDescription *desc)
  */
 void
 pango_font_description_set_size (PangoFontDescription *desc,
-                                 gint                  size)
+                                 int                   size)
 {
   g_return_if_fail (desc != NULL);
   g_return_if_fail (size >= 0);
@@ -382,7 +382,7 @@ pango_font_description_set_size (PangoFontDescription *desc,
  *   Use [method@Pango.FontDescription.get_set_fields] to find out
  *   if the field was explicitly set or not.
  */
-gint
+int
 pango_font_description_get_size (const PangoFontDescription *desc)
 {
   g_return_val_if_fail (desc != NULL, pfd_defaults.size);
@@ -1022,19 +1022,19 @@ static const FieldMap gravity_map[] = {
 };
 
 static gboolean
-field_matches (const gchar *s1,
-               const gchar *s2,
-               gsize n)
+field_matches (const char *s1,
+               const char *s2,
+               gsize       n)
 {
-  gint c1, c2;
+  int c1, c2;
 
   g_return_val_if_fail (s1 != NULL, 0);
   g_return_val_if_fail (s2 != NULL, 0);
 
   while (n && *s1 && *s2)
     {
-      c1 = (gint)(guchar) TOLOWER (*s1);
-      c2 = (gint)(guchar) TOLOWER (*s2);
+      c1 = (int)(guchar) TOLOWER (*s1);
+      c2 = (int)(guchar) TOLOWER (*s2);
       if (c1 != c2) {
         if (c1 == '-') {
           s1++;
diff --git a/pango/pango-glyph-iter.h b/pango/pango-glyph-iter.h
index 3c328cc7..ef0df5fb 100644
--- a/pango/pango-glyph-iter.h
+++ b/pango/pango-glyph-iter.h
@@ -72,7 +72,7 @@ typedef struct _PangoGlyphItemIter PangoGlyphItemIter;
 struct _PangoGlyphItemIter
 {
   PangoGlyphItem *glyph_item;
-  const gchar *text;
+  const char *text;
 
   int start_glyph;
   int start_index;
diff --git a/pango/pango-impl-utils.h b/pango/pango-impl-utils.h
index 627d0616..1592e305 100644
--- a/pango/pango-impl-utils.h
+++ b/pango/pango-impl-utils.h
@@ -43,7 +43,7 @@ pango_unichar_width (gunichar c)
 }
 
 static G_GNUC_UNUSED glong
-pango_utf8_strwidth (const gchar *p)
+pango_utf8_strwidth (const char *p)
 {
   glong len = 0;
   g_return_val_if_fail (p != NULL, 0);
@@ -60,10 +60,10 @@ pango_utf8_strwidth (const gchar *p)
 /* Glib's g_utf8_strlen() is broken and stops at embedded NUL's.
  * Wrap it here. */
 static G_GNUC_UNUSED glong
-pango_utf8_strlen (const gchar *p, gssize max)
+pango_utf8_strlen (const char *p, gssize max)
 {
   glong len = 0;
-  const gchar *start = p;
+  const char *start = p;
   g_return_val_if_fail (p != NULL || max == 0, 0);
 
   if (max <= 0)
@@ -97,7 +97,7 @@ pango_glyph_string_reverse_range (PangoGlyphString *glyphs,
   for (i = start, j = end - 1; i < j; i++, j--)
     {
       PangoGlyphInfo glyph_info;
-      gint log_cluster;
+      int log_cluster;
 
       glyph_info = glyphs->glyphs[i];
       glyphs->glyphs[i] = glyphs->glyphs[j];
diff --git a/pango/pango-item.c b/pango/pango-item.c
index 64ddbb76..25f552ea 100644
--- a/pango/pango-item.c
+++ b/pango/pango-item.c
@@ -284,8 +284,8 @@ pango_analysis_collect_features (const PangoAnalysis *analysis,
       PangoAttribute *attr = l->data;
       if (attr->type == PANGO_ATTR_FONT_FEATURES)
         {
-          const gchar *feat;
-          const gchar *end;
+          const char *feat;
+          const char *end;
           int len;
 
           feat = attr->str_value;
diff --git a/pango/pango-language.c b/pango/pango-language.c
index d7551edf..eea32002 100644
--- a/pango/pango-language.c
+++ b/pango/pango-language.c
@@ -170,7 +170,7 @@ G_DEFINE_BOXED_TYPE (PangoLanguage, pango_language,
  *
  * Return value: a dynamically allocated string, free with [GLib.free]
  */
-static gchar *
+static char *
 _pango_get_lc_ctype (void)
 {
 #ifdef G_OS_WIN32
@@ -185,7 +185,7 @@ _pango_get_lc_ctype (void)
    * start the program with LC_ALL=something on the command line.)
    */
 
-  gchar *p;
+  char *p;
 
   p = getenv ("LC_ALL");
   if (p != NULL)
@@ -203,8 +203,8 @@ _pango_get_lc_ctype (void)
 #elif defined(HAVE_CORE_TEXT)
   CFArrayRef languages;
   CFStringRef language;
-  gchar ret[16];
-  gchar *p;
+  char ret[16];
+  char *p;
 
   /* Take the same approach as done for Windows above. First we check
    * if somebody tried to set the locale through environment variables.
@@ -238,7 +238,7 @@ _pango_get_lc_ctype (void)
   return g_strdup (ret);
 #else
   {
-    gchar *lc_ctype = setlocale (LC_CTYPE, NULL);
+    char *lc_ctype = setlocale (LC_CTYPE, NULL);
 
     if (lc_ctype)
       return g_strdup (lc_ctype);
@@ -292,7 +292,7 @@ pango_language_get_default (void)
 
   if (g_once_init_enter (&result))
     {
-      gchar *lc_ctype;
+      char *lc_ctype;
       PangoLanguage *lang;
 
       lc_ctype = _pango_get_lc_ctype ();
diff --git a/pango/pango-line-breaker.c b/pango/pango-line-breaker.c
index ccec0ffe..55eb9f4f 100644
--- a/pango/pango-line-breaker.c
+++ b/pango/pango-line-breaker.c
@@ -811,7 +811,7 @@ shape_tab (PangoLineBreaker *self,
 
 static inline gboolean
 can_break_at (PangoLineBreaker *self,
-              gint              offset,
+              int               offset,
               PangoWrapMode     wrap)
 {
   if (offset == self->data->n_chars)
diff --git a/pango/pango-line.c b/pango/pango-line.c
index 775a25ba..10661e90 100644
--- a/pango/pango-line.c
+++ b/pango/pango-line.c
@@ -1197,14 +1197,14 @@ pango_line_x_to_index (PangoLine *line,
                        int       *trailing)
 {
   GSList *tmp_list;
-  gint start_pos = 0;
-  gint first_index = 0; /* line->start_index */
-  gint first_offset;
-  gint last_index;      /* start of last grapheme in line */
-  gint last_offset;
-  gint end_index;       /* end iterator for line */
-  gint end_offset;      /* end iterator for line */
-  gint last_trailing;
+  int start_pos = 0;
+  int first_index = 0; /* line->start_index */
+  int first_offset;
+  int last_index;      /* start of last grapheme in line */
+  int last_offset;
+  int end_index;       /* end iterator for line */
+  int end_offset;      /* end iterator for line */
+  int last_trailing;
   gboolean suppress_last_trailing;
 
   /* Find the last index in the line */
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index 1786bfba..53f35db4 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -70,11 +70,11 @@ struct _OpenTag
    * an absolute size is set.
    * Each "larger" ups it 1, each "smaller" decrements it 1
    */
-  gint scale_level;
+  int scale_level;
   /* Our impact on scale_level, so we know whether we
    * need to create an attribute ourselves on close
    */
-  gint scale_level_delta;
+  int scale_level_delta;
   /* Base scale factor currently in effect
    * or size that this tag
    * forces, or parent's scale factor or size.
@@ -86,75 +86,75 @@ struct _OpenTag
 
 typedef gboolean (*TagParseFunc) (MarkupData            *md,
                                   OpenTag               *tag,
-                                  const gchar          **names,
-                                  const gchar          **values,
+                                  const char           **names,
+                                  const char           **values,
                                   GMarkupParseContext   *context,
                                   GError               **error);
 
 static gboolean b_parse_func        (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean big_parse_func      (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean span_parse_func     (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean i_parse_func        (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean markup_parse_func   (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean s_parse_func        (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean sub_parse_func      (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean sup_parse_func      (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean small_parse_func    (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean tt_parse_func       (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 static gboolean u_parse_func        (MarkupData           *md,
                                      OpenTag              *tag,
-                                     const gchar         **names,
-                                     const gchar         **values,
+                                     const char          **names,
+                                     const char          **values,
                                      GMarkupParseContext  *context,
                                      GError              **error);
 
@@ -494,9 +494,9 @@ markup_data_close_tag (MarkupData *md)
 
 static void
 start_element_handler  (GMarkupParseContext *context,
-                        const gchar         *element_name,
-                        const gchar        **attribute_names,
-                        const gchar        **attribute_values,
+                        const char          *element_name,
+                        const char         **attribute_names,
+                        const char         **attribute_values,
                         gpointer             user_data,
                         GError             **error)
 {
@@ -551,7 +551,7 @@ start_element_handler  (GMarkupParseContext *context,
 
   if (parse_func == NULL)
     {
-      gint line_number, char_number;
+      int line_number, char_number;
 
       g_markup_parse_context_get_position (context,
                                            &line_number, &char_number);
@@ -582,7 +582,7 @@ start_element_handler  (GMarkupParseContext *context,
 
 static void
 end_element_handler    (GMarkupParseContext *context G_GNUC_UNUSED,
-                        const gchar         *element_name G_GNUC_UNUSED,
+                        const char          *element_name G_GNUC_UNUSED,
                         gpointer             user_data,
                         GError             **error G_GNUC_UNUSED)
 {
@@ -591,7 +591,7 @@ end_element_handler    (GMarkupParseContext *context G_GNUC_UNUSED,
 
 static void
 text_handler           (GMarkupParseContext *context G_GNUC_UNUSED,
-                        const gchar         *text,
+                        const char          *text,
                         gsize                text_len,
                         gpointer             user_data,
                         GError             **error G_GNUC_UNUSED)
@@ -609,10 +609,10 @@ text_handler           (GMarkupParseContext *context G_GNUC_UNUSED,
   else
     {
       /* Parse the accelerator */
-      const gchar *p;
-      const gchar *end;
-      const gchar *range_start;
-      const gchar *range_end;
+      const char *p;
+      const char *end;
+      const char *range_start;
+      const char *range_end;
       gssize uline_index = -1;
       gsize uline_len = 0;      /* Quiet GCC */
 
@@ -971,7 +971,7 @@ set_bad_attribute (GError             **error,
                    const char          *element_name,
                    const char          *attribute_name)
 {
-  gint line_number, char_number;
+  int line_number, char_number;
 
   g_markup_parse_context_get_position (context,
                                        &line_number, &char_number);
@@ -1004,8 +1004,8 @@ add_attribute (OpenTag        *ot,
 static gboolean
 b_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1017,8 +1017,8 @@ b_parse_func        (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 big_parse_func      (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1095,7 +1095,7 @@ done:
 }
 
 /* a string compare func that ignores '-' vs '_' differences */
-static gint
+static int
 attr_strcmp (gconstpointer pa,
              gconstpointer pb)
 {
@@ -1311,8 +1311,8 @@ parse_length (const char *attr_val,
 static gboolean
 span_parse_func     (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values,
+                     const char           **names,
+                     const char           **values,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1760,7 +1760,7 @@ span_parse_func     (MarkupData            *md G_GNUC_UNUSED,
 
   if (G_UNLIKELY (rise))
     {
-      gint n = 0;
+      int n = 0;
 
       if (!parse_length (rise, &n))
         {
@@ -1779,7 +1779,7 @@ span_parse_func     (MarkupData            *md G_GNUC_UNUSED,
 
   if (G_UNLIKELY (baseline_shift))
     {
-      gint shift = 0;
+      int shift = 0;
 
       if (span_parse_enum ("baseline_shift", baseline_shift, PANGO_TYPE_BASELINE_SHIFT, (int*)(void*)&shift, line_number, NULL))
         add_attribute (tag, pango_attr_baseline_shift_new (shift));
@@ -1811,7 +1811,7 @@ span_parse_func     (MarkupData            *md G_GNUC_UNUSED,
 
   if (G_UNLIKELY (letter_spacing))
     {
-      gint n = 0;
+      int n = 0;
 
       if (!span_parse_int ("letter_spacing", letter_spacing, &n, line_number, error))
         goto error;
@@ -1894,8 +1894,8 @@ span_parse_func     (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 i_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1908,8 +1908,8 @@ i_parse_func        (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 markup_parse_func (MarkupData            *md G_GNUC_UNUSED,
                    OpenTag               *tag G_GNUC_UNUSED,
-                   const gchar          **names G_GNUC_UNUSED,
-                   const gchar          **values G_GNUC_UNUSED,
+                   const char           **names G_GNUC_UNUSED,
+                   const char           **values G_GNUC_UNUSED,
                    GMarkupParseContext   *context G_GNUC_UNUSED,
                    GError               **error G_GNUC_UNUSED)
 {
@@ -1922,8 +1922,8 @@ markup_parse_func (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 s_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1936,8 +1936,8 @@ s_parse_func        (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 sub_parse_func      (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1952,8 +1952,8 @@ sub_parse_func      (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 sup_parse_func      (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1968,8 +1968,8 @@ sup_parse_func      (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 small_parse_func    (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1988,8 +1988,8 @@ small_parse_func    (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 tt_parse_func       (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -2003,8 +2003,8 @@ tt_parse_func       (MarkupData            *md G_GNUC_UNUSED,
 static gboolean
 u_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
-                     const gchar          **names,
-                     const gchar          **values G_GNUC_UNUSED,
+                     const char           **names,
+                     const char           **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
diff --git a/pango/pango-matrix.c b/pango/pango-matrix.c
index d564e75a..78aacae6 100644
--- a/pango/pango-matrix.c
+++ b/pango/pango-matrix.c
@@ -127,7 +127,7 @@ pango_matrix_rotate (PangoMatrix *matrix,
 		     double       degrees)
 {
   PangoMatrix tmp;
-  gdouble r, s, c;
+  double r, s, c;
 
   g_return_if_fail (matrix != NULL);
 
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index 37eb8dfc..42a9bb61 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -1036,7 +1036,7 @@ get_total_matrix (PangoMatrix       *total,
                   int                square)
 {
   PangoMatrix local;
-  gdouble scale = 0.5 * square;
+  double scale = 0.5 * square;
 
   /* The local matrix translates from the axis aligned coordinate system
    * to the original user space coordinate system.
diff --git a/pango/pango-script-private.h b/pango/pango-script-private.h
index cad2dcfe..c300be43 100644
--- a/pango/pango-script-private.h
+++ b/pango/pango-script-private.h
@@ -32,11 +32,11 @@ struct _ParenStackEntry
 
 struct _PangoScriptIter
 {
-  const gchar *text_start;
-  const gchar *text_end;
+  const char *text_start;
+  const char *text_end;
 
-  const gchar *script_start;
-  const gchar *script_end;
+  const char *script_start;
+  const char *script_end;
   GUnicodeScript script_code;
 
   ParenStackEntry paren_stack[PAREN_STACK_DEPTH];
diff --git a/pango/pango-tabs.c b/pango/pango-tabs.c
index d72182f4..1ad732f5 100644
--- a/pango/pango-tabs.c
+++ b/pango/pango-tabs.c
@@ -45,14 +45,14 @@ struct _PangoTab
  */
 struct _PangoTabArray
 {
-  gint size;
-  gint allocated;
+  int size;
+  int allocated;
   gboolean positions_in_pixels;
   PangoTab *tabs;
 };
 
 static void
-init_tabs (PangoTabArray *array, gint start, gint end)
+init_tabs (PangoTabArray *array, int start, int end)
 {
   while (start < end)
     {
@@ -77,7 +77,7 @@ init_tabs (PangoTabArray *array, gint start, gint end)
  *   be freed with [method@Pango.TabArray.free].
  */
 PangoTabArray*
-pango_tab_array_new (gint     initial_size,
+pango_tab_array_new (int     initial_size,
                      gboolean positions_in_pixels)
 {
   PangoTabArray *array;
@@ -122,10 +122,10 @@ pango_tab_array_new (gint     initial_size,
  *   be freed with [method@Pango.TabArray.free].
  */
 PangoTabArray  *
-pango_tab_array_new_with_positions (gint           size,
+pango_tab_array_new_with_positions (int            size,
                                     gboolean       positions_in_pixels,
                                     PangoTabAlign  first_alignment,
-                                    gint           first_position,
+                                    int            first_position,
                                     ...)
 {
   PangoTabArray *array;
@@ -218,7 +218,7 @@ pango_tab_array_free (PangoTabArray *tab_array)
  *
  * Return value: the number of tab stops in the array.
  */
-gint
+int
 pango_tab_array_get_size (PangoTabArray *tab_array)
 {
   g_return_val_if_fail (tab_array != NULL, 0);
@@ -238,11 +238,11 @@ pango_tab_array_get_size (PangoTabArray *tab_array)
  */
 void
 pango_tab_array_resize (PangoTabArray *tab_array,
-                        gint           new_size)
+                        int            new_size)
 {
   if (new_size > tab_array->allocated)
     {
-      gint current_end = tab_array->allocated;
+      int current_end = tab_array->allocated;
 
       /* Ratchet allocated size up above the index. */
       if (tab_array->allocated == 0)
@@ -271,9 +271,9 @@ pango_tab_array_resize (PangoTabArray *tab_array,
  */
 void
 pango_tab_array_set_tab (PangoTabArray *tab_array,
-                         gint           tab_index,
+                         int            tab_index,
                          PangoTabAlign  alignment,
-                         gint           location)
+                         int            location)
 {
   g_return_if_fail (tab_array != NULL);
   g_return_if_fail (tab_index >= 0);
@@ -297,9 +297,9 @@ pango_tab_array_set_tab (PangoTabArray *tab_array,
  */
 void
 pango_tab_array_get_tab (PangoTabArray *tab_array,
-                         gint           tab_index,
+                         int            tab_index,
                          PangoTabAlign *alignment,
-                         gint          *location)
+                         int           *location)
 {
   g_return_if_fail (tab_array != NULL);
   g_return_if_fail (tab_index < tab_array->size);
@@ -327,11 +327,11 @@ pango_tab_array_get_tab (PangoTabArray *tab_array,
  * You must free the returned array.
  */
 void
-pango_tab_array_get_tabs (PangoTabArray *tab_array,
+pango_tab_array_get_tabs (PangoTabArray  *tab_array,
                           PangoTabAlign **alignments,
-                          gint          **locations)
+                          int           **locations)
 {
-  gint i;
+  int i;
 
   g_return_if_fail (tab_array != NULL);
 
@@ -339,7 +339,7 @@ pango_tab_array_get_tabs (PangoTabArray *tab_array,
     *alignments = g_new (PangoTabAlign, tab_array->size);
 
   if (locations)
-    *locations = g_new (gint, tab_array->size);
+    *locations = g_new (int, tab_array->size);
 
   i = 0;
   while (i < tab_array->size)
diff --git a/pango/pango-tabs.h b/pango/pango-tabs.h
index d72c957c..828a153b 100644
--- a/pango/pango-tabs.h
+++ b/pango/pango-tabs.h
@@ -50,13 +50,13 @@ typedef enum
 #define PANGO_TYPE_TAB_ARRAY (pango_tab_array_get_type ())
 
 PANGO_AVAILABLE_IN_ALL
-PangoTabArray  *pango_tab_array_new                 (gint           initial_size,
+PangoTabArray  *pango_tab_array_new                 (int            initial_size,
                                                      gboolean       positions_in_pixels);
 PANGO_AVAILABLE_IN_ALL
-PangoTabArray  *pango_tab_array_new_with_positions  (gint           size,
+PangoTabArray  *pango_tab_array_new_with_positions  (int            size,
                                                      gboolean       positions_in_pixels,
                                                      PangoTabAlign  first_alignment,
-                                                     gint           first_position,
+                                                     int            first_position,
                                                      ...);
 PANGO_AVAILABLE_IN_ALL
 GType           pango_tab_array_get_type            (void) G_GNUC_CONST;
@@ -65,24 +65,24 @@ PangoTabArray  *pango_tab_array_copy                (PangoTabArray *src);
 PANGO_AVAILABLE_IN_ALL
 void            pango_tab_array_free                (PangoTabArray *tab_array);
 PANGO_AVAILABLE_IN_ALL
-gint            pango_tab_array_get_size            (PangoTabArray *tab_array);
+int             pango_tab_array_get_size            (PangoTabArray *tab_array);
 PANGO_AVAILABLE_IN_ALL
 void            pango_tab_array_resize              (PangoTabArray *tab_array,
-                                                     gint           new_size);
+                                                     int            new_size);
 PANGO_AVAILABLE_IN_ALL
 void            pango_tab_array_set_tab             (PangoTabArray *tab_array,
-                                                     gint           tab_index,
+                                                     int            tab_index,
                                                      PangoTabAlign  alignment,
-                                                     gint           location);
+                                                     int            location);
 PANGO_AVAILABLE_IN_ALL
 void            pango_tab_array_get_tab             (PangoTabArray *tab_array,
-                                                     gint           tab_index,
+                                                     int            tab_index,
                                                      PangoTabAlign *alignment,
-                                                     gint          *location);
+                                                     int           *location);
 PANGO_AVAILABLE_IN_ALL
 void            pango_tab_array_get_tabs            (PangoTabArray *tab_array,
                                                      PangoTabAlign **alignments,
-                                                     gint          **locations);
+                                                     int           **locations);
 
 PANGO_AVAILABLE_IN_ALL
 gboolean        pango_tab_array_get_positions_in_pixels (PangoTabArray *tab_array);
diff --git a/pango/pango-trace-private.h b/pango/pango-trace-private.h
index fc305ea3..96cc44d6 100644
--- a/pango/pango-trace-private.h
+++ b/pango/pango-trace-private.h
@@ -33,8 +33,8 @@
 #endif
 
 void pango_trace_mark (gint64       begin_time,
-                       const gchar *name,
-                       const gchar *message_format,
+                       const char  *name,
+                       const char  *message_format,
                        ...) G_GNUC_PRINTF (3, 4);
 
 #ifndef HAVE_SYSPROF
diff --git a/pango/pango-trace.c b/pango/pango-trace.c
index 9f37376d..4338928f 100644
--- a/pango/pango-trace.c
+++ b/pango/pango-trace.c
@@ -24,9 +24,9 @@
 #include <stdarg.h>
 
 void
-(pango_trace_mark) (gint64       begin_time,
-                    const gchar *name,
-                    const gchar *message_format,
+(pango_trace_mark) (gint64      begin_time,
+                    const char *name,
+                    const char *message_format,
                     ...)
 {
 #ifdef HAVE_SYSPROF
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index d759d2ac..e993976e 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -111,13 +111,13 @@ pango_version_string (void)
  *   mismatch.  The returned string is owned by Pango and should not
  *   be modified or freed.
  */
-const gchar*
+const char *
 pango_version_check (int required_major,
 		     int required_minor,
 		     int required_micro)
 {
-  gint pango_effective_micro = 100 * PANGO_VERSION_MINOR + PANGO_VERSION_MICRO;
-  gint required_effective_micro = 100 * required_minor + required_micro;
+  int pango_effective_micro = 100 * PANGO_VERSION_MINOR + PANGO_VERSION_MICRO;
+  int required_effective_micro = 100 * required_minor + required_micro;
 
   if (required_major > PANGO_VERSION_MAJOR)
     return "Pango version too old (major mismatch)";
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 5860ea13..ab5d342e 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -127,11 +127,11 @@ ct_font_descriptor_get_weight (CTFontDescriptorRef desc)
   return weight;
 }
 
-static gchar *
+static char *
 gchar_from_cf_string (CFStringRef str)
 {
   CFIndex len;
-  gchar *buffer;
+  char *buffer;
 
   /* GetLength returns the number of UTF-16 pairs, so this number
    * times 2 should definitely gives us enough space for UTF8.
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 0cf445d6..9ac45f1a 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -165,7 +165,7 @@ pango_font_description_from_pattern (FcPattern *pattern)
   res = FcPatternGetString (pattern, FC_FAMILY, 0, (FcChar8 **) &s);
   g_assert (res == FcResultMatch);
 
-  pango_font_description_set_family (desc, (gchar *)s);
+  pango_font_description_set_family (desc, (char *)s);
 
   if (FcPatternGetInteger (pattern, FC_SLANT, 0, &i) == FcResultMatch)
     style = convert_fc_slant_to_pango (i);