--- a/ui/CMakeLists.txt	Fri Mar 21 17:12:53 2014 +0100
+++ b/ui/CMakeLists.txt	Fri Mar 21 17:13:24 2014 +0100
@@ -1,5 +1,3 @@
-find_package(Qt5Widgets REQUIRED)
-
 include_directories(${Qt5Widgets_INCLUDE_DIRS})
 include_directories(${POLARSSL_INCLUDE_DIR})
 add_definitions(${Qt5Widgets_DEFINITIONS})
@@ -7,7 +5,6 @@
 set(CERTIFICATELIST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/certificatelist.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/certificate.cpp
-    ${CMAKE_SOURCE_DIR}/common/listutil.c
 )
 
 set(DOWNLOADER_SOURCES
@@ -35,11 +32,17 @@
    # The following list is taken from the .pri file
    get_target_property(_loc Qt5::Widgets LOCATION)
    get_filename_component(_qtpath ${_loc} PATH)
+
+   if(NOT XKBCOMMON_LIB)
+      # Hack on a hack to overwrite the xkbcommon libname.
+      set(XKBCOMMON_LIB -lxkbcommon)
+   endif()
+
    set(XCB_EXTRA_LIBS
       -L${_qtpath}
       -lX11 -lX11-xcb -lXi -lxcb-render-util -lXrender -lSM -lICE -lxcb-render -ldbus-1
       -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr
-      -lxkbcommon -lxcb-shape -lxcb-keysyms -lQt5PlatformSupport
+      ${XKBCOMMON_LIB} -lxcb-shape -lxcb-keysyms -lQt5PlatformSupport
       -lfreetype -lQt5DBus -lQt5Gui -ljpeg -lpng -lQt5Core
       -lz -lm -ldl -lrt -lpthread)
 
@@ -71,6 +74,7 @@
 add_executable(m13ui ${M13UI_SOURCES_WITH_RESOURCES})
 
 target_link_libraries(m13ui Qt5::Widgets
+   m13_common
    ${POLARSSL_LIBRARIES}
    ${EXTRA_STATIC_LIBS}
    ${PROFILING_LIBS})

--- a/ui/tests/CMakeLists.txt	Fri Mar 21 17:12:53 2014 +0100
+++ b/ui/tests/CMakeLists.txt	Fri Mar 21 17:13:24 2014 +0100
@@ -17,6 +17,7 @@
   add_executable(${_name} ${_test} ${_additional_sources})
   add_test(m13-${_name} ${_name})
   target_link_libraries(${_name} Qt5::Test Qt5::Widgets
+     m13_common
      ${POLARSSL_LIBRARIES}
      ${EXTRA_STATIC_LIBS})
 endmacro()