diff --git a/.gitignore b/.gitignore
index 00ca3ac..4bc8107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@ wlr-layer-shell-unstable-v1-protocol.c
 wlr-layer-shell-unstable-v1-protocol.h
 xdg-shell-protocol.c
 xdg-shell-protocol.h
-xdg-output-protocol.c
-xdg-output-protocol.h
+xdg-output-unstable-v1-protocol.c
+xdg-output-unstable-v1-protocol.h
diff --git a/Makefile b/Makefile
index a6de8c8..a4aca0b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,15 +24,15 @@ xdg-shell-protocol.c:
 
 xdg-shell-protocol.o: xdg-shell-protocol.h
 
-xdg-output-protocol.h:
+xdg-output-unstable-v1-protocol.h:
 	$(WAYLAND_SCANNER) client-header \
 		$(WAYLAND_PROTOCOLS)/unstable/xdg-output/xdg-output-unstable-v1.xml $@
 
-xdg-output-protocol.c:
+xdg-output-unstable-v1-protocol.c:
 	$(WAYLAND_SCANNER) private-code \
 		$(WAYLAND_PROTOCOLS)/unstable/xdg-output/xdg-output-unstable-v1.xml $@
 
-xdg-output-protocol.o: xdg-output-protocol.h
+xdg-output-unstable-v1-protocol.o: xdg-output-unstable-v1-protocol.h
 
 wlr-layer-shell-unstable-v1-protocol.h:
 	$(WAYLAND_SCANNER) client-header \
@@ -44,10 +44,10 @@ wlr-layer-shell-unstable-v1-protocol.c:
 
 wlr-layer-shell-unstable-v1-protocol.o: wlr-layer-shell-unstable-v1-protocol.h
 
-dwlb.o: utf8.h xdg-shell-protocol.h xdg-output-protocol.h wlr-layer-shell-unstable-v1-protocol.h
+dwlb.o: utf8.h xdg-shell-protocol.h xdg-output-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h
 
 # Protocol dependencies
-dwlb: xdg-shell-protocol.o xdg-output-protocol.o wlr-layer-shell-unstable-v1-protocol.o
+dwlb: xdg-shell-protocol.o xdg-output-unstable-v1-protocol.o wlr-layer-shell-unstable-v1-protocol.o
 
 # Library dependencies
 dwlb: CFLAGS+=$(shell pkg-config --cflags wayland-client fcft pixman-1)
diff --git a/dwlb.c b/dwlb.c
index f951b64..90337af 100644
--- a/dwlb.c
+++ b/dwlb.c
@@ -19,9 +19,9 @@
 #include <wayland-client.h>
 
 #include "utf8.h"
-#include "wlr-layer-shell-unstable-v1-protocol.h"
 #include "xdg-shell-protocol.h"
-#include "xdg-output-protocol.h"
+#include "xdg-output-unstable-v1-protocol.h"
+#include "wlr-layer-shell-unstable-v1-protocol.h"
 
 #define DIE(fmt, ...)						\
 	do {							\