diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index 32b1a1ac..6c7c444c 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -1,3 +1,4 @@
+#include <wlr/config.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
@@ -8,6 +9,9 @@
 #elif __FreeBSD__
 #include <dev/evdev/input-event-codes.h>
 #endif
+#ifdef WLR_HAS_XCB_XKB
+#include <xcb/xkb.h>
+#endif
 #include "backend/x11.h"
 #include "util/signal.h"
 
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
index 6a0843f7..6259c311 100644
--- a/include/wlr/meson.build
+++ b/include/wlr/meson.build
@@ -9,5 +9,6 @@ version_data.set('WLR_VERSION_API_CURRENT',  so_version[0])
 version_data.set('WLR_VERSION_API_REVISION', so_version[1])
 version_data.set('WLR_VERSION_API_AGE',      so_version[2])
 
-configure_file(output: 'config.h',  install_dir: 'include/wlr', configuration: conf_data)
-configure_file(output: 'version.h', install_dir: 'include/wlr', configuration: version_data)
+wlr_inc_dest = join_paths(get_option('includedir'), 'wlr')
+configure_file(output: 'config.h',  install_dir: wlr_inc_dest, configuration: conf_data)
+configure_file(output: 'version.h', install_dir: wlr_inc_dest, configuration: version_data)
diff --git a/meson.build b/meson.build
index 0d8fbe58..19d334e3 100644
--- a/meson.build
+++ b/meson.build
@@ -125,8 +125,10 @@ if get_option('enable-xwayland')
 else
 	exclude_headers += 'xwayland.h'
 endif
+
+includedir = get_option('includedir')
 exclude_headers += 'meson.build'
-install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers)
+install_subdir('include/wlr', install_dir: includedir, exclude_files: exclude_headers)
 
 
 subdir('include')
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 6fb2688c..ac46ff5d 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -271,7 +271,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 			break;
 		case WLR_BUTTON_PRESSED:
 			roots_seat_set_focus(seat, view);
-			if (wlr_surface_is_layer_surface(surface)) {
+			if (surface && wlr_surface_is_layer_surface(surface)) {
 				struct wlr_layer_surface *layer =
 					wlr_layer_surface_from_wlr_surface(surface);
 				if (layer->current.keyboard_interactive) {