diff --git a/glfw/wl_init.c b/glfw/wl_init.c
index 7653cf1ff..69d77c54f 100644
--- a/glfw/wl_init.c
+++ b/glfw/wl_init.c
@@ -31,10 +31,10 @@
 #include "backend_utils.h"
 #include "linux_desktop_settings.h"
 #include "../kitty/monotonic.h"
+#include "wl_text_input.h"
+#include "wayland-text-input-unstable-v3-client-protocol.h"
 
 #include <assert.h>
-#include <errno.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -629,7 +629,7 @@ static void registryHandleGlobal(void* data UNUSED,
                                  const char* interface,
                                  uint32_t version)
 {
-#define is(x) strcmp(interface, #x) == 0
+#define is(x) strcmp(interface, x##_interface.name) == 0
     if (is(wl_compositor))
     {
         _glfw.wl.compositorVersion = min(3, version);
diff --git a/glfw/wl_platform.h b/glfw/wl_platform.h
index f3a546227..2dfa9eb72 100644
--- a/glfw/wl_platform.h
+++ b/glfw/wl_platform.h
@@ -58,7 +58,6 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR
 #include "wayland-pointer-constraints-unstable-v1-client-protocol.h"
 #include "wayland-primary-selection-unstable-v1-client-protocol.h"
 #include "wayland-primary-selection-unstable-v1-client-protocol.h"
-#include "wl_text_input.h"
 #include "wayland-xdg-activation-v1-client-protocol.h"
 #include "wayland-cursor-shape-v1-client-protocol.h"