diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt
index 9fc47bbff8..9b183ff85f 100644
--- a/Userland/Utilities/CMakeLists.txt
+++ b/Userland/Utilities/CMakeLists.txt
@@ -73,6 +73,7 @@ target_link_libraries(comm LibMain)
 target_link_libraries(config LibConfig)
 target_link_libraries(copy LibGUI LibMain)
 target_link_libraries(cp LibMain)
+target_link_libraries(cpp-lexer LibMain)
 target_link_libraries(diff LibDiff)
 target_link_libraries(disasm LibX86)
 target_link_libraries(dmesg LibMain)
diff --git a/Userland/Utilities/cpp-lexer.cpp b/Userland/Utilities/cpp-lexer.cpp
index 528f231405..991214bab1 100644
--- a/Userland/Utilities/cpp-lexer.cpp
+++ b/Userland/Utilities/cpp-lexer.cpp
@@ -7,13 +7,14 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/File.h>
 #include <LibCpp/Lexer.h>
+#include <LibMain/Main.h>
 
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
     Core::ArgsParser args_parser;
     const char* path = nullptr;
     args_parser.add_positional_argument(path, "Cpp File", "cpp-file", Core::ArgsParser::Required::Yes);
-    args_parser.parse(argc, argv);
+    args_parser.parse(arguments);
 
     auto file = Core::File::construct(path);
     if (!file->open(Core::OpenMode::ReadOnly)) {
@@ -27,4 +28,6 @@ int main(int argc, char** argv)
     lexer.lex_iterable([](auto token) {
         outln("{}", token.to_string());
     });
+
+    return 0;
 }