diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c
index b5dbb7cbd3..a77d6b7ee3 100644
--- a/src/examples/ecore/ecore_audio_custom.c
+++ b/src/examples/ecore/ecore_audio_custom.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <Ecore.h>
 #include <Ecore_Audio.h>
+#include <ecore_audio_obj_out_pulse.h>
 #include <math.h>
 
 Eo *in = NULL;
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 6c93fd565a..f34b147904 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include <Ecore.h>
 #include <Ecore_Audio.h>
+#include <ecore_audio_obj_out_pulse.h>
 #include <Eina.h>
 
 Eo *out = NULL;
diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h
index e97706032f..1a5e4ed4d5 100644
--- a/src/lib/ecore_audio/Ecore_Audio.h
+++ b/src/lib/ecore_audio/Ecore_Audio.h
@@ -210,8 +210,6 @@ EAPI int                 ecore_audio_shutdown(void);
 
 #include <ecore_audio_obj_in_tone.h>
 
-#include <ecore_audio_obj_out_pulse.h>
-
 /**
  * @}
  */
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 5c413050b7..930a4f9e2d 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -12,6 +12,7 @@
 
 #include <Eo.h>
 #include "ecore_audio_private.h"
+#include "ecore_audio_obj_out_pulse.h"
 #include <pulse/pulseaudio.h>
 
 #include <sys/time.h>
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index b321e75e25..a6860c933c 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -1,6 +1,18 @@
 #include "edje_private.h"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef ENABLE_MULTISENSE
+
+#ifdef HAVE_PULSE
+#include "ecore_audio_obj_out_pulse.h"
+#define MY_CLASS ECORE_AUDIO_OBJ_OUT_PULSE_CLASS
+#else
+#error "Multisense needs Pulseaudio suport!"
+#endif
+
 #include <sndfile.h>
 #include "Ecore_Audio.h"
 
@@ -153,7 +165,7 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
                         eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL));
             if (!out)
               {
-                 out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+                 out = eo_add(MY_CLASS, NULL);
                  if (out) outs++;
               }
             if (!out)
@@ -210,7 +222,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
              eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL));
 
              if (!out)
-               out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+               out = eo_add(MY_CLASS, NULL);
 
              eo_do(out, ecore_audio_obj_out_input_attach(in, &ret));
              if (!ret) {
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index beebefe378..2744a8e62d 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -13,6 +13,12 @@
 #include <Ecore.h>
 #include <Ecore_Audio.h>
 
+#ifdef HAVE_PULSE
+#include <ecore_audio_obj_out_pulse.h>
+#endif
+
+
+
 #if 0