diff --git a/xdg-shell.xml b/protocols/xdg-shell.xml
similarity index 100%
rename from xdg-shell.xml
rename to protocols/xdg-shell.xml
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt
index 5a46ffb81..5cf4ff052 100644
--- a/swaybg/CMakeLists.txt
+++ b/swaybg/CMakeLists.txt
@@ -1,16 +1,18 @@
-project (swaybg)
+project(swaybg)
 
 find_package(Wayland REQUIRED)
 find_package(Cairo REQUIRED)
 find_package(Pango REQUIRED)
 
 include(Wayland)
-WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell)
+set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/)
+WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" xdg-shell)
 
 include_directories(
   ${WAYLAND_CLIENT_INCLUDE_DIR}
   ${CAIRO_INCLUDE_DIRS}
   ${PANGO_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c)
@@ -21,9 +23,10 @@ add_executable(swaybg
   ${sources}
   ${wl_sources}
   ${common}
+  ${proto-xdg-shell}
 )
 
-TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} -lm)
+TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m)
 
 install(
   TARGETS   swaybg
diff --git a/wayland/client.c b/wayland/client.c
index 116538cfe..190d5ecb7 100644
--- a/wayland/client.c
+++ b/wayland/client.c
@@ -1,4 +1,5 @@
 #include <wayland-client.h>
+#include "wayland-xdg-shell-client-protocol.h"
 #include <cairo/cairo.h>
 #include <pango/pangocairo.h>
 #include <stdlib.h>