diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
index ac6db3051d..6dd36c9250 100644
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@@ -665,7 +665,7 @@ if (BUILD_LAGOM)
 
         add_executable(ntpquery_lagom ../../Userland/Utilities/ntpquery.cpp)
         set_target_properties(ntpquery_lagom PROPERTIES OUTPUT_NAME ntpquery)
-        target_link_libraries(ntpquery_lagom LibCore)
+        target_link_libraries(ntpquery_lagom LibCore LibMain)
 
         add_executable(shell_lagom ../../Userland/Shell/main.cpp)
         set_target_properties(shell_lagom PROPERTIES OUTPUT_NAME shell)
diff --git a/Userland/Libraries/LibC/link.h b/Userland/Libraries/LibC/link.h
index eaa28ec4de..e5458af861 100644
--- a/Userland/Libraries/LibC/link.h
+++ b/Userland/Libraries/LibC/link.h
@@ -6,11 +6,7 @@
 
 #pragma once
 
-#ifndef __serenity__
-#    include <LibC/elf.h>
-#else
-#    include <elf.h>
-#endif
+#include <elf.h>
 #include <limits.h>
 #include <sys/cdefs.h>
 
diff --git a/Userland/Libraries/LibGfx/DDSLoader.cpp b/Userland/Libraries/LibGfx/DDSLoader.cpp
index 3adaaf4117..561aed3ea2 100644
--- a/Userland/Libraries/LibGfx/DDSLoader.cpp
+++ b/Userland/Libraries/LibGfx/DDSLoader.cpp
@@ -19,10 +19,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#ifdef __serenity__
-#    include <serenity.h>
-#endif
-
 namespace Gfx {
 
 struct DDSLoadingContext {
diff --git a/Userland/Libraries/LibGfx/PNGLoader.cpp b/Userland/Libraries/LibGfx/PNGLoader.cpp
index e0c8d2be85..ae6fb7f5e3 100644
--- a/Userland/Libraries/LibGfx/PNGLoader.cpp
+++ b/Userland/Libraries/LibGfx/PNGLoader.cpp
@@ -14,10 +14,6 @@
 #include <LibGfx/PNGShared.h>
 #include <string.h>
 
-#ifdef __serenity__
-#    include <LibCompress/Deflate.h>
-#endif
-
 namespace Gfx {
 
 struct PNG_IHDR {
diff --git a/Userland/Shell/Shell.cpp b/Userland/Shell/Shell.cpp
index bb3aad9f42..6465607777 100644
--- a/Userland/Shell/Shell.cpp
+++ b/Userland/Shell/Shell.cpp
@@ -877,13 +877,11 @@ ErrorOr<RefPtr<Job>> Shell::run_command(const AST::Command& command)
 
 void Shell::execute_process(Vector<char const*>&& argv)
 {
-#ifdef __serenity__
     for (auto& promise : m_active_promises) {
-        pledge("stdio rpath exec", promise.data.exec_promises.characters());
+        MUST(Core::System::pledge("stdio rpath exec"sv, promise.data.exec_promises));
         for (auto& item : promise.data.unveils)
-            unveil(item.path.characters(), item.access.characters());
+            MUST(Core::System::unveil(item.path, item.access));
     }
-#endif
 
     int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
     if (rc < 0) {
diff --git a/Userland/Shell/main.cpp b/Userland/Shell/main.cpp
index 35f5cf5615..7a68275018 100644
--- a/Userland/Shell/main.cpp
+++ b/Userland/Shell/main.cpp
@@ -41,9 +41,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         s_shell->editor()->save_history(s_shell->get_history_path());
     });
 
-#ifdef __serenity__
     TRY(Core::System::pledge("stdio rpath wpath cpath proc exec tty sigaction unix fattr"));
-#endif
 
     RefPtr<::Shell::Shell> shell;
     bool attempt_interactive = false;
@@ -57,13 +55,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
         s_shell->setup_signals();
 
-#ifndef __serenity__
-        sigset_t blocked;
-        sigemptyset(&blocked);
-        sigaddset(&blocked, SIGTTOU);
-        sigaddset(&blocked, SIGTTIN);
-        pthread_sigmask(SIG_BLOCK, &blocked, nullptr);
-#endif
         shell->termios = editor->termios();
         shell->default_termios = editor->default_termios();
 
diff --git a/Userland/Utilities/adjtime.cpp b/Userland/Utilities/adjtime.cpp
index ba56cf8be1..18e8ecd45e 100644
--- a/Userland/Utilities/adjtime.cpp
+++ b/Userland/Utilities/adjtime.cpp
@@ -13,9 +13,7 @@
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
-#ifdef __serenity__
     TRY(Core::System::pledge("stdio settime"));
-#endif
 
     Core::ArgsParser args_parser;
     Optional<double> delta;
@@ -34,9 +32,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         TRY(Core::System::adjtime(&delta_timeval, nullptr));
     }
 
-#ifdef __serenity__
     TRY(Core::System::pledge("stdio"));
-#endif
 
     timeval remaining_delta_timeval;
     TRY(Core::System::adjtime(nullptr, &remaining_delta_timeval));
diff --git a/Userland/Utilities/gml-format.cpp b/Userland/Utilities/gml-format.cpp
index cd8cf97aa3..7c44d1d45d 100644
--- a/Userland/Utilities/gml-format.cpp
+++ b/Userland/Utilities/gml-format.cpp
@@ -48,9 +48,7 @@ ErrorOr<bool> format_file(StringView path, bool inplace)
 
 ErrorOr<int> serenity_main(Main::Arguments args)
 {
-#ifdef __serenity__
     TRY(Core::System::pledge("stdio rpath wpath cpath"));
-#endif
 
     bool inplace = false;
     Vector<String> files;
@@ -61,10 +59,8 @@ ErrorOr<int> serenity_main(Main::Arguments args)
     args_parser.add_positional_argument(files, "File(s) to process", "path", Core::ArgsParser::Required::No);
     args_parser.parse(args);
 
-#ifdef __serenity__
     if (!inplace)
         TRY(Core::System::pledge("stdio rpath"));
-#endif
 
     if (files.is_empty())
         files.append("-");
diff --git a/Userland/Utilities/js.cpp b/Userland/Utilities/js.cpp
index 9afd29ce4e..67e1f83848 100644
--- a/Userland/Utilities/js.cpp
+++ b/Userland/Utilities/js.cpp
@@ -1505,9 +1505,7 @@ private:
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
-#ifdef __serenity__
     TRY(Core::System::pledge("stdio rpath wpath cpath tty sigaction"));
-#endif
 
     bool gc_on_every_allocation = false;
     bool disable_syntax_highlight = false;
diff --git a/Userland/Utilities/ntpquery.cpp b/Userland/Utilities/ntpquery.cpp
index 11e8a477d8..d45051f4a5 100644
--- a/Userland/Utilities/ntpquery.cpp
+++ b/Userland/Utilities/ntpquery.cpp
@@ -90,15 +90,9 @@ static String format_ntp_timestamp(NtpTimestamp ntp_timestamp)
     buffer[written] = '\0';
     return buffer;
 }
-#ifdef __serenity__
 ErrorOr<int> serenity_main(Main::Arguments arguments)
-#else
-int main(int argc, char** argv)
-#endif
 {
-#ifdef __serenity__
     TRY(Core::System::pledge("stdio inet unix settime"));
-#endif
 
     bool adjust_time = false;
     bool set_time = false;
@@ -119,22 +113,16 @@ int main(int argc, char** argv)
     args_parser.add_option(set_time, "Immediately set system time (requires root)", "set", 's');
     args_parser.add_option(verbose, "Verbose output", "verbose", 'v');
     args_parser.add_positional_argument(host, "NTP server", "host", Core::ArgsParser::Required::No);
-#ifdef __serenity__
     args_parser.parse(arguments);
-#else
-    args_parser.parse(argc, argv);
-#endif
 
     if (adjust_time && set_time) {
         warnln("-a and -s are mutually exclusive");
         return 1;
     }
 
-#ifdef __serenity__
     if (!adjust_time && !set_time) {
         TRY(Core::System::pledge("stdio inet unix"));
     }
-#endif
 
     auto* hostent = gethostbyname(host);
     if (!hostent) {
@@ -142,10 +130,8 @@ int main(int argc, char** argv)
         return 1;
     }
 
-#ifdef __serenity__
     TRY(Core::System::pledge((adjust_time || set_time) ? "stdio inet settime"sv : "stdio inet"sv));
     TRY(Core::System::unveil(nullptr, nullptr));
-#endif
 
     int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
     if (fd < 0) {