diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index 6a69ac137..ebfa99f47 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -95,8 +95,8 @@ e_screensaver_update(void)
 EAPI void
 e_screensaver_force_update(void)
 {
-   int timeout = e_screensaver_timeout_get(EINA_TRUE);
 #ifndef HAVE_WAYLAND_ONLY
+   int timeout = e_screensaver_timeout_get(EINA_TRUE);
    if (e_comp_get(NULL)->comp_type == E_PIXMAP_TYPE_X)
      {
         ecore_x_screensaver_set(timeout + 10,
diff --git a/src/modules/conf_bindings/e_int_config_acpibindings.c b/src/modules/conf_bindings/e_int_config_acpibindings.c
index 12cc8b521..b9479d66d 100644
--- a/src/modules/conf_bindings/e_int_config_acpibindings.c
+++ b/src/modules/conf_bindings/e_int_config_acpibindings.c
@@ -511,11 +511,9 @@ _cb_add_binding(void *data,
                 void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
-   E_Manager *man;
 
    if (grab_win != 0) return;
    if (!(cfdata = data)) return;
-   man = e_manager_current_get();
    grab_dlg = e_dialog_new(NULL, "E",
                            "_acpibind_getbind_dialog");
    if (!grab_dlg) return;
@@ -528,6 +526,9 @@ _cb_add_binding(void *data,
    e_win_borderless_set(grab_dlg->win, EINA_TRUE);
 
 #ifndef HAVE_WAYLAND_ONLY
+   E_Manager *man;
+
+   man = e_manager_current_get();
    grab_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1);
    ecore_x_window_show(grab_win);
    e_grabinput_get(grab_win, 0, grab_win);