--- CMakeLists.txt.orig	2019-06-11 17:20:18 UTC
+++ CMakeLists.txt
@@ -77,7 +77,7 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
 
 if(UNIX)
     set(
-        FALLBACK_CONFIG_DIRS "/etc/xdg"
+        FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
         CACHE
             STRING
             "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
@@ -97,10 +97,12 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
 
     if(BUILD_WSI_XCB_SUPPORT)
         find_package(XCB REQUIRED)
+        include_directories(SYSTEM ${XCB_INCLUDE_DIR})
     endif()
 
     if(BUILD_WSI_XLIB_SUPPORT)
         find_package(X11 REQUIRED)
+        include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
     endif()
 
     if(BUILD_WSI_WAYLAND_SUPPORT)
