diff --git a/src/modules/battery/e_mod_sysctl.c b/src/modules/battery/e_mod_sysctl.c
index e84ccf1ee..3cbeb30a2 100644
--- a/src/modules/battery/e_mod_sysctl.c
+++ b/src/modules/battery/e_mod_sysctl.c
@@ -18,8 +18,8 @@ extern Eina_List *device_batteries;
 extern Eina_List *device_ac_adapters;
 extern double init_time;
 
-Ac_Adapter *ac = NULL;
-Battery *bat = NULL;
+static Ac_Adapter *ac = NULL;
+static Battery *bat = NULL;
 
 int
 _battery_sysctl_start(void)
@@ -138,8 +138,8 @@ _battery_sysctl_stop(void)
    if (ac)
      {
         eina_stringshare_del(ac->udi);
-        free(ac->mib);
-        free(ac);
+        E_FREE(ac->mib);
+        E_FREE(ac);
      }
 
    if (bat)
@@ -150,12 +150,12 @@ _battery_sysctl_stop(void)
         eina_stringshare_del(bat->vendor);
         ecore_poller_del(bat->poll);
 #if defined(__FreeBSD__) || defined(__DragonFly__)
-        free(bat->mib_state);
-        free(bat->mib_time);
-        free(bat->mib_units);
+        E_FREE(bat->mib_state);
+        E_FREE(bat->mib_time);
+        E_FREE(bat->mib_units);
 #endif
-        free(bat->mib);
-        free(bat);
+        E_FREE(bat->mib);
+        E_FREE(bat);
      }
 }
 
diff --git a/src/modules/sysinfo/batman/batman_sysctl.c b/src/modules/sysinfo/batman/batman_sysctl.c
index 7e1fc681b..57d3d46b0 100644
--- a/src/modules/sysinfo/batman/batman_sysctl.c
+++ b/src/modules/sysinfo/batman/batman_sysctl.c
@@ -18,8 +18,8 @@ extern Eina_List *batman_device_batteries;
 extern Eina_List *batman_device_ac_adapters;
 extern double batman_init_time;
 
-Ac_Adapter *ac = NULL;
-Battery *bat = NULL;
+static Ac_Adapter *ac = NULL;
+static Battery *bat = NULL;
 
 int
 _batman_sysctl_start(Instance *inst)