diff --git a/xdg-app-builtins-add-repo.c b/xdg-app-builtins-add-repo.c
index 7ab835ff..1e3e3af7 100644
--- a/xdg-app-builtins-add-repo.c
+++ b/xdg-app-builtins-add-repo.c
@@ -17,14 +17,6 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-static void
-usage_error (GOptionContext *context, const char *message, GError **error)
-{
-  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
-  g_printerr ("%s", help);
-  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
-}
-
 gboolean
 xdg_app_builtin_add_repo (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
diff --git a/xdg-app-builtins-build-init.c b/xdg-app-builtins-build-init.c
index 3aea5293..5d235b93 100644
--- a/xdg-app-builtins-build-init.c
+++ b/xdg-app-builtins-build-init.c
@@ -21,14 +21,6 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-static void
-usage_error (GOptionContext *context, const char *message, GError **error)
-{
-  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
-  g_printerr ("%s", help);
-  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
-}
-
 gboolean
 xdg_app_builtin_build_init (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
diff --git a/xdg-app-builtins-build.c b/xdg-app-builtins-build.c
index c28a38f8..cd14b77a 100644
--- a/xdg-app-builtins-build.c
+++ b/xdg-app-builtins-build.c
@@ -22,14 +22,6 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-static void
-usage_error (GOptionContext *context, const char *message, GError **error)
-{
-  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
-  g_printerr ("%s", help);
-  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
-}
-
 gboolean
 xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
diff --git a/xdg-app-builtins-delete-repo.c b/xdg-app-builtins-delete-repo.c
index 5b7c8e61..413bee0a 100644
--- a/xdg-app-builtins-delete-repo.c
+++ b/xdg-app-builtins-delete-repo.c
@@ -8,14 +8,6 @@
 
 #include "xdg-app-builtins.h"
 
-static void
-usage_error (GOptionContext *context, const char *message, GError **error)
-{
-  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
-  g_printerr ("%s", help);
-  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
-}
-
 gboolean
 xdg_app_builtin_delete_repo (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
diff --git a/xdg-app-builtins-install.c b/xdg-app-builtins-install.c
index f21457fc..bc9671a8 100644
--- a/xdg-app-builtins-install.c
+++ b/xdg-app-builtins-install.c
@@ -17,14 +17,6 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-static void
-usage_error (GOptionContext *context, const char *message, GError **error)
-{
-  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
-  g_printerr ("%s", help);
-  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
-}
-
 gboolean
 xdg_app_builtin_install_runtime (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
diff --git a/xdg-app-builtins-run.c b/xdg-app-builtins-run.c
index bcf4bb15..cb1852ec 100644
--- a/xdg-app-builtins-run.c
+++ b/xdg-app-builtins-run.c
@@ -24,14 +24,6 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-static void
-usage_error (GOptionContext *context, const char *message, GError **error)
-{
-  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
-  g_printerr ("%s", help);
-  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
-}
-
 static char *
 extract_unix_path_from_dbus_addres (const char *address)
 {
diff --git a/xdg-app-builtins-update.c b/xdg-app-builtins-update.c
index acd04f74..1b76b755 100644
--- a/xdg-app-builtins-update.c
+++ b/xdg-app-builtins-update.c
@@ -17,14 +17,6 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-static void
-usage_error (GOptionContext *context, const char *message, GError **error)
-{
-  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
-  g_printerr ("%s", help);
-  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
-}
-
 gboolean
 xdg_app_builtin_update_runtime (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
diff --git a/xdg-app-builtins.h b/xdg-app-builtins.h
index 1045a4a8..d2c149d8 100644
--- a/xdg-app-builtins.h
+++ b/xdg-app-builtins.h
@@ -22,6 +22,10 @@ gboolean xdg_app_option_context_parse (GOptionContext *context,
                                        GCancellable *cancellable,
                                        GError **error);
 
+void usage_error (GOptionContext *context,
+                  const char *message,
+                  GError **error);
+
 #define BUILTINPROTO(name) gboolean xdg_app_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error)
 
 BUILTINPROTO(add_repo);
diff --git a/xdg-app-main.c b/xdg-app-main.c
index c5fd6fbe..84a7f735 100644
--- a/xdg-app-main.c
+++ b/xdg-app-main.c
@@ -153,6 +153,14 @@ xdg_app_option_context_parse (GOptionContext *context,
   return success;
 }
 
+void
+usage_error (GOptionContext *context, const char *message, GError **error)
+{
+  gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
+  g_printerr ("%s", help);
+  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
+}
+
 int
 xdg_app_run (int    argc,
              char **argv,