diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
index a63a6491c..4e3edf740 100644
--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@@ -1,19 +1,24 @@
-#include "e.h"
+#include "config.h"
 #ifdef __linux__
 #include <features.h>
 #endif
+#include <ctype.h>
 #include <Eet.h>
 #include <Eeze.h>
 #include <Eeze_Disk.h>
+#include <Ecore_Con.h>
 
 #include "e_fm_shared_device.h"
 #include "e_fm_shared_codec.h"
 #include "e_fm_ipc.h"
-#include "e_fm_device.h"
 #include <eeze_scanner.h>
 
+#include "e_macros.h"
+#include "e_user.h"
 #include "e_fm_main.h"
 #include "e_fm_main_eeze.h"
+#define E_TYPEDEFS
+#include "e_fm_op.h"
 
 static void _e_fm_main_eeze_storage_rescan(const char *syspath);
 static void _e_fm_main_eeze_volume_rescan(const char *syspath);
diff --git a/src/bin/e_fm/e_fm_main_udisks.c b/src/bin/e_fm/e_fm_main_udisks.c
index fe8004e0c..fb7311acf 100644
--- a/src/bin/e_fm/e_fm_main_udisks.c
+++ b/src/bin/e_fm/e_fm_main_udisks.c
@@ -1,12 +1,16 @@
-#include "e.h"
+#include "config.h"
+
 #include "e_fm_shared_device.h"
 #include "e_fm_shared_codec.h"
 #include "e_fm_ipc.h"
-#include "e_fm_device.h"
 
+#include "e_macros.h"
 #include "e_fm_main_udisks.h"
 #include "e_fm_main.h"
 
+#define E_TYPEDEFS
+#include "e_fm_op.h"
+
 #define UDISKS_BUS "org.freedesktop.UDisks"
 #define UDISKS_PATH "/org/freedesktop/UDisks"
 #define UDISKS_INTERFACE "org.freedesktop.UDisks"
diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c
index 4964ca742..e6585d2f4 100644
--- a/src/bin/e_fm/e_fm_main_udisks2.c
+++ b/src/bin/e_fm/e_fm_main_udisks2.c
@@ -1,12 +1,16 @@
-#include "e.h"
+#include "config.h"
+
 #include "e_fm_shared_device.h"
 #include "e_fm_shared_codec.h"
 #include "e_fm_ipc.h"
-#include "e_fm_device.h"
 
+#include "e_macros.h"
 #include "e_fm_main_udisks2.h"
 #include "e_fm_main.h"
 
+#define E_TYPEDEFS
+#include "e_fm_op.h"
+
 #define UDISKS2_BUS "org.freedesktop.UDisks2"
 #define UDISKS2_PATH "/org/freedesktop/UDisks2"
 #define UDISKS2_INTERFACE "org.freedesktop.UDisks2"
diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c
index b32fbd651..7820990bc 100644
--- a/src/bin/e_prefix.c
+++ b/src/bin/e_prefix.c
@@ -1,10 +1,38 @@
-#include "e.h"
-
+#include "config.h"
+#include <Eina.h>
+#include "e_macros.h"
+#ifdef E_LOGGING
+#include "e_log.h"
+#endif
 static Eina_Prefix *pfx = NULL;
 
 static const char *_prefix_path_data = NULL;
 static unsigned int _prefix_path_data_len = 0;
 
+static void
+_env_set(const char *var, const char *val)
+{
+   if (val)
+     {
+#ifdef HAVE_SETENV
+        setenv(var, val, 1);
+#else
+        char buf[8192];
+
+        snprintf(buf, sizeof(buf), "%s=%s", var, val);
+        putenv(strdup(buf));
+#endif
+     }
+   else
+     {
+#ifdef HAVE_UNSETENV
+        unsetenv(var);
+#else
+        if (getenv(var)) putenv(var);
+#endif
+     }
+}
+
 /* externally accessible functions */
 E_API int
 e_prefix_determine(char *argv0)
@@ -42,11 +70,11 @@ e_prefix_determine(char *argv0)
    printf("LOCALE:  %s\n", eina_prefix_locale_get(pfx));
    printf("=================================\n");
 #endif
-   e_util_env_set("E_PREFIX", eina_prefix_get(pfx));
-   e_util_env_set("E_BIN_DIR", eina_prefix_bin_get(pfx));
-   e_util_env_set("E_LIB_DIR", eina_prefix_lib_get(pfx));
-   e_util_env_set("E_DATA_DIR", eina_prefix_data_get(pfx));
-   e_util_env_set("E_LOCALE_DIR", eina_prefix_locale_get(pfx));
+   _env_set("E_PREFIX", eina_prefix_get(pfx));
+   _env_set("E_BIN_DIR", eina_prefix_bin_get(pfx));
+   _env_set("E_LIB_DIR", eina_prefix_lib_get(pfx));
+   _env_set("E_DATA_DIR", eina_prefix_data_get(pfx));
+   _env_set("E_LOCALE_DIR", eina_prefix_locale_get(pfx));
    return 1;
 }