Replace "gchar" with "char"

88 files changed, 430 insertions, 430 deletions

diff --git a/gdk/broadway/broadway-server.c b/gdk/broadway/broadway-server.c
index df6d25c066..1256e1a1f6 100644
--- a/gdk/broadway/broadway-server.c
+++ b/gdk/broadway/broadway-server.c
@@ -1060,8 +1060,8 @@ send_error (HttpRequest *request,
 #define SEC_WEB_SOCKET_KEY_MAGIC "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
 
 /* 'x3JJHMbDL1EzLkh9GBhXDw==' generates 'HSmrc0sMlYUkAGmm5OPpG2HaGWk=' */
-static gchar *
-generate_handshake_response_wsietf_v7 (const gchar *key)
+static char *
+generate_handshake_response_wsietf_v7 (const char *key)
 {
   gsize digest_len = 20;
   guchar digest[20];
diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index fd82a1810e..af1fd47ce4 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -175,7 +175,7 @@ create_touchscreen (GdkDisplay *display)
 }
 
 GdkDisplay *
-_gdk_broadway_display_open (const gchar *display_name)
+_gdk_broadway_display_open (const char *display_name)
 {
   GdkDisplay *display;
   GdkBroadwayDisplay *broadway_display;
@@ -225,12 +225,12 @@ _gdk_broadway_display_open (const gchar *display_name)
   return display;
 }
 
-static const gchar *
+static const char *
 gdk_broadway_display_get_name (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
-  return (gchar *) "Broadway";
+  return (char *) "Broadway";
 }
 
 static void
@@ -311,7 +311,7 @@ gdk_broadway_display_finalize (GObject *object)
 
 static void
 gdk_broadway_display_notify_startup_complete (GdkDisplay  *display,
-					      const gchar *startup_id)
+					      const char *startup_id)
 {
 }
 
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index 98d02958c8..78cab28440 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -89,10 +89,10 @@ void _gdk_broadway_events_got_input      (GdkDisplay *display,
                                           BroadwayInputMsg *message);
 
 void _gdk_broadway_display_init_root_window (GdkDisplay *display);
-GdkDisplay * _gdk_broadway_display_open (const gchar *display_name);
+GdkDisplay * _gdk_broadway_display_open (const char *display_name);
 void _gdk_broadway_display_queue_events (GdkDisplay *display);
 GdkCursor*_gdk_broadway_display_get_cursor_for_name (GdkDisplay  *display,
-                                                     const gchar *name);
+                                                     const char *name);
 GdkCursor *_gdk_broadway_display_get_cursor_for_texture (GdkDisplay *display,
                                                          GdkTexture *texture,
                                                          int         x,
diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 8d7fb8d954..5b5abdb6b3 100644
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -660,13 +660,13 @@ gdk_broadway_surface_set_geometry_hints (GdkSurface        *surface,
 
 static void
 gdk_broadway_surface_set_title (GdkSurface  *surface,
-                                const gchar *title)
+                                const char *title)
 {
 }
 
 static void
 gdk_broadway_surface_set_startup_id (GdkSurface  *surface,
-                                     const gchar *startup_id)
+                                     const char *startup_id)
 {
 }
 
diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
index 100c54adce..fb058c0f39 100644
--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@ -30,7 +30,7 @@ void gdk_display_set_cursor_theme          (GdkDisplay   *display,
 gboolean gdk_running_in_sandbox (void);
 gboolean gdk_should_use_portal (void);
 
-const gchar *   gdk_get_startup_notification_id (void);
+const char *   gdk_get_startup_notification_id (void);
 
 PangoDirection gdk_unichar_direction (gunichar    ch);
 PangoDirection gdk_find_base_dir     (const char *text,
diff --git a/gdk/gdk.c b/gdk/gdk.c
index bb6c1fc457..c874d15260 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -163,7 +163,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
 G_DEFINE_CONSTRUCTOR(stash_desktop_startup_notification_id)
 #endif
 
-static gchar *startup_notification_id = NULL;
+static char *startup_notification_id = NULL;
 
 static void
 stash_desktop_startup_notification_id (void)
@@ -209,8 +209,8 @@ gdk_parse_debug_var (const char        *variable,
   guint i;
   guint result = 0;
   const char *string;
-  const gchar *p;
-  const gchar *q;
+  const char *p;
+  const char *q;
   gboolean invert;
   gboolean help;
 
@@ -352,7 +352,7 @@ gdk_display_open_default (void)
  * Returns: (nullable) (transfer none): the original value of the
  *   DESKTOP_STARTUP_ID environment variable, or %NULL.
  */
-const gchar *
+const char *
 gdk_get_startup_notification_id (void)
 {
   return startup_notification_id;
@@ -402,11 +402,11 @@ gdk_unichar_direction (gunichar ch)
 }
 
 PangoDirection
-gdk_find_base_dir (const gchar *text,
+gdk_find_base_dir (const char *text,
                    int          length)
 {
   PangoDirection dir = PANGO_DIRECTION_NEUTRAL;
-  const gchar *p;
+  const char *p;
 
   g_return_val_if_fail (text != NULL || length == 0, PANGO_DIRECTION_NEUTRAL);
 
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index a466209939..b34cdaad80 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -60,14 +60,14 @@
  */
 
 static void    gdk_app_launch_context_finalize    (GObject           *object);
-static gchar * gdk_app_launch_context_get_display_name (GAppLaunchContext *context,
+static char * gdk_app_launch_context_get_display_name (GAppLaunchContext *context,
                                                         GAppInfo          *info,
                                                         GList             *files);
-static gchar * gdk_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
+static char * gdk_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
                                                              GAppInfo          *info,
                                                              GList             *files);
 static void    gdk_app_launch_context_launch_failed (GAppLaunchContext *context,
-                                                     const gchar       *startup_notify_id);
+                                                     const char        *startup_notify_id);
 
 
 enum
@@ -157,7 +157,7 @@ gdk_app_launch_context_finalize (GObject *object)
   G_OBJECT_CLASS (gdk_app_launch_context_parent_class)->finalize (object);
 }
 
-static gchar *
+static char *
 gdk_app_launch_context_get_display_name (GAppLaunchContext *context,
                                          GAppInfo          *info,
                                          GList             *files)
@@ -298,6 +298,6 @@ gdk_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
 
 static void
 gdk_app_launch_context_launch_failed (GAppLaunchContext *context,
-                                      const gchar       *startup_notify_id)
+                                      const char        *startup_notify_id)
 {
 }
diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c
index f4c5b91637..b408a68e23 100644
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -1103,7 +1103,7 @@ gdk_clipboard_write_async (GdkClipboard        *clipboard,
       return;
     }
 
-  mime_formats = gdk_content_formats_new ((const gchar *[2]) { mime_type, NULL }, 1);
+  mime_formats = gdk_content_formats_new ((const char *[2]) { mime_type, NULL }, 1);
   mime_formats = gdk_content_formats_union_serialize_gtypes (mime_formats);
   gtype = gdk_content_formats_match_gtype (formats, mime_formats);
   if (gtype != G_TYPE_INVALID)
diff --git a/gdk/gdkcontentdeserializer.c b/gdk/gdkcontentdeserializer.c
index 6a56f0187f..b372dc4847 100644
--- a/gdk/gdkcontentdeserializer.c
+++ b/gdk/gdkcontentdeserializer.c
@@ -835,7 +835,7 @@ init (void)
   for (f = formats; f; f = f->next)
     {
       GdkPixbufFormat *fmt = f->data;
-      gchar *name; 
+      char *name; 
  
       name = gdk_pixbuf_format_get_name (fmt);
       if (g_str_equal (name, "png"))
@@ -854,7 +854,7 @@ init (void)
   for (f = formats; f; f = f->next)
     {
       GdkPixbufFormat *fmt = f->data;
-      gchar **mimes, **m;
+      char **mimes, **m;
 
       mimes = gdk_pixbuf_format_get_mime_types (fmt);
       for (m = mimes; *m; m++)
diff --git a/gdk/gdkcontentserializer.c b/gdk/gdkcontentserializer.c
index d9151527ff..aa22980f71 100644
--- a/gdk/gdkcontentserializer.c
+++ b/gdk/gdkcontentserializer.c
@@ -864,7 +864,7 @@ init (void)
   for (f = formats; f; f = f->next)
     {
       GdkPixbufFormat *fmt = f->data;
-      gchar *name; 
+      char *name; 
  
       name = gdk_pixbuf_format_get_name (fmt);
       if (g_str_equal (name, "png"))
@@ -883,7 +883,7 @@ init (void)
   for (f = formats; f; f = f->next)
     {
       GdkPixbufFormat *fmt = f->data;
-      gchar **mimes, **m;
+      char **mimes, **m;
 
       if (!gdk_pixbuf_format_is_writable (fmt))
 	continue;
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index be3dca2e98..354d3e2cd9 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -319,7 +319,7 @@ gdk_cursor_equal (gconstpointer a,
  *   cursor with the given name
  */
 GdkCursor*
-gdk_cursor_new_from_name (const gchar *name,
+gdk_cursor_new_from_name (const char *name,
                           GdkCursor   *fallback)
 {
   g_return_val_if_fail (name != NULL, NULL);
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index d08baa511a..a2f161bd58 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -50,7 +50,7 @@ GdkCursor* gdk_cursor_new_from_texture   (GdkTexture      *texture,
 					  int              hotspot_y,
                                           GdkCursor       *fallback);
 GDK_AVAILABLE_IN_ALL
-GdkCursor*  gdk_cursor_new_from_name	 (const gchar     *name,
+GdkCursor*  gdk_cursor_new_from_name	 (const char      *name,
                                           GdkCursor       *fallback);
 
 GDK_AVAILABLE_IN_ALL
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 5cddd20c78..ae6cd79e6b 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -634,7 +634,7 @@ gdk_device_get_surface_at_position (GdkDevice *device,
  *
  * Returns: a name
  **/
-const gchar *
+const char *
 gdk_device_get_name (GdkDevice *device)
 {
   g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
@@ -1297,10 +1297,10 @@ _gdk_device_surface_at_position (GdkDevice       *device,
  *  static GSettings *
  *  get_device_settings (GdkDevice *device)
  *  {
- *    const gchar *vendor, *product;
+ *    const char *vendor, *product;
  *    GSettings *settings;
  *    GdkDevice *device;
- *    gchar *path;
+ *    char *path;
  *
  *    vendor = gdk_device_get_vendor_id (device);
  *    product = gdk_device_get_product_id (device);
@@ -1315,7 +1315,7 @@ _gdk_device_surface_at_position (GdkDevice       *device,
  *
  * Returns: (nullable): the vendor ID, or %NULL
  */
-const gchar *
+const char *
 gdk_device_get_vendor_id (GdkDevice *device)
 {
   g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
@@ -1334,7 +1334,7 @@ gdk_device_get_vendor_id (GdkDevice *device)
  *
  * Returns: (nullable): the product ID, or %NULL
  */
-const gchar *
+const char *
 gdk_device_get_product_id (GdkDevice *device)
 {
   g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index caa557c266..09286c6119 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -100,7 +100,7 @@ GDK_AVAILABLE_IN_ALL
 GType                 gdk_device_get_type       (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-const gchar *         gdk_device_get_name       (GdkDevice *device);
+const char *         gdk_device_get_name       (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL
 gboolean              gdk_device_get_has_cursor (GdkDevice *device);
 
@@ -142,9 +142,9 @@ GDK_AVAILABLE_IN_ALL
 GdkDeviceType gdk_device_get_device_type (GdkDevice *device);
 
 GDK_AVAILABLE_IN_ALL
-const gchar *gdk_device_get_vendor_id       (GdkDevice *device);
+const char *gdk_device_get_vendor_id       (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL
-const gchar *gdk_device_get_product_id      (GdkDevice *device);
+const char *gdk_device_get_product_id      (GdkDevice *device);
 
 GDK_AVAILABLE_IN_ALL
 GdkSeat     *gdk_device_get_seat            (GdkDevice *device);
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 3c3140691a..1bd00c4241 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -36,7 +36,7 @@ struct _GdkDevice
 {
   GObject parent_instance;
 
-  gchar *name;
+  char *name;
   GdkInputSource source;
   gboolean has_cursor;
   GdkAxisFlags axis_flags;
@@ -50,8 +50,8 @@ struct _GdkDevice
   GArray *axes;
   guint num_touches;
 
-  gchar *vendor_id;
-  gchar *product_id;
+  char *vendor_id;
+  char *product_id;
 
   GdkSeat *seat;
   GdkDeviceTool *last_tool;
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index b06f412caf..5651bd1300 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -931,7 +931,7 @@ gdk_display_device_is_grabbed (GdkDisplay *display,
  * Returns: a string representing the display name. This string is owned
  * by GDK and should not be modified or freed.
  */
-const gchar *
+const char *
 gdk_display_get_name (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
@@ -1127,7 +1127,7 @@ gdk_display_get_app_launch_context (GdkDisplay *display)
  *     display could not be opened
  */
 GdkDisplay *
-gdk_display_open (const gchar *display_name)
+gdk_display_open (const char *display_name)
 {
   return gdk_display_manager_open_display (gdk_display_manager_get (),
                                            display_name);
@@ -1172,7 +1172,7 @@ _gdk_display_get_next_serial (GdkDisplay *display)
  */
 void
 gdk_display_notify_startup_complete (GdkDisplay  *display,
-                                     const gchar *startup_id)
+                                     const char *startup_id)
 {
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
@@ -1188,7 +1188,7 @@ gdk_display_notify_startup_complete (GdkDisplay  *display,
  *
  * Returns: the startup notification ID for @display, or %NULL
  */
-const gchar *
+const char *
 gdk_display_get_startup_notification_id (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 217fbb6b57..de39f54271 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -41,10 +41,10 @@ G_BEGIN_DECLS
 GDK_AVAILABLE_IN_ALL
 GType       gdk_display_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
-GdkDisplay *gdk_display_open                (const gchar *display_name);
+GdkDisplay *gdk_display_open                (const char *display_name);
 
 GDK_AVAILABLE_IN_ALL
-const gchar * gdk_display_get_name         (GdkDisplay *display);
+const char * gdk_display_get_name         (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_device_is_grabbed  (GdkDisplay  *display,
@@ -81,9 +81,9 @@ GdkClipboard *          gdk_display_get_primary_clipboard       (GdkDisplay
 
 GDK_AVAILABLE_IN_ALL
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
-                                                const gchar   *startup_id);
+                                                const char    *startup_id);
 GDK_AVAILABLE_IN_ALL
-const gchar * gdk_display_get_startup_notification_id (GdkDisplay *display);
+const char * gdk_display_get_startup_notification_id (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
 GdkAppLaunchContext *gdk_display_get_app_launch_context (GdkDisplay *display);
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index db7dfa19ea..bfd5bb8b3c 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -215,7 +215,7 @@ gdk_display_manager_get_property (GObject      *object,
     }
 }
 
-static const gchar *allowed_backends;
+static const char *allowed_backends;
 
 /**
  * gdk_set_allowed_backends:
@@ -250,7 +250,7 @@ static const gchar *allowed_backends;
  * in order to take effect.
  */
 void
-gdk_set_allowed_backends (const gchar *backends)
+gdk_set_allowed_backends (const char *backends)
 {
   allowed_backends = g_strdup (backends);
 }
@@ -389,11 +389,11 @@ gdk_display_manager_list_displays (GdkDisplayManager *manager)
  */
 GdkDisplay *
 gdk_display_manager_open_display (GdkDisplayManager *manager,
-                                  const gchar       *name)
+                                  const char        *name)
 {
-  const gchar *backend_list;
+  const char *backend_list;
   GdkDisplay *display;
-  gchar **backends;
+  char **backends;
   int i, j;
   gboolean allow_any;
 
@@ -419,7 +419,7 @@ gdk_display_manager_open_display (GdkDisplayManager *manager,
 
   for (i = 0; display == NULL && backends[i] != NULL; i++)
     {
-      const gchar *backend = backends[i];
+      const char *backend = backends[i];
       gboolean any = g_str_equal (backend, "*");
 
       if (!allow_any && !any && !strstr (allowed_backends, backend))
diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index 5e66d4145d..d7cbb649af 100644
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -54,9 +54,9 @@ GDK_AVAILABLE_IN_ALL
 GSList *           gdk_display_manager_list_displays       (GdkDisplayManager *manager);
 GDK_AVAILABLE_IN_ALL
 GdkDisplay *       gdk_display_manager_open_display        (GdkDisplayManager *manager,
-                                                            const gchar       *name);
+                                                            const char        *name);
 GDK_AVAILABLE_IN_ALL
-void               gdk_set_allowed_backends                (const gchar       *backends);
+void               gdk_set_allowed_backends                (const char        *backends);
 
 
 G_END_DECLS
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 8a50d3cd3a..2ddc6d81cf 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -116,7 +116,7 @@ struct _GdkDisplayClass
   GType vk_context_type;      /* type for GdkVulkanContext, must be set if vk_extension_name != NULL */
   const char *vk_extension_name; /* Name of required windowing vulkan extension or %NULL (default) if Vulkan isn't supported */
 
-  const gchar *              (*get_name)           (GdkDisplay *display);
+  const char *              (*get_name)           (GdkDisplay *display);
   void                       (*beep)               (GdkDisplay *display);
   void                       (*sync)               (GdkDisplay *display);
   void                       (*flush)              (GdkDisplay *display);
@@ -130,8 +130,8 @@ struct _GdkDisplayClass
   gulong                     (*get_next_serial) (GdkDisplay *display);
 
   void                       (*notify_startup_complete) (GdkDisplay  *display,
-                                                         const gchar *startup_id);
-  const gchar *              (*get_startup_notification_id) (GdkDisplay  *display);
+                                                         const char *startup_id);
+  const char *              (*get_startup_notification_id) (GdkDisplay  *display);
 
   void                       (*event_data_copy) (GdkDisplay     *display,
                                                  GdkEvent       *event,
diff --git a/gdk/gdkdrag.c b/gdk/gdkdrag.c
index c1eac41ac4..01314f9602 100644
--- a/gdk/gdkdrag.c
+++ b/gdk/gdkdrag.c
@@ -37,7 +37,7 @@
 
 static struct {
   GdkDragAction action;
-  const gchar  *name;
+  const char   *name;
   GdkCursor    *cursor;
 } drag_cursors[] = {
   { GDK_ACTION_ASK,     "dnd-ask",  NULL },
@@ -604,7 +604,7 @@ gdk_drag_write_async (GdkDrag             *drag,
       return;
     }
 
-  mime_formats = gdk_content_formats_new ((const gchar *[2]) { mime_type, NULL }, 1);
+  mime_formats = gdk_content_formats_new ((const char *[2]) { mime_type, NULL }, 1);
   mime_formats = gdk_content_formats_union_serialize_gtypes (mime_formats);
   gtype = gdk_content_formats_match_gtype (formats, mime_formats);
   if (gtype != G_TYPE_INVALID)
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 264c62f06c..2248b94208 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -120,7 +120,7 @@ value_event_collect_value (GValue      *value,
   return NULL;
 }
 
-static gchar *
+static char *
 value_event_lcopy_value (const GValue *value,
                          guint         n_collect_values,
                          GTypeCValue  *collect_values,
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 5ab960335b..73523b88e1 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -455,7 +455,7 @@ gdk_gl_context_push_debug_group_printf (GdkGLContext *context,
                                         ...)
 {
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-  gchar *message;
+  char *message;
   va_list args;
 
   if (priv->use_khr_debug)
@@ -501,7 +501,7 @@ gdk_gl_context_label_object_printf  (GdkGLContext *context,
                                      ...)
 {
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-  gchar *message;
+  char *message;
   va_list args;
 
   if (priv->use_khr_debug)
diff --git a/gdk/gdkglcontextprivate.h b/gdk/gdkglcontextprivate.h
index c7acccba43..6d3d721eee 100644
--- a/gdk/gdkglcontextprivate.h
+++ b/gdk/gdkglcontextprivate.h
@@ -93,7 +93,7 @@ gboolean                gdk_gl_context_has_unpack_subimage      (GdkGLContext
 void                    gdk_gl_context_push_debug_group         (GdkGLContext    *context,
                                                                  const char      *message);
 void                    gdk_gl_context_push_debug_group_printf  (GdkGLContext    *context,
-                                                                 const gchar     *format,
+                                                                 const char      *format,
                                                                  ...)  G_GNUC_PRINTF (2, 3);
 void                    gdk_gl_context_pop_debug_group          (GdkGLContext    *context);
 void                    gdk_gl_context_label_object             (GdkGLContext    *context,
diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index f8dfc1e5c0..2672d9b83b 100644
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@@ -43,10 +43,10 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase)
   return (*(int *) pkey) - ((gdk_key *) pbase)->keyval;
 }
 
-static gchar*
+static char *
 _gdk_keyval_name (guint keyval)
 {
-  static gchar buf[100];
+  static char buf[100];
   gdk_key *found;
 
   /* Check for directly encoded 24-bit UCS characters: */
@@ -66,7 +66,7 @@ _gdk_keyval_name (guint keyval)
              ((found - 1)->keyval == keyval))
         found--;
 	    
-      return (gchar *) (keynames + found->offset);
+      return (char *) (keynames + found->offset);
     }
   else if (keyval != 0)
     {
@@ -85,7 +85,7 @@ gdk_keys_name_compare (const void *pkey, const void *pbase)
 }
 
 static guint
-_gdk_keyval_from_name (const gchar *keyval_name)
+_gdk_keyval_from_name (const char *keyval_name)
 {
   gdk_key *found;
 
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index ac85d1da74..0c74dd64f4 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -757,7 +757,7 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  *     of the key, or %NULL if @keyval is not a valid key. The string
  *     should not be modified.
  */
-const gchar *
+const char *
 gdk_keyval_name (guint keyval)
 {
   return _gdk_keyval_name (keyval);
@@ -777,7 +777,7 @@ gdk_keyval_name (guint keyval)
  *     if the key name is not a valid key
  */
 guint
-gdk_keyval_from_name (const gchar *keyval_name)
+gdk_keyval_from_name (const char *keyval_name)
 {
   return _gdk_keyval_from_name (keyval_name);
 }
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 8baef542c6..0f75a2affc 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -38,7 +38,7 @@ GDK_AVAILABLE_IN_ALL
 const char *gdk_keyval_name      (guint        keyval) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-guint    gdk_keyval_from_name    (const gchar *keyval_name);
+guint    gdk_keyval_from_name    (const char *keyval_name);
 GDK_AVAILABLE_IN_ALL
 void     gdk_keyval_convert_case (guint        symbol,
 				  guint       *lower,
diff --git a/gdk/gdkprofiler.c b/gdk/gdkprofiler.c
index 4617d9a7e3..e87fefbd50 100644
--- a/gdk/gdkprofiler.c
+++ b/gdk/gdkprofiler.c
@@ -55,7 +55,7 @@ gdk_profiler_start (int fd)
 
   if (fd == -1)
     {
-      gchar *filename;
+      char *filename;
 
       filename = g_strdup_printf ("gtk.%d.syscap", getpid ());
       g_print ("Writing profiling data to %s\n", filename);
diff --git a/gdk/gdkrgba.c b/gdk/gdkrgba.c
index 4d6d46143c..80c4349572 100644
--- a/gdk/gdkrgba.c
+++ b/gdk/gdkrgba.c
@@ -130,8 +130,8 @@ gdk_rgba_is_opaque (const GdkRGBA *rgba)
  *    rgb() or rgba() specification.
  */
 static gboolean
-parse_rgb_value (const gchar  *str,
-                 gchar       **endp,
+parse_rgb_value (const char   *str,
+                 char        **endp,
                  gdouble      *number)
 {
   const char *p;
@@ -183,12 +183,12 @@ parse_rgb_value (const gchar  *str,
  */
 gboolean
 gdk_rgba_parse (GdkRGBA     *rgba,
-                const gchar *spec)
+                const char *spec)
 {
   gboolean has_alpha;
   gdouble r, g, b, a;
-  gchar *str = (gchar *) spec;
-  gchar *p;
+  char *str = (char *) spec;
+  char *p;
 
   g_return_val_if_fail (spec != NULL, FALSE);
 
@@ -370,7 +370,7 @@ gdk_rgba_equal (gconstpointer p1,
  *
  * Returns: A newly allocated text string
  */
-gchar *
+char *
 gdk_rgba_to_string (const GdkRGBA *rgba)
 {
   if (rgba->alpha > 0.999)
@@ -382,7 +382,7 @@ gdk_rgba_to_string (const GdkRGBA *rgba)
     }
   else
     {
-      gchar alpha[G_ASCII_DTOSTR_BUF_SIZE];
+      char alpha[G_ASCII_DTOSTR_BUF_SIZE];
 
       g_ascii_formatd (alpha, G_ASCII_DTOSTR_BUF_SIZE, "%g", CLAMP (rgba->alpha, 0, 1));
 
diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 7ba506fc89..3c9f05b23a 100644
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -65,9 +65,9 @@ gboolean  gdk_rgba_equal     (gconstpointer  p1,
 
 GDK_AVAILABLE_IN_ALL
 gboolean  gdk_rgba_parse     (GdkRGBA       *rgba,
-                              const gchar   *spec);
+                              const char    *spec);
 GDK_AVAILABLE_IN_ALL
-gchar *   gdk_rgba_to_string (const GdkRGBA *rgba);
+char *   gdk_rgba_to_string (const GdkRGBA *rgba);
 
 
 G_END_DECLS
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 9840034514..eb2776b164 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -2763,8 +2763,8 @@ add_event_mark (GdkEvent *event,
                 gint64    time,
                 guint64   duration)
 {
-  gchar *message = NULL;
-  const gchar *kind;
+  char *message = NULL;
+  const char *kind;
   GEnumClass *class;
   GEnumValue *value;
   GdkEventType event_type;
diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
index 34a9f1dae0..d4c36a7cd0 100644
--- a/gdk/gdkvulkancontext.c
+++ b/gdk/gdkvulkancontext.c
@@ -971,7 +971,7 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
                                                     0,
                                                     NULL,
                                                     device_extensions->len,
-                                                    (const gchar * const *) device_extensions->pdata
+                                                    (const char * const *) device_extensions->pdata
                                                 },
                                                 NULL,
                                                 &display->vk_device) != VK_SUCCESS)
diff --git a/gdk/macos/gdkmacoscursor.c b/gdk/macos/gdkmacoscursor.c
index a6da5c922b..cf571a9a11 100644
--- a/gdk/macos/gdkmacoscursor.c
+++ b/gdk/macos/gdkmacoscursor.c
@@ -84,7 +84,7 @@ CUSTOM_CURSOR_CTOR(gdkZoomOutCursor, 43)
 @end
 
 struct CursorsByName {
-  const gchar *name;
+  const char *name;
   NSString *selector;
 };
 
diff --git a/gdk/macos/gdkmacosdisplay-private.h b/gdk/macos/gdkmacosdisplay-private.h
index 9f3d55853b..7638f87be3 100644
--- a/gdk/macos/gdkmacosdisplay-private.h
+++ b/gdk/macos/gdkmacosdisplay-private.h
@@ -83,7 +83,7 @@ struct _GdkMacosDisplayClass
 };
 
 
-GdkDisplay      *_gdk_macos_display_open                           (const gchar     *display_name);
+GdkDisplay      *_gdk_macos_display_open                           (const char      *display_name);
 int              _gdk_macos_display_get_fd                         (GdkMacosDisplay *self);
 void             _gdk_macos_display_queue_events                   (GdkMacosDisplay *self);
 void             _gdk_macos_display_to_display_coords              (GdkMacosDisplay *self,
@@ -129,7 +129,7 @@ NSWindow        *_gdk_macos_display_find_native_under_pointer      (GdkMacosDisp
                                                                     int             *x,
                                                                     int             *y);
 gboolean         _gdk_macos_display_get_setting                    (GdkMacosDisplay *self,
-                                                                    const gchar     *setting,
+                                                                    const char      *setting,
                                                                     GValue          *value);
 void             _gdk_macos_display_reload_settings                (GdkMacosDisplay *self);
 void             _gdk_macos_display_surface_resigned_main          (GdkMacosDisplay *self,
diff --git a/gdk/macos/gdkmacosdisplay-settings.c b/gdk/macos/gdkmacosdisplay-settings.c
index cf3224b6db..e6714f0a14 100644
--- a/gdk/macos/gdkmacosdisplay-settings.c
+++ b/gdk/macos/gdkmacosdisplay-settings.c
@@ -96,7 +96,7 @@ _gdk_macos_settings_load (GdkMacosSettings *settings)
 
 gboolean
 _gdk_macos_display_get_setting (GdkMacosDisplay *self,
-                                const gchar     *setting,
+                                const char      *setting,
                                 GValue          *value)
 {
   GDK_BEGIN_MACOS_ALLOC_POOL;
diff --git a/gdk/macos/gdkmacosdisplay.c b/gdk/macos/gdkmacosdisplay.c
index 800696eb09..13d7dc8d1b 100644
--- a/gdk/macos/gdkmacosdisplay.c
+++ b/gdk/macos/gdkmacosdisplay.c
@@ -94,7 +94,7 @@ get_monitor (GdkMacosDisplay *self,
 
 static gboolean
 gdk_macos_display_get_setting (GdkDisplay  *display,
-                               const gchar *setting,
+                               const char *setting,
                                GValue      *value)
 {
   return _gdk_macos_display_get_setting (GDK_MACOS_DISPLAY (display), setting, value);
@@ -343,7 +343,7 @@ gdk_macos_display_load_display_link (GdkMacosDisplay *self)
   g_source_attach (self->frame_source, NULL);
 }
 
-static const gchar *
+static const char *
 gdk_macos_display_get_name (GdkDisplay *display)
 {
   return GDK_MACOS_DISPLAY (display)->name;
@@ -382,7 +382,7 @@ gdk_macos_display_has_pending (GdkDisplay *display)
 
 static void
 gdk_macos_display_notify_startup_complete (GdkDisplay  *display,
-                                           const gchar *startup_notification_id)
+                                           const char *startup_notification_id)
 {
   /* Not Supported */
 }
@@ -677,7 +677,7 @@ gdk_macos_display_init (GdkMacosDisplay *self)
 }
 
 GdkDisplay *
-_gdk_macos_display_open (const gchar *display_name)
+_gdk_macos_display_open (const char *display_name)
 {
   static GdkMacosDisplay *self;
   ProcessSerialNumber psn = { 0, kCurrentProcess };
diff --git a/gdk/macos/gdkmacosmonitor.c b/gdk/macos/gdkmacosmonitor.c
index ade7f0bf42..91a85a0dfa 100644
--- a/gdk/macos/gdkmacosmonitor.c
+++ b/gdk/macos/gdkmacosmonitor.c
@@ -152,7 +152,7 @@ GetLocalizedName (NSScreen *screen)
   return g_steal_pointer (&name);
 }
 
-static gchar *
+static char *
 GetConnectorName (CGDirectDisplayID screen_id)
 {
   guint unit = CGDisplayUnitNumber (screen_id);
@@ -193,8 +193,8 @@ _gdk_macos_monitor_reconfigure (GdkMacosMonitor *self)
   CGRect bounds;
   size_t width;
   size_t pixel_width;
-  gchar *connector;
-  gchar *name;
+  char *connector;
+  char *name;
   int refresh_rate;
   int scale_factor = 1;
   int width_mm;
diff --git a/gdk/macos/gdkmacossurface-private.h b/gdk/macos/gdkmacossurface-private.h
index 4d9aa4c053..074fd28854 100644
--- a/gdk/macos/gdkmacossurface-private.h
+++ b/gdk/macos/gdkmacossurface-private.h
@@ -79,7 +79,7 @@ NSWindow          *_gdk_macos_surface_get_native              (GdkMacosSurface
 CGDirectDisplayID  _gdk_macos_surface_get_screen_id           (GdkMacosSurface    *self);
 const char        *_gdk_macos_surface_get_title               (GdkMacosSurface    *self);
 void               _gdk_macos_surface_set_title               (GdkMacosSurface    *self,
-                                                               const gchar        *title);
+                                                               const char         *title);
 void               _gdk_macos_surface_get_shadow              (GdkMacosSurface    *self,
                                                                int                *top,
                                                                int                *right,
diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index 84c74b9d46..a5bc4098b9 100644
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -571,7 +571,7 @@ _gdk_macos_surface_get_title (GdkMacosSurface *self)
 
 void
 _gdk_macos_surface_set_title (GdkMacosSurface *self,
-                              const gchar     *title)
+                              const char      *title)
 {
   g_return_if_fail (GDK_IS_MACOS_SURFACE (self));
 
diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
index 943a1c9185..cb6cf9a12b 100644
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
@@ -49,7 +49,7 @@ typedef struct _GdkWaylandAppLaunchContextClass GdkWaylandAppLaunchContextClass;
 struct _GdkWaylandAppLaunchContext
 {
   GdkAppLaunchContext base;
-  gchar *name;
+  char *name;
   guint serial;
 };
 
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index 3358a8184a..c859f3ccac 100644
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -62,7 +62,7 @@ _gdk_wayland_display_finalize_cursors (GdkWaylandDisplay *display)
 }
 
 static const struct {
-  const gchar *css_name, *traditional_name;
+  const char *css_name, *traditional_name;
 } name_map[] = {
   { "default",      "left_ptr" },
   { "help",         "question_arrow" },
@@ -101,8 +101,8 @@ static const struct {
   { "zoom-out",     "left_ptr" }
 };
 
-static const gchar *
-name_fallback (const gchar *name)
+static const char *
+name_fallback (const char *name)
 {
   int i;
 
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 13f03ca4b3..e9fc839e83 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -161,7 +161,7 @@ struct _GdkWaylandTabletPadData
 
   guint enter_serial;
   uint32_t n_buttons;
-  gchar *path;
+  char *path;
 
   GList *rings;
   GList *strips;
@@ -171,8 +171,8 @@ struct _GdkWaylandTabletPadData
 struct _GdkWaylandTabletData
 {
   struct zwp_tablet_v2 *wp_tablet;
-  gchar *name;
-  gchar *path;
+  char *name;
+  char *path;
   uint32_t vid;
   uint32_t pid;
 
@@ -2853,8 +2853,8 @@ tablet_handle_done (void                 *data,
   GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tablet->seat);
   GdkDisplay *display = gdk_seat_get_display (GDK_SEAT (seat));
   GdkDevice *logical_device, *stylus_device;
-  gchar *logical_name;
-  gchar *vid, *pid;
+  char *logical_name;
+  char *vid, *pid;
 
   vid = g_strdup_printf ("%.4x", tablet->vid);
   pid = g_strdup_printf ("%.4x", tablet->pid);
@@ -5077,7 +5077,7 @@ gdk_wayland_seat_get_wl_seat (GdkSeat *seat)
  *
  * Returns: the /dev/input/event* path of this device
  **/
-const gchar *
+const char *
 gdk_wayland_device_get_node_path (GdkDevice *device)
 {
   GdkWaylandTabletData *tablet;
@@ -5113,7 +5113,7 @@ void
 gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
                                      GdkDevicePadFeature  feature,
                                      guint                feature_idx,
-                                     const gchar         *label)
+                                     const char          *label)
 {
   GdkWaylandTabletPadData *pad;
   GdkWaylandTabletPadGroupData *group;
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 22623042eb..d0e6298e56 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -610,7 +610,7 @@ _gdk_wayland_display_prepare_cursor_themes (GdkWaylandDisplay *display_wayland)
 static void init_settings (GdkDisplay *display);
 
 GdkDisplay *
-_gdk_wayland_display_open (const gchar *display_name)
+_gdk_wayland_display_open (const char *display_name)
 {
   struct wl_display *wl_display;
   GdkDisplay *display;
@@ -758,10 +758,10 @@ gdk_wayland_display_finalize (GObject *object)
   G_OBJECT_CLASS (gdk_wayland_display_parent_class)->finalize (object);
 }
 
-static const gchar *
+static const char *
 gdk_wayland_display_get_name (GdkDisplay *display)
 {
-  const gchar *name;
+  const char *name;
 
   name = g_getenv ("WAYLAND_DISPLAY");
   if (name == NULL)
@@ -830,7 +830,7 @@ static void
 gdk_wayland_display_make_default (GdkDisplay *display)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-  const gchar *startup_id;
+  const char *startup_id;
 
   g_free (display_wayland->startup_notification_id);
   display_wayland->startup_notification_id = NULL;
@@ -870,7 +870,7 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
  *
  * Returns: the startup notification ID for @display, or %NULL
  */
-const gchar *
+const char *
 gdk_wayland_display_get_startup_notification_id (GdkDisplay  *display)
 {
   return GDK_WAYLAND_DISPLAY (display)->startup_notification_id;
@@ -903,10 +903,10 @@ gdk_wayland_display_set_startup_notification_id (GdkDisplay *display,
 
 static void
 gdk_wayland_display_notify_startup_complete (GdkDisplay  *display,
-					     const gchar *startup_id)
+					     const char *startup_id)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-  gchar *free_this = NULL;
+  char *free_this = NULL;
 
   if (startup_id == NULL)
     {
@@ -1071,7 +1071,7 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
 
 void
 gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
-                                      const gchar *name,
+                                      const char *name,
                                       int          size)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY(display);
@@ -1116,7 +1116,7 @@ static void
 _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland)
 {
   guint size;
-  const gchar *name;
+  const char *name;
   GValue v = G_VALUE_INIT;
   gint64 before = g_get_monotonic_time ();
 
@@ -1467,9 +1467,9 @@ get_dpi_from_gsettings (GdkWaylandDisplay *display_wayland)
 typedef struct _TranslationEntry TranslationEntry;
 struct _TranslationEntry {
   gboolean valid;
-  const gchar *schema;
-  const gchar *key;
-  const gchar *setting;
+  const char *schema;
+  const char *key;
+  const char *setting;
   GType type;
   union {
     const char *s;
@@ -1994,7 +1994,7 @@ set_value_from_entry (GdkDisplay       *display,
     case G_TYPE_STRING:
       if (settings && entry->valid)
         {
-          gchar *s;
+          char *s;
           s = g_settings_get_string (settings, entry->key);
           g_value_set_string (value, s);
           g_free (s);
@@ -2053,7 +2053,7 @@ set_decoration_layout_from_entry (GdkDisplay       *display,
 
   if (settings)
     {
-      gchar *s = g_settings_get_string (settings, entry->key);
+      char *s = g_settings_get_string (settings, entry->key);
 
       translate_wm_button_layout_to_gtk (s);
       g_value_set_string (value, s);
@@ -2585,11 +2585,11 @@ gdk_wayland_display_get_output_scale (GdkWaylandDisplay *display_wayland,
  **/
 gboolean
 gdk_wayland_display_query_registry (GdkDisplay  *display,
-				    const gchar *global)
+				    const char *global)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
   GHashTableIter iter;
-  gchar *value;
+  char *value;
 
   g_return_val_if_fail (GDK_IS_WAYLAND_DISPLAY (display), FALSE);
   g_return_val_if_fail (global != NULL, FALSE);
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index 7321b34a4e..daf157dbcc 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -59,8 +59,8 @@ typedef struct {
         gboolean     antialias;
         gboolean     hinting;
         int          dpi;
-        const gchar *rgba;
-        const gchar *hintstyle;
+        const char *rgba;
+        const char *hintstyle;
 } GsdXftSettings;
 
 typedef enum _GdkWaylandShellVariant
@@ -81,7 +81,7 @@ struct _GdkWaylandDisplay
   guint32    shell_capabilities;
 
   /* Startup notification */
-  gchar *startup_notification_id;
+  char *startup_notification_id;
 
   /* Most recent serial */
   guint32 serial;
@@ -127,7 +127,7 @@ struct _GdkWaylandDisplay
   GList *current_grabbing_popups;
 
   struct wl_cursor_theme *cursor_theme;
-  gchar *cursor_theme_name;
+  char *cursor_theme_name;
   int cursor_theme_size;
   GHashTable *cursor_surface_cache;
 
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index c38f9b7f68..98b4af7a1c 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -153,7 +153,7 @@ void     _gdk_wayland_display_queue_events (GdkDisplay *display);
 
 GdkAppLaunchContext *_gdk_wayland_display_get_app_launch_context (GdkDisplay *display);
 
-GdkDisplay *_gdk_wayland_display_open (const gchar *display_name);
+GdkDisplay *_gdk_wayland_display_open (const char *display_name);
 
 GList *gdk_wayland_display_get_toplevel_surfaces (GdkDisplay *display);
 
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 65eb7f387d..b6e60a40fe 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -111,17 +111,17 @@ struct _GdkWaylandSurface
   int pending_buffer_offset_x;
   int pending_buffer_offset_y;
 
-  gchar *title;
+  char *title;
 
   struct {
     gboolean was_set;
 
-    gchar *application_id;
-    gchar *app_menu_path;
-    gchar *menubar_path;
-    gchar *window_object_path;
-    gchar *application_object_path;
-    gchar *unique_bus_name;
+    char *application_id;
+    char *app_menu_path;
+    char *menubar_path;
+    char *window_object_path;
+    char *application_object_path;
+    char *unique_bus_name;
   } application;
 
   GdkGeometry geometry_hints;
@@ -387,7 +387,7 @@ gdk_wayland_surface_update_size (GdkSurface *surface,
   gdk_surface_invalidate_rect (surface, NULL);
 }
 
-static const gchar *
+static const char *
 get_default_title (void)
 {
   const char *title;
@@ -1688,7 +1688,7 @@ gdk_wayland_surface_create_xdg_toplevel (GdkSurface *surface)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
   GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
-  const gchar *app_id;
+  const char *app_id;
 
   gdk_surface_freeze_updates (surface);
 
@@ -3393,7 +3393,7 @@ gdk_wayland_surface_set_geometry_hints (GdkSurface         *surface,
 
 static void
 gdk_wayland_surface_set_title (GdkSurface  *surface,
-                               const gchar *title)
+                               const char *title)
 {
   GdkWaylandSurface *impl;
   const char *end;
@@ -3429,7 +3429,7 @@ gdk_wayland_surface_set_title (GdkSurface  *surface,
 
 static void
 gdk_wayland_surface_set_startup_id (GdkSurface  *surface,
-                                    const gchar *startup_id)
+                                    const char *startup_id)
 {
 }
 
diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h
index d0daaeae8c..f07662bec3 100644
--- a/gdk/wayland/gdkwaylanddevice.h
+++ b/gdk/wayland/gdkwaylanddevice.h
@@ -56,13 +56,13 @@ GDK_AVAILABLE_IN_ALL
 struct wl_seat      *gdk_wayland_seat_get_wl_seat           (GdkSeat   *seat);
 
 GDK_AVAILABLE_IN_ALL
-const gchar         *gdk_wayland_device_get_node_path       (GdkDevice *device);
+const char          *gdk_wayland_device_get_node_path       (GdkDevice *device);
 
 GDK_AVAILABLE_IN_ALL
 void                 gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
                                                           GdkDevicePadFeature  element,
                                                           guint                idx,
-                                                          const gchar         *label);
+                                                          const char          *label);
 
 G_END_DECLS
 
diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index 373a2a8e46..f5d955f20f 100644
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -51,10 +51,10 @@ GDK_AVAILABLE_IN_ALL
 struct wl_compositor   *gdk_wayland_display_get_wl_compositor   (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_cursor_theme    (GdkDisplay  *display,
-                                                                 const gchar *theme,
+                                                                 const char *theme,
                                                                  int          size);
 GDK_AVAILABLE_IN_ALL
-const gchar *           gdk_wayland_display_get_startup_notification_id (GdkDisplay *display);
+const char *           gdk_wayland_display_get_startup_notification_id (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_startup_notification_id (GdkDisplay *display,
                                                                          const char *startup_id);
@@ -63,7 +63,7 @@ gboolean                gdk_wayland_display_prefers_ssd         (GdkDisplay *dis
 
 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_wayland_display_query_registry      (GdkDisplay  *display,
-								 const gchar *global);
+								 const char *global);
 
 G_END_DECLS
 
diff --git a/gdk/win32/bdfcursor.c b/gdk/win32/bdfcursor.c
index 7c091a1626..8eb8e0ec76 100644
--- a/gdk/win32/bdfcursor.c
+++ b/gdk/win32/bdfcursor.c
@@ -25,21 +25,21 @@
 #include <glib.h>
 
 typedef struct {
-	gchar	*name;
+	char	*name;
 	int	id;
-	gchar	*bitmap;
+	char	*bitmap;
 	int	hotx;
 	int	hoty;
 } font_info_t;
 
 typedef struct {
-	gchar	*name;
+	char	*name;
 	int	id;
 	int	width;
 	int	height;
 	int	hotx;
 	int	hoty;
-	gchar	*data;
+	char	*data;
 } cursor_info_t;
 
 static GSList *fonts = NULL;
@@ -98,13 +98,13 @@ cursor_info_t *ci;
 }
 
 static int read_bdf_font(fname)
-gchar *fname;
+char *fname;
 {
 	FILE *f;
-	gchar line[2048];
+	char line[2048];
 	int rv = 0;
 	gboolean startchar = FALSE, startbitmap = FALSE;
-	gchar *charname,*p,*bitmap;
+	char *charname,*p,*bitmap;
 	int dx = 0,dy = 0;
 	int w,h,x,y,py;
 	int id,tmp;
@@ -280,7 +280,7 @@ static void compose_cursors_from_fonts()
 	for (l = g_slist_copy (fonts); l; l = g_slist_delete_link (l,l))
 	{
 		font_info_t *fi = l->data;
-		gchar *name;
+		char *name;
 		GSList *ml;
 
 		name = g_strconcat(fi->name, "_mask", NULL);
@@ -301,8 +301,8 @@ static char *dump_cursor(ci, id)
 cursor_info_t *ci;
 int id;
 {
-	static gchar cdata[8192];
-	gchar *p;
+	static char cdata[8192];
+	char *p;
 	int i;
 	int c;
 	gboolean flushed;
@@ -351,7 +351,7 @@ static int dump_cursors()
 	GSList *ptr;
 	FILE *f = stdout;
 
-	fprintf(f, "static const struct { const gchar *name; int type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n");
+	fprintf(f, "static const struct { const char *name; int type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n");
 
 	for (ptr = cursors; ptr; ptr = ptr->next)
 	{
@@ -367,7 +367,7 @@ static int dump_cursors()
 
 int main(argc, argv)
 int argc;
-gchar **argv;
+char **argv;
 {
 	if (argc != 2)
 	{
diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c
index 65e4fdb0d9..4a7fac2bd2 100644
--- a/gdk/win32/gdkclipdrop-win32.c
+++ b/gdk/win32/gdkclipdrop-win32.c
@@ -297,7 +297,7 @@ Otherwise it's similar to how the clipboard works. Only the DnD server
 #define CLIPBOARD_RENDER_TIMEOUT (G_USEC_PER_SEC * 29)
 
 gboolean _gdk_win32_transmute_windows_data (UINT          from_w32format,
-                                            const gchar  *to_contentformat,
+                                            const char   *to_contentformat,
                                             HANDLE        hdata,
                                             guchar      **set_data,
                                             gsize        *set_data_length);
@@ -347,7 +347,7 @@ typedef struct _GdkWin32ClipboardStorePrepElement GdkWin32ClipboardStorePrepElem
 struct _GdkWin32ClipboardStorePrepElement
 {
   UINT           w32format;
-  const gchar   *contentformat;
+  const char    *contentformat;
   HANDLE         handle;
   GOutputStream *stream;
 };
@@ -889,7 +889,7 @@ grab_data_from_hdata (GdkWin32ClipboardThreadRetrieve *retr,
 
   if (data == NULL)
     {
-      gchar *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
+      char *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
       send_response (retr->parent.item_type,
                      retr->parent.opaque_task,
                      g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -1609,22 +1609,22 @@ gdk_win32_clipdrop_init (GdkWin32Clipdrop *win32_clipdrop)
   win32_clipdrop->n_known_pixbuf_formats = 0;
   for (rover = pixbuf_formats; rover != NULL; rover = rover->next)
     {
-      gchar **mime_types =
+      char **mime_types =
 	gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) rover->data);
-      gchar **mime_type;
+      char **mime_type;
 
       for (mime_type = mime_types; *mime_type != NULL; mime_type++)
 	win32_clipdrop->n_known_pixbuf_formats++;
     }
 
-  win32_clipdrop->known_pixbuf_formats = g_new (const gchar *, win32_clipdrop->n_known_pixbuf_formats);
+  win32_clipdrop->known_pixbuf_formats = g_new (const char *, win32_clipdrop->n_known_pixbuf_formats);
 
   i = 0;
   for (rover = pixbuf_formats; rover != NULL; rover = rover->next)
     {
-      gchar **mime_types =
+      char **mime_types =
 	gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) rover->data);
-      gchar **mime_type;
+      char **mime_type;
 
       for (mime_type = mime_types; *mime_type != NULL; mime_type++)
 	win32_clipdrop->known_pixbuf_formats[i++] = g_intern_string (*mime_type);
@@ -1840,7 +1840,7 @@ gdk_win32_clipdrop_init (GdkWin32Clipdrop *win32_clipdrop)
 
 #define CLIPBOARD_IDLE_ABORT_TIME 30
 
-static const gchar *
+static const char *
 predefined_name (UINT fmt)
 {
 #define CASE(fmt) case fmt: return #fmt
@@ -1876,15 +1876,15 @@ predefined_name (UINT fmt)
     }
 }
 
-gchar *
+char *
 _gdk_win32_get_clipboard_format_name (UINT      fmt,
                                       gboolean *is_predefined)
 {
   int registered_name_w_len = 1024;
   wchar_t *registered_name_w = g_malloc (registered_name_w_len);
-  gchar *registered_name = NULL;
+  char *registered_name = NULL;
   int gcfn_result;
-  const gchar *predef = predefined_name (fmt);
+  const char *predef = predefined_name (fmt);
 
   /* TODO: cache the result in a hash table */
 
@@ -1934,13 +1934,13 @@ _gdk_win32_get_clipboard_format_name (UINT      fmt,
  * Does nothing for strings that already look like a mime/type
  * (no spaces, one slash, with at least one char on each side of the slash).
  */
-const gchar *
-_gdk_win32_get_clipboard_format_name_as_interned_mimetype (gchar *w32format_name)
+const char *
+_gdk_win32_get_clipboard_format_name_as_interned_mimetype (char *w32format_name)
 {
-  gchar *mime_type;
-  const gchar *result;
-  gchar *space = strchr (w32format_name, ' ');
-  gchar *slash = strchr (w32format_name, '/');
+  char *mime_type;
+  const char *result;
+  char *space = strchr (w32format_name, ' ');
+  char *slash = strchr (w32format_name, '/');
 
   if (space == NULL &&
       slash > w32format_name &&
@@ -1956,7 +1956,7 @@ _gdk_win32_get_clipboard_format_name_as_interned_mimetype (gchar *w32format_name
 }
 
 static GArray *
-get_compatibility_w32formats_for_contentformat (const gchar *contentformat)
+get_compatibility_w32formats_for_contentformat (const char *contentformat)
 {
   GArray *result = NULL;
   int i;
@@ -2017,8 +2017,8 @@ _gdk_win32_add_w32format_to_pairs (UINT                      w32format,
                                    GdkContentFormatsBuilder *builder)
 {
   gboolean predef;
-  gchar *w32format_name = _gdk_win32_get_clipboard_format_name (w32format, &predef);
-  const gchar *interned_w32format_name;
+  char *w32format_name = _gdk_win32_get_clipboard_format_name (w32format, &predef);
+  const char *interned_w32format_name;
   GdkWin32ContentFormatPair pair;
   GArray *comp_pairs;
   int i, j;
@@ -2079,7 +2079,7 @@ transmute_cf_unicodetext_to_utf8_string (const guchar    *data,
                                          GDestroyNotify  *set_data_destroy)
 {
   wchar_t *ptr, *p, *q;
-  gchar *result;
+  char *result;
   glong wclen, u8_len;
 
   /* Strip out \r */
@@ -2280,12 +2280,12 @@ transmute_cf_text_to_utf8_string (const guchar    *data,
                                   GDestroyNotify  *set_data_destroy)
 {
   char *ptr, *p, *q;
-  gchar *result;
+  char *result;
   glong wclen, u8_len;
   wchar_t *wstr;
 
   /* Strip out \r */
-  ptr = (gchar *) data;
+  ptr = (char *) data;
   p = ptr;
   q = ptr;
   wclen = 0;
@@ -2509,11 +2509,11 @@ transmute_cf_shell_id_list_to_text_uri_list (const guchar    *data,
 
       if (SHGetPathFromIDListW (file_id_full, path_w))
         {
-          gchar *filename = g_utf16_to_utf8 (path_w, -1, NULL, NULL, NULL);
+          char *filename = g_utf16_to_utf8 (path_w, -1, NULL, NULL, NULL);
 
           if (filename)
             {
-              gchar *uri = g_filename_to_uri (filename, NULL, NULL);
+              char *uri = g_filename_to_uri (filename, NULL, NULL);
 
               if (uri)
                 {
@@ -2566,7 +2566,7 @@ transmute_image_bmp_to_cf_dib (const guchar    *data,
 
 gboolean
 _gdk_win32_transmute_windows_data (UINT          from_w32format,
-                                   const gchar  *to_contentformat,
+                                   const char   *to_contentformat,
                                    HANDLE        hdata,
                                    guchar      **set_data,
                                    gsize        *set_data_length)
@@ -2627,7 +2627,7 @@ _gdk_win32_transmute_windows_data (UINT          from_w32format,
 }
 
 gboolean
-_gdk_win32_transmute_contentformat (const gchar   *from_contentformat,
+_gdk_win32_transmute_contentformat (const char    *from_contentformat,
                                     UINT           to_w32format,
                                     const guchar  *data,
                                     int            length,
diff --git a/gdk/win32/gdkclipdrop-win32.h b/gdk/win32/gdkclipdrop-win32.h
index f28b0eec80..6d37e9e367 100644
--- a/gdk/win32/gdkclipdrop-win32.h
+++ b/gdk/win32/gdkclipdrop-win32.h
@@ -38,7 +38,7 @@ typedef struct {
   /* This is assumed to be an interned string, it will be
    * compared by simply comparing the pointer.
    */
-  const gchar *contentformat;
+  const char *contentformat;
   gboolean transmute;
 } GdkWin32ContentFormatPair;
 
@@ -129,7 +129,7 @@ struct _GdkWin32Clipdrop
   GObject *parent_instance;
 
   /* interned strings for well-known image formats */
-  const gchar **known_pixbuf_formats;
+  const char **known_pixbuf_formats;
   int n_known_pixbuf_formats;
 
   /* GArray of GdkAtoms for various known Selection and DnD strings.
@@ -238,7 +238,7 @@ void     _gdk_win32_clipdrop_init                                  (void);
 
 gboolean _gdk_win32_format_uses_hdata                              (UINT                         w32format);
 
-gchar  * _gdk_win32_get_clipboard_format_name                      (UINT                         fmt,
+char   * _gdk_win32_get_clipboard_format_name                      (UINT                         fmt,
                                                                     gboolean                    *is_predefined);
 void     _gdk_win32_add_w32format_to_pairs                         (UINT                         format,
                                                                     GArray                      *array,
@@ -249,7 +249,7 @@ int      _gdk_win32_add_contentformat_to_pairs                     (const char
 void     _gdk_win32_clipboard_default_output_done                  (GObject                     *clipboard,
                                                                     GAsyncResult                *result,
                                                                     gpointer                     user_data);
-gboolean _gdk_win32_transmute_contentformat                        (const gchar                 *from_contentformat,
+gboolean _gdk_win32_transmute_contentformat                        (const char                  *from_contentformat,
                                                                     UINT                         to_w32format,
                                                                     const guchar                *data,
                                                                     int                          length,
@@ -257,7 +257,7 @@ gboolean _gdk_win32_transmute_contentformat                        (const gchar
                                                                     gsize                       *set_data_length);
 
 gboolean _gdk_win32_transmute_windows_data                         (UINT                         from_w32format,
-                                                                    const gchar                 *to_contentformat,
+                                                                    const char                  *to_contentformat,
                                                                     HANDLE                       hdata,
                                                                     guchar                     **set_data,
                                                                     gsize                       *set_data_length);
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index 9184e6bcd3..9bfdd2c443 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -382,7 +382,7 @@ gdk_win32_hcursor_get_handle (GdkWin32HCursor *cursor)
 
 static HCURSOR
 hcursor_from_x_cursor (int          i,
-                       const gchar *name)
+                       const char *name)
 {
   int j, x, y, ofs;
   HCURSOR rv;
@@ -448,7 +448,7 @@ hcursor_from_x_cursor (int          i,
 static GdkWin32HCursor *
 win32_cursor_create_win32hcursor (GdkWin32Display *display,
                                   Win32Cursor     *cursor,
-                                  const gchar     *name)
+                                  const char      *name)
 {
   GdkWin32HCursor *result;
 
@@ -467,7 +467,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
       case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_NULL:
         result = gdk_win32_hcursor_new (display,
                                         LoadImageA (NULL,
-                                                    (const gchar *) cursor->resource_name,
+                                                    (const char *) cursor->resource_name,
                                                     IMAGE_CURSOR,
                                                     cursor->width,
                                                     cursor->height,
@@ -477,7 +477,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
       case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_THIS:
         result = gdk_win32_hcursor_new (display,
                                         LoadImageA (_gdk_app_hmodule,
-                                                    (const gchar *) cursor->resource_name,
+                                                    (const char *) cursor->resource_name,
                                                     IMAGE_CURSOR,
                                                     cursor->width,
                                                     cursor->height,
@@ -487,7 +487,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
       case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_GTK:
         result = gdk_win32_hcursor_new (display,
                                         LoadImageA (_gdk_dll_hinstance,
-                                                    (const gchar *) cursor->resource_name,
+                                                    (const char *) cursor->resource_name,
                                                     IMAGE_CURSOR,
                                                     cursor->width,
                                                     cursor->height,
@@ -546,10 +546,10 @@ win32_cursor_destroy (gpointer data)
 static void
 win32_cursor_theme_load_from (Win32CursorTheme *theme,
                               int               size,
-                              const gchar      *dir)
+                              const char       *dir)
 {
   GDir *gdir;
-  const gchar *filename;
+  const char *filename;
   HCURSOR hcursor;
 
   gdir = g_dir_open (dir, 0, NULL);
@@ -559,10 +559,10 @@ win32_cursor_theme_load_from (Win32CursorTheme *theme,
 
   while ((filename = g_dir_read_name (gdir)) != NULL)
     {
-      gchar *fullname;
+      char *fullname;
       gunichar2 *filenamew;
-      gchar *cursor_name;
-      gchar *dot;
+      char *cursor_name;
+      char *dot;
       Win32Cursor *cursor;
 
       fullname = g_build_filename (dir, filename, NULL);
@@ -599,11 +599,11 @@ win32_cursor_theme_load_from (Win32CursorTheme *theme,
 
 static void
 win32_cursor_theme_load_from_dirs (Win32CursorTheme *theme,
-                                   const gchar      *name,
+                                   const char       *name,
                                    int               size)
 {
-  gchar *theme_dir;
-  const gchar * const *dirs;
+  char *theme_dir;
+  const char * const *dirs;
   int i;
 
   dirs = g_get_system_data_dirs ();
@@ -689,7 +689,7 @@ win32_cursor_theme_load_system (Win32CursorTheme *theme,
 }
 
 Win32CursorTheme *
-win32_cursor_theme_load (const gchar *name,
+win32_cursor_theme_load (const char *name,
                          int         size)
 {
   Win32CursorTheme *result = g_new0 (Win32CursorTheme, 1);
@@ -725,7 +725,7 @@ win32_cursor_theme_destroy (Win32CursorTheme *theme)
 
 Win32Cursor *
 win32_cursor_theme_get_cursor (Win32CursorTheme *theme,
-                               const gchar      *name)
+                               const char       *name)
 {
   return g_hash_table_lookup (theme->named_cursors, name);
 }
@@ -779,7 +779,7 @@ _gdk_win32_display_init_cursors (GdkWin32Display *display)
 /* This is where we use the names mapped to the equivalents that Windows defines by default */
 static GdkWin32HCursor *
 win32hcursor_idc_from_name (GdkWin32Display *display,
-                            const gchar     *name)
+                            const char      *name)
 {
   int i;
 
@@ -799,7 +799,7 @@ win32hcursor_idc_from_name (GdkWin32Display *display,
 
 static GdkWin32HCursor *
 win32hcursor_x_from_name (GdkWin32Display *display,
-                          const gchar     *name)
+                          const char      *name)
 {
   int i;
 
@@ -812,7 +812,7 @@ win32hcursor_x_from_name (GdkWin32Display *display,
 
 static GdkWin32HCursor *
 win32hcursor_from_theme (GdkWin32Display *display,
-                         const gchar     *name)
+                         const char      *name)
 {
   Win32CursorTheme *theme;
   Win32Cursor *theme_cursor;
@@ -832,7 +832,7 @@ win32hcursor_from_theme (GdkWin32Display *display,
 
 static GdkWin32HCursor *
 win32hcursor_from_name (GdkWin32Display *display,
-                        const gchar     *name)
+                        const char      *name)
 {
   GdkWin32HCursor *win32hcursor;
 
@@ -879,7 +879,7 @@ create_blank_win32hcursor (GdkWin32Display *display)
 
 static GdkWin32HCursor *
 gdk_win32hcursor_create_for_name (GdkWin32Display  *display,
-                                  const gchar *name)
+                                  const char *name)
 {
   GdkWin32HCursor *win32hcursor = NULL;
 
@@ -940,7 +940,7 @@ _gdk_win32_cursor_update (GdkWin32Display  *win32_display,
   Win32CursorTheme *theme;
   Win32Cursor      *theme_cursor;
 
-  const gchar *name = gdk_cursor_get_name (cursor);
+  const char *name = gdk_cursor_get_name (cursor);
 
   /* Do nothing if this is not a named cursor. */
   if (name == NULL)
@@ -1509,7 +1509,7 @@ gdk_win32_display_get_win32hcursor (GdkWin32Display *display,
 {
   GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display);
   GdkWin32HCursor *win32hcursor;
-  const gchar     *cursor_name;
+  const char      *cursor_name;
   GdkCursor       *fallback;
 
   g_return_val_if_fail (cursor != NULL, NULL);
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index a2d26b0231..df456c29fd 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -360,7 +360,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
   UINT devix, cursorix;
   int i, num_axes = 0;
   wchar_t devname[100], csrname[100];
-  gchar *devname_utf8, *csrname_utf8, *device_name;
+  char *devname_utf8, *csrname_utf8, *device_name;
   BOOL defcontext_done;
   HMODULE wintab32;
   char *wintab32_dll_path;
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 53227c70ff..27e094d535 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -339,7 +339,7 @@ _gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
  */
 void
 gdk_win32_display_set_cursor_theme (GdkDisplay  *display,
-                                    const gchar *name,
+                                    const char *name,
                                     int          size)
 {
   int cursor_size;
@@ -492,7 +492,7 @@ register_display_change_notification (GdkDisplay *display)
 }
 
 GdkDisplay *
-_gdk_win32_display_open (const gchar *display_name)
+_gdk_win32_display_open (const char *display_name)
 {
   GdkWin32Display *win32_display;
 
@@ -548,7 +548,7 @@ _gdk_win32_display_open (const gchar *display_name)
 
 G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)
 
-static const gchar *
+static const char *
 gdk_win32_display_get_name (GdkDisplay *display)
 {
   HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ());
@@ -882,7 +882,7 @@ _gdk_win32_enable_hidpi (GdkWin32Display *display)
 static void
 gdk_win32_display_init (GdkWin32Display *display)
 {
-  const gchar *scale_str = g_getenv ("GDK_SCALE");
+  const char *scale_str = g_getenv ("GDK_SCALE");
 
   display->monitors = G_LIST_MODEL (g_list_store_new (GDK_TYPE_MONITOR));
 
@@ -927,7 +927,7 @@ gdk_win32_display_check_composited (GdkWin32Display *display)
 
 static void
 gdk_win32_display_notify_startup_complete (GdkDisplay  *display,
-                                           const gchar *startup_id)
+                                           const char *startup_id)
 {
   /* nothing */
 }
@@ -1038,7 +1038,7 @@ _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display,
 
 static gboolean
 gdk_win32_display_get_setting (GdkDisplay  *display,
-                               const gchar *name,
+                               const char *name,
                                GValue      *value)
 {
   return _gdk_win32_get_setting (name, value);
diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index 02c217189f..bbb96fe255 100644
--- a/gdk/win32/gdkdisplay-win32.h
+++ b/gdk/win32/gdkdisplay-win32.h
@@ -72,7 +72,7 @@ struct _GdkWin32Display
   GdkWin32Screen *screen;
 
   Win32CursorTheme *cursor_theme;
-  gchar *cursor_theme_name;
+  char *cursor_theme_name;
   int cursor_theme_size;
 
   HWND hwnd;
diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index 20f8cb3f4b..8d6caa9ae3 100644
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -2255,7 +2255,7 @@ gdk_win32_drag_cancel (GdkDrag             *drag,
 {
   GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
 
-  const gchar *reason_str = NULL;
+  const char *reason_str = NULL;
   switch (reason)
     {
     case GDK_DRAG_CANCEL_NO_TARGET:
diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index 8d0ba39431..aecb5d8eed 100644
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -95,7 +95,7 @@ struct _GdkWin32Drop
   /* The list from WM_DROPFILES is store here temporarily,
    * until the next gdk_win32_drop_read_async ()
    */
-  gchar           *dropfiles_list;
+  char            *dropfiles_list;
 
   guint drop_finished : 1; /* FALSE until gdk_drop_finish() is called */
   guint drop_failed : 1;   /* Whether the drop was unsuccessful */
@@ -316,7 +316,7 @@ query_object_formats (LPDATAOBJECT  pDataObj,
   while (SUCCEEDED (hr) && hr != S_FALSE)
     {
       gboolean is_predef;
-      gchar *registered_name = _gdk_win32_get_clipboard_format_name (fmt.cfFormat, &is_predef);
+      char *registered_name = _gdk_win32_get_clipboard_format_name (fmt.cfFormat, &is_predef);
 
       if (registered_name && is_predef)
         GDK_NOTE (DND, g_print ("supported built-in source format 0x%x %s\n", fmt.cfFormat, registered_name));
@@ -817,7 +817,7 @@ target_context_new (GdkSurface *window)
 static gboolean
 resolve_link (HWND     hWnd,
               wchar_t *link,
-              gchar  **lpszPath)
+              char   **lpszPath)
 {
   WIN32_FILE_ATTRIBUTE_DATA wfad;
   HRESULT hr;
@@ -940,7 +940,7 @@ gdk_dropfiles_filter (GdkWin32Display *display,
   HANDLE hdrop;
   POINT pt;
   int nfiles, i;
-  gchar *fileName, *linkedFile;
+  char *fileName, *linkedFile;
 
   if (msg->message != WM_DROPFILES)
     return GDK_WIN32_MESSAGE_FILTER_CONTINUE;
@@ -972,7 +972,7 @@ gdk_dropfiles_filter (GdkWin32Display *display,
   result = g_string_new (NULL);
   for (i = 0; i < nfiles; i++)
     {
-      gchar *uri;
+      char *uri;
       wchar_t wfn[MAX_PATH];
 
       DragQueryFileW (hdrop, i, wfn, MAX_PATH);
@@ -1225,7 +1225,7 @@ grab_data_from_hdata (GTask  *task,
 
   if (data == NULL)
     {
-      gchar *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
+      char *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
       g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED,
                                _("Cannot get DnD data. Failed to allocate %s bytes to store the data."), length_str);
       g_free (length_str);
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 0802fabdd3..a2ff0d952e 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2038,7 +2038,7 @@ gdk_event_translate (MSG *msg,
 
   int button;
 
-  gchar buf[256];
+  char buf[256];
   gboolean return_val = FALSE;
 
   int i;
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index ea71f046b3..73fd620ac1 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -52,7 +52,7 @@ static gboolean gdk_synchronize = FALSE;
 void
 _gdk_win32_surfaceing_init (void)
 {
-  gchar buf[10];
+  char buf[10];
 
   if (getenv ("GDK_IGNORE_WINTAB") != NULL)
     _gdk_input_ignore_wintab = TRUE;
@@ -77,18 +77,18 @@ _gdk_win32_surfaceing_init (void)
 }
 
 void
-_gdk_win32_api_failed (const gchar *where,
-                       const gchar *api)
+_gdk_win32_api_failed (const char *where,
+                       const char *api)
 {
   DWORD error_code = GetLastError ();
-  gchar *msg = g_win32_error_message (error_code);
+  char *msg = g_win32_error_message (error_code);
   g_warning ("%s: %s failed with code %lu: %s", where, api, error_code, msg);
   g_free (msg);
 }
 
 void
-_gdk_other_api_failed (const gchar *where,
-		      const gchar *api)
+_gdk_other_api_failed (const char *where,
+		      const char *api)
 {
   g_warning ("%s: %s failed", where, api);
 }
@@ -104,14 +104,14 @@ _gdk_other_api_failed (const gchar *where,
  * function’s return value is used in debugging output right after the call,
  * and the return value isn’t used after that.
  */
-static gchar *
-static_printf (const gchar *format,
+static char *
+static_printf (const char *format,
 	       ...)
 {
-  static gchar buf[10000];
-  gchar *msg;
-  static gchar *bufp = buf;
-  gchar *retval;
+  static char buf[10000];
+  char *msg;
+  static char *bufp = buf;
+  char *retval;
   va_list args;
 
   va_start (args, format);
@@ -244,7 +244,7 @@ _gdk_win32_print_dc (HDC hdc)
   DeleteObject (hrgn);
 }
 
-gchar *
+char *
 _gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol)
 {
   switch (protocol)
@@ -261,12 +261,12 @@ _gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_surface_state_to_string (GdkSurfaceState state)
 {
-  gchar buf[100];
-  gchar *bufp = buf;
-  gchar *s = "";
+  char buf[100];
+  char *bufp = buf;
+  char *s = "";
 
   buf[0] = '\0';
 
@@ -287,12 +287,12 @@ _gdk_win32_surface_state_to_string (GdkSurfaceState state)
   return static_printf ("%s", buf);
 }
 
-gchar *
+char *
 _gdk_win32_surface_style_to_string (LONG style)
 {
-  gchar buf[1000];
-  gchar *bufp = buf;
-  gchar *s = "";
+  char buf[1000];
+  char *bufp = buf;
+  char *s = "";
 
   buf[0] = '\0';
 
@@ -329,12 +329,12 @@ _gdk_win32_surface_style_to_string (LONG style)
   return static_printf ("%s", buf);
 }
 
-gchar *
+char *
 _gdk_win32_surface_exstyle_to_string (LONG style)
 {
-  gchar buf[1000];
-  gchar *bufp = buf;
-  gchar *s = "";
+  char buf[1000];
+  char *bufp = buf;
+  char *s = "";
 
   buf[0] = '\0';
 
@@ -375,12 +375,12 @@ _gdk_win32_surface_exstyle_to_string (LONG style)
   return static_printf ("%s", buf);
 }
 
-gchar *
+char *
 _gdk_win32_surface_pos_bits_to_string (UINT flags)
 {
-  gchar buf[1000];
-  gchar *bufp = buf;
-  gchar *s = "";
+  char buf[1000];
+  char *bufp = buf;
+  char *s = "";
 
   buf[0] = '\0';
 
@@ -407,12 +407,12 @@ _gdk_win32_surface_pos_bits_to_string (UINT flags)
   return static_printf ("%s", buf);
 }
 
-gchar *
+char *
 _gdk_win32_drag_action_to_string (GdkDragAction actions)
 {
-  gchar buf[100];
-  gchar *bufp = buf;
-  gchar *s = "";
+  char buf[100];
+  char *bufp = buf;
+  char *s = "";
 
   buf[0] = '\0';
 
@@ -429,7 +429,7 @@ _gdk_win32_drag_action_to_string (GdkDragAction actions)
   return static_printf ("%s", buf);
 }
 
-gchar *
+char *
 _gdk_win32_rop2_to_string (int rop2)
 {
   switch (rop2)
@@ -458,7 +458,7 @@ _gdk_win32_rop2_to_string (int rop2)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_lbstyle_to_string (UINT brush_style)
 {
   switch (brush_style)
@@ -477,7 +477,7 @@ _gdk_win32_lbstyle_to_string (UINT brush_style)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_pstype_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_TYPE_MASK)
@@ -490,7 +490,7 @@ _gdk_win32_pstype_to_string (DWORD pen_style)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_psstyle_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_STYLE_MASK)
@@ -512,7 +512,7 @@ _gdk_win32_psstyle_to_string (DWORD pen_style)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_psendcap_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_ENDCAP_MASK)
@@ -528,7 +528,7 @@ _gdk_win32_psendcap_to_string (DWORD pen_style)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_psjoin_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_JOIN_MASK)
@@ -544,7 +544,7 @@ _gdk_win32_psjoin_to_string (DWORD pen_style)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_message_to_string (UINT msg)
 {
   switch (msg)
@@ -781,16 +781,16 @@ _gdk_win32_message_to_string (UINT msg)
   return NULL;
 }
 
-gchar *
+char *
 _gdk_win32_key_to_string (LONG lParam)
 {
   char buf[100];
-  gchar *keyname_utf8;
+  char *keyname_utf8;
 
   if (GetKeyNameText (lParam, buf, sizeof (buf)) &&
       (keyname_utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL)) != NULL)
     {
-      gchar *retval = static_printf ("%s", keyname_utf8);
+      char *retval = static_printf ("%s", keyname_utf8);
 
       g_free (keyname_utf8);
 
@@ -800,7 +800,7 @@ _gdk_win32_key_to_string (LONG lParam)
   return static_printf ("unk-%#lx", lParam);
 }
 
-gchar *
+char *
 _gdk_win32_cf_to_string (UINT format)
 {
   char buf[100];
@@ -844,13 +844,13 @@ _gdk_win32_cf_to_string (UINT format)
     }
 }
 
-gchar *
+char *
 _gdk_win32_data_to_string (const guchar *data,
 			   int           nbytes)
 {
   GString *s = g_string_new ("");
   int i;
-  gchar *retval;
+  char *retval;
 
   for (i = 0; i < nbytes; i++)
     if (data[i] >=' ' && data[i] <= '~')
@@ -864,7 +864,7 @@ _gdk_win32_data_to_string (const guchar *data,
   return retval;
 }
 
-gchar *
+char *
 _gdk_win32_rect_to_string (const RECT *rect)
 {
   return static_printf ("%ldx%ld@%+ld%+ld",
@@ -872,7 +872,7 @@ _gdk_win32_rect_to_string (const RECT *rect)
 			rect->left, rect->top);
 }
 
-gchar *
+char *
 _gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect)
 {
   return static_printf ("%dx%d@%+d%+d",
@@ -880,7 +880,7 @@ _gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect)
 			rect->x, rect->y);
 }
 
-gchar *
+char *
 _gdk_win32_cairo_region_to_string (const cairo_region_t *rgn)
 {
   cairo_rectangle_int_t extents;
@@ -890,7 +890,7 @@ _gdk_win32_cairo_region_to_string (const cairo_region_t *rgn)
 			extents.x, extents.y);
 }
 
-gchar *
+char *
 _gdk_win32_surface_description (GdkSurface *d)
 {
   g_return_val_if_fail (GDK_IS_SURFACE (d), NULL);
diff --git a/gdk/win32/gdkmonitor-win32.c b/gdk/win32/gdkmonitor-win32.c
index 4171965fc7..9452f0f33b 100644
--- a/gdk/win32/gdkmonitor-win32.c
+++ b/gdk/win32/gdkmonitor-win32.c
@@ -186,7 +186,7 @@ get_device_property (HDEVINFO          device_infoset,
 
       if (error_code != ERROR_INSUFFICIENT_BUFFER)
         {
-          gchar *emsg = g_win32_error_message (error_code);
+          char *emsg = g_win32_error_message (error_code);
           g_warning ("Failed to get device node property {" G_GUID_FORMAT "},%lu size: %s",
                      g_format_guid (&property_key->fmtid),
                      property_key->pid,
@@ -212,7 +212,7 @@ get_device_property (HDEVINFO          device_infoset,
         {
           DWORD error_code = GetLastError ();
 
-          gchar *emsg = g_win32_error_message (error_code);
+          char *emsg = g_win32_error_message (error_code);
           g_warning ("Failed to get device node property {" G_GUID_FORMAT "},%lu: %s",
                      g_format_guid (&property_key->fmtid),
                      property_key->pid,
@@ -256,7 +256,7 @@ get_monitor_devices (GdkWin32Display *win32_display)
   for (device_index = 0; TRUE; device_index++)
     {
       gunichar2 *p;
-      gchar *instance_path;
+      char *instance_path;
       gunichar2 *prop;
       DWORD proptype;
       HKEY device_registry_key;
@@ -325,7 +325,7 @@ get_monitor_devices (GdkWin32Display *win32_display)
         {
           if (proptype == DEVPROP_TYPE_STRING)
             {
-              gchar *manufacturer = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
+              char *manufacturer = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
               gdk_monitor_set_manufacturer (mon, manufacturer);
               g_free (manufacturer);
             }
@@ -341,7 +341,7 @@ get_monitor_devices (GdkWin32Display *win32_display)
         {
           if (proptype == DEVPROP_TYPE_STRING)
             {
-              gchar *name = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
+              char *name = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
               gdk_monitor_set_model (mon, name);
               g_free (name);
             }
@@ -456,7 +456,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
       int i;
       GdkWin32Monitor *w32mon;
       GdkMonitor *mon;
-      gchar *path, *path_lower;
+      char *path, *path_lower;
       DISPLAYCONFIG_RATIONAL *refresh;
 
       if ((dispconf_paths[path_index].flags & DISPLAYCONFIG_PATH_ACTIVE) == 0)
@@ -502,7 +502,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
       if (!tdn.flags.friendlyNameForced)
         {
           /* monitorFriendlyDeviceName is usually nicer */
-          gchar *name = g_utf16_to_utf8 (tdn.monitorFriendlyDeviceName, -1, NULL, NULL, NULL);
+          char *name = g_utf16_to_utf8 (tdn.monitorFriendlyDeviceName, -1, NULL, NULL, NULL);
           gdk_monitor_set_model (mon, name);
           g_free (name);
         }
@@ -574,7 +574,7 @@ enum_monitor (HMONITOR hmonitor,
       for (i_monitor = 0; TRUE; i_monitor++)
         {
           DISPLAY_DEVICEW dd_monitor;
-          gchar *device_id_lower, *tmp;
+          char *device_id_lower, *tmp;
           DWORD i;
           GdkWin32Monitor *w32mon;
           GdkMonitor *mon;
@@ -631,7 +631,7 @@ enum_monitor (HMONITOR hmonitor,
           if (gdk_monitor_get_model (mon) == NULL)
             {
               
-              gchar *name = NULL;
+              char *name = NULL;
 
               /* Only use dd.DeviceName as a last resort, as it is just
                * \\.\DISPLAYX\MonitorY (for some values of X and Y).
diff --git a/gdk/win32/gdkmonitor-win32.h b/gdk/win32/gdkmonitor-win32.h
index c32f403169..6bfcd2bc1f 100644
--- a/gdk/win32/gdkmonitor-win32.h
+++ b/gdk/win32/gdkmonitor-win32.h
@@ -34,7 +34,7 @@ struct _GdkWin32Monitor
   GdkRectangle work_rect;
 
   /* Device instance path (used to match GdkWin32Monitor to monitor device) */
-  gchar *instance_path;
+  char *instance_path;
 
   /* TRUE if monitor is made up by us
    * (this happens when system has logical monitors, but no physical ones).
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 86c0157369..9357d22be9 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -212,39 +212,39 @@ void   _gdk_win32_print_system_palette (void);
 void   _gdk_win32_print_hpalette       (HPALETTE     hpal);
 void   _gdk_win32_print_dc             (HDC          hdc);
 
-gchar *_gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol);
-gchar *_gdk_win32_surface_state_to_string (GdkSurfaceState state);
-gchar *_gdk_win32_surface_style_to_string (LONG style);
-gchar *_gdk_win32_surface_exstyle_to_string (LONG style);
-gchar *_gdk_win32_surface_pos_bits_to_string (UINT flags);
-gchar *_gdk_win32_drag_action_to_string (GdkDragAction actions);
-gchar *_gdk_win32_surface_description (GdkSurface *d);
-
-gchar *_gdk_win32_rop2_to_string       (int          rop2);
-gchar *_gdk_win32_lbstyle_to_string    (UINT         brush_style);
-gchar *_gdk_win32_pstype_to_string     (DWORD        pen_style);
-gchar *_gdk_win32_psstyle_to_string    (DWORD        pen_style);
-gchar *_gdk_win32_psendcap_to_string   (DWORD        pen_style);
-gchar *_gdk_win32_psjoin_to_string     (DWORD        pen_style);
-gchar *_gdk_win32_message_to_string    (UINT         msg);
-gchar *_gdk_win32_key_to_string        (LONG         lParam);
-gchar *_gdk_win32_cf_to_string         (UINT         format);
-gchar *_gdk_win32_data_to_string       (const guchar*data,
+char *_gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol);
+char *_gdk_win32_surface_state_to_string (GdkSurfaceState state);
+char *_gdk_win32_surface_style_to_string (LONG style);
+char *_gdk_win32_surface_exstyle_to_string (LONG style);
+char *_gdk_win32_surface_pos_bits_to_string (UINT flags);
+char *_gdk_win32_drag_action_to_string (GdkDragAction actions);
+char *_gdk_win32_surface_description (GdkSurface *d);
+
+char *_gdk_win32_rop2_to_string       (int          rop2);
+char *_gdk_win32_lbstyle_to_string    (UINT         brush_style);
+char *_gdk_win32_pstype_to_string     (DWORD        pen_style);
+char *_gdk_win32_psstyle_to_string    (DWORD        pen_style);
+char *_gdk_win32_psendcap_to_string   (DWORD        pen_style);
+char *_gdk_win32_psjoin_to_string     (DWORD        pen_style);
+char *_gdk_win32_message_to_string    (UINT         msg);
+char *_gdk_win32_key_to_string        (LONG         lParam);
+char *_gdk_win32_cf_to_string         (UINT         format);
+char *_gdk_win32_data_to_string       (const guchar*data,
                                         int          nbytes);
-gchar *_gdk_win32_rect_to_string       (const RECT  *rect);
+char *_gdk_win32_rect_to_string       (const RECT  *rect);
 
-gchar *_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect);
-gchar *_gdk_win32_cairo_region_to_string (const cairo_region_t    *box);
+char *_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect);
+char *_gdk_win32_cairo_region_to_string (const cairo_region_t    *box);
 
 void   _gdk_win32_print_event            (GdkEvent     *event);
 
 #endif
 
-gchar  *_gdk_win32_last_error_string (void);
-void    _gdk_win32_api_failed        (const gchar *where,
-                                      const gchar *api);
-void    _gdk_other_api_failed        (const gchar *where,
-                                      const gchar *api);
+char   *_gdk_win32_last_error_string (void);
+void    _gdk_win32_api_failed        (const char *where,
+                                      const char *api);
+void    _gdk_other_api_failed        (const char *where,
+                                      const char *api);
 
 #define WIN32_API_FAILED(api) _gdk_win32_api_failed (G_STRLOC , api)
 #define WIN32_GDI_FAILED(api) WIN32_API_FAILED (api)
@@ -329,7 +329,7 @@ HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
 void _gdk_win32_display_init_cursors (GdkWin32Display     *display);
 void _gdk_win32_display_finalize_cursors (GdkWin32Display *display);
 void _gdk_win32_display_update_cursors (GdkWin32Display   *display);
-GdkCursor *_gdk_win32_display_get_cursor_for_name (GdkDisplay   *display, const gchar* cursor_name);
+GdkCursor *_gdk_win32_display_get_cursor_for_name (GdkDisplay   *display, const char * cursor_name);
 GdkCursor *gdk_win32_display_cursor_from_hcursor (GdkDisplay *display, HCURSOR     hcursor);
 
 typedef struct _Win32CursorTheme Win32CursorTheme;
@@ -357,10 +357,10 @@ struct _Win32Cursor {
   int xcursor_number;
 };
 
-Win32CursorTheme *win32_cursor_theme_load             (const gchar      *name,
+Win32CursorTheme *win32_cursor_theme_load             (const char       *name,
                                                        int               size);
 Win32Cursor *     win32_cursor_theme_get_cursor       (Win32CursorTheme *theme,
-                                                       const gchar      *name);
+                                                       const char       *name);
 void              win32_cursor_theme_destroy          (Win32CursorTheme *theme);
 Win32CursorTheme *_gdk_win32_display_get_cursor_theme (GdkWin32Display  *win32_display);
 
@@ -399,13 +399,13 @@ GdkDrag *_gdk_win32_surface_drag_begin (GdkSurface         *window,
                                         double              y_root);
 
 /* Stray GdkWin32Screen members */
-gboolean _gdk_win32_get_setting (const gchar *name, GValue *value);
+gboolean _gdk_win32_get_setting (const char *name, GValue *value);
 void _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen);
 GdkSurface *gdk_win32_screen_get_root_window (GdkWin32Screen *screen);
 GdkSurface *gdk_win32_display_get_root_window (GdkDisplay *display);
 
 /* Distributed display manager implementation */
-GdkDisplay *_gdk_win32_display_open (const gchar *display_name);
+GdkDisplay *_gdk_win32_display_open (const char *display_name);
 void _gdk_win32_append_event (GdkEvent *event);
 void _gdk_win32_emit_configure_event (GdkSurface *window);
 
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index a5c9ade81a..0cbd3f0095 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -33,12 +33,12 @@
 #include "gdkprivate-win32.h"
 #include "gdkwin32.h"
 
-static gchar*
+static char *
 _get_system_font_name (HDC hdc)
 {
   NONCLIENTMETRICSW ncm;
   PangoFontDescription *font_desc;
-  gchar *result, *font_desc_string;
+  char *result, *font_desc_string;
   int logpixelsy;
   int font_size;
 
@@ -98,7 +98,7 @@ _get_system_font_name (HDC hdc)
 
 */
 gboolean
-_gdk_win32_get_setting (const gchar *name,
+_gdk_win32_get_setting (const char *name,
                         GValue      *value)
 {
   /*
@@ -188,7 +188,7 @@ _gdk_win32_get_setting (const gchar *name,
     }
   else if (strcmp ("gtk-font-name", name) == 0)
     {
-      gchar *font_name = _get_system_font_name (_gdk_display_hdc);
+      char *font_name = _get_system_font_name (_gdk_display_hdc);
 
       if (font_name)
         {
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 428311904b..06af6e8303 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -312,7 +312,7 @@ _gdk_win32_surface_enable_transparency (GdkSurface *window)
   return SUCCEEDED (call_result);
 }
 
-static const gchar *
+static const char *
 get_default_title (void)
 {
   const char *title;
@@ -355,7 +355,7 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint)
   /* initialize once! */
   if (0 == hAppIcon && 0 == hAppIconSm)
     {
-      gchar sLoc [MAX_PATH+1];
+      char sLoc [MAX_PATH+1];
 
       if (0 != GetModuleFileName (_gdk_dll_hinstance, sLoc, MAX_PATH))
         {
@@ -486,7 +486,7 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
   GdkWin32Surface *impl;
   GdkWin32Display *display_win32;
   GdkSurface *surface;
-  const gchar *title;
+  const char *title;
   wchar_t *wtitle;
   int window_width, window_height;
   int window_x, window_y;
@@ -1529,7 +1529,7 @@ gdk_win32_surface_set_geometry_hints (GdkSurface         *window,
 
 static void
 gdk_win32_surface_set_title (GdkSurface   *window,
-		      const gchar *title)
+		      const char *title)
 {
   wchar_t *wtitle;
 
@@ -2029,7 +2029,7 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
 
 #if defined(MORE_AEROSNAP_DEBUGGING)
 static void
-log_region (gchar *prefix, AeroSnapEdgeRegion *region)
+log_region (char *prefix, AeroSnapEdgeRegion *region)
 {
   GDK_NOTE (MISC, g_print ("Region %s:\n"
                            "edge %d x %d @ %d x %d\n"
@@ -3456,7 +3456,7 @@ handle_aerosnap_move_resize (GdkSurface                   *window,
 }
 
 
-static const gchar *
+static const char *
 get_cursor_name_from_op (GdkW32WindowDragOp op,
                          GdkSurfaceEdge      edge)
 {
@@ -3511,7 +3511,7 @@ setup_drag_move_resize_context (GdkSurface                   *window,
                                 guint32                      timestamp)
 {
   RECT rect;
-  const gchar *cursor_name;
+  const char *cursor_name;
   GdkSurface *pointer_window;
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
   gboolean maximized = gdk_toplevel_get_state (GDK_TOPLEVEL (window)) & GDK_SURFACE_STATE_MAXIMIZED;
diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h
index 6eebe6e76d..a91fe3e49d 100644
--- a/gdk/win32/gdkwin32display.h
+++ b/gdk/win32/gdkwin32display.h
@@ -54,7 +54,7 @@ GType      gdk_win32_display_get_type            (void);
 
 GDK_AVAILABLE_IN_ALL
 void       gdk_win32_display_set_cursor_theme    (GdkDisplay  *display,
-                                                  const gchar *name,
+                                                  const char *name,
                                                   int          size);
 
 /**
diff --git a/gdk/win32/xcursors.h b/gdk/win32/xcursors.h
index 03e10d12e2..a7a95a2515 100644
--- a/gdk/win32/xcursors.h
+++ b/gdk/win32/xcursors.h
@@ -1,4 +1,4 @@
-static const struct { const gchar *name; const gchar *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; gchar *data; } cursors[] = {
+static const struct { const char *name; const char *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; char *data; } cursors[] = {
   { "X_cursor", NULL, 0, 16, 16, 7, 7, 
     "\125\000\000\125\152\100\001\251\152\220\006\251\152\244\032\251"
     "\032\251\152\244\006\252\252\220\001\252\252\100\000\152\251\000"
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index adc11bf4ec..b0a8985640 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -293,7 +293,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
     }
   else if (files_count == 1)
     {
-      gchar *display_name;
+      char *display_name;
 
       if (g_file_is_native (files->data))
         fileinfo = g_file_query_info (files->data,
@@ -389,7 +389,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
 
 static void
 gdk_x11_app_launch_context_launch_failed (GAppLaunchContext *context,
-                                          const gchar       *startup_notify_id)
+                                          const char        *startup_notify_id)
 {
   GdkAppLaunchContext *ctx;
   GdkX11Screen *screen;
@@ -457,7 +457,7 @@ GdkAppLaunchContext *
 _gdk_x11_display_get_app_launch_context (GdkDisplay *display)
 {
   GdkAppLaunchContext *ctx;
-  const gchar *display_name;
+  const char *display_name;
 
   ctx = g_object_new (GDK_TYPE_X11_APP_LAUNCH_CONTEXT,
                       "display", display,
diff --git a/gdk/x11/gdkclipboard-x11.c b/gdk/x11/gdkclipboard-x11.c
index af2434fbf4..404c8c7cd6 100644
--- a/gdk/x11/gdkclipboard-x11.c
+++ b/gdk/x11/gdkclipboard-x11.c
@@ -823,7 +823,7 @@ gdk_x11_clipboard_init (GdkX11Clipboard *cb)
 
 GdkClipboard *
 gdk_x11_clipboard_new (GdkDisplay  *display,
-                       const gchar *selection)
+                       const char *selection)
 {
   GdkX11Clipboard *cb;
 
diff --git a/gdk/x11/gdkclipboard-x11.h b/gdk/x11/gdkclipboard-x11.h
index e4b82ee622..9eeea4a0c6 100644
--- a/gdk/x11/gdkclipboard-x11.h
+++ b/gdk/x11/gdkclipboard-x11.h
@@ -34,7 +34,7 @@ typedef struct _GdkX11Clipboard GdkX11Clipboard;
 GType                   gdk_x11_clipboard_get_type              (void) G_GNUC_CONST;
 
 GdkClipboard *          gdk_x11_clipboard_new                   (GdkDisplay             *display,
-                                                                 const gchar            *selection);
+                                                                 const char             *selection);
 
 GSList *                gdk_x11_clipboard_formats_to_targets    (GdkContentFormats      *formats);
 Atom *                  gdk_x11_clipboard_formats_to_atoms      (GdkDisplay             *display,
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index bb05c01baf..3e99403954 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -184,8 +184,8 @@ gdk_x11_cursor_create_for_texture (GdkDisplay *display,
   return xcursor;
 }
 
-static const gchar *
-name_fallback (const gchar *name)
+static const char *
+name_fallback (const char *name)
 {
   int i;
 
@@ -239,7 +239,7 @@ gdk_x11_cursor_create_for_texture (GdkDisplay *display,
 
 static Cursor
 gdk_x11_cursor_create_for_name (GdkDisplay  *display,
-                                const gchar *name)
+                                const char *name)
 {
   int i;
 
@@ -279,12 +279,12 @@ gdk_x11_cursor_create_for_name (GdkDisplay  *display,
  */
 void
 gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
-                                  const gchar *theme,
+                                  const char *theme,
                                   const int    size)
 {
 #if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
   Display *xdisplay;
-  gchar *old_theme;
+  char *old_theme;
   int old_size;
   gpointer cursor, xcursor;
   GHashTableIter iter;
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index ef63fb5c4d..51cd98a2a5 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -384,8 +384,8 @@ has_abs_axes (GdkDisplay      *display,
 static gboolean
 get_device_ids (GdkDisplay    *display,
                 XIDeviceInfo  *info,
-                gchar        **vendor_id,
-                gchar        **product_id)
+                char         **vendor_id,
+                char         **product_id)
 {
   gulong nitems, bytes_after;
   guint32 *data;
@@ -474,7 +474,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
   GdkDeviceType type;
   GdkDevice *device;
   int num_touches = 0;
-  gchar *vendor_id = NULL, *product_id = NULL;
+  char *vendor_id = NULL, *product_id = NULL;
 
   if (dev->use == XIMasterKeyboard || dev->use == XISlaveKeyboard)
     input_source = GDK_SOURCE_KEYBOARD;
@@ -485,7 +485,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
     input_source = touch_source;
   else
     {
-      gchar *tmp_name;
+      char *tmp_name;
 
       tmp_name = g_ascii_strdown (dev->name, -1);
 
@@ -531,8 +531,8 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
 
   GDK_DISPLAY_NOTE (display, INPUT,
             ({
-              const gchar *type_names[] = { "logical", "physical", "floating" };
-              const gchar *source_names[] = { "mouse", "pen", "eraser", "cursor", "keyboard", "direct touch", "indirect touch", "trackpoint", "pad" };
+              const char *type_names[] = { "logical", "physical", "floating" };
+              const char *source_names[] = { "mouse", "pen", "eraser", "cursor", "keyboard", "direct touch", "indirect touch", "trackpoint", "pad" };
               g_message ("input device:\n\tname: %s\n\ttype: %s\n\tsource: %s\n\thas cursor: %d\n\ttouches: %d",
                          dev->name,
                          type_names[type],
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index ab9a1ee949..8be698fa6e 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1331,7 +1331,7 @@ gdk_event_init (GdkDisplay *display)
 
 static void
 set_sm_client_id (GdkDisplay  *display,
-                  const gchar *sm_client_id)
+                  const char *sm_client_id)
 {
   GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
 
@@ -1377,13 +1377,13 @@ gdk_display_setup_window_visual (GdkDisplay *display,
  *     %NULL on error.
  **/
 GdkDisplay *
-gdk_x11_display_open (const gchar *display_name)
+gdk_x11_display_open (const char *display_name)
 {
   Display *xdisplay;
   GdkDisplay *display;
   GdkX11Display *display_x11;
   int argc;
-  gchar *argv[1];
+  char *argv[1];
   XClassHint *class_hint;
   int ignore;
   int maj, min;
@@ -1733,10 +1733,10 @@ gdk_internal_connection_watch (Display  *display,
     gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data);
 }
 
-static const gchar *
+static const char *
 gdk_x11_display_get_name (GdkDisplay *display)
 {
-  return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
+  return (char *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
 }
 
 gboolean
@@ -2093,7 +2093,7 @@ static void
 gdk_x11_display_make_default (GdkDisplay *display)
 {
   GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
-  const gchar *startup_id;
+  const char *startup_id;
 
   g_free (display_x11->startup_notification_id);
   display_x11->startup_notification_id = NULL;
@@ -2257,9 +2257,9 @@ gdk_x11_display_broadcast_startup_message (GdkDisplay *display,
 
 static void
 gdk_x11_display_notify_startup_complete (GdkDisplay  *display,
-                                         const gchar *startup_id)
+                                         const char *startup_id)
 {
-  gchar *free_this = NULL;
+  char *free_this = NULL;
 
   if (startup_id == NULL)
     {
@@ -2329,7 +2329,7 @@ gdk_x11_display_get_user_time (GdkDisplay *display)
  * 
  * Returns: the startup notification ID for @display
  */
-const gchar *
+const char *
 gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
 {
   return GDK_X11_DISPLAY (display)->startup_notification_id;
@@ -2357,10 +2357,10 @@ gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
  **/
 void
 gdk_x11_display_set_startup_notification_id (GdkDisplay  *display,
-                                             const gchar *startup_id)
+                                             const char *startup_id)
 {
   GdkX11Display *display_x11;
-  gchar *time_str;
+  char *time_str;
 
   display_x11 = GDK_X11_DISPLAY (display);
 
@@ -2376,7 +2376,7 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay  *display,
       if (time_str != NULL)
         {
           gulong retval;
-          gchar *end;
+          char *end;
           errno = 0;
 
           /* Skip past the "_TIME" part */
@@ -2463,8 +2463,8 @@ _gdk_x11_display_error_event (GdkDisplay  *display,
 
   if (!ignore)
     {
-      gchar buf[64];
-      gchar *msg;
+      char buf[64];
+      char *msg;
 
       XGetErrorText (display_x11->xdisplay, error->error_code, buf, 63);
 
@@ -2735,7 +2735,7 @@ gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display)
  * session management and the Inter-Client Communication Conventions Manual
  */
 void
-gdk_x11_set_sm_client_id (const gchar *sm_client_id)
+gdk_x11_set_sm_client_id (const char *sm_client_id)
 {
  GSList *displays, *l;
 
@@ -2893,7 +2893,7 @@ gdk_x11_display_get_window_colormap (GdkX11Display *display)
 
 static gboolean
 gdk_x11_display_get_setting (GdkDisplay  *display,
-                             const gchar *name,
+                             const char *name,
                              GValue      *value)
 {
   return gdk_x11_screen_get_setting (GDK_X11_DISPLAY (display)->screen, name, value);
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index c3719e9ac5..58eafeca61 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -110,7 +110,7 @@ struct _GdkX11Display
   int primary_monitor;
 
   /* Startup notification */
-  gchar *startup_notification_id;
+  char *startup_notification_id;
 
   /* Time of most recent user interaction. */
   gulong user_time;
diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 5e8e03fccb..291a892156 100644
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -302,7 +302,7 @@ precache_target_list (GdkDrag *drag)
   atoms = gdk_content_formats_get_mime_types (formats, &n_atoms);
 
   _gdk_x11_precache_atoms (gdk_drag_get_display (drag),
-                           (const gchar **) atoms,
+                           (const char **) atoms,
                            n_atoms);
 }
 
@@ -805,7 +805,7 @@ get_client_window_at_coords (GdkSurfaceCache *cache,
 /* Utility functions */
 
 static struct {
-  const gchar *name;
+  const char *name;
   GdkDragAction action;
 } xdnd_actions_table[] = {
     { "XdndActionCopy",    GDK_ACTION_COPY },
diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c
index 628ac33d0e..7bbb6cc78f 100644
--- a/gdk/x11/gdkdrop-x11.c
+++ b/gdk/x11/gdkdrop-x11.c
@@ -257,7 +257,7 @@ gdk_x11_drop_finalize (GObject *object)
 static void
 print_target_list (GdkContentFormats *formats)
 {
-  gchar *name = gdk_content_formats_to_string (formats);
+  char *name = gdk_content_formats_to_string (formats);
   g_message ("DND formats: %s", name);
   g_free (name);
 }
@@ -270,7 +270,7 @@ print_target_list (GdkContentFormats *formats)
 /* Utility functions */
 
 static struct {
-  const gchar *name;
+  const char *name;
   GdkDragAction action;
 } xdnd_actions_table[] = {
     { "XdndActionCopy",    GDK_ACTION_COPY },
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index dc4cd45e3c..689c6b330e 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -166,7 +166,7 @@ update_modmap (Display      *display,
                GdkX11Keymap *keymap_x11)
 {
   static struct {
-    const gchar *name;
+    const char *name;
     Atom atom;
     GdkModifierType mask;
   } vmods[] = {
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index eca7e4fcbd..eeae4abbe5 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -129,7 +129,7 @@ int         _gdk_x11_display_text_property_to_utf8_list (GdkDisplay     *display
                                                          int             format,
                                                          const guchar   *text,
                                                          int             length,
-                                                         gchar        ***list);
+                                                         char         ***list);
 char *      gdk_x11_utf8_to_string_target               (const char     *utf8_str,
                                                          gboolean        return_latin1);
 
@@ -186,11 +186,11 @@ GdkSurface * _gdk_x11_display_create_surface (GdkDisplay     *display,
 GList *    gdk_x11_display_get_toplevel_windows     (GdkDisplay *display);
 
 void _gdk_x11_precache_atoms (GdkDisplay          *display,
-                              const gchar * const *atom_names,
+                              const char * const *atom_names,
                               int                  n_atoms);
 
 Atom _gdk_x11_get_xatom_for_display_printf         (GdkDisplay    *display,
-                                                    const gchar   *format,
+                                                    const char    *format,
                                                     ...) G_GNUC_PRINTF (2, 3);
 
 GdkDrag        *gdk_x11_drag_find                       (GdkDisplay             *display,
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index fd6ddca2fb..bbe916d5cc 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -77,7 +77,7 @@ lookup_cached_xatom (GdkDisplay *display,
  **/
 Atom
 gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
-				       const gchar *atom_name)
+				       const char *atom_name)
 {
   Atom xatom = None;
 
@@ -102,7 +102,7 @@ gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
 
 void
 _gdk_x11_precache_atoms (GdkDisplay          *display,
-			 const gchar * const *atom_names,
+			 const char * const *atom_names,
 			 int                  n_atoms)
 {
   Atom *xatoms;
@@ -147,7 +147,7 @@ _gdk_x11_precache_atoms (GdkDisplay          *display,
  * Returns: name of the X atom; this string is owned by GDK,
  *   so it shouldn’t be modified or freed. 
  **/
-const gchar *
+const char *
 gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
 				    Atom        xatom)
 
@@ -197,7 +197,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
 
 Atom
 _gdk_x11_get_xatom_for_display_printf (GdkDisplay    *display,
-                                       const gchar   *format,
+                                       const char    *format,
                                        ...)
 {
   va_list args;
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 8b875dfc58..6a96389040 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -1061,7 +1061,7 @@ _gdk_x11_screen_window_manager_changed (GdkX11Screen *screen)
 
 gboolean
 gdk_x11_screen_get_setting (GdkX11Screen   *x11_screen,
-			    const gchar *name,
+			    const char *name,
 			    GValue      *value)
 {
   const GValue *setting;
@@ -1305,7 +1305,7 @@ gdk_x11_screen_get_window_manager_name (GdkX11Screen *x11_screen)
           int format;
           gulong n_items;
           gulong bytes_after;
-          gchar *name;
+          char *name;
 
           name = NULL;
 
@@ -1357,7 +1357,7 @@ gdk_x11_screen_class_init (GdkX11ScreenClass *klass)
 
 static guint32
 get_netwm_cardinal_property (GdkX11Screen *x11_screen,
-                             const gchar  *name)
+                             const char   *name)
 {
   guint32 prop = 0;
   Atom type;
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 83cdd8c37a..26e1b589b5 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -59,12 +59,12 @@ gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
                                             int           format,
                                             const guchar *text,
                                             int           length,
-                                            gchar      ***list)
+                                            char       ***list)
 {
   XTextProperty property;
   int count = 0;
   int res;
-  gchar **local_list;
+  char **local_list;
   g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
 
   if (list)
@@ -101,7 +101,7 @@ gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
  * gdk_x11_display_text_property_to_text_list().
  */
 void
-gdk_x11_free_text_list (gchar **list)
+gdk_x11_free_text_list (char **list)
 {
   g_return_if_fail (list != NULL);
 
@@ -109,22 +109,22 @@ gdk_x11_free_text_list (gchar **list)
 }
 
 static int
-make_list (const gchar  *text,
+make_list (const char   *text,
            int           length,
            gboolean      latin1,
-           gchar      ***list)
+           char       ***list)
 {
   GSList *strings = NULL;
   int n_strings = 0;
   int i;
-  const gchar *p = text;
-  const gchar *q;
+  const char *p = text;
+  const char *q;
   GSList *tmp_list;
   GError *error = NULL;
 
   while (p < text + length)
     {
-      gchar *str;
+      char *str;
 
       q = p;
       while (*q && q < text + length)
@@ -165,7 +165,7 @@ make_list (const gchar  *text,
 
   if (list)
     {
-      *list = g_new (gchar *, n_strings + 1);
+      *list = g_new (char *, n_strings + 1);
       (*list)[n_strings] = NULL;
     }
 
@@ -192,22 +192,22 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
                                              int            format,
                                              const guchar  *text,
                                              int            length,
-                                             gchar       ***list)
+                                             char        ***list)
 {
   if (g_str_equal (encoding, "STRING"))
     {
-      return make_list ((gchar *)text, length, TRUE, list);
+      return make_list ((char *)text, length, TRUE, list);
     }
   else if (g_str_equal (encoding, "UTF8_STRING"))
     {
-      return make_list ((gchar *)text, length, FALSE, list);
+      return make_list ((char *)text, length, FALSE, list);
     }
   else
     {
-      gchar **local_list;
+      char **local_list;
       int local_count;
       int i;
-      const gchar *charset = NULL;
+      const char *charset = NULL;
       gboolean need_conversion = !g_get_charset (&charset);
       int count = 0;
       GError *error = NULL;
@@ -221,7 +221,7 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
                                                                 length,
                                                                 &local_list);
       if (list)
-        *list = g_new (gchar *, local_count + 1);
+        *list = g_new (char *, local_count + 1);
 
       for (i=0; i<local_count; i++)
         {
@@ -229,7 +229,7 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
            */
           if (need_conversion)
             {
-              gchar *utf = g_convert (local_list[i], -1,
+              char *utf = g_convert (local_list[i], -1,
                                       "UTF-8", charset,
                                       NULL, NULL, &error);
               if (utf)
@@ -348,8 +348,8 @@ gdk_x11_display_utf8_to_compound_text (GdkDisplay  *display,
                                        int         *length)
 {
   gboolean need_conversion;
-  const gchar *charset;
-  gchar *locale_str, *tmp_str;
+  const char *charset;
+  char *locale_str, *tmp_str;
   GError *error = NULL;
   gboolean result;
 
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index ec0c6d582a..261b123940 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -103,7 +103,7 @@ static void     gdk_x11_surface_apply_fullscreen_mode (GdkSurface  *surface);
 static gboolean gdk_surface_icon_name_set          (GdkSurface  *surface);
 static void     set_wm_name                       (GdkDisplay  *display,
 						   Window       xwindow,
-						   const gchar *name);
+						   const char *name);
 static void     move_to_current_desktop           (GdkSurface *surface);
 static void     gdk_x11_toplevel_state_callback   (GdkSurface *surface);
 static gboolean gdk_x11_toplevel_event_callback   (GdkSurface *surface,
@@ -652,7 +652,7 @@ set_wm_protocols (GdkSurface *surface)
   XSetWMProtocols (GDK_DISPLAY_XDISPLAY (display), GDK_SURFACE_XID (surface), protocols, n);
 }
 
-static const gchar *
+static const char *
 get_default_title (void)
 {
   const char *title;
@@ -1799,7 +1799,7 @@ move_to_current_desktop (GdkSurface *surface)
 
 static guint32
 get_netwm_cardinal_property (GdkSurface   *surface,
-                             const gchar *name)
+                             const char *name)
 {
   GdkX11Screen *x11_screen = GDK_SURFACE_SCREEN (surface);
   guint32 prop = 0;
@@ -2306,7 +2306,7 @@ gdk_surface_get_geometry_hints (GdkSurface      *surface,
 }
 
 static gboolean
-utf8_is_latin1 (const gchar *str)
+utf8_is_latin1 (const char *str)
 {
   const char *p = str;
 
@@ -2330,9 +2330,9 @@ static void
 set_text_property (GdkDisplay  *display,
 		   Window       xwindow,
 		   Atom         property,
-		   const gchar *utf8_str)
+		   const char *utf8_str)
 {
-  gchar *prop_text = NULL;
+  char *prop_text = NULL;
   Atom prop_type;
   int prop_length;
   int prop_format;
@@ -2378,7 +2378,7 @@ set_text_property (GdkDisplay  *display,
 static void
 set_wm_name (GdkDisplay  *display,
 	     Window       xwindow,
-	     const gchar *name)
+	     const char *name)
 {
   XChangeProperty (GDK_DISPLAY_XDISPLAY (display), xwindow,
 		   gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME"),
@@ -2392,7 +2392,7 @@ set_wm_name (GdkDisplay  *display,
 
 static void
 gdk_x11_surface_set_title (GdkSurface   *surface,
-			  const gchar *title)
+			  const char *title)
 {
   GdkDisplay *display;
   Display *xdisplay;
@@ -2424,7 +2424,7 @@ gdk_x11_surface_set_title (GdkSurface   *surface,
 
 static void
 gdk_x11_surface_set_startup_id (GdkSurface   *surface,
-			       const gchar *startup_id)
+			       const char *startup_id)
 {
   GdkDisplay *display;
 
@@ -2846,8 +2846,8 @@ gdk_x11_surface_set_user_time (GdkSurface *surface,
  */
 void
 gdk_x11_surface_set_utf8_property  (GdkSurface *surface,
-				   const gchar *name,
-				   const gchar *value)
+				   const char *name,
+				   const char *value)
 {
   GdkDisplay *display;
 
diff --git a/gdk/x11/gdktextlistconverter-x11.c b/gdk/x11/gdktextlistconverter-x11.c
index fdd4228ad2..c8f7a0276f 100644
--- a/gdk/x11/gdktextlistconverter-x11.c
+++ b/gdk/x11/gdktextlistconverter-x11.c
@@ -134,7 +134,7 @@ gdk_x11_utf8_to_string_target (const char *utf8_str,
 {
   int len = strlen (utf8_str);
   GString *result = g_string_sized_new (len);
-  const gchar *p = utf8_str;
+  const char *p = utf8_str;
 
   while (*p)
     {
@@ -200,7 +200,7 @@ gdk_x11_text_list_converter_encode (GdkX11TextListConverter *conv,
       g_str_equal (conv->encoding, "TEXT"))
     {
       GConverterResult result;
-      gchar *tmp, *latin1;
+      char *tmp, *latin1;
 
       tmp = g_strndup (inbuf, inbuf_size);
       latin1 = gdk_x11_utf8_to_string_target (tmp, TRUE);
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index ecb9ea6b6f..6d18060a9e 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -198,7 +198,7 @@ _gdk_x11_screen_init_visuals (GdkX11Screen *x11_screen,
 #ifdef G_ENABLE_DEBUG
   if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), MISC))
     {
-      static const gchar *const visual_names[] =
+      static const char *const visual_names[] =
       {
         "static gray",
         "grayscale",
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 0eb84a8025..a84247fd00 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -81,17 +81,17 @@ GDK_AVAILABLE_IN_ALL
 guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
-const gchar * gdk_x11_display_get_startup_notification_id         (GdkDisplay *display);
+const char * gdk_x11_display_get_startup_notification_id         (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_startup_notification_id         (GdkDisplay  *display,
-                                                                   const gchar *startup_id);
+                                                                   const char *startup_id);
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_program_class                   (GdkDisplay  *display,
                                                                    const char  *program_class);
 
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
-                                                const gchar *theme,
+                                                const char *theme,
                                                 const int    size);
 
 GDK_AVAILABLE_IN_ALL
@@ -126,7 +126,7 @@ GDK_AVAILABLE_IN_ALL
 void                           gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
-void        gdk_x11_set_sm_client_id (const gchar *sm_client_id);
+void        gdk_x11_set_sm_client_id (const char *sm_client_id);
 
 G_END_DECLS
 
diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 5275c61214..905711cb76 100644
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -38,9 +38,9 @@ G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
 Atom                  gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
-                                                             const gchar *atom_name);
+                                                             const char *atom_name);
 GDK_AVAILABLE_IN_ALL
-const gchar *         gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
+const char *         gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
                                                           Atom         xatom);
 
 G_END_DECLS
diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 7fd9f73892..2b012e0685 100644
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -42,9 +42,9 @@ int      gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
                                                      int           format,
                                                      const guchar *text,
                                                      int           length,
-                                                     gchar      ***list);
+                                                     char       ***list);
 GDK_AVAILABLE_IN_ALL
-void     gdk_x11_free_text_list                     (gchar       **list);
+void     gdk_x11_free_text_list                     (char        **list);
 GDK_AVAILABLE_IN_ALL
 int      gdk_x11_display_string_to_compound_text    (GdkDisplay   *display,
                                                      const char   *str,
diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h
index f2be036d38..63b11ecf04 100644
--- a/gdk/x11/gdkx11surface.h
+++ b/gdk/x11/gdkx11surface.h
@@ -60,8 +60,8 @@ void     gdk_x11_surface_set_user_time     (GdkSurface   *surface,
                                             guint32      timestamp);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_surface_set_utf8_property (GdkSurface *surface,
-                                            const gchar *name,
-                                            const gchar *value);
+                                            const char *name,
+                                            const char *value);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_surface_set_theme_variant (GdkSurface   *surface,
                                             const char  *variant);
diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index 2d3709c97c..226bbcd985 100644
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -57,7 +57,7 @@
 static int
 parse_boolean (char *v)
 {
-  gchar c0, c1;
+  char c0, c1;
   
   c0 = *v;
   if (g_ascii_isupper ((int)c0))
@@ -82,11 +82,11 @@ parse_boolean (char *v)
 
 static gboolean
 get_boolean_default (GdkX11Screen *x11_screen,
-		     const gchar *option,
+		     const char *option,
 		     gboolean    *value)
 {
   Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
-  gchar *v;
+  char *v;
   int i;
 
   if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
@@ -108,11 +108,11 @@ get_boolean_default (GdkX11Screen *x11_screen,
 
 static gboolean
 get_double_default (GdkX11Screen *x11_screen,
-		    const gchar *option,
+		    const char *option,
 		    gdouble     *value)
 {
   Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
-  gchar    *v, *e;
+  char     *v, *e;
 
   if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
       return FALSE;
@@ -135,11 +135,11 @@ get_double_default (GdkX11Screen *x11_screen,
 
 static gboolean
 get_integer_default (GdkX11Screen *x11_screen,
-		     const gchar *option,
+		     const char *option,
 		     int         *value)
 {
   Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
-  gchar *v, *e;
+  char *v, *e;
 
   if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
       return FALSE;