diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
index 1e4851b1d..cd062c832 100644
--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@@ -32,15 +32,14 @@ void *alloca(size_t);
 #include <Eeze.h>
 #include <Eeze_Disk.h>
 
-#include "e_fm_main.h"
-#include "e_fm_main_eeze.h"
-
-#include "e_fm_shared_codec.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 "eeze_scanner.h"
+#include "e_fm_main.h"
+#include "e_fm_main_eeze.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_eeze.h b/src/bin/e_fm/e_fm_main_eeze.h
index d06aada35..6fbcc5a17 100644
--- a/src/bin/e_fm/e_fm_main_eeze.h
+++ b/src/bin/e_fm/e_fm_main_eeze.h
@@ -1,11 +1,6 @@
 #ifndef E_FM_MAIN_EEZE_H
 #define E_FM_MAIN_EEZE_H
 
-#include <Eeze.h>
-#include <Eeze_Disk.h>
-
-#include "e_fm_shared_types.h"
-
 E_Volume *_e_fm_main_eeze_volume_add(const char *syspath, Eina_Bool first_time);
 void _e_fm_main_eeze_volume_del(const char *syspath);
 E_Volume *_e_fm_main_eeze_volume_find(const char *syspath);
diff --git a/src/bin/e_fm/e_fm_main_hal.c b/src/bin/e_fm/e_fm_main_hal.c
index a11f413c7..7176b0bb0 100644
--- a/src/bin/e_fm/e_fm_main_hal.c
+++ b/src/bin/e_fm/e_fm_main_hal.c
@@ -48,7 +48,6 @@ void *alloca(size_t);
 #include <E_DBus.h>
 #include <E_Hal.h>
 
-#include "e_fm_main.h"
 #include "e_fm_main_hal.h"
 #ifdef HAVE_UDISKS_MOUNT
 # include "e_fm_main_udisks.h"
@@ -59,6 +58,8 @@ void *alloca(size_t);
 #include "e_fm_ipc.h"
 #include "e_fm_device.h"
 
+#include "e_fm_main.h"
+
 static E_DBus_Signal_Handler *_hal_poll = NULL;
 static E_DBus_Connection *_e_fm_main_hal_conn = NULL;
 static Eina_List *_e_stores = NULL;
diff --git a/src/bin/e_fm/e_fm_main_hal.h b/src/bin/e_fm/e_fm_main_hal.h
index 9ce1c12f5..95d5e27cd 100644
--- a/src/bin/e_fm/e_fm_main_hal.h
+++ b/src/bin/e_fm/e_fm_main_hal.h
@@ -1,11 +1,6 @@
 #ifndef E_FM_MAIN_HAL_H
 #define E_FM_MAIN_HAL_H
 
-#include <E_DBus.h>
-#include <E_Hal.h>
-
-#include "e_fm_shared_types.h"
-
 E_Volume *_e_fm_main_hal_volume_add(const char *udi, Eina_Bool first_time);
 void _e_fm_main_hal_volume_del(const char *udi);
 E_Volume *_e_fm_main_hal_volume_find(const char *udi);
diff --git a/src/bin/e_fm/e_fm_main_udisks.c b/src/bin/e_fm/e_fm_main_udisks.c
index 4df197b3e..923450245 100644
--- a/src/bin/e_fm/e_fm_main_udisks.c
+++ b/src/bin/e_fm/e_fm_main_udisks.c
@@ -48,14 +48,14 @@ void *alloca(size_t);
 #include <E_DBus.h>
 #include <E_Ukit.h>
 
-#include "e_fm_main.h"
-#include "e_fm_main_udisks.h"
-
 #include "e_fm_shared_codec.h"
 #include "e_fm_shared_device.h"
 #include "e_fm_ipc.h"
 #include "e_fm_device.h"
 
+#include "e_fm_main_udisks.h"
+#include "e_fm_main.h"
+
 static E_DBus_Signal_Handler *_udisks_poll = NULL;
 static E_DBus_Signal_Handler *_udisks_add = NULL;
 static E_DBus_Signal_Handler *_udisks_del = NULL;
diff --git a/src/bin/e_fm/e_fm_main_udisks.h b/src/bin/e_fm/e_fm_main_udisks.h
index f9bc659eb..1d5ea8920 100644
--- a/src/bin/e_fm/e_fm_main_udisks.h
+++ b/src/bin/e_fm/e_fm_main_udisks.h
@@ -1,11 +1,6 @@
 #ifndef E_FM_MAIN_UDISKS_H
 #define E_FM_MAIN_UDISKS_H
 
-#include <E_DBus.h>
-#include <E_Ukit.h>
-
-#include "e_fm_shared_types.h"
-
 E_Volume *_e_fm_main_udisks_volume_add(const char *udi, Eina_Bool first_time);
 void _e_fm_main_udisks_volume_del(const char *udi);
 E_Volume *_e_fm_main_udisks_volume_find(const char *udi);