diff --git a/src/bin/clouseau.c b/src/bin/clouseau.c
index 3faeff1..3d62319 100644
--- a/src/bin/clouseau.c
+++ b/src/bin/clouseau.c
@@ -1794,10 +1794,6 @@ _main_list_create(Evas_Object *panes)
                                   "selected", _gl_selected, gui);
 }
 
-static void
-_clouseau_object_dbg_string_build(Clouseau_Eo_Dbg_Info *eo,
-      char *buf, int buf_size);
-
 static void
 _obj_info_gl_selected(void *data EINA_UNUSED, Evas_Object *pobj EINA_UNUSED,
       void *event_info EINA_UNUSED)
diff --git a/src/bin/clouseaud.c b/src/bin/clouseaud.c
index 37ef75d..3078387 100644
--- a/src/bin/clouseaud.c
+++ b/src/bin/clouseaud.c
@@ -76,11 +76,6 @@ _daemon_cleanup(void)
 
    gui = app = NULL;
    eet_svr = NULL;
-
-   clouseau_data_shutdown();
-   ecore_con_shutdown();
-   ecore_shutdown();
-   eina_shutdown();
 }
 
 /* START - Ecore communication callbacks */
@@ -432,7 +427,13 @@ int main(void)
          _bmp_data_cb, NULL);
 
    ecore_main_loop_begin();
+
    _daemon_cleanup();
 
+   clouseau_data_shutdown();
+   ecore_con_shutdown();
+   ecore_shutdown();
+   eina_shutdown();
+
    return 0;
 }