diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake
index c2e8368f7..1a4852762 100644
--- a/cmake/ConkyBuildOptions.cmake
+++ b/cmake/ConkyBuildOptions.cmake
@@ -169,7 +169,10 @@ if(BUILD_X11)
   option(BUILD_XINERAMA "Build Xinerama support" true)
   option(BUILD_XDBE "Build Xdbe (double-buffer) support" true)
   option(BUILD_XFT "Build Xft (freetype fonts) support" true)
+  option(BUILD_IMLIB2 "Enable Imlib2 support" true)
   option(BUILD_XSHAPE "Enable Xshape support" true)
+
+  option(BUILD_LUA_IMLIB2 "Build Imlib2 bindings for Lua" false)
 else(BUILD_X11)
   set(OWN_WINDOW false CACHE BOOL "Enable own_window support" FORCE)
   set(BUILD_XDAMAGE false CACHE BOOL "Build Xdamage support" FORCE)
@@ -177,7 +180,10 @@ else(BUILD_X11)
   set(BUILD_XINERAMA false CACHE BOOL "Build Xinerama support" FORCE)
   set(BUILD_XDBE false CACHE BOOL "Build Xdbe (double-buffer) support" FORCE)
   set(BUILD_XFT false CACHE BOOL "Build Xft (freetype fonts) support" FORCE)
+  set(BUILD_IMLIB2 false CACHE BOOL "Enable Imlib2 support" FORCE)
   set(BUILD_XSHAPE false CACHE BOOL "Enable Xshape support" FORCE)
+
+  set(BUILD_LUA_IMLIB2 false CACHE BOOL "Build Imlib2 bindings for Lua" FORCE)
   set(BUILD_NVIDIA false)
 endif(BUILD_X11)
 
@@ -190,12 +196,13 @@ if(BUILD_WAYLAND)
 endif(BUILD_WAYLAND)
 
 if(BUILD_GUI)
-  option(BUILD_IMLIB2 "Enable Imlib2 support" true)
   option(BUILD_MOUSE_EVENTS "Enable mouse event support" true)
 endif(BUILD_GUI)
 
 if(BUILD_GUI AND BUILD_MOUSE_EVENTS)
   option(BUILD_XINPUT "Build Xinput 2 support" true)
+else(BUILD_GUI AND BUILD_MOUSE_EVENTS)
+  set(BUILD_XINPUT false CACHE BOOL "Build Xinput 2 support" FORCE)
 endif(BUILD_GUI AND BUILD_MOUSE_EVENTS)
 
 if(OWN_WINDOW)
@@ -207,7 +214,6 @@ else(OWN_WINDOW)
 endif(OWN_WINDOW)
 
 option(BUILD_LUA_CAIRO "Build cairo bindings for Lua" false)
-option(BUILD_LUA_IMLIB2 "Build Imlib2 bindings for Lua" false)
 option(BUILD_LUA_RSVG "Build rsvg bindings for Lua" false)
 
 option(BUILD_AUDACIOUS "Build audacious (music player) support" false)
diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
index 4b5943dd8..0804afe10 100644
--- a/cmake/ConkyPlatformChecks.cmake
+++ b/cmake/ConkyPlatformChecks.cmake
@@ -487,13 +487,14 @@ if(BUILD_GUI)
     endif(NOT APP_PATCH)
   endif(BUILD_LUA_CAIRO)
 
-  if(BUILD_LUA_IMLIB2)
+  if(BUILD_X11 AND BUILD_LUA_IMLIB2)
     pkg_search_module(IMLIB2 REQUIRED imlib2 Imlib2)
     set(luaimlib2_libs ${IMLIB2_LIBS} ${IMLIB2_LDFLAGS} ${LUA_LIBRARIES})
     set(luaimlib2_includes
       ${IMLIB2_INCLUDE_DIRS}
-      ${LUA_INCLUDE_DIR})
-  endif(BUILD_LUA_IMLIB2)
+      ${LUA_INCLUDE_DIR}
+      ${X11_INCLUDE_DIR})
+  endif(BUILD_X11 AND BUILD_LUA_IMLIB2)
 
   if(BUILD_LUA_RSVG)
     pkg_check_modules(RSVG REQUIRED librsvg-2.0>=2.52)
diff --git a/src/display-x11.cc b/src/display-x11.cc
index 5d3841e8f..2c139f7b4 100644
--- a/src/display-x11.cc
+++ b/src/display-x11.cc
@@ -677,7 +677,6 @@ bool display_output_x11::main_loop_wait(double t) {
 }
 
 void display_output_x11::sigterm_cleanup() {
-  puts("sigtermed");
   XDestroyRegion(x11_stuff.region);
   x11_stuff.region = nullptr;
 #ifdef BUILD_XDAMAGE
@@ -690,7 +689,6 @@ void display_output_x11::sigterm_cleanup() {
 }
 
 void display_output_x11::cleanup() {
-  puts("normal cleanup");
   if (window_created == 1) {
     int border_total = get_border_total();