diff --git a/gio/Gir.toml b/gio/Gir.toml
index 504e94347e48..578d7610b502 100644
--- a/gio/Gir.toml
+++ b/gio/Gir.toml
@@ -367,12 +367,12 @@ manual_traits = ["ApplicationCommandLineExtManual"]
         string_type = "os_string"
     [[object.function]]
     name = "set_exit_status"
-    # Uses glib::ExitCode for consitency with gio::Application interfaces
+    # Uses glib::ExitCode for consistency with gio::Application interfaces
     manual = true
     doc_trait_name = "ApplicationCommandLineExtManual"
     [[object.function]]
     name = "get_exit_status"
-    # Uses glib::ExitCode for consitency with gio::Application interfaces
+    # Uses glib::ExitCode for consistency with gio::Application interfaces
     manual = true
     doc_trait_name = "ApplicationCommandLineExtManual"
 
diff --git a/gio/src/application_command_line.rs b/gio/src/application_command_line.rs
index a99a4270c5fb..59324cac5abb 100644
--- a/gio/src/application_command_line.rs
+++ b/gio/src/application_command_line.rs
@@ -1,17 +1,10 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::{boxed::Box as Box_, mem::transmute, ops::ControlFlow};
+use glib::{prelude::*, translate::*, ExitCode};
 
-use glib::{
-    prelude::*,
-    signal::{connect_raw, SignalHandlerId},
-    translate::*,
-    ExitCode, GString,
-};
+use crate::{ffi, ApplicationCommandLine};
 
-use crate::{ffi, Application, ApplicationCommandLine, ExitCode, File};
-
-pub trait ApplicationCommandLineExtManual: IsA<Application> {
+pub trait ApplicationCommandLineExtManual: IsA<ApplicationCommandLine> {
     #[doc(alias = "g_application_command_line_get_exit_status")]
     #[doc(alias = "get_exit_status")]
     fn exit_code(&self) -> ExitCode {
@@ -33,4 +26,4 @@ pub trait ApplicationCommandLineExtManual: IsA<Application> {
     }
 }
 
-impl<O: IsA<Application>> ApplicationExtManual for O {}
+impl<O: IsA<ApplicationCommandLine>> ApplicationCommandLineExtManual for O {}
diff --git a/gio/src/lib.rs b/gio/src/lib.rs
index eb7e6fd0a48d..cc6e13f840d8 100644
--- a/gio/src/lib.rs
+++ b/gio/src/lib.rs
@@ -17,6 +17,7 @@ mod app_info;
 mod application;
 pub use action_entry::{ActionEntry, ActionEntryBuilder};
 pub use application::{ApplicationBusyGuard, ApplicationHoldGuard};
+mod application_command_line;
 mod async_initable;
 mod cancellable;
 pub use cancellable::CancelledHandlerId;
diff --git a/gio/src/prelude.rs b/gio/src/prelude.rs
index 05bef53b4480..1706dec803d1 100644
--- a/gio/src/prelude.rs
+++ b/gio/src/prelude.rs
@@ -32,7 +32,8 @@ pub use crate::win32_input_stream::Win32InputStreamExt;
 #[cfg(windows)]
 pub use crate::win32_output_stream::Win32OutputStreamExt;
 pub use crate::{
-    action_map::ActionMapExtManual, application::ApplicationExtManual, auto::traits::*,
+    action_map::ActionMapExtManual, application::ApplicationExtManual,
+    application_command_line::ApplicationCommandLineExtManual, auto::traits::*,
     cancellable::CancellableExtManual, converter::ConverterExtManual,
     data_input_stream::DataInputStreamExtManual, datagram_based::DatagramBasedExtManual,
     dbus_connection::DBusMethodCall, dbus_proxy::DBusProxyExtManual, file::FileExtManual,