diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt
new file mode 100644
index 00000000000..921cef93f70
--- /dev/null
+++ b/Libraries/CMakeLists.txt
@@ -0,0 +1,31 @@
+add_subdirectory(LibCompress)
+add_subdirectory(LibCrypto)
+add_subdirectory(LibDiff)
+add_subdirectory(LibDNS)
+add_subdirectory(LibGC)
+add_subdirectory(LibHTTP)
+add_subdirectory(LibIPC)
+add_subdirectory(LibJS)
+add_subdirectory(LibLine)
+add_subdirectory(LibRegex)
+add_subdirectory(LibRequests)
+add_subdirectory(LibRIFF)
+add_subdirectory(LibSyntax)
+add_subdirectory(LibTest)
+add_subdirectory(LibTextCodec)
+add_subdirectory(LibThreading)
+add_subdirectory(LibTLS)
+add_subdirectory(LibUnicode)
+add_subdirectory(LibURL)
+add_subdirectory(LibWasm)
+add_subdirectory(LibWebSocket)
+add_subdirectory(LibXML)
+
+if (ENABLE_GUI_TARGETS)
+    add_subdirectory(LibDevTools)
+    add_subdirectory(LibGfx)
+    add_subdirectory(LibImageDecoderClient)
+    add_subdirectory(LibMedia)
+    add_subdirectory(LibWebView)
+    add_subdirectory(LibWeb)
+endif()
diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
index f023ab53977..72a9e50bdc0 100644
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@@ -352,42 +352,8 @@ if (LAGOM_TOOLS_ONLY)
 endif()
 
 # Lagom Libraries
-set(lagom_standard_libraries
-    Compress
-    Crypto
-    Diff
-    DNS
-    GC
-    HTTP
-    IPC
-    JS
-    Line
-    Regex
-    Requests
-    RIFF
-    Syntax
-    Test
-    TextCodec
-    Threading
-    TLS
-    Unicode
-    URL
-    Wasm
-    WebSocket
-    XML
-)
-
-if (ENABLE_GUI_TARGETS)
-    list(APPEND lagom_standard_libraries
-        DevTools
-        Gfx
-        ImageDecoderClient
-        Media
-        WebView
-        Web
-    )
-endif()
-
+# FIXME: Move these calls to the relevant client library CMakeLists
+# Note that the Services themselves are only built if ENABLE_GUI_TARGETS, from top level.
 compile_ipc(${SERENITY_PROJECT_ROOT}/Services/RequestServer/RequestClient.ipc Services/RequestServer/RequestClientEndpoint.h)
 compile_ipc(${SERENITY_PROJECT_ROOT}/Services/RequestServer/RequestServer.ipc Services/RequestServer/RequestServerEndpoint.h)
 compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebContentServer.ipc Services/WebContent/WebContentServerEndpoint.h)
@@ -397,9 +363,7 @@ compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebDriverServer.ipc Ser
 compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebUIClient.ipc Services/WebContent/WebUIClientEndpoint.h)
 compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebUIServer.ipc Services/WebContent/WebUIServerEndpoint.h)
 
-foreach(lib IN LISTS lagom_standard_libraries)
-    add_serenity_subdirectory("Libraries/Lib${lib}")
-endforeach()
+add_serenity_subdirectory(Libraries)
 
 if (ENABLE_FUZZERS)
     add_subdirectory(Fuzzers)