diff --git a/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c b/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c
index 38fe78bd9a1496a5d1505dffe0bfe03e8d7e6b70..81e4af0009a871d2c1c70c4ed790f6d16d7edc7c 100644
--- a/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c
+++ b/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c
@@ -74,7 +74,7 @@ on_clicked (PhoshDarkModeQuickSetting *self)
 
 static void
 on_color_scheme_changed (PhoshDarkModeQuickSetting *self,
-                         gchar                     *_key,
+                         char                      *_key,
                          GSettings                 *_settings)
 {
   gint color_scheme = g_settings_get_enum (self->settings, "color-scheme");
diff --git a/plugins/ticket-box/prefs/ticket-box-prefs.c b/plugins/ticket-box/prefs/ticket-box-prefs.c
index 10241d7293b864468e9eb3998358a02db88fbd19..c95b2a38ce69510281dec878303c4ad32bb4973d 100644
--- a/plugins/ticket-box/prefs/ticket-box-prefs.c
+++ b/plugins/ticket-box/prefs/ticket-box-prefs.c
@@ -58,7 +58,7 @@ on_select_folder_ready (GObject *source_object, GAsyncResult *res, gpointer user
   PhoshTicketBoxPrefs *self = NULL;
   g_autoptr (GError) err = NULL;
   g_autoptr (GFile) file = NULL;
-  g_autofree gchar *filename = NULL;
+  g_autofree char *filename = NULL;
 
   file = gtk_file_dialog_select_folder_finish (GTK_FILE_DIALOG (source_object),
                                                res,
diff --git a/searchd/search-provider.c b/searchd/search-provider.c
index afc750fd718d15a17ef7e204b4d6c08aba417818..3f26ccea835c3f50e35a3213ab88bd8397e74a23 100644
--- a/searchd/search-provider.c
+++ b/searchd/search-provider.c
@@ -547,7 +547,7 @@ phosh_search_provider_get_result_meta (PhoshSearchProvider *self,
   g_task_set_source_tag (task, phosh_search_provider_get_result_meta);
 
   phosh_dbus_search_provider2_call_get_result_metas (PHOSH_DBUS_SEARCH_PROVIDER2 (priv->proxy),
-                                                     (const gchar * const*) results,
+                                                     (const char * const*) results,
                                                      priv->cancellable,
                                                      got_result_meta,
                                                      task);
diff --git a/searchd/searchd.c b/searchd/searchd.c
index 77a0a5198a8cb23a57b705b710035733ba97939b..c170f8fd6640afcc7dc9d728597c65225704ee01 100644
--- a/searchd/searchd.c
+++ b/searchd/searchd.c
@@ -96,7 +96,7 @@ phosh_search_application_finalize (GObject *object)
 static gboolean
 phosh_search_application_dbus_register (GApplication     *app,
                                         GDBusConnection  *connection,
-                                        const gchar      *object_path,
+                                        const char       *object_path,
                                         GError          **error)
 {
   PhoshSearchApplication *self = PHOSH_SEARCH_APPLICATION (app);
@@ -120,7 +120,7 @@ phosh_search_application_dbus_register (GApplication     *app,
 static void
 phosh_search_application_dbus_unregister (GApplication    *app,
                                           GDBusConnection *connection,
-                                          const gchar     *object_path)
+                                          const char      *object_path)
 {
   PhoshSearchApplication *self = PHOSH_SEARCH_APPLICATION (app);
   PhoshSearchApplicationPrivate *priv = phosh_search_application_get_instance_private (self);
@@ -153,7 +153,7 @@ phosh_search_application_class_init (PhoshSearchApplicationClass *klass)
 static gboolean
 launch_source (PhoshDBusSearch       *interface,
                GDBusMethodInvocation *invocation,
-               const gchar           *source_id,
+               const char            *source_id,
                guint                  timestamp,
                gpointer               user_data)
 {
@@ -200,8 +200,8 @@ launch_source (PhoshDBusSearch       *interface,
 static gboolean
 activate_result (PhoshDBusSearch       *interface,
                  GDBusMethodInvocation *invocation,
-                 const gchar           *source_id,
-                 const gchar           *result_id,
+                 const char            *source_id,
+                 const char            *result_id,
                  guint                  timestamp,
                  gpointer               user_data)
 {
diff --git a/src/app-auth-prompt.c b/src/app-auth-prompt.c
index 37f121433616c796c9026c6d0296fe9c8c1d129d..19dadd3209d2b473744c0745b40f40b4426b6b32 100644
--- a/src/app-auth-prompt.c
+++ b/src/app-auth-prompt.c
@@ -174,9 +174,9 @@ on_dialog_canceled (PhoshAppAuthPrompt *self)
 
 static void
 add_switch_option ( PhoshAppAuthPrompt *self,
-                    gchar *choice_id,
-                    gchar *choice_label,
-                    char *default_option_id)
+                    char               *choice_id,
+                    char               *choice_label,
+                    char               *default_option_id)
 {
   GtkWidget *action_row_choice;
   GtkWidget *switch_choice;
diff --git a/src/app-grid-button.c b/src/app-grid-button.c
index 6811c87ed4e7f04feee4f362dab80e5c1c05e8a8..9c9ced2f511b7e06b258e2fce6182e709afcda87 100644
--- a/src/app-grid-button.c
+++ b/src/app-grid-button.c
@@ -358,7 +358,7 @@ favorite_add_activated (GSimpleAction *action,
 static void
 spawn_gnome_software (const char *action, const char *app_id)
 {
-  const gchar *argv[] = { "gnome-software", action, app_id, NULL };
+  const char *argv[] = { "gnome-software", action, app_id, NULL };
   g_autoptr (GError) err = NULL;
 
   if (!g_spawn_async (NULL, (char **)argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err))
diff --git a/src/app-tracker.c b/src/app-tracker.c
index a23feb48b68f5aa0c42ab00c848f8abb6a034b08..d465655bed7f40a97a1cce113051e24d38cf2e86 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -329,7 +329,7 @@ on_app_launched (PhoshAppTracker   *self,
                  GVariant          *platform_data,
                  GAppLaunchContext *context)
 {
-  g_autofree gchar *startup_id = NULL;
+  g_autofree char *startup_id = NULL;
   const char *app_id;
   PhoshAppState *state;
   gint32 pid;
diff --git a/src/background-manager.c b/src/background-manager.c
index 8c383af22f5e7b2027439d7c0df01faba45c6ea3..8f4b77423f9c9438d9151f644fc1acbd9db20508 100644
--- a/src/background-manager.c
+++ b/src/background-manager.c
@@ -537,7 +537,7 @@ phosh_background_manager_get_data (PhoshBackgroundManager *self, PhoshBackground
   if (self->slideshow) {
     gint width, height;
     gboolean fixed;
-    const gchar *file1;
+    const char *file1;
 
     width = phosh_layer_surface_get_configured_width (PHOSH_LAYER_SURFACE (background));
     height = phosh_layer_surface_get_configured_height (PHOSH_LAYER_SURFACE (background));
diff --git a/src/docked-manager.c b/src/docked-manager.c
index 60ff8d793520ecc2907404a996b6f0321207fdf0..35d97dfc13d7af956d7c47334728b7a1349be426 100644
--- a/src/docked-manager.c
+++ b/src/docked-manager.c
@@ -283,7 +283,7 @@ phosh_docked_manager_get_can_dock (PhoshDockedManager *self)
 void
 phosh_docked_manager_set_enabled (PhoshDockedManager *self, gboolean enable)
 {
-  const gchar *icon_name;
+  const char *icon_name;
 
   g_return_if_fail (PHOSH_IS_DOCKED_MANAGER (self));
   g_return_if_fail ((enable && self->can_dock) || !enable);
diff --git a/src/emergency-calls-manager.h b/src/emergency-calls-manager.h
index df59b8107cdf88122aeaed805dafe029556cb3cd..7063e52a96bd77b609bffebb26b4b8fea323d04a 100644
--- a/src/emergency-calls-manager.h
+++ b/src/emergency-calls-manager.h
@@ -22,6 +22,6 @@ G_DECLARE_FINAL_TYPE (PhoshEmergencyCallsManager, phosh_emergency_calls_manager,
 
 PhoshEmergencyCallsManager *phosh_emergency_calls_manager_new (void);
 GListStore *phosh_emergency_calls_manager_get_list_store (PhoshEmergencyCallsManager *self);
-void        phosh_emergency_calls_manager_call (PhoshEmergencyCallsManager *self, const gchar *id);
+void        phosh_emergency_calls_manager_call (PhoshEmergencyCallsManager *self, const char *id);
 
 G_END_DECLS
diff --git a/src/emergency-contact.c b/src/emergency-contact.c
index c590f910e410b7f04c9d14a8c0739105f0dea322..974711f906ff0abc091968c69e2c231532df13f6 100644
--- a/src/emergency-contact.c
+++ b/src/emergency-contact.c
@@ -39,8 +39,8 @@ static GParamSpec *props[LAST_PROP];
 struct _PhoshEmergencyContact {
   GObject   parent;
 
-  gchar    *id;
-  gchar    *name;
+  char     *id;
+  char     *name;
   gint32    source;
   GVariant *additional_properties;
 };
diff --git a/src/emergency-menu.c b/src/emergency-menu.c
index 40314938c35e34919b28a29adef45a0d0d7e979d..9dd32b62cb9029a9fbd28d3d29c5a41884593641 100644
--- a/src/emergency-menu.c
+++ b/src/emergency-menu.c
@@ -183,7 +183,7 @@ emergency_menu_dispose (GObject *object)
 }
 
 static void
-on_dialpad_dialed (PhoshEmergencyMenu *self, const gchar *number)
+on_dialpad_dialed (PhoshEmergencyMenu *self, const char *number)
 {
   phosh_emergency_calls_manager_call (self->manager, number);
 }
diff --git a/src/gnome-shell-manager.c b/src/gnome-shell-manager.c
index a792d610e4b13a49499716c80b913998f3fce5e7..6e4c572f34b6aeb1f0d33411499143f6c4bab745 100644
--- a/src/gnome-shell-manager.c
+++ b/src/gnome-shell-manager.c
@@ -72,15 +72,15 @@ static void accelerator_activated_action (GSimpleAction *action, GVariant *param
 
 typedef struct _AcceleratorInfo {
   guint                            action_id;
-  gchar                           *accelerator;
-  gchar                           *sender;
+  char                            *accelerator;
+  char                            *sender;
   guint                            mode_flags;
   guint                            grab_flags;
   guint                            repeat_id;
 } AcceleratorInfo;
 
 static void
-remove_action_entries (gchar *accelerator)
+remove_action_entries (char *accelerator)
 {
   GStrv action_names = (char*[]){ accelerator, NULL };
 
@@ -217,10 +217,10 @@ handle_show_osd (PhoshDBusGnomeShell   *skeleton,
 
 static guint
 grab_single_accelerator (PhoshGnomeShellManager *self,
-                         const gchar            *accelerator,
+                         const char             *accelerator,
                          guint                   mode_flags,
                          guint                   grab_flags,
-                         const gchar            *sender,
+                         const char             *sender,
                          GError                **error)
 {
   AcceleratorInfo *info;
@@ -273,13 +273,13 @@ grab_single_accelerator (PhoshGnomeShellManager *self,
 static gboolean
 handle_grab_accelerator (PhoshDBusGnomeShell   *skeleton,
                          GDBusMethodInvocation *invocation,
-                         const gchar           *arg_accelerator,
+                         const char            *arg_accelerator,
                          guint                  arg_modeFlags,
                          guint                  arg_grabFlags)
 {
   PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton);
   g_autoptr (GError) error = NULL;
-  const gchar * sender;
+  const char *sender;
   guint action_id;
 
   g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE);
@@ -318,11 +318,11 @@ handle_grab_accelerators (PhoshDBusGnomeShell   *skeleton,
   PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton);
   g_autoptr (GVariantBuilder) builder = NULL;
   g_autoptr (GVariantIter) arg_iter = NULL;
-  gchar *accelerator_name;
+  char *accelerator_name;
   guint accelerator_mode_flags;
   guint accelerator_grab_flags;
   g_autoptr (GError) error = NULL;
-  const gchar *sender;
+  const char *sender;
   gboolean conflict = FALSE;
 
   g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE);
@@ -386,7 +386,7 @@ handle_ungrab_accelerator (PhoshDBusGnomeShell   *skeleton,
   PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton);
   AcceleratorInfo *info;
   gboolean success = FALSE;
-  const gchar *sender;
+  const char *sender;
 
   g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE);
   g_debug ("DBus ungrab accelerator (id %u)", arg_action);
@@ -420,7 +420,7 @@ handle_ungrab_accelerators (PhoshDBusGnomeShell   *skeleton,
   PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton);
   AcceleratorInfo *info;
   gboolean success = TRUE;
-  const gchar *sender;
+  const char *sender;
   g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE);
 
   sender = g_dbus_method_invocation_get_sender (invocation);
@@ -541,10 +541,10 @@ do_activate_accelerator (AcceleratorInfo *info)
   g_assert (info);
 
   if ((info->mode_flags & self->action_mode) == 0) {
-    g_autofree gchar *str_shell_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE,
-                                                          self->action_mode);
-    g_autofree gchar *str_grabbed_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE,
-                                                            info->mode_flags);
+    g_autofree char *str_shell_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE,
+                                                         self->action_mode);
+    g_autofree char *str_grabbed_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE,
+                                                           info->mode_flags);
     g_debug ("Accelerator registered for mode %s, but shell is currently in %s",
              str_grabbed_mode,
              str_shell_mode);
diff --git a/src/gtk-mount-prompt.h b/src/gtk-mount-prompt.h
index db768a78c586fe532e9e06e291dfdc4b75238649..3ccdd2ede1478b099ea4e13d1409017158b79f8b 100644
--- a/src/gtk-mount-prompt.h
+++ b/src/gtk-mount-prompt.h
@@ -20,7 +20,7 @@ GtkWidget        *phosh_gtk_mount_prompt_new (const char *message,
                                               GVariant   *pids,
                                               const char *const *choices,
                                               GAskPasswordFlags ask_flags);
-const gchar      *phosh_gtk_mount_prompt_get_password (PhoshGtkMountPrompt *self);
+const char       *phosh_gtk_mount_prompt_get_password (PhoshGtkMountPrompt *self);
 GAskPasswordFlags phosh_gtk_mount_prompt_get_ask_flags (PhoshGtkMountPrompt *self);
 gboolean          phosh_gtk_mount_prompt_get_cancelled (PhoshGtkMountPrompt *self);
 int               phosh_gtk_mount_prompt_get_choice (PhoshGtkMountPrompt *self);
diff --git a/src/hks-info.c b/src/hks-info.c
index 282f65fcfabfa6f20ed1a160a807a28153c95837..c3e126fa682b04014d30143e7cbe1b81a2aee79c 100644
--- a/src/hks-info.c
+++ b/src/hks-info.c
@@ -96,7 +96,7 @@ phosh_hks_info_constructed (GObject *object)
 {
   PhoshHksInfo *self = PHOSH_HKS_INFO (object);
   PhoshShell *shell;
-  g_autofree gchar *propname = NULL;
+  g_autofree char *propname = NULL;
 
   G_OBJECT_CLASS (phosh_hks_info_parent_class)->constructed (object);
 
diff --git a/src/hks-manager.c b/src/hks-manager.c
index 0afb521b7c090656679b51b13f3bd9fabc64047a..f7b9a52f194837f9e71e927db1c8938d60c10b7d 100644
--- a/src/hks-manager.c
+++ b/src/hks-manager.c
@@ -63,8 +63,8 @@ enum {
 typedef struct {
   gboolean present;
   gboolean blocked;
-  gchar   *blocked_icon_name;
-  gchar   *unblocked_icon_name;
+  char    *blocked_icon_name;
+  char    *unblocked_icon_name;
   GHashTable *killswitches;
 } Hks;
 
@@ -88,7 +88,7 @@ phosh_hks_manager_get_property (GObject    *object,
                                 GParamSpec *pspec)
 {
   PhoshHksManager *self = PHOSH_HKS_MANAGER (object);
-  const gchar *icon_name;
+  const char *icon_name;
 
   switch (property_id) {
   case PROP_MIC_PRESENT:
diff --git a/src/home.c b/src/home.c
index f77825e9fcb8ee50f436d01a4ac6935a4488e201..a57c8026a22ffec92db721d6b74062731901c030 100644
--- a/src/home.c
+++ b/src/home.c
@@ -438,7 +438,7 @@ add_keybindings (PhoshHome *self)
 
 static void
 on_keybindings_changed (PhoshHome *self,
-                        gchar     *key,
+                        char      *key,
                         GSettings *settings)
 {
   /* For now just redo all keybindings */
diff --git a/src/keyboard-events.c b/src/keyboard-events.c
index f2df4cb88e59efbfb1c17e2da0815d853500bbbc..99b1ecff84ca8473d28d403c43e1cb078f70ebc0 100644
--- a/src/keyboard-events.c
+++ b/src/keyboard-events.c
@@ -45,7 +45,7 @@ handle_accelerator_activated_event (void *data,
                                     uint32_t timestamp)
 {
   PhoshKeyboardEvents *self = PHOSH_KEYBOARD_EVENTS (data);
-  const gchar *action;
+  const char *action;
   GVariant *pressed = NULL;
 
   action = g_hash_table_lookup (self->accelerators, GUINT_TO_POINTER (action_id));
@@ -70,7 +70,7 @@ handle_accelerator_released_event (void *data,
                                    uint32_t timestamp)
 {
   PhoshKeyboardEvents *self = PHOSH_KEYBOARD_EVENTS (data);
-  const gchar *action;
+  const char *action;
 
   action = g_hash_table_lookup (self->accelerators, GUINT_TO_POINTER (action_id));
   g_return_if_fail (action);
@@ -156,7 +156,7 @@ static const struct phosh_private_keyboard_event_listener keyboard_event_listene
 
 static void
 on_action_added (PhoshKeyboardEvents *self,
-                 gchar               *action_name,
+                 char                *action_name,
                  GActionGroup        *action_group)
 {
   g_debug ("Grabbing accelerator %s", action_name);
@@ -166,7 +166,7 @@ on_action_added (PhoshKeyboardEvents *self,
 
 static void
 on_action_removed (PhoshKeyboardEvents *self,
-                   gchar               *action_name,
+                   char                *action_name,
                    GActionGroup        *action_group)
 {
   GHashTableIter iter;
diff --git a/src/keypad.c b/src/keypad.c
index a22f56b6b9804f8f42d161d69a628972e17734fb..2d6f3747c455088b8effdd884b56977e39fb91ec 100644
--- a/src/keypad.c
+++ b/src/keypad.c
@@ -59,10 +59,9 @@ enum {
 static GParamSpec *props[PROP_LAST_PROP];
 
 static void
-symbol_clicked (PhoshKeypad *self,
-                gchar        symbol)
+symbol_clicked (PhoshKeypad *self, char symbol)
 {
-  g_autofree gchar *string = g_strdup_printf ("%c", symbol);
+  g_autofree char *string = g_strdup_printf ("%c", symbol);
 
   if (!self->entry)
     return;
diff --git a/src/location-manager.c b/src/location-manager.c
index 6c39d80f2f4a05db9e095f27090ef068cebed548..81e881570a2ae798797a8b7a55eeb974f6cf661e 100644
--- a/src/location-manager.c
+++ b/src/location-manager.c
@@ -212,7 +212,7 @@ on_app_auth_prompt_closed (PhoshLocationManager *self, PhoshAppAuthPrompt *promp
 static gboolean
 handle_authorize_app (PhoshGeoClueDBusOrgFreedesktopGeoClue2Agent *object,
                       GDBusMethodInvocation                       *invocation,
-                      const gchar                                 *arg_desktop_id,
+                      const char                                  *arg_desktop_id,
                       guint                                        arg_req_accuracy_level)
 {
   PhoshLocationManager *self = PHOSH_LOCATION_MANAGER (object);
@@ -397,8 +397,8 @@ on_manager_proxy_ready (GObject              *source_object,
 
 static void
 on_manager_name_appeared (GDBusConnection      *connection,
-                          const gchar          *name,
-                          const gchar          *name_owner,
+                          const char           *name,
+                          const char           *name_owner,
                           PhoshLocationManager *self)
 {
   g_return_if_fail (PHOSH_IS_LOCATION_MANAGER (self));
@@ -416,7 +416,7 @@ on_manager_name_appeared (GDBusConnection      *connection,
 
 static void
 on_manager_name_vanished (GDBusConnection      *connection,
-                          const gchar          *name,
+                          const char           *name,
                           PhoshLocationManager *self)
 {
   g_return_if_fail (PHOSH_IS_LOCATION_MANAGER (self));
diff --git a/src/lockscreen.c b/src/lockscreen.c
index 40d0f8599c164e3d1f899d1c716663d2d0c54069..7b32d939a537ec88193abcab523d90dfc9650879 100644
--- a/src/lockscreen.c
+++ b/src/lockscreen.c
@@ -526,7 +526,7 @@ carousel_page_changed_cb (PhoshLockscreen *self,
 
 
 static void
-update_active_call (PhoshLockscreen *self, const gchar *path)
+update_active_call (PhoshLockscreen *self, const char *path)
 {
   PhoshLockscreenPrivate *priv = phosh_lockscreen_get_instance_private (self);
   PhoshCall *call;
@@ -545,7 +545,7 @@ update_active_call (PhoshLockscreen *self, const gchar *path)
 
 
 static void
-on_calls_call_added (PhoshLockscreen *self, const gchar *path)
+on_calls_call_added (PhoshLockscreen *self, const char *path)
 {
   PhoshLockscreenPrivate *priv;
 
@@ -560,7 +560,7 @@ on_calls_call_added (PhoshLockscreen *self, const gchar *path)
 
 
 static void
-on_calls_call_removed (PhoshLockscreen *self, const gchar *path)
+on_calls_call_removed (PhoshLockscreen *self, const char *path)
 {
   PhoshLockscreenPrivate *priv;
 
diff --git a/src/log.c b/src/log.c
index c2372e5a3fab80df70a100bd8c0b0aa2482ebe0b..4b78ea6f9175d2333990b43ab1328a33f408c394 100644
--- a/src/log.c
+++ b/src/log.c
@@ -59,7 +59,7 @@ phosh_log_writer_default (GLogLevelFlags   log_level,
 
   /* Disable debug message output unless specified in _log_domains. */
   if (!(log_level & DEFAULT_LEVELS) && !(log_level >> G_LOG_LEVEL_USER_SHIFT)) {
-    const gchar *log_domain = NULL;
+    const char *log_domain = NULL;
     gsize i;
 
     if ((log_level & INFO_LEVELS) == 0 || _log_domains == NULL) {
diff --git a/src/mode-manager.c b/src/mode-manager.c
index 0501375e39fa1198abfbc7851cac575cac2f7f19..4248c35c8fb7126af28eeddda87ddc043511c259 100644
--- a/src/mode-manager.c
+++ b/src/mode-manager.c
@@ -47,7 +47,7 @@ struct _PhoshModeManager {
 
   PhoshDBusHostname1          *proxy;
   GCancellable                *cancel;
-  gchar                       *chassis;
+  char                        *chassis;
   PhoshWaylandSeatCapabilities wl_caps;
 
   /* Tablet mode */
@@ -207,7 +207,7 @@ on_chassis_changed (PhoshModeManager   *self,
                     GParamSpec         *pspec,
                     PhoshDBusHostname1 *proxy)
 {
-  const gchar *chassis;
+  const char *chassis;
 
   g_return_if_fail (PHOSH_IS_MODE_MANAGER (self));
   g_return_if_fail (PHOSH_DBUS_IS_HOSTNAME1 (proxy));
diff --git a/src/monitor/head-priv.h b/src/monitor/head-priv.h
index 33b45ccd0401e6a49f3e71753491bf04e3c97375..f5131d591a5a07b08576381615084c15ffb23e19 100644
--- a/src/monitor/head-priv.h
+++ b/src/monitor/head-priv.h
@@ -36,9 +36,9 @@ typedef struct _PhoshHeadMode {
 struct _PhoshHead {
   GObject                     parent;
 
-  gchar                      *name;
-  gchar                      *description;
-  gchar                      *vendor, *product, *serial;
+  char                       *name;
+  char                       *description;
+  char                       *vendor, *product, *serial;
   gboolean                    enabled;
 
   struct PhoshPhysicalSize {
diff --git a/src/network-auth-manager.c b/src/network-auth-manager.c
index 3995140948b1b123ebbe5279805e23a395eb7b8a..6b568e260263b8a557c2177f96777ff8f750e46d 100644
--- a/src/network-auth-manager.c
+++ b/src/network-auth-manager.c
@@ -440,7 +440,7 @@ on_search_vpn_plugin_ready (GObject      *source_object,
   g_autoptr (GPtrArray) auth_helper_argv = NULL;
   g_autoptr (NMVpnPluginInfo) plugin = NULL;
   g_autoptr (GError) err = NULL;
-  const gchar *service_type;
+  const char *service_type;
 
   GString * auth_helper_request;
   g_autofree char * auth_helper_request_str = NULL;
@@ -565,7 +565,7 @@ vpn_secret_request (PhoshNetworkAuthManager     *self,
                     NMSecretAgentGetSecretsFlags flags)
 {
   NMSettingVpn *setting = nm_connection_get_setting_vpn (connection);
-  const gchar *service_type = nm_setting_vpn_get_service_type (setting);
+  const char *service_type = nm_setting_vpn_get_service_type (setting);
   VPNRequest *request = g_new0 (VPNRequest, 1);
 
   g_debug ("Handling VPN secrets for %s, flags: 0x%x", service_type, flags);
diff --git a/src/notifications/mount-notification.c b/src/notifications/mount-notification.c
index 4c74bdeb45083bc4cacc8b74617098930b9e316a..af79f5e3b6d9932f3a5e97027a306e82e85e60f8 100644
--- a/src/notifications/mount-notification.c
+++ b/src/notifications/mount-notification.c
@@ -110,15 +110,15 @@ phosh_mount_notification_init (PhoshMountNotification *self)
 PhoshMountNotification *
 phosh_mount_notification_new_from_mount (guint id, GMount *mount)
 {
-  g_autofree gchar *name = NULL;
-  g_autofree gchar *uri = NULL;
+  g_autofree char *name = NULL;
+  g_autofree char *uri = NULL;
   g_autoptr (GIcon) icon = NULL;
   g_autoptr (GIcon) app_icon = NULL;
   g_autoptr (GFile) root = NULL;
   g_autoptr (GAppInfo) info = NULL;
   g_autoptr (GAppInfo) handler_info = NULL;
   GDesktopAppInfo *desktop_info;
-  gchar *actions[] = { NULL, _("Open"), NULL };
+  char *actions[] = { NULL, _("Open"), NULL };
 
   name = g_mount_get_name (mount);
   g_debug ("Mount '%s' added", name);
diff --git a/src/notifications/notify-manager.c b/src/notifications/notify-manager.c
index 73643e6ff9f645c71dfdad9cd3614e683c9ca38c..2581f78f9e00aacc8300e63c9a78e41d04f96978 100644
--- a/src/notifications/notify-manager.c
+++ b/src/notifications/notify-manager.c
@@ -176,7 +176,7 @@ forget_unlock_notify (PhoshNotifyManager *self)
 
 
 static void
-invoke_action (PhoshNotifyManager *self, PhoshNotification *notification, const gchar *action)
+invoke_action (PhoshNotifyManager *self, PhoshNotification *notification, const char *action)
 {
   guint id;
 
@@ -379,11 +379,11 @@ phosh_notify_manager_add_application (PhoshNotifyManager *self, GAppInfo *info)
   g_autofree char *path = NULL;
   g_autoptr (GSettings) settings = NULL;
   g_autoptr(GPtrArray) new_apps = NULL;
-  const gchar *id;
+  const char *id;
 
   id = g_app_info_get_id(info);
   munged_id = phosh_munge_app_id (id);
-  if (g_strv_contains ((const gchar * const *)self->app_children, munged_id))
+  if (g_strv_contains ((const char * const *)self->app_children, munged_id))
     return;
 
   g_debug ("Adding new application: %s/%s", id, munged_id);
@@ -398,7 +398,7 @@ phosh_notify_manager_add_application (PhoshNotifyManager *self, GAppInfo *info)
   settings = g_settings_new_with_path (NOTIFICATIONS_APP_SCHEMA_ID, path);
   g_settings_set_string (settings, NOTIFICATIONS_APP_KEY_APP_ID, id);
   g_settings_set_strv (self->settings, NOTIFICATIONS_KEY_APP_CHILDREN,
-                       (const gchar * const *)new_apps->pdata);
+                       (const char * const *)new_apps->pdata);
 }
 
 
@@ -848,7 +848,7 @@ phosh_notify_manager_get_notification_id (PhoshNotifyManager *self)
  */
 void
 phosh_notify_manager_add_notification (PhoshNotifyManager *self,
-                                       const gchar        *source_id,
+                                       const char         *source_id,
                                        int                 expire_timeout,
                                        PhoshNotification  *notification)
 {
diff --git a/src/notifications/notify-manager.h b/src/notifications/notify-manager.h
index dfd4770caea41f6c873e5497d3d4ebbbe6c38efd..6b78d555e894cc47b53e2afbad0545f866fa693e 100644
--- a/src/notifications/notify-manager.h
+++ b/src/notifications/notify-manager.h
@@ -26,7 +26,7 @@ PhoshNotificationList *phosh_notify_manager_get_list         (PhoshNotifyManager
 gboolean               phosh_notify_manager_get_show_banners (PhoshNotifyManager *self);
 guint                  phosh_notify_manager_get_notification_id (PhoshNotifyManager *self);
 void                   phosh_notify_manager_add_notification (PhoshNotifyManager *self,
-                                                              const gchar *source_id,
+                                                              const char *source_id,
                                                               int expire_timeout,
                                                               PhoshNotification *notification);
 gboolean               phosh_notify_manager_close_notification_by_id (PhoshNotifyManager      *self,
diff --git a/src/quick-settings.c b/src/quick-settings.c
index 2f86e6a51af841fddf624fac7ffa5179dc01ea2e..641dbf77929328621a681be5519a397b41d22535 100644
--- a/src/quick-settings.c
+++ b/src/quick-settings.c
@@ -224,7 +224,7 @@ unload_custom_quick_setting (GtkWidget *quick_setting)
 
 
 static void
-load_custom_quick_settings (PhoshQuickSettings *self, GSettings *settings, gchar *key)
+load_custom_quick_settings (PhoshQuickSettings *self, GSettings *settings, char *key)
 {
   g_auto (GStrv) plugins = NULL;
   GtkWidget *widget;
diff --git a/src/rotation-manager.c b/src/rotation-manager.c
index e9863b489ee542a438544c511d7568e25baa64b6..fdd37d052440e7cd2b20c1a62fa71eda417816b2 100644
--- a/src/rotation-manager.c
+++ b/src/rotation-manager.c
@@ -97,7 +97,7 @@ apply_transform (PhoshRotationManager *self, PhoshMonitorTransform transform)
 static gboolean
 match_orientation (PhoshRotationManager *self)
 {
-  const gchar *orient;
+  const char *orient;
   PhoshMonitorTransform transform;
 
   if (self->orientation_locked || !self->claimed ||
diff --git a/src/run-command-dialog.c b/src/run-command-dialog.c
index 937e3689164ab0cc77dafd361a3c605edad57ef0..033fac89360745b84e6264b08dc88ba614e1937f 100644
--- a/src/run-command-dialog.c
+++ b/src/run-command-dialog.c
@@ -123,7 +123,7 @@ phosh_run_command_dialog_new (void)
 
 void
 phosh_run_command_dialog_set_message (PhoshRunCommandDialog *self,
-                                      const gchar           *message)
+                                      const char            *message)
 {
   if (message == NULL)
     message = _("Press ESC to close");
diff --git a/src/run-command-dialog.h b/src/run-command-dialog.h
index 77361ba3a51744284aa94b7113602aee51efa38a..512f1620a0a071d33450ac0dbcecde6ba8ae4c68 100644
--- a/src/run-command-dialog.h
+++ b/src/run-command-dialog.h
@@ -19,6 +19,6 @@ G_DECLARE_FINAL_TYPE (PhoshRunCommandDialog, phosh_run_command_dialog, PHOSH, RU
 
 GtkWidget *phosh_run_command_dialog_new         (void);
 void       phosh_run_command_dialog_set_message (PhoshRunCommandDialog *self,
-                                                 const gchar           *message);
+                                                 const char            *message);
 
 G_END_DECLS
diff --git a/src/session-manager.c b/src/session-manager.c
index 6a2e5371a9a4c4f92d4fe3bcef84cb8d1cb1606e..3a300109bee3bb89097f446c2c5daaec38606b75 100644
--- a/src/session-manager.c
+++ b/src/session-manager.c
@@ -112,7 +112,7 @@ handle_end_session_open (PhoshDBusEndSessionDialog *object,
                          guint                      arg_type,
                          guint                      arg_timestamp,
                          guint                      arg_seconds_to_stay_open,
-                         const gchar *const        *arg_inhibitor_object_paths)
+                         const char *const         *arg_inhibitor_object_paths)
 {
   PhoshSessionManager *self = PHOSH_SESSION_MANAGER (object);
 
@@ -283,7 +283,7 @@ on_client_registered (PhoshDBusSessionManager *proxy,
                       GAsyncResult            *res,
                       PhoshSessionManager     *self)
 {
-  g_autofree gchar *client_id = NULL;
+  g_autofree char *client_id = NULL;
   g_autoptr (GError) err = NULL;
 
   if (!phosh_dbus_session_manager_call_register_client_finish (proxy, &client_id, res, &err)) {
@@ -441,8 +441,8 @@ phosh_session_manager_is_active (PhoshSessionManager *self)
 
 void
 phosh_session_manager_register (PhoshSessionManager *self,
-                                const gchar         *app_id,
-                                const gchar         *startup_id)
+                                const char          *app_id,
+                                const char          *startup_id)
 {
   g_return_if_fail (PHOSH_IS_SESSION_MANAGER (self));
   g_return_if_fail (PHOSH_DBUS_IS_SESSION_MANAGER_PROXY (self->proxy));
diff --git a/src/session-manager.h b/src/session-manager.h
index d3e1e9338f8e5b442158c3f7cfd5ce554a4fdd87..9468b64f03f89f9f0ff580a4125c1bb0ebdd97a6 100644
--- a/src/session-manager.h
+++ b/src/session-manager.h
@@ -28,7 +28,7 @@ G_DECLARE_FINAL_TYPE (PhoshSessionManager, phosh_session_manager,
 
 PhoshSessionManager *phosh_session_manager_new (void);
 gboolean phosh_session_manager_is_active (PhoshSessionManager *self);
-void     phosh_session_manager_register (PhoshSessionManager *self, const gchar *app_id, const gchar *startup_id);
+void     phosh_session_manager_register (PhoshSessionManager *self, const char *app_id, const char *startup_id);
 void     phosh_session_manager_logout (PhoshSessionManager *self);
 void     phosh_session_manager_shutdown (PhoshSessionManager *self);
 void     phosh_session_manager_reboot (PhoshSessionManager *self);
diff --git a/src/settings/audio-devices.c b/src/settings/audio-devices.c
index 7f2546b6314f6fdb5b8df3fb486f70e99ca2fd3d..2601f3a3a93280279ab048cf143f3c7b6958e8a2 100644
--- a/src/settings/audio-devices.c
+++ b/src/settings/audio-devices.c
@@ -136,7 +136,7 @@ static void
 on_device_added (PhoshAudioDevices *self, guint id)
 {
   GvcMixerUIDevice *device = NULL;
-  g_autofree gchar *description = NULL;
+  g_autofree char *description = NULL;
   const char *icon_name;
   const char *origin;
   g_autoptr (PhoshAudioDevice) audio_device = NULL;
diff --git a/src/shell.c b/src/shell.c
index 9cb2baeed272f87d268b5f0e84ce29e4096b6bfd..a40b95f392f23347ecad7c011e05fe17484c4ff8 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1088,7 +1088,7 @@ phosh_shell_constructed (GObject *object)
 
 /* {{{ Action Map/Group */
 
-static gchar **
+static char **
 phosh_shell_list_actions (GActionGroup *group)
 {
   PhoshShell *self = PHOSH_SHELL (group);
@@ -1103,7 +1103,7 @@ phosh_shell_list_actions (GActionGroup *group)
 
 static gboolean
 phosh_shell_query_action (GActionGroup        *group,
-                          const gchar         *action_name,
+                          const char          *action_name,
                           gboolean            *enabled,
                           const GVariantType **parameter_type,
                           const GVariantType **state_type,
@@ -1128,7 +1128,7 @@ phosh_shell_query_action (GActionGroup        *group,
 
 static void
 _phosh_shell_activate_action (GActionGroup *group,
-                              const gchar  *action_name,
+                              const char   *action_name,
                               GVariant     *parameter)
 {
   PhoshShell *self = PHOSH_SHELL (group);
@@ -1143,7 +1143,7 @@ _phosh_shell_activate_action (GActionGroup *group,
 
 static void
 phosh_shell_change_action_state (GActionGroup *group,
-                                 const gchar  *action_name,
+                                 const char   *action_name,
                                  GVariant     *state)
 {
   PhoshShell *self = PHOSH_SHELL (group);
@@ -1167,7 +1167,7 @@ phosh_shell_action_group_iface_init (GActionGroupInterface *iface)
 
 
 static GAction *
-phosh_shell_lookup_action (GActionMap *action_map, const gchar *action_name)
+phosh_shell_lookup_action (GActionMap *action_map, const char *action_name)
 {
   PhoshShell *self = PHOSH_SHELL (action_map);
   PhoshShellPrivate *priv = phosh_shell_get_instance_private (self);
@@ -1191,7 +1191,7 @@ phosh_shell_add_action (GActionMap *action_map, GAction *action)
 }
 
 static void
-phosh_shell_remove_action (GActionMap *action_map, const gchar *action_name)
+phosh_shell_remove_action (GActionMap *action_map, const char *action_name)
 {
   PhoshShell *self = PHOSH_SHELL (action_map);
   PhoshShellPrivate *priv = phosh_shell_get_instance_private (self);
@@ -2396,8 +2396,8 @@ phosh_shell_set_state (PhoshShell          *self,
 {
   PhoshShellPrivate *priv;
   PhoshShellStateFlags old_state;
-  g_autofree gchar *str_state = NULL;
-  g_autofree gchar *str_new_flags = NULL;
+  g_autofree char *str_state = NULL;
+  g_autofree char *str_new_flags = NULL;
 
   g_return_if_fail (PHOSH_IS_SHELL (self));
   priv = phosh_shell_get_instance_private (self);
diff --git a/src/splash-manager.c b/src/splash-manager.c
index b390972a6bf84a567fa7c6bff55e1a0e957739d0..9233dc8c48deb5620ddbb8178dba90e8ea69a71b 100644
--- a/src/splash-manager.c
+++ b/src/splash-manager.c
@@ -84,7 +84,7 @@ phosh_splash_manager_get_property (GObject    *object,
 static void
 on_splash_closed (PhoshSplashManager *self, GtkWidget *splash)
 {
-  const gchar *key;
+  const char *key;
 
   g_return_if_fail (PHOSH_IS_SPLASH_MANAGER (self));
   g_return_if_fail (PHOSH_IS_SPLASH (splash));
diff --git a/src/system-modal-dialog.c b/src/system-modal-dialog.c
index 959eebffdb39126fe2dd4dcf1623a76e32ed973e..a795b5a3ba00c93f452c20548fe1e00d8586699b 100644
--- a/src/system-modal-dialog.c
+++ b/src/system-modal-dialog.c
@@ -84,7 +84,7 @@ enum {
 static guint signals[N_SIGNALS] = { 0 };
 
 typedef struct {
-  gchar          *title;
+  char           *title;
 
   GtkWidget      *lbl_title;
   GtkWidget      *box_dialog;
@@ -230,7 +230,7 @@ static void
 phosh_system_modal_dialog_buildable_add_child (GtkBuildable *buildable,
                                                GtkBuilder   *builder,
                                                GObject      *child,
-                                               const gchar  *type)
+                                               const char   *type)
 {
   PhoshSystemModalDialog *self = PHOSH_SYSTEM_MODAL_DIALOG (buildable);
 
@@ -415,7 +415,7 @@ phosh_system_modal_dialog_get_title (PhoshSystemModalDialog *self)
 }
 
 void
-phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const gchar *title)
+phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const char *title)
 {
   PhoshSystemModalDialogPrivate *priv;
 
diff --git a/src/system-modal-dialog.h b/src/system-modal-dialog.h
index a601a59a22266019a3d2be7ce6a3891f0a45348c..2a4faaadcaf3c824d335e0ba00dfe659adf21c1f 100644
--- a/src/system-modal-dialog.h
+++ b/src/system-modal-dialog.h
@@ -26,7 +26,7 @@ struct _PhoshSystemModalDialogClass {
 GtkWidget  *phosh_system_modal_dialog_new (void);
 void        phosh_system_modal_dialog_set_content (PhoshSystemModalDialog *self, GtkWidget *content);
 void        phosh_system_modal_dialog_add_button (PhoshSystemModalDialog *self, GtkWidget *button, gint position);
-void        phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const gchar *title);
+void        phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const char *title);
 const char *phosh_system_modal_dialog_get_title (PhoshSystemModalDialog *self);
 void        phosh_system_modal_dialog_remove_button (PhoshSystemModalDialog *self, GtkWidget *button);
 GList      *phosh_system_modal_dialog_get_buttons (PhoshSystemModalDialog *self);
diff --git a/src/top-panel.c b/src/top-panel.c
index 6fb5552d21f7ce76ed0cf8e5f025b2fba249ed04..1ccfb6ce55762b8cb925eba078d113774515b1c7 100644
--- a/src/top-panel.c
+++ b/src/top-panel.c
@@ -413,7 +413,7 @@ add_keybindings (PhoshTopPanel *self)
 
 static void
 on_keybindings_changed (PhoshTopPanel *self,
-                        gchar         *key,
+                        char          *key,
                         GSettings     *settings)
 {
   /* For now just redo all keybindings */
diff --git a/src/util.c b/src/util.c
index 02f7dd37ed09d4ffc61e3fe303985564102350c0..f154f941dcb48a9bd7edf83bdd6971193c867e27 100644
--- a/src/util.c
+++ b/src/util.c
@@ -218,7 +218,7 @@ phosh_error_warnv (const char *log_domain,
                    GError     *err,
                    GQuark      domain,
                    gint        code,
-                   const gchar *fmt, ...)
+                   const char *fmt, ...)
 {
   g_autofree char *msg = NULL;
   gboolean matched = FALSE;
@@ -456,7 +456,7 @@ phosh_util_gesture_is_touch (GtkGestureSingle *gesture)
 gboolean
 phosh_util_have_gnome_software (gboolean scan)
 {
-  g_autofree gchar *path = NULL;
+  g_autofree char *path = NULL;
 
   if (have_gnome_software >= 0 && !scan)
     return have_gnome_software;
diff --git a/src/util.h b/src/util.h
index 0e030cafe50d4e0918282bc9978528aa839e43c5..4f52e32e4547a0457935f786d0f3f7a68b5430fb 100644
--- a/src/util.h
+++ b/src/util.h
@@ -19,14 +19,14 @@
 
 void             phosh_cp_widget_destroy (void *widget);
 GDesktopAppInfo *phosh_get_desktop_app_info_for_app_id (const char *app_id);
-gchar           *phosh_munge_app_id (const gchar *app_id);
+char            *phosh_munge_app_id (const char *app_id);
 char            *phosh_strip_suffix_from_app_id (const char *app_id);
 gboolean         phosh_find_systemd_session (char **session_id);
-gboolean         phosh_error_warnv (const char  *log_domain,
-                                    GError      *err,
-                                    GQuark       domain,
-                                    int          code,
-                                    const gchar *fmt,
+gboolean         phosh_error_warnv (const char *log_domain,
+                                    GError     *err,
+                                    GQuark      domain,
+                                    int         code,
+                                    const char *fmt,
                                     ...) G_GNUC_PRINTF(5, 6);
 int              phosh_create_shm_file (off_t size);
 char            *phosh_util_escape_markup (const char *markup, gboolean allow_markup);
diff --git a/tests/services/testlib-search-provider-app.c b/tests/services/testlib-search-provider-app.c
index af97f406ef5576ffc2007a747cf8e2b5a10160a3..ccd9c457132ed6ce47eacda36aaa2f7726a315d1 100644
--- a/tests/services/testlib-search-provider-app.c
+++ b/tests/services/testlib-search-provider-app.c
@@ -29,7 +29,7 @@ G_DEFINE_TYPE (PhoshSearchProviderMockApp, phosh_search_provider_mock_app, G_TYP
 static gboolean
 phosh_search_provider_mock_app_dbus_register (GApplication    *application,
                                               GDBusConnection *connection,
-                                              const gchar     *object_path,
+                                              const char      *object_path,
                                               GError         **error)
 {
   PhoshSearchProviderMockApp *self;
@@ -52,7 +52,7 @@ phosh_search_provider_mock_app_dbus_register (GApplication    *application,
 static void
 phosh_search_provider_mock_app_dbus_unregister (GApplication    *application,
                                                 GDBusConnection *connection,
-                                                const gchar     *object_path)
+                                                const char      *object_path)
 {
   PhoshSearchProviderMockApp *self = PHOSH_SEARCH_PROVIDER_MOCK_APP (application);
 
diff --git a/tests/services/testlib-search-provider.c b/tests/services/testlib-search-provider.c
index 192e3faa05a5b56b8f2d1a78ad56d824360184d1..5ccef523bb2971cb9c2dd156bd61e2d23f6aa076 100644
--- a/tests/services/testlib-search-provider.c
+++ b/tests/services/testlib-search-provider.c
@@ -169,7 +169,7 @@ phosh_search_provider_mock_init (PhoshSearchProviderMock *self)
 gboolean
 phosh_search_provider_mock_dbus_register (PhoshSearchProviderMock  *self,
                                           GDBusConnection          *connection,
-                                          const gchar              *object_path,
+                                          const char               *object_path,
                                           GError                  **error)
 {
   GDBusInterfaceSkeleton *skeleton = G_DBUS_INTERFACE_SKELETON (self->skeleton);
@@ -181,7 +181,7 @@ phosh_search_provider_mock_dbus_register (PhoshSearchProviderMock  *self,
 void
 phosh_search_provider_mock_dbus_unregister (PhoshSearchProviderMock *self,
                                             GDBusConnection         *connection,
-                                            const gchar             *object_path)
+                                            const char              *object_path)
 {
   GDBusInterfaceSkeleton *skeleton = G_DBUS_INTERFACE_SKELETON (self->skeleton);
 
diff --git a/tests/test-search-provider.c b/tests/test-search-provider.c
index 85bafbbb6ecafdaf9270f7aac829e864d56c7315..cc78e9a31119a5e6eb81cc37150a66d05da5d170 100644
--- a/tests/test-search-provider.c
+++ b/tests/test-search-provider.c
@@ -208,10 +208,10 @@ test_phosh_search_provider_limit_results (TestFixture *fixture, gconstpointer un
 
 
 gint
-main (gint argc, gchar *argv[])
+main (gint argc, char *argv[])
 {
   g_autoptr(GTestDBus) dbus = NULL;
-  g_autofree gchar *relative = NULL, *servicesdir = NULL;
+  g_autofree char *relative = NULL, *servicesdir = NULL;
   const char *display;
   int ret = -1;
 
diff --git a/tests/test-take-screenshots.c b/tests/test-take-screenshots.c
index f51373a4919759de028888b71d8f393bcfb84439..d5bd5a23ffaf40dfa359c220f6c95e7db8d9985a 100644
--- a/tests/test-take-screenshots.c
+++ b/tests/test-take-screenshots.c
@@ -348,7 +348,7 @@ screenshot_end_session_dialog (GMainLoop                      *loop,
                                            0,
                                            0,
                                            30,
-                                           (const gchar * const*)inhibitors->pdata,
+                                           (const char * const*)inhibitors->pdata,
                                            NULL,
                                            on_end_session_dialog_open_finish,
                                            NULL);
diff --git a/tests/testlib-wait-for-shell-state.c b/tests/testlib-wait-for-shell-state.c
index ece156eb6b1ff9b17a5fb7f2cddd6a9bf2b5c444..0569ec03a47d433fb00cabd5f8315f918d6da347 100644
--- a/tests/testlib-wait-for-shell-state.c
+++ b/tests/testlib-wait-for-shell-state.c
@@ -76,7 +76,7 @@ void
 phosh_test_wait_for_shell_state_wait (PhoshTestWaitForShellState *self, PhoshShellStateFlags state,
                                       gboolean enabled, guint64 timeout_ms)
 {
-  g_autofree gchar *str_state = NULL;
+  g_autofree char *str_state = NULL;
 
   self->state = state;
   self->state_enabled = enabled;