diff --git a/src/focus.c b/src/focus.c
index 3409f9fd8..d77c499d5 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -1,35 +1,56 @@
+#include "debug.h"
 #include "focus.h"
+#include "e.h"
+#include "util.h"
 
 static Evas_List focus_list = NULL;
 
 void
 e_focus_set_focus(E_Border *b)
 {
+   D_ENTER;
+
    if (e_focus_can_focus(b)) ecore_focus_to_window(b->win.client);   
+
+   D_RETURN;
 }
 
 int
 e_focus_can_focus(E_Border *b)
 {
-   return (b->client.takes_focus);
+   D_ENTER;
+
+   D_RETURN_(b->client.takes_focus);
 }
 
 void
 e_focus_list_border_add(E_Border *b)
 {
+   D_ENTER;
+
+   D_RETURN;
+   UN(b);
 }
 
 void
 e_focus_list_border_del(E_Border *b)
 {
+   D_ENTER;
+
+   D_RETURN;
+   UN(b);
 }
 
 void
 e_focus_list_clear(void)
 {
+   D_ENTER;
+
    if (focus_list) 
      {
 	evas_list_free(focus_list);
 	focus_list = NULL;
      }
+
+   D_RETURN;
 }
diff --git a/src/focus.h b/src/focus.h
index d88c8c21b..90997ca3c 100644
--- a/src/focus.h
+++ b/src/focus.h
@@ -1,7 +1,6 @@
 #ifndef E_FOCUS_H
 #define E_FOCUS_H
 
-#include "e.h"
 #include "border.h"
 
 void e_focus_set_focus(E_Border *b);