diff --git a/src/modules/conf_randr/e_int_config_randr.c b/src/modules/conf_randr/e_int_config_randr.c
index 6b51fa5b2..5d2accb05 100644
--- a/src/modules/conf_randr/e_int_config_randr.c
+++ b/src/modules/conf_randr/e_int_config_randr.c
@@ -156,8 +156,7 @@ free_cfdata(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    EINA_SAFETY_ON_TRUE_RETURN(!e_randr_screen_info);
    dialog_subdialog_arrangement_free_data(cfd, cfdata);
 
-   if (cfdata) free(cfdata);
-   cfdata = NULL;
+   free(cfdata);
 }
 
 static Eina_Bool
diff --git a/src/modules/conf_randr/e_int_config_randr_arrangement.c b/src/modules/conf_randr/e_int_config_randr_arrangement.c
index 575e96783..c2ba98fbb 100644
--- a/src/modules/conf_randr/e_int_config_randr_arrangement.c
+++ b/src/modules/conf_randr/e_int_config_randr_arrangement.c
@@ -42,8 +42,8 @@ extern void              dialog_subdialog_orientation_update_edje(Evas_Object *c
 // Functions for the orientation subdialog interaction
 extern void              dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
 
-Evas_Smart_Class screen_setup_smart_class = EVAS_SMART_CLASS_INIT_NAME_VERSION("EvasObjectSmartScreenSetup");
-Evas_Smart *screen_setup_smart;
+static Evas_Smart_Class screen_setup_smart_class = EVAS_SMART_CLASS_INIT_NAME_VERSION("EvasObjectSmartScreenSetup");
+static Evas_Smart *screen_setup_smart = NULL;
 
 extern E_Config_Dialog_Data *e_config_runtime_info;
 extern char _theme_file_path[];