diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index 3bc3125122..6905ff9dde 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -128,7 +128,7 @@ EAPI int
 ecore_wl_init(const char *name)
 {
    struct wl_callback *callback;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (++_ecore_wl_init_count != 1) return _ecore_wl_init_count;
 
@@ -240,7 +240,7 @@ exit_eina:
 EAPI int
 ecore_wl_shutdown(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    return _ecore_wl_shutdown(EINA_TRUE);
 }
@@ -337,7 +337,7 @@ ecore_wl_screen_size_get(int *w, int *h)
    Eina_Inlist *tmp;
    int ow = 0, oh = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (w) *w = 0;
    if (h) *h = 0;
@@ -380,7 +380,7 @@ ecore_wl_screen_size_get(int *w, int *h)
 EAPI void
 ecore_wl_pointer_xy_get(int *x, int *y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    _ecore_wl_input_pointer_xy_get(x, y);
 }
@@ -390,7 +390,7 @@ ecore_wl_dpi_get(void)
 {
    int w, mw;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!_ecore_wl_disp) return 0;
 
@@ -428,7 +428,7 @@ ecore_wl_display_iterate(void)
 EAPI Eina_Bool
 ecore_wl_animator_source_set(Ecore_Animator_Source source)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (_ecore_wl_server_mode) return EINA_FALSE;
 
@@ -477,7 +477,7 @@ ecore_wl_server_mode_set(Eina_Bool on)
 static int
 _ecore_wl_shutdown(Eina_Bool close)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (_ecore_wl_init_count < 1)
      {
@@ -619,7 +619,7 @@ _ecore_wl_cb_handle_data(void *data, Ecore_Fd_Handler *hdl)
    Ecore_Wl_Display *ewd;
    int ret = 0;
 
-   /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */
+   /* LOGFN; */
 
    if (_ecore_wl_fatal_error) return ECORE_CALLBACK_CANCEL;
 
@@ -664,7 +664,7 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
    Ecore_Wl_Display *ewd;
    Ecore_Wl_Global *global;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    ewd = data;
 
@@ -769,7 +769,7 @@ _ecore_wl_cb_handle_global_remove(void *data, struct wl_registry *registry EINA_
    Ecore_Wl_Global *global;
    Eina_Inlist *tmp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    ewd = data;
 
@@ -786,7 +786,7 @@ _ecore_wl_cb_handle_global_remove(void *data, struct wl_registry *registry EINA_
 static Eina_Bool
 _ecore_wl_xkb_init(Ecore_Wl_Display *ewd)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ewd->xkb.context = xkb_context_new(0)))
      return EINA_FALSE;
@@ -797,7 +797,7 @@ _ecore_wl_xkb_init(Ecore_Wl_Display *ewd)
 static Eina_Bool
 _ecore_wl_xkb_shutdown(Ecore_Wl_Display *ewd)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    xkb_context_unref(ewd->xkb.context);
 
diff --git a/src/lib/ecore_wayland/ecore_wl_dnd.c b/src/lib/ecore_wayland/ecore_wl_dnd.c
index 09f6c9c9a9..d4bf3e193f 100644
--- a/src/lib/ecore_wayland/ecore_wl_dnd.c
+++ b/src/lib/ecore_wayland/ecore_wl_dnd.c
@@ -85,7 +85,7 @@ _ecore_wl_dnd_offer_listener =
 EINA_DEPRECATED EAPI Eina_Bool
 ecore_wl_dnd_set_selection(Ecore_Wl_Dnd *dnd, const char **types_offered)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    return ecore_wl_dnd_selection_set(dnd->input, types_offered);
 }
@@ -97,7 +97,7 @@ ecore_wl_dnd_set_selection(Ecore_Wl_Dnd *dnd, const char **types_offered)
 EINA_DEPRECATED EAPI Eina_Bool
 ecore_wl_dnd_get_selection(Ecore_Wl_Dnd *dnd, const char *type)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    return ecore_wl_dnd_selection_get(dnd->input, type);
 }
@@ -143,7 +143,7 @@ ecore_wl_dnd_selection_set(Ecore_Wl_Input *input, const char **types_offered)
    const char **type;
    char **t;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return EINA_FALSE;
 
@@ -197,7 +197,7 @@ ecore_wl_dnd_selection_get(Ecore_Wl_Input *input, const char *type)
 {
    char **t;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    /* check for valid input and selection source */
    if ((!input) || (!input->selection_source)) return EINA_FALSE;
@@ -221,7 +221,7 @@ ecore_wl_dnd_selection_get(Ecore_Wl_Input *input, const char *type)
 EAPI Eina_Bool
 ecore_wl_dnd_selection_owner_has(Ecore_Wl_Input *input)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return EINA_FALSE;
    return (input->selection_source != NULL);
@@ -234,7 +234,7 @@ ecore_wl_dnd_selection_owner_has(Ecore_Wl_Input *input)
 EAPI Eina_Bool
 ecore_wl_dnd_selection_clear(Ecore_Wl_Input *input)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    /* check for valid input */
    if (!input) return EINA_FALSE;
@@ -256,7 +256,7 @@ ecore_wl_dnd_drag_start(Ecore_Wl_Input *input, Ecore_Wl_Window *win, Ecore_Wl_Wi
    struct wl_surface *drag_surface;
    struct wl_surface *origin_surface;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    /* check for valid input. if not, get the default one */
    if (!input) input = _ecore_wl_disp->input;
@@ -312,7 +312,7 @@ ecore_wl_dnd_drag_end(Ecore_Wl_Input *input)
 {
    Ecore_Wl_Event_Dnd_End *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    /* check for valid input. if not, get the default one */
    if (!input) input = _ecore_wl_disp->input;
@@ -354,7 +354,7 @@ ecore_wl_dnd_drag_get(Ecore_Wl_Input *input, const char *type)
 {
    char **t;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    /* check for valid input and drag source */
    if ((!input) || (!input->drag_source)) return EINA_FALSE;
@@ -380,7 +380,7 @@ ecore_wl_dnd_drag_types_set(Ecore_Wl_Input *input, const char **types_offered)
    const char **type;
    char **t;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    /* check for valid input. if not, get the default one */
    if (!input) input = _ecore_wl_disp->input;
@@ -426,7 +426,7 @@ ecore_wl_dnd_drag_types_set(Ecore_Wl_Input *input, const char **types_offered)
 EAPI struct wl_array *
 ecore_wl_dnd_drag_types_get(Ecore_Wl_Input *input)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    /* check for valid input. if not, get the default one */
    if (!input) input = _ecore_wl_disp->input;
@@ -441,7 +441,7 @@ _ecore_wl_dnd_add(Ecore_Wl_Input *input, struct wl_data_device *data_device EINA
 {
    Ecore_Wl_Dnd_Source *source;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(source = malloc(sizeof(Ecore_Wl_Dnd_Source))))
      return;
@@ -464,7 +464,7 @@ _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device EINA_UNUSED,
    char **types;
    int num = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -510,7 +510,7 @@ _ecore_wl_dnd_leave(void *data, struct wl_data_device *data_device EINA_UNUSED)
    Ecore_Wl_Event_Dnd_Leave *ev;
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -531,7 +531,7 @@ _ecore_wl_dnd_motion(void *data, struct wl_data_device *data_device EINA_UNUSED,
    Ecore_Wl_Event_Dnd_Position *ev;
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -558,7 +558,7 @@ _ecore_wl_dnd_drop(void *data, struct wl_data_device *data_device EINA_UNUSED)
    Ecore_Wl_Event_Dnd_Drop *ev;
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -583,7 +583,7 @@ _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device EINA_UNUS
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -603,7 +603,7 @@ _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device EINA_UNUS
 void
 _ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!source) return;
    source->refcount--;
@@ -626,7 +626,7 @@ _ecore_wl_dnd_selection_data_receive(Ecore_Wl_Dnd_Source *source, const char *ty
    struct _dnd_source *read_source = NULL;
    int p[2];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (pipe2(p, O_CLOEXEC) == -1)
      return;
@@ -689,7 +689,7 @@ _ecore_wl_dnd_selection_data_read(void *data, Ecore_Fd_Handler *fd_handler EINA_
    Ecore_Wl_Event_Selection_Data_Ready *event;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    read_source = data;
    source = read_source->source;
@@ -733,7 +733,7 @@ _ecore_wl_dnd_selection_data_ready_cb_free(void *data EINA_UNUSED, void *event)
 {
    Ecore_Wl_Event_Selection_Data_Ready *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = event)) return;
 
@@ -748,7 +748,7 @@ _ecore_wl_dnd_selection_cb_idle(void *data)
    struct _dnd_task *task;
    int count, i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    ctx = data;
    count = epoll_wait(ctx->epoll_fd, ctx->ep, 1, 0);
@@ -772,7 +772,7 @@ _ecore_wl_dnd_source_cb_target(void *data, struct wl_data_source *source EINA_UN
 {
    Ecore_Wl_Event_Data_Source_Target *event;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!data) return;
 
    if (!(event = calloc(1, sizeof(Ecore_Wl_Event_Data_Source_Target)))) return;
@@ -789,7 +789,7 @@ _ecore_wl_dnd_source_cb_target_free(void *data EINA_UNUSED, void *event)
 {
    Ecore_Wl_Event_Data_Source_Target *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = event)) return;
 
@@ -802,7 +802,7 @@ _ecore_wl_dnd_source_cb_send(void *data, struct wl_data_source *source EINA_UNUS
 {
    Ecore_Wl_Event_Data_Source_Send *event;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!data) return;
 
@@ -820,7 +820,7 @@ _ecore_wl_dnd_source_cb_send_free(void *data EINA_UNUSED, void *event)
 {
    Ecore_Wl_Event_Data_Source_Send *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = event)) return;
 
@@ -834,7 +834,7 @@ _ecore_wl_dnd_source_cb_cancelled(void *data, struct wl_data_source *source)
    Ecore_Wl_Input *input;
    Ecore_Wl_Event_Data_Source_Cancelled *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -858,7 +858,7 @@ _ecore_wl_dnd_offer_cb_offer(void *data, struct wl_data_offer *data_offer EINA_U
    Ecore_Wl_Dnd_Source *source;
    char **t;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(source = data)) return;
    if (!type) return;
diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c
index e3fb6f487d..12220d78c5 100644
--- a/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
@@ -150,7 +150,7 @@ static int _pointer_x, _pointer_y;
 EAPI void
 ecore_wl_input_grab(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsigned int button)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
    input->grab = win;
@@ -160,7 +160,7 @@ ecore_wl_input_grab(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsigned int bu
 EAPI void
 ecore_wl_input_ungrab(Ecore_Wl_Input *input)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
 
@@ -184,7 +184,7 @@ ecore_wl_input_ungrab(Ecore_Wl_Input *input)
 void
 _ecore_wl_input_grab_release(Ecore_Wl_Input *input, Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
    if (input->grab != win) return;
@@ -204,7 +204,7 @@ _pointer_update_stop(Ecore_Wl_Input *input)
 EAPI void
 ecore_wl_input_pointer_set(Ecore_Wl_Input *input, struct wl_surface *surface, int hot_x, int hot_y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
 
@@ -217,7 +217,7 @@ ecore_wl_input_pointer_set(Ecore_Wl_Input *input, struct wl_surface *surface, in
 EAPI void
 ecore_wl_input_cursor_size_set(Ecore_Wl_Input *input, const int size)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
 
@@ -234,7 +234,7 @@ ecore_wl_input_cursor_size_set(Ecore_Wl_Input *input, const int size)
 EAPI void
 ecore_wl_input_cursor_theme_name_set(Ecore_Wl_Input *input, const char *cursor_theme_name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
 
@@ -252,7 +252,7 @@ ecore_wl_input_cursor_theme_name_set(Ecore_Wl_Input *input, const char *cursor_t
 EAPI struct xkb_keymap *
 ecore_wl_input_keymap_get(Ecore_Wl_Input *input)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL);
 
@@ -308,7 +308,7 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
 {
    struct wl_cursor *cursor;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
    /* No pointer device. Don't need to set cursor and update it */
@@ -346,7 +346,7 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
 EAPI void
 ecore_wl_input_cursor_default_restore(Ecore_Wl_Input *input)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return;
 
@@ -369,7 +369,7 @@ ecore_wl_input_get(void)
 EAPI struct wl_seat *
 ecore_wl_input_seat_get(Ecore_Wl_Input *input)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!input) return NULL;
 
@@ -400,7 +400,7 @@ _ecore_wl_input_add(Ecore_Wl_Display *ewd, unsigned int id)
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = calloc(1, sizeof(Ecore_Wl_Input)))) return;
 
@@ -525,7 +525,7 @@ _ecore_wl_input_seat_handle_capabilities(void *data, struct wl_seat *seat, enum
 
    if (!(input = data)) return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if ((caps & WL_SEAT_CAPABILITY_POINTER) && (!input->pointer))
      {
@@ -577,7 +577,7 @@ _ecore_wl_input_cb_pointer_motion(void *data, struct wl_pointer *pointer EINA_UN
 {
    Ecore_Wl_Input *input;
 
-   /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */
+   /* LOGFN; */
 
    if (!(input = data)) return;
 
@@ -595,7 +595,7 @@ _ecore_wl_input_cb_pointer_button(void *data, struct wl_pointer *pointer EINA_UN
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -637,7 +637,7 @@ _ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer EINA_UNUS
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
    _ecore_wl_input_mouse_wheel_send(input, axis, wl_fixed_to_int(value),
@@ -649,7 +649,7 @@ _ecore_wl_input_cb_pointer_frame(void *data, struct wl_callback *callback, unsig
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -680,7 +680,7 @@ _ecore_wl_input_cb_keyboard_keymap(void *data, struct wl_keyboard *keyboard EINA
    Ecore_Wl_Input *input;
    char *map = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data))
      {
@@ -789,7 +789,7 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard EINA_UN
    char key[256], keyname[256], compose[256];
    Ecore_Event_Key *e;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -891,7 +891,7 @@ _ecore_wl_input_cb_keyboard_modifiers(void *data, struct wl_keyboard *keyboard E
    Ecore_Wl_Input *input;
    xkb_mod_mask_t mask;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -927,7 +927,7 @@ _ecore_wl_input_cb_keyboard_repeat_setup(void *data, struct wl_keyboard *keyboar
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
 
@@ -949,7 +949,7 @@ _ecore_wl_input_cb_keyboard_repeat(void *data)
    Ecore_Wl_Input *input;
    Ecore_Wl_Window *win = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return ECORE_CALLBACK_RENEW;
 
@@ -974,7 +974,7 @@ _ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *pointer EINA_UNU
    Ecore_Wl_Input *input;
    Ecore_Wl_Window *win = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!surface) return;
    if (!(input = data)) return;
@@ -1022,7 +1022,7 @@ _ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer EINA_UNU
    Ecore_Wl_Input *input;
    Ecore_Wl_Window *win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!surface) return;
    if (!(input = data)) return;
@@ -1055,7 +1055,7 @@ _ecore_wl_input_cb_keyboard_enter(void *data, struct wl_keyboard *keyboard EINA_
    Ecore_Wl_Input *input;
    Ecore_Wl_Window *win = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!surface) return;
    if (!(input = data)) return;
@@ -1084,7 +1084,7 @@ _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard EINA_
    Ecore_Wl_Input *input;
    Ecore_Wl_Window *win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!surface) return;
    if (!(input = data)) return;
@@ -1119,7 +1119,7 @@ _ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch EINA_UNUSED, un
    Ecore_Wl_Input *input;
    Ecore_Wl_Window *win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!surface) return;
    if (!(input = data)) return;
@@ -1158,7 +1158,7 @@ _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch EINA_UNUSED, unsi
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
    if (!input->touch_focus) return;
@@ -1178,7 +1178,7 @@ _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch EINA_UNUSED,
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(input = data)) return;
    if (!input->touch_focus) return;
@@ -1193,19 +1193,19 @@ _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch EINA_UNUSED,
 static void
 _ecore_wl_input_cb_touch_frame(void *data EINA_UNUSED, struct wl_touch *touch EINA_UNUSED)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 }
 
 static void
 _ecore_wl_input_cb_touch_cancel(void *data EINA_UNUSED, struct wl_touch *touch EINA_UNUSED)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 }
 
 static void
 _ecore_wl_input_cb_data_offer(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    _ecore_wl_dnd_add(data, data_device, offer);
 }
@@ -1213,7 +1213,7 @@ _ecore_wl_input_cb_data_offer(void *data, struct wl_data_device *data_device, st
 static void
 _ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct wl_data_offer *offer)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!surface) return;
 
@@ -1223,7 +1223,7 @@ _ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, un
 static void
 _ecore_wl_input_cb_data_leave(void *data, struct wl_data_device *data_device)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    _ecore_wl_dnd_leave(data, data_device);
 }
@@ -1231,7 +1231,7 @@ _ecore_wl_input_cb_data_leave(void *data, struct wl_data_device *data_device)
 static void
 _ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, wl_fixed_t x, wl_fixed_t y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    _ecore_wl_dnd_motion(data, data_device, timestamp, x, y);
 }
@@ -1239,7 +1239,7 @@ _ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, u
 static void
 _ecore_wl_input_cb_data_drop(void *data, struct wl_data_device *data_device)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    _ecore_wl_dnd_drop(data, data_device);
 }
@@ -1247,7 +1247,7 @@ _ecore_wl_input_cb_data_drop(void *data, struct wl_data_device *data_device)
 static void
 _ecore_wl_input_cb_data_selection(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    _ecore_wl_dnd_selection(data, data_device, offer);
 }
@@ -1258,7 +1258,7 @@ _ecore_wl_input_mouse_move_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, uns
    Ecore_Event_Mouse_Move *ev;
    Ecore_Wl_Mouse_Down_Info *down_info;
 
-   /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */
+   /* LOGFN; */
 
    if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move)))) return;
 
@@ -1299,7 +1299,7 @@ _ecore_wl_input_mouse_in_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsig
 {
    Ecore_Wl_Event_Mouse_In *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Mouse_In)))) return;
 
@@ -1324,7 +1324,7 @@ _ecore_wl_input_mouse_out_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsi
 {
    Ecore_Wl_Event_Mouse_Out *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Mouse_Out)))) return;
 
@@ -1349,7 +1349,7 @@ _ecore_wl_input_focus_in_send(Ecore_Wl_Input *input EINA_UNUSED, Ecore_Wl_Window
 {
    Ecore_Wl_Event_Focus_In *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Focus_In)))) return;
    ev->timestamp = timestamp;
@@ -1362,7 +1362,7 @@ _ecore_wl_input_focus_out_send(Ecore_Wl_Input *input EINA_UNUSED, Ecore_Wl_Windo
 {
    Ecore_Wl_Event_Focus_Out *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Focus_Out)))) return;
    ev->timestamp = timestamp;
@@ -1376,7 +1376,7 @@ _ecore_wl_input_mouse_down_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, int
    Ecore_Event_Mouse_Button *ev;
    Ecore_Wl_Mouse_Down_Info *down_info;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)))) return;
 
@@ -1485,7 +1485,7 @@ _ecore_wl_input_mouse_up_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, int d
    Ecore_Event_Mouse_Button *ev;
    Ecore_Wl_Mouse_Down_Info *down_info;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)))) return;
 
@@ -1548,7 +1548,7 @@ _ecore_wl_input_mouse_wheel_send(Ecore_Wl_Input *input, unsigned int axis, int v
 {
    Ecore_Event_Mouse_Wheel *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Wheel)))) return;
 
diff --git a/src/lib/ecore_wayland/ecore_wl_output.c b/src/lib/ecore_wayland/ecore_wl_output.c
index 596a0f80a9..cb61c077ad 100644
--- a/src/lib/ecore_wayland/ecore_wl_output.c
+++ b/src/lib/ecore_wayland/ecore_wl_output.c
@@ -10,7 +10,7 @@ _ecore_wl_output_cb_geometry(void *data, struct wl_output *wl_output EINA_UNUSED
 {
    Ecore_Wl_Output *output;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    output = data;
    output->allocation.x = x;
@@ -27,7 +27,7 @@ _ecore_wl_output_cb_mode(void *data, struct wl_output *wl_output EINA_UNUSED, un
    Ecore_Wl_Output *output;
    Ecore_Wl_Display *ewd;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    output = data;
    ewd = output->display;
@@ -77,7 +77,7 @@ _ecore_wl_output_add(Ecore_Wl_Display *ewd, unsigned int id)
 {
    Ecore_Wl_Output *output;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(output = calloc(1, sizeof(Ecore_Wl_Output)))) return;
 
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index a100b440e5..c2e0825785 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -17,9 +17,9 @@
 
 # ifdef LOGFNS
 #  include <stdio.h>
-#  define LOGFN(fl, ln, fn) printf("-ECORE-WL: %25s: %5i - %s\n", fl, ln, fn);
+#  define LOGFN printf("-ECORE-WL: %25s: %5i - %s\n", __FILE__, __LINE__, __func__)
 # else
-#  define LOGFN(fl, ln, fn)
+#  define LOGFN
 # endif
 
 extern int _ecore_wl_log_dom;
diff --git a/src/lib/ecore_wayland/ecore_wl_subsurf.c b/src/lib/ecore_wayland/ecore_wl_subsurf.c
index 3c92ce8c4e..96e35877a5 100644
--- a/src/lib/ecore_wayland/ecore_wl_subsurf.c
+++ b/src/lib/ecore_wayland/ecore_wl_subsurf.c
@@ -35,7 +35,7 @@ ecore_wl_subsurf_create(Ecore_Wl_Window *win)
    Ecore_Wl_Subsurf *ess;
    struct wl_subcompositor *subcomp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!win) return NULL;
    if (!win->surface) return NULL;
@@ -89,7 +89,7 @@ _ecore_wl_subsurf_destroy(Ecore_Wl_Subsurf *ess)
 EAPI void
 ecore_wl_subsurf_del(Ecore_Wl_Subsurf *ess)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return;
 
@@ -112,7 +112,7 @@ _ecore_wl_subsurfs_del_all(Ecore_Wl_Window *win)
 EAPI struct wl_surface *
 ecore_wl_subsurf_surface_get(Ecore_Wl_Subsurf *ess)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return NULL;
 
@@ -122,7 +122,7 @@ ecore_wl_subsurf_surface_get(Ecore_Wl_Subsurf *ess)
 EAPI void
 ecore_wl_subsurf_position_set(Ecore_Wl_Subsurf *ess, int x, int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return;
    if (!ess->subsurface) return;
@@ -139,7 +139,7 @@ ecore_wl_subsurf_position_set(Ecore_Wl_Subsurf *ess, int x, int y)
 EAPI void
 ecore_wl_subsurf_position_get(Ecore_Wl_Subsurf *ess, int *x, int *y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return;
 
@@ -150,7 +150,7 @@ ecore_wl_subsurf_position_get(Ecore_Wl_Subsurf *ess, int *x, int *y)
 EAPI void
 ecore_wl_subsurf_place_above(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return;
    if (!surface) return;
@@ -162,7 +162,7 @@ ecore_wl_subsurf_place_above(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
 EAPI void
 ecore_wl_subsurf_place_below(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return;
    if (!surface) return;
@@ -174,7 +174,7 @@ ecore_wl_subsurf_place_below(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
 EAPI void
 ecore_wl_subsurf_sync_set(Ecore_Wl_Subsurf *ess, Eina_Bool val)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return;
    if (!ess->subsurface) return;
@@ -195,7 +195,7 @@ ecore_wl_subsurf_opaque_region_set(Ecore_Wl_Subsurf *ess, int x, int y, int w, i
 {
    struct wl_region *region = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ess) return;
    if (!ess->surface) return;
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 39764d42e7..9504128e51 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -196,7 +196,7 @@ ecore_wl_window_new(Ecore_Wl_Window *parent, int x, int y, int w, int h, int buf
    Ecore_Wl_Window *win;
    static int _win_id = 1;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(win = calloc(1, sizeof(Ecore_Wl_Window))))
      {
@@ -236,7 +236,7 @@ ecore_wl_window_free(Ecore_Wl_Window *win)
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -285,7 +285,7 @@ ecore_wl_window_move(Ecore_Wl_Window *win, int x, int y)
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -314,7 +314,7 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w EINA_UNUSED, int h EINA_UNUSE
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -341,7 +341,7 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w EINA_UNUSED, int h EINA_UNUSE
 EAPI void
 ecore_wl_window_damage(Ecore_Wl_Window *win, int x, int y, int w, int h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -351,7 +351,7 @@ ecore_wl_window_damage(Ecore_Wl_Window *win, int x, int y, int w, int h)
 EAPI void
 ecore_wl_window_commit(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -362,7 +362,7 @@ ecore_wl_window_commit(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, int x, int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -391,7 +391,7 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
 EAPI struct wl_surface *
 ecore_wl_window_surface_create(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
 
@@ -418,7 +418,7 @@ ecore_wl_window_surface_create(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_show(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!win) return;
 
@@ -430,7 +430,7 @@ ecore_wl_window_show(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_hide(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -450,7 +450,7 @@ ecore_wl_window_hide(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_raise(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -464,7 +464,7 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
 {
    Eina_Bool prev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -494,7 +494,7 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
 EAPI Eina_Bool
 ecore_wl_window_maximized_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
 
@@ -506,7 +506,7 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
 {
    Eina_Bool prev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -541,7 +541,7 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
 EAPI Eina_Bool
 ecore_wl_window_fullscreen_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
 
@@ -551,7 +551,7 @@ ecore_wl_window_fullscreen_get(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_transparent_set(Ecore_Wl_Window *win, Eina_Bool transparent)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -566,7 +566,7 @@ ecore_wl_window_transparent_set(Ecore_Wl_Window *win, Eina_Bool transparent)
 EAPI Eina_Bool
 ecore_wl_window_alpha_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
 
@@ -576,7 +576,7 @@ ecore_wl_window_alpha_get(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_alpha_set(Ecore_Wl_Window *win, Eina_Bool alpha)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -591,7 +591,7 @@ ecore_wl_window_alpha_set(Ecore_Wl_Window *win, Eina_Bool alpha)
 EAPI Eina_Bool
 ecore_wl_window_transparent_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
 
@@ -601,7 +601,7 @@ ecore_wl_window_transparent_get(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -622,7 +622,7 @@ ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h)
 EAPI void
 ecore_wl_window_update_location(Ecore_Wl_Window *win, int x, int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -638,7 +638,7 @@ ecore_wl_window_update_location(Ecore_Wl_Window *win, int x, int y)
 EAPI struct wl_surface *
 ecore_wl_window_surface_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
 
@@ -649,7 +649,7 @@ ecore_wl_window_surface_get(Ecore_Wl_Window *win)
 EAPI struct wl_shell_surface *
 ecore_wl_window_shell_surface_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
 
@@ -660,7 +660,7 @@ ecore_wl_window_shell_surface_get(Ecore_Wl_Window *win)
 EAPI struct xdg_surface *
 ecore_wl_window_xdg_surface_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
 
@@ -680,7 +680,7 @@ ecore_wl_window_find(unsigned int id)
 EAPI void
 ecore_wl_window_type_set(Ecore_Wl_Window *win, Ecore_Wl_Window_Type type)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -692,7 +692,7 @@ ecore_wl_window_pointer_set(Ecore_Wl_Window *win, struct wl_surface *surface, in
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -710,7 +710,7 @@ ecore_wl_window_cursor_from_name_set(Ecore_Wl_Window *win, const char *cursor_na
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -730,7 +730,7 @@ ecore_wl_window_cursor_default_restore(Ecore_Wl_Window *win)
 {
    Ecore_Wl_Input *input;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -744,7 +744,7 @@ ecore_wl_window_cursor_default_restore(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_parent_set(Ecore_Wl_Window *win, Ecore_Wl_Window *parent)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -759,7 +759,7 @@ ecore_wl_window_iconified_set(Ecore_Wl_Window *win, Eina_Bool iconified)
    struct wl_array states;
    uint32_t *s;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -798,7 +798,7 @@ ecore_wl_window_iconified_set(Ecore_Wl_Window *win, Eina_Bool iconified)
 EAPI Eina_Bool
 ecore_wl_window_iconified_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
 
@@ -833,7 +833,7 @@ ecore_wl_window_surface_find(struct wl_surface *surface)
 EAPI void
 ecore_wl_window_input_region_set(Ecore_Wl_Window *win, int x, int y, int w, int h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -876,7 +876,7 @@ ecore_wl_window_opaque_region_set(Ecore_Wl_Window *win, int x, int y, int w, int
 {
    struct wl_region *region;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -914,7 +914,7 @@ ecore_wl_window_opaque_region_set(Ecore_Wl_Window *win, int x, int y, int w, int
 EAPI void
 ecore_wl_window_rotation_set(Ecore_Wl_Window *win, int rotation)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -925,7 +925,7 @@ ecore_wl_window_rotation_set(Ecore_Wl_Window *win, int rotation)
 EAPI int
 ecore_wl_window_rotation_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
 
@@ -936,7 +936,7 @@ ecore_wl_window_rotation_get(Ecore_Wl_Window *win)
 EAPI int
 ecore_wl_window_id_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
 
@@ -947,7 +947,7 @@ ecore_wl_window_id_get(Ecore_Wl_Window *win)
 EAPI int
 ecore_wl_window_surface_id_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
 
@@ -958,7 +958,7 @@ ecore_wl_window_surface_id_get(Ecore_Wl_Window *win)
 EAPI void
 ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -974,7 +974,7 @@ ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title)
 EAPI void
 ecore_wl_window_class_name_set(Ecore_Wl_Window *win, const char *class_name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(win);
 
@@ -991,7 +991,7 @@ ecore_wl_window_class_name_set(Ecore_Wl_Window *win, const char *class_name)
 EAPI Ecore_Wl_Input *
 ecore_wl_window_keyboard_get(Ecore_Wl_Window *win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
 
@@ -1012,7 +1012,7 @@ _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface *shell_surface
 {
    Ecore_Wl_Window *win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(win = data)) return;
 
@@ -1028,7 +1028,7 @@ _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface
    Ecore_Wl_Window *win;
    uint32_t *p;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(win = data)) return;
 
@@ -1071,7 +1071,7 @@ _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface EIN
 {
    Ecore_Wl_Window *win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(win = data)) return;
    ecore_wl_window_free(win);
@@ -1082,7 +1082,7 @@ _ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surfac
 {
    Ecore_Wl_Window *win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!shell_surface) return;
    if (!(win = data)) return;
@@ -1094,7 +1094,7 @@ _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup)
 {
    Ecore_Wl_Window *win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!xdg_popup) return;
    if (!(win = data)) return;
@@ -1107,7 +1107,7 @@ _ecore_session_recovery_uuid(void *data EINA_UNUSED, struct zwp_e_session_recove
    Ecore_Wl_Window *win;
    char uuid_string[37];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(win = data)) return;
    if (!session_recovery) return;
@@ -1122,7 +1122,7 @@ _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int h, int edges)
 {
    Ecore_Wl_Event_Window_Configure *ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Window_Configure)))) return;
    ev->win = win->id;
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index ff603bb43b..74e50efd01 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -352,7 +352,7 @@ clean_up:
 static Eina_Bool
 _ecore_x_init1(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 #ifdef LOGRT
    _logrt_init();
 #endif /* ifdef LOGRT */
@@ -762,7 +762,7 @@ _ecore_x_shutdown(void)
    if (!_ecore_x_disp)
      return 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    ecore_event_type_flush(ECORE_X_EVENT_ANY,
                           ECORE_X_EVENT_MOUSE_IN,
@@ -928,7 +928,7 @@ ecore_x_display_get(void)
 EAPI int
 ecore_x_fd_get(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    return ConnectionNumber(_ecore_x_disp);
 }
@@ -941,7 +941,7 @@ ecore_x_fd_get(void)
 EAPI Ecore_X_Screen *
 ecore_x_default_screen_get(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
    return (Ecore_X_Screen *)DefaultScreenOfDisplay(_ecore_x_disp);
 }
@@ -962,7 +962,7 @@ ecore_x_screen_size_get(const Ecore_X_Screen *screen,
                         int *h)
 {
    Screen *s = (Screen *)screen;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (w) *w = 0;
    if (h) *h = 0;
    EINA_SAFETY_ON_NULL_RETURN(screen);
@@ -981,7 +981,7 @@ ecore_x_screen_size_get(const Ecore_X_Screen *screen,
 EAPI int
 ecore_x_screen_count_get(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    return ScreenCount(_ecore_x_disp);
 }
@@ -1065,7 +1065,7 @@ ecore_x_double_click_time_get(void)
 EAPI void
 ecore_x_flush(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XFlush(_ecore_x_disp);
 }
@@ -1078,7 +1078,7 @@ ecore_x_flush(void)
 EAPI void
 ecore_x_sync(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XSync(_ecore_x_disp, False);
 }
@@ -1101,7 +1101,7 @@ ecore_x_killall(Ecore_X_Window root)
    Window *children_r = NULL;
    unsigned int num_children = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XGrabServer(_ecore_x_disp);
    /* Tranverse window tree starting from root, and drag each
@@ -1130,7 +1130,7 @@ ecore_x_killall(Ecore_X_Window root)
 EAPI void
 ecore_x_kill(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XKillClient(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1159,7 +1159,7 @@ ecore_x_dpi_get(void)
 {
    Screen *s;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    s = DefaultScreenOfDisplay(_ecore_x_disp);
    if (s->mwidth <= 0)
@@ -1286,7 +1286,7 @@ ecore_x_window_root_list(int *num_ret)
 
    *num_ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
    num = ScreenCount(_ecore_x_disp);
    roots = malloc(num * sizeof(Ecore_X_Window));
@@ -1308,7 +1308,7 @@ ecore_x_window_root_first_get(void)
    int num;
    Ecore_X_Window root, *roots = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    roots = ecore_x_window_root_list(&num);
    if (!(roots)) return 0;
 
@@ -1337,7 +1337,7 @@ ecore_x_window_manage(Ecore_X_Window win)
 {
    XWindowAttributes att;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    if (XGetWindowAttributes(_ecore_x_disp, win, &att) != True)
      return EINA_FALSE;
@@ -1369,7 +1369,7 @@ ecore_x_window_manage(Ecore_X_Window win)
 EAPI void
 ecore_x_window_container_manage(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XSelectInput(_ecore_x_disp, win,
@@ -1381,7 +1381,7 @@ ecore_x_window_container_manage(Ecore_X_Window win)
 EAPI void
 ecore_x_window_client_manage(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
    XSelectInput(_ecore_x_disp, win,
@@ -1401,7 +1401,7 @@ ecore_x_window_client_manage(Ecore_X_Window win)
 EAPI void
 ecore_x_window_sniff(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
    XSelectInput(_ecore_x_disp, win,
@@ -1414,7 +1414,7 @@ ecore_x_window_sniff(Ecore_X_Window win)
 EAPI void
 ecore_x_window_root_properties_select(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (_ecore_x_window_manage_succeeded) return;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XSelectInput(_ecore_x_disp, ecore_x_window_root_first_get(), PropertyChangeMask);
@@ -1424,7 +1424,7 @@ ecore_x_window_root_properties_select(void)
 EAPI void
 ecore_x_window_client_sniff(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XSelectInput(_ecore_x_disp, win,
@@ -1446,7 +1446,7 @@ ecore_x_window_attributes_get(Ecore_X_Window win,
    XWindowAttributes att;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = XGetWindowAttributes(_ecore_x_disp, win, &att);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1488,7 +1488,7 @@ ecore_x_window_attributes_get(Ecore_X_Window win,
 EAPI void
 ecore_x_window_save_set_add(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XAddToSaveSet(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1497,7 +1497,7 @@ ecore_x_window_save_set_add(Ecore_X_Window win)
 EAPI void
 ecore_x_window_save_set_del(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XRemoveFromSaveSet(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1512,7 +1512,7 @@ ecore_x_window_children_get(Ecore_X_Window win,
    Window root_ret = 0, parent_ret = 0, *children_ret = NULL;
    unsigned int children_ret_num = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
    success = XQueryTree(_ecore_x_disp, win, &root_ret, &parent_ret, &children_ret,
                    &children_ret_num);
@@ -1543,7 +1543,7 @@ ecore_x_pointer_control_set(int accel_num,
                             int threshold)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = !!XChangePointerControl(_ecore_x_disp, 1, 1,
                                 accel_num, accel_denom, threshold);
@@ -1557,7 +1557,7 @@ ecore_x_pointer_control_get(int *accel_num,
                             int *threshold)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = !!XGetPointerControl(_ecore_x_disp,
                              accel_num, accel_denom, threshold);
@@ -1570,7 +1570,7 @@ ecore_x_pointer_mapping_set(unsigned char *map,
                             int nmap)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = (XSetPointerMapping(_ecore_x_disp, map, nmap) == MappingSuccess);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1582,7 +1582,7 @@ ecore_x_pointer_mapping_get(unsigned char *map,
                             int nmap)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = !!XGetPointerMapping(_ecore_x_disp, map, nmap);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1593,7 +1593,7 @@ EAPI Eina_Bool
 ecore_x_pointer_grab(Ecore_X_Window win)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = (XGrabPointer(_ecore_x_disp, win, False,
                     ButtonPressMask | ButtonReleaseMask |
@@ -1608,7 +1608,7 @@ EAPI Eina_Bool
 ecore_x_pointer_confine_grab(Ecore_X_Window win)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = (XGrabPointer(_ecore_x_disp, win, False,
                     ButtonPressMask | ButtonReleaseMask |
@@ -1622,7 +1622,7 @@ ecore_x_pointer_confine_grab(Ecore_X_Window win)
 EAPI void
 ecore_x_pointer_ungrab(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XUngrabPointer(_ecore_x_disp, CurrentTime);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1634,7 +1634,7 @@ ecore_x_pointer_warp(Ecore_X_Window win,
                      int y)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = !!XWarpPointer(_ecore_x_disp, None, win, 0, 0, 0, 0, x, y);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1645,7 +1645,7 @@ EAPI Eina_Bool
 ecore_x_keyboard_grab(Ecore_X_Window win)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    ret = (XGrabKeyboard(_ecore_x_disp, win, False,
                      GrabModeAsync, GrabModeAsync,
@@ -1657,7 +1657,7 @@ ecore_x_keyboard_grab(Ecore_X_Window win)
 EAPI void
 ecore_x_keyboard_ungrab(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XUngrabKeyboard(_ecore_x_disp, CurrentTime);
 }
@@ -1665,7 +1665,7 @@ ecore_x_keyboard_ungrab(void)
 EAPI void
 ecore_x_grab(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    _ecore_x_grab_count++;
    if (_ecore_x_grab_count == 1)
@@ -1675,7 +1675,7 @@ ecore_x_grab(void)
 EAPI void
 ecore_x_ungrab(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    _ecore_x_grab_count--;
    if (_ecore_x_grab_count < 0)
@@ -1696,7 +1696,7 @@ ecore_x_passive_grab_replay_func_set(Eina_Bool (*func)(void *data,
                                                        void *event),
                                      void *data)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_window_grab_replay_func = func;
    _ecore_window_grab_replay_data = data;
 }
@@ -1722,7 +1722,7 @@ _ecore_x_window_button_grab_internal(Ecore_X_Window win,
    unsigned int locks[8];
    int i, ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    b = button;
    if (b == 0)
      b = AnyButton;
@@ -1836,7 +1836,7 @@ _ecore_x_window_button_ungrab_internal(Ecore_X_Window win,
    unsigned int locks[8];
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    b = button;
    if (b == 0)
      b = AnyButton;
@@ -1928,7 +1928,7 @@ _ecore_x_window_key_grab_internal(Ecore_X_Window win,
    unsigned int locks[8];
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!strncmp(key, "Keycode-", 8))
      keycode = atoi(key + 8);
    else
@@ -2044,7 +2044,7 @@ _ecore_x_window_key_ungrab_internal(Ecore_X_Window win,
    unsigned int locks[8];
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!strncmp(key, "Keycode-", 8))
      keycode = atoi(key + 8);
    else
@@ -2148,7 +2148,7 @@ ecore_x_client_message32_send(Ecore_X_Window win,
    XEvent xev = { 0 };
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    xev.xclient.window = win;
    xev.xclient.type = ClientMessage;
@@ -2184,7 +2184,7 @@ ecore_x_client_message8_send(Ecore_X_Window win,
    XEvent xev = { 0 };
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    xev.xclient.window = win;
    xev.xclient.type = ClientMessage;
@@ -2214,7 +2214,7 @@ ecore_x_mouse_move_send(Ecore_X_Window win,
    int rx, ry;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    XGetWindowAttributes(_ecore_x_disp, win, &att);
    XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2247,7 +2247,7 @@ ecore_x_mouse_down_send(Ecore_X_Window win,
    int rx, ry;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    XGetWindowAttributes(_ecore_x_disp, win, &att);
    XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2280,7 +2280,7 @@ ecore_x_mouse_up_send(Ecore_X_Window win,
    int rx, ry;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    XGetWindowAttributes(_ecore_x_disp, win, &att);
    XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2312,7 +2312,7 @@ ecore_x_mouse_in_send(Ecore_X_Window win,
    int rx, ry;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    XGetWindowAttributes(_ecore_x_disp, win, &att);
    XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2346,7 +2346,7 @@ ecore_x_mouse_out_send(Ecore_X_Window win,
    int rx, ry;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    XGetWindowAttributes(_ecore_x_disp, win, &att);
    XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2372,7 +2372,7 @@ ecore_x_mouse_out_send(Ecore_X_Window win,
 EAPI void
 ecore_x_focus_reset(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XSetInputFocus(_ecore_x_disp, PointerRoot, RevertToPointerRoot, CurrentTime);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -2381,7 +2381,7 @@ ecore_x_focus_reset(void)
 EAPI void
 ecore_x_events_allow_all(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XAllowEvents(_ecore_x_disp, AsyncBoth, CurrentTime);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -2407,7 +2407,7 @@ ecore_x_pointer_xy_get(Ecore_X_Window win,
    int rx, ry, wx, wy, ret;
    unsigned int mask;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    ret = XQueryPointer(_ecore_x_disp, win, &rwin, &cwin,
                        &rx, &ry, &wx, &wy, &mask);
@@ -2428,7 +2428,7 @@ ecore_x_pointer_root_xy_get(int *x, int *y)
    int i, num;
    unsigned int mask;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    root = ecore_x_window_root_list(&num);
    for (i = 0; i < num; i++) 
diff --git a/src/lib/ecore_x/ecore_x_atoms.c b/src/lib/ecore_x/ecore_x_atoms.c
index 5276238fd4..d3d39fa29d 100644
--- a/src/lib/ecore_x/ecore_x_atoms.c
+++ b/src/lib/ecore_x/ecore_x_atoms.c
@@ -46,7 +46,7 @@ ecore_x_atom_get(const char *name)
 {
    Ecore_X_Atom atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    atom = XInternAtom(_ecore_x_disp, name, False);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -61,7 +61,7 @@ ecore_x_atoms_get(const char **names,
    Atom *atoms_int;
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    atoms_int = alloca(num * sizeof(Atom));
    XInternAtoms(_ecore_x_disp, (char **)names, num, False, atoms_int);
@@ -76,7 +76,7 @@ ecore_x_atom_name_get(Ecore_X_Atom atom)
    char *name;
    char *xname;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
 
diff --git a/src/lib/ecore_x/ecore_x_composite.c b/src/lib/ecore_x/ecore_x_composite.c
index 913839f481..16ba2db635 100644
--- a/src/lib/ecore_x/ecore_x_composite.c
+++ b/src/lib/ecore_x/ecore_x_composite.c
@@ -38,7 +38,7 @@ _ecore_x_composite_init(void)
 EAPI Eina_Bool
 ecore_x_composite_query(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _composite_available;
 }
 
@@ -49,7 +49,7 @@ ecore_x_composite_redirect_window(Ecore_X_Window win,
 #ifdef ECORE_XCOMPOSITE
    int update = CompositeRedirectAutomatic;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    switch (type)
      {
       case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -72,7 +72,7 @@ ecore_x_composite_redirect_subwindows(Ecore_X_Window win,
 #ifdef ECORE_XCOMPOSITE
    int update = CompositeRedirectAutomatic;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    switch (type)
      {
       case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -95,7 +95,7 @@ ecore_x_composite_unredirect_window(Ecore_X_Window win,
 #ifdef ECORE_XCOMPOSITE
    int update = CompositeRedirectAutomatic;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    switch (type)
      {
       case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -118,7 +118,7 @@ ecore_x_composite_unredirect_subwindows(Ecore_X_Window win,
 #ifdef ECORE_XCOMPOSITE
    int update = CompositeRedirectAutomatic;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    switch (type)
      {
       case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -139,7 +139,7 @@ ecore_x_composite_name_window_pixmap_get(Ecore_X_Window win)
 {
    Ecore_X_Pixmap pixmap = None;
 #ifdef ECORE_XCOMPOSITE
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    pixmap = XCompositeNameWindowPixmap(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XCOMPOSITE */
@@ -180,7 +180,7 @@ EAPI void
 ecore_x_composite_render_window_disable(Ecore_X_Window root)
 {
 #ifdef ECORE_XCOMPOSITE
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XCompositeReleaseOverlayWindow(_ecore_x_disp, root);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XCOMPOSITE */
diff --git a/src/lib/ecore_x/ecore_x_cursor.c b/src/lib/ecore_x/ecore_x_cursor.c
index 46ac42e59a..c472c02af6 100644
--- a/src/lib/ecore_x/ecore_x_cursor.c
+++ b/src/lib/ecore_x/ecore_x_cursor.c
@@ -22,7 +22,7 @@ ecore_x_cursor_new(Ecore_X_Window win,
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
 #ifdef ECORE_XCURSOR
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (_ecore_x_xcursor)
      {
@@ -218,7 +218,7 @@ ecore_x_cursor_new(Ecore_X_Window win,
 EAPI void
 ecore_x_cursor_free(Ecore_X_Cursor c)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XFreeCursor(_ecore_x_disp, c);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -233,7 +233,7 @@ EAPI Ecore_X_Cursor
 ecore_x_cursor_shape_get(int shape)
 {
    Ecore_X_Cursor cur;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    /* Shapes are defined in Ecore_X_Cursor.h */
    cur = XCreateFontCursor(_ecore_x_disp, shape);
@@ -245,7 +245,7 @@ EAPI void
 ecore_x_cursor_size_set(int size)
 {
 #ifdef ECORE_XCURSOR
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XcursorSetDefaultSize(_ecore_x_disp, size);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -258,7 +258,7 @@ EAPI int
 ecore_x_cursor_size_get(void)
 {
 #ifdef ECORE_XCURSOR
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    return XcursorGetDefaultSize(_ecore_x_disp);
 #else /* ifdef ECORE_XCURSOR */
diff --git a/src/lib/ecore_x/ecore_x_damage.c b/src/lib/ecore_x/ecore_x_damage.c
index c5906b4531..8a19a03d07 100644
--- a/src/lib/ecore_x/ecore_x_damage.c
+++ b/src/lib/ecore_x/ecore_x_damage.c
@@ -17,7 +17,7 @@ _ecore_x_damage_init(void)
    _damage_major = 1;
    _damage_minor = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (XDamageQueryVersion(_ecore_x_disp, &_damage_major, &_damage_minor))
      _damage_available = EINA_TRUE;
    else
@@ -41,7 +41,7 @@ ecore_x_damage_new(Ecore_X_Drawable d,
 #ifdef ECORE_XDAMAGE
    Ecore_X_Damage damage;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    damage = XDamageCreate(_ecore_x_disp, d, level);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -55,7 +55,7 @@ EAPI void
 ecore_x_damage_free(Ecore_X_Damage damage)
 {
 #ifdef ECORE_XDAMAGE
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XDamageDestroy(_ecore_x_disp, damage);
 #endif /* ifdef ECORE_XDAMAGE */
@@ -67,7 +67,7 @@ ecore_x_damage_subtract(Ecore_X_Damage damage,
                         Ecore_X_Region parts)
 {
 #ifdef ECORE_XDAMAGE
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XDamageSubtract(_ecore_x_disp, damage, repair, parts);
    if (_ecore_xlib_sync) ecore_x_sync();
diff --git a/src/lib/ecore_x/ecore_x_dnd.c b/src/lib/ecore_x/ecore_x_dnd.c
index c5d6fd5cd2..b758be8e54 100644
--- a/src/lib/ecore_x/ecore_x_dnd.c
+++ b/src/lib/ecore_x/ecore_x_dnd.c
@@ -147,7 +147,7 @@ ecore_x_dnd_aware_set(Ecore_X_Window win,
 {
    Ecore_X_Atom prop_data = ECORE_X_DND_VERSION;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (on)
      ecore_x_window_prop_property_set(win, ECORE_X_ATOM_XDND_AWARE,
                                       XA_ATOM, 32, &prop_data, 1);
@@ -162,7 +162,7 @@ ecore_x_dnd_version_get(Ecore_X_Window win)
    int num;
    Version_Cache_Item *t;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    // this looks hacky - and it is, but we need a way of caching info about
    // a window while dragging, because we literally query this every mouse
    // move and going to and from x multiple times per move is EXPENSIVE
@@ -234,7 +234,7 @@ ecore_x_dnd_type_isset(Ecore_X_Window win,
    unsigned char *data;
    Ecore_X_Atom *atoms, atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST,
                                          XA_ATOM, 32, &data, &num))
      return ret;
@@ -266,10 +266,10 @@ ecore_x_dnd_type_set(Ecore_X_Window win,
    unsigned char *data = NULL;
    unsigned char *old_data = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = ecore_x_atom_get(type);
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (on)
      {
         if (ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST,
@@ -341,7 +341,7 @@ ecore_x_dnd_types_set(Ecore_X_Window win,
    unsigned int i;
    unsigned char *data = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!num_types)
      ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_TYPE_LIST);
    else
@@ -371,7 +371,7 @@ ecore_x_dnd_actions_set(Ecore_X_Window win,
    unsigned int i;
    unsigned char *data = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!num_actions)
      ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_ACTION_LIST);
    else
@@ -431,7 +431,7 @@ _ecore_x_dnd_begin(Ecore_X_Window source,
                    unsigned char *data,
                    int size)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_dnd_version_get(source))
      return EINA_FALSE;
 
@@ -469,7 +469,7 @@ _ecore_x_dnd_drop(Eina_Bool self)
    XEvent xev = { 0 };
    int status = EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (_source->dest)
      {
         xev.xany.type = ClientMessage;
@@ -553,7 +553,7 @@ ecore_x_dnd_send_status(Eina_Bool will_accept,
    if (_target->state == ECORE_X_DND_TARGET_IDLE)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    memset(&xev, 0, sizeof(XEvent));
 
    _target->will_accept = will_accept;
@@ -605,7 +605,7 @@ ecore_x_dnd_send_finished(void)
    if (_target->state == ECORE_X_DND_TARGET_IDLE)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xev.xany.type = ClientMessage;
    xev.xany.display = _ecore_x_disp;
    xev.xclient.message_type = ECORE_X_ATOM_XDND_FINISHED;
diff --git a/src/lib/ecore_x/ecore_x_dpms.c b/src/lib/ecore_x/ecore_x_dpms.c
index ad946d45c9..b55c1992f5 100644
--- a/src/lib/ecore_x/ecore_x_dpms.c
+++ b/src/lib/ecore_x/ecore_x_dpms.c
@@ -54,7 +54,7 @@ EAPI Eina_Bool
 ecore_x_dpms_capable_get(void)
 {
 #ifdef ECORE_XDPMS
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    return DPMSCapable(_ecore_x_disp) ? EINA_TRUE : EINA_FALSE;
 #else /* ifdef ECORE_XDPMS */
@@ -74,7 +74,7 @@ ecore_x_dpms_enabled_get(void)
    unsigned char state;
    unsigned short power_lvl;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    DPMSInfo(_ecore_x_disp, &power_lvl, &state);
    return state ? EINA_TRUE : EINA_FALSE;
@@ -99,7 +99,7 @@ ecore_x_dpms_power_level_get(void)
    unsigned char state;
    unsigned short power_lvl;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, -1);
    DPMSInfo(_ecore_x_disp, &power_lvl, &state);
    return (int)power_lvl;
@@ -117,7 +117,7 @@ EAPI void
 ecore_x_dpms_enabled_set(int enabled)
 {
 #ifdef ECORE_XDPMS
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    if (enabled)
      DPMSEnable(_ecore_x_disp);
@@ -140,7 +140,7 @@ ecore_x_dpms_timeouts_get(unsigned int *standby,
                           unsigned int *off)
 {
 #ifdef ECORE_XDPMS
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby,
                    (unsigned short *)suspend, (unsigned short *)off);
@@ -160,7 +160,7 @@ ecore_x_dpms_timeouts_set(unsigned int standby,
                           unsigned int off)
 {
 #ifdef ECORE_XDPMS
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
    return DPMSSetTimeouts(_ecore_x_disp, standby, suspend, off) ? EINA_TRUE : EINA_FALSE;
 #else /* ifdef ECORE_XDPMS */
@@ -179,7 +179,7 @@ ecore_x_dpms_timeout_standby_get(void)
 #ifdef ECORE_XDPMS
    unsigned short standby, suspend, off;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
    return standby;
@@ -200,7 +200,7 @@ ecore_x_dpms_timeout_suspend_get(void)
 #ifdef ECORE_XDPMS
    unsigned short standby, suspend, off;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
    return suspend;
@@ -221,7 +221,7 @@ ecore_x_dpms_timeout_off_get(void)
 #ifdef ECORE_XDPMS
    unsigned short standby, suspend, off;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
    return off;
@@ -241,7 +241,7 @@ ecore_x_dpms_timeout_standby_set(unsigned int new_timeout)
 #ifdef ECORE_XDPMS
    unsigned short standby, suspend, off;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
    DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off);
@@ -259,7 +259,7 @@ ecore_x_dpms_timeout_suspend_set(unsigned int new_timeout)
 #ifdef ECORE_XDPMS
    unsigned short standby, suspend, off;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
    DPMSSetTimeouts(_ecore_x_disp, standby, new_timeout, off);
@@ -277,7 +277,7 @@ ecore_x_dpms_timeout_off_set(unsigned int new_timeout)
 #ifdef ECORE_XDPMS
    unsigned short standby, suspend, off;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
    DPMSSetTimeouts(_ecore_x_disp, standby, suspend, new_timeout);
@@ -293,7 +293,7 @@ EAPI void
 ecore_x_dpms_force(Eina_Bool on)
 {
 #ifdef ECORE_XDPMS
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    if (on) DPMSForceLevel(_ecore_x_disp, DPMSModeOn);
    else DPMSForceLevel(_ecore_x_disp, DPMSModeOff);
diff --git a/src/lib/ecore_x/ecore_x_drawable.c b/src/lib/ecore_x/ecore_x_drawable.c
index e0edbe2776..dcd457c67d 100644
--- a/src/lib/ecore_x/ecore_x_drawable.c
+++ b/src/lib/ecore_x/ecore_x_drawable.c
@@ -31,7 +31,7 @@ ecore_x_drawable_geometry_get(Ecore_X_Drawable d,
    int ret_x, ret_y;
    unsigned int ret_w, ret_h, dummy_border, dummy_depth;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &ret_x, &ret_y,
                      &ret_w, &ret_h, &dummy_border, &dummy_depth))
@@ -69,7 +69,7 @@ ecore_x_drawable_border_width_get(Ecore_X_Drawable d)
    int dummy_x, dummy_y;
    unsigned int dummy_w, dummy_h, border_ret, dummy_depth;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y,
                      &dummy_w, &dummy_h, &border_ret, &dummy_depth))
@@ -91,7 +91,7 @@ ecore_x_drawable_depth_get(Ecore_X_Drawable d)
    int dummy_x, dummy_y;
    unsigned int dummy_w, dummy_h, dummy_border, depth_ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
    if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y,
                      &dummy_w, &dummy_h, &dummy_border, &depth_ret))
@@ -117,7 +117,7 @@ ecore_x_drawable_rectangle_fill(Ecore_X_Drawable d,
                                 int width,
                                 int height)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
    XFillRectangle(_ecore_x_disp, d, gc, x, y, width, height);
    if (_ecore_xlib_sync) ecore_x_sync();
diff --git a/src/lib/ecore_x/ecore_x_e.c b/src/lib/ecore_x/ecore_x_e.c
index 8d10ba0700..0444010c88 100644
--- a/src/lib/ecore_x/ecore_x_e.c
+++ b/src/lib/ecore_x/ecore_x_e.c
@@ -34,7 +34,7 @@ ecore_x_e_frame_size_set(Ecore_X_Window win,
 {
    unsigned int frames[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    frames[0] = fl;
    frames[1] = fr;
    frames[2] = ft;
@@ -46,7 +46,7 @@ EAPI void
 ecore_x_e_virtual_keyboard_set(Ecore_X_Window win,
                                unsigned int is_keyboard)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD,
                                   &is_keyboard, 1);
 }
@@ -57,7 +57,7 @@ ecore_x_e_virtual_keyboard_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD,
                                         &val, 1);
    if ((ret == 0) || (ret == -1))
@@ -178,7 +178,7 @@ ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_vkbd_atom_get(state);
    ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE,
                                 &atom, 1);
@@ -189,7 +189,7 @@ ecore_x_e_virtual_keyboard_state_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE,
                                      &atom, 1))
      return ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN;
@@ -201,7 +201,7 @@ EAPI void
 ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win,
                                       Ecore_X_Virtual_Keyboard_State state)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  _ecore_x_e_vkbd_atom_get(state),
@@ -247,7 +247,7 @@ EAPI void
 ecore_x_e_illume_zone_set(Ecore_X_Window win,
                           Ecore_X_Window zone)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE,
                                   &zone, 1);
 }
@@ -258,7 +258,7 @@ ecore_x_e_illume_zone_get(Ecore_X_Window win)
    Ecore_X_Window zone = 0;
    int ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_window_get(win, ECORE_X_ATOM_E_ILLUME_ZONE,
                                         &zone, 1);
    if ((ret == 0) || (ret == -1))
@@ -272,7 +272,7 @@ ecore_x_e_illume_zone_list_set(Ecore_X_Window win,
                                Ecore_X_Window *zones,
                                unsigned int n_zones)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE_LIST,
                                   zones, n_zones);
 }
@@ -281,7 +281,7 @@ EAPI void
 ecore_x_e_illume_conformant_set(Ecore_X_Window win,
                                 unsigned int is_conformant)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT,
                                   &is_conformant, 1);
 }
@@ -292,7 +292,7 @@ ecore_x_e_illume_conformant_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT,
                                         &val, 1);
    if ((ret == 0) || (ret == -1))
@@ -307,7 +307,7 @@ ecore_x_e_illume_mode_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_illume_atom_get(mode);
    ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_MODE,
                                 &atom, 1);
@@ -318,7 +318,7 @@ ecore_x_e_illume_mode_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_ILLUME_MODE, &atom, 1))
      return ECORE_X_ILLUME_MODE_UNKNOWN;
 
@@ -329,7 +329,7 @@ EAPI void
 ecore_x_e_illume_mode_send(Ecore_X_Window win,
                            Ecore_X_Illume_Mode mode)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_MODE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  _ecore_x_e_illume_atom_get(mode),
@@ -339,7 +339,7 @@ ecore_x_e_illume_mode_send(Ecore_X_Window win,
 EAPI void
 ecore_x_e_illume_focus_back_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_BACK,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -348,7 +348,7 @@ ecore_x_e_illume_focus_back_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_focus_forward_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_FORWARD,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -357,7 +357,7 @@ ecore_x_e_illume_focus_forward_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_focus_home_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_HOME,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -366,7 +366,7 @@ ecore_x_e_illume_focus_home_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_close_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_CLOSE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -375,7 +375,7 @@ ecore_x_e_illume_close_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_home_new_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_NEW,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -384,7 +384,7 @@ ecore_x_e_illume_home_new_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_home_del_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_DEL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -393,7 +393,7 @@ ecore_x_e_illume_home_del_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_next_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -404,7 +404,7 @@ ecore_x_e_illume_access_action_next_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_prev_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -415,7 +415,7 @@ ecore_x_e_illume_access_action_prev_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_activate_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -426,7 +426,7 @@ ecore_x_e_illume_access_action_activate_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_over_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -437,7 +437,7 @@ ecore_x_e_illume_access_action_over_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_read_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -448,7 +448,7 @@ ecore_x_e_illume_access_action_read_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_read_next_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -459,7 +459,7 @@ ecore_x_e_illume_access_action_read_next_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_read_prev_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -470,7 +470,7 @@ ecore_x_e_illume_access_action_read_prev_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_up_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -481,7 +481,7 @@ ecore_x_e_illume_access_action_up_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_access_action_down_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  win,
@@ -493,7 +493,7 @@ EAPI void
 ecore_x_e_illume_drag_set(Ecore_X_Window win,
                           unsigned int drag)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG, &drag, 1);
 }
 
@@ -503,7 +503,7 @@ ecore_x_e_illume_drag_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG,
                                         &val, 1);
    if ((ret == 0) || (ret == -1))
@@ -516,7 +516,7 @@ EAPI void
 ecore_x_e_illume_drag_locked_set(Ecore_X_Window win,
                                  unsigned int is_locked)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED,
                                   &is_locked, 1);
 }
@@ -527,7 +527,7 @@ ecore_x_e_illume_drag_locked_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED,
                                         &val, 1);
    if ((ret == 0) || (ret == -1))
@@ -539,7 +539,7 @@ ecore_x_e_illume_drag_locked_get(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_drag_start_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_START,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -548,7 +548,7 @@ ecore_x_e_illume_drag_start_send(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_drag_end_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_END,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  1, 0, 0, 0, 0);
@@ -563,7 +563,7 @@ ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win,
 {
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    geom[0] = x;
    geom[1] = y;
    geom[2] = w;
@@ -582,7 +582,7 @@ ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret =
      ecore_x_window_prop_card32_get(win,
                                     ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY,
@@ -614,7 +614,7 @@ ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win,
 {
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    geom[0] = x;
    geom[1] = y;
    geom[2] = w;
@@ -633,7 +633,7 @@ ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret =
      ecore_x_window_prop_card32_get(win,
                                     ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY,
@@ -665,7 +665,7 @@ ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win,
 {
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    geom[0] = x;
    geom[1] = y;
    geom[2] = w;
@@ -684,7 +684,7 @@ ecore_x_e_illume_keyboard_geometry_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret =
      ecore_x_window_prop_card32_get(win,
                                     ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY,
@@ -740,7 +740,7 @@ EAPI void
 ecore_x_e_illume_quickpanel_set(Ecore_X_Window win,
                                 unsigned int is_quickpanel)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL,
                                   &is_quickpanel, 1);
 }
@@ -751,7 +751,7 @@ ecore_x_e_illume_quickpanel_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL,
                                         &val, 1);
    if ((ret == 0) || (ret == -1))
@@ -766,7 +766,7 @@ ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_quickpanel_atom_get(state);
    ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE,
                                 &atom, 1);
@@ -777,7 +777,7 @@ ecore_x_e_illume_quickpanel_state_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_atom_get(win,
                                      ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE,
                                      &atom, 1))
@@ -790,7 +790,7 @@ EAPI void
 ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win,
                                        Ecore_X_Illume_Quickpanel_State state)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  _ecore_x_e_quickpanel_atom_get(state),
@@ -800,7 +800,7 @@ ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win,
 EAPI void
 ecore_x_e_illume_quickpanel_state_toggle(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win,
                                  ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE_TOGGLE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -811,7 +811,7 @@ EAPI void
 ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win,
                                                unsigned int priority)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win,
                                   ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR,
                                   &priority, 1);
@@ -823,7 +823,7 @@ ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR,
                                        &val, 1);
    if ((ret == 0) || (ret == -1))
@@ -836,7 +836,7 @@ EAPI void
 ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win,
                                                unsigned int priority)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win,
                                   ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR,
                                   &priority, 1);
@@ -848,7 +848,7 @@ ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR,
                                         &val, 1);
@@ -862,7 +862,7 @@ EAPI void
 ecore_x_e_illume_quickpanel_zone_set(Ecore_X_Window win,
                                      unsigned int zone)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win,
                                   ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE,
                                   &zone, 1);
@@ -874,7 +874,7 @@ ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win)
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE,
                                         &val, 1);
@@ -887,7 +887,7 @@ ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win)
 EAPI void
 ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win,
                                  ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -927,7 +927,7 @@ ecore_x_e_illume_clipboard_state_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_clipboard_atom_get(state);
 
    ecore_x_window_prop_atom_set(win,
@@ -940,7 +940,7 @@ ecore_x_e_illume_clipboard_state_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!ecore_x_window_prop_atom_get(win,
                                      ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE,
@@ -955,7 +955,7 @@ ecore_x_e_illume_clipboard_geometry_set(Ecore_X_Window win,
 {
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    geom[0] = x;
    geom[1] = y;
    geom[2] = w;
@@ -972,7 +972,7 @@ ecore_x_e_illume_clipboard_geometry_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret =
       ecore_x_window_prop_card32_get(win,
                                      ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY,
@@ -992,7 +992,7 @@ EAPI void
 ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win,
                                        unsigned int   is_visible)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, 
                                   ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 
                                   &is_visible, 1);
@@ -1004,7 +1004,7 @@ ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win)
    unsigned int is_visible = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 
                                         &is_visible, 1);
@@ -1023,7 +1023,7 @@ ecore_x_e_illume_sliding_win_geometry_set(Ecore_X_Window win,
 {
    unsigned int geom[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    geom[0] = x;
    geom[1] = y;
    geom[2] = w;
@@ -1043,7 +1043,7 @@ ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int geom[4];
    
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = 
      ecore_x_window_prop_card32_get(win, 
                                     ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, 
@@ -1070,7 +1070,7 @@ EAPI void
 ecore_x_e_comp_sync_counter_set(Ecore_X_Window win,
                                 Ecore_X_Sync_Counter counter)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (counter)
      ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_SYNC_COUNTER,
                                  ECORE_X_ATOM_CARDINAL, &counter, 1);
@@ -1084,7 +1084,7 @@ ecore_x_e_comp_sync_counter_get(Ecore_X_Window win)
    int ret = 0;
    Ecore_X_Sync_Counter counter = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret =
      ecore_x_window_prop_xid_get(win,
                                  ECORE_X_ATOM_E_COMP_SYNC_COUNTER,
@@ -1102,7 +1102,7 @@ ecore_x_e_comp_sync_draw_done_send(Ecore_X_Window root,
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1134,7 +1134,7 @@ ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root,
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1169,7 +1169,7 @@ ecore_x_e_window_profile_list_set(Ecore_X_Window  win,
 {
    Ecore_X_Atom *atoms;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!win)
      return;
 
@@ -1199,7 +1199,7 @@ ecore_x_e_window_profile_list_get(Ecore_X_Window   win,
    Ecore_X_Atom *atoms;
    int num, i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (ret_num)
      *ret_num = 0;
@@ -1254,7 +1254,7 @@ ecore_x_e_window_profile_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!win)
      return;
 
@@ -1279,7 +1279,7 @@ ecore_x_e_window_profile_get(Ecore_X_Window win)
    char *profile = NULL;
    int num;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_E_WINDOW_PROFILE,
                                          XA_ATOM, 32, &data, &num))
      {
@@ -1304,7 +1304,7 @@ ecore_x_e_window_profile_supported_set(Ecore_X_Window root,
 {
    Ecore_X_Window win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1344,7 +1344,7 @@ ecore_x_e_window_profile_supported_get(Ecore_X_Window root)
    Ecore_X_Window win, win2;
    int ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
 
@@ -1377,7 +1377,7 @@ ecore_x_e_window_available_profiles_set(Ecore_X_Window  win,
 {
    Ecore_X_Atom *atoms;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!win)
      return;
@@ -1404,7 +1404,7 @@ ecore_x_e_window_available_profiles_get(Ecore_X_Window   win,
    Ecore_X_Atom *atoms;
    int num, i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (count)
      *count = 0;
@@ -1460,7 +1460,7 @@ ecore_x_e_window_profile_change_send(Ecore_X_Window  root,
    XEvent xev = { 0 };
    Ecore_X_Atom atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1496,7 +1496,7 @@ ecore_x_e_window_profile_change_request_send(Ecore_X_Window win,
    XEvent xev = { 0 };
    Ecore_X_Atom atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1529,7 +1529,7 @@ ecore_x_e_window_profile_change_done_send(Ecore_X_Window root,
    XEvent xev = { 0 };
    Ecore_X_Atom atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1566,7 +1566,7 @@ ecore_x_e_comp_sync_supported_set(Ecore_X_Window root,
    if (!root)
      root = DefaultRootWindow(_ecore_x_disp);
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (enabled)
      {
         win = ecore_x_window_new(root, 1, 2, 3, 4);
@@ -1600,7 +1600,7 @@ ecore_x_e_comp_sync_supported_get(Ecore_X_Window root)
    Ecore_X_Window win, win2;
    int ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
 
@@ -1631,7 +1631,7 @@ ecore_x_e_comp_sync_begin_send(Ecore_X_Window win)
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1657,7 +1657,7 @@ ecore_x_e_comp_sync_end_send(Ecore_X_Window win)
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1683,7 +1683,7 @@ ecore_x_e_comp_sync_cancel_send(Ecore_X_Window win)
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1709,7 +1709,7 @@ ecore_x_e_comp_flush_send(Ecore_X_Window win)
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1735,7 +1735,7 @@ ecore_x_e_comp_dump_send(Ecore_X_Window win)
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1760,7 +1760,7 @@ EAPI void
 ecore_x_e_comp_pixmap_set(Ecore_X_Window win,
                           Ecore_X_Pixmap pixmap)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (pixmap)
      ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_PIXMAP,
                                  ECORE_X_ATOM_PIXMAP, &pixmap, 1);
@@ -1774,7 +1774,7 @@ ecore_x_e_comp_pixmap_get(Ecore_X_Window win)
    int ret = 0;
    Ecore_X_Pixmap pixmap = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret =
      ecore_x_window_prop_xid_get(win,
                                  ECORE_X_ATOM_E_COMP_PIXMAP,
@@ -1821,7 +1821,7 @@ ecore_x_e_illume_indicator_state_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_indicator_atom_get(state);
    ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE,
                                 &atom, 1);
@@ -1832,7 +1832,7 @@ ecore_x_e_illume_indicator_state_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_atom_get(win,
                                      ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE,
                                      &atom, 1))
@@ -1845,7 +1845,7 @@ EAPI void
 ecore_x_e_illume_indicator_state_send(Ecore_X_Window win,
                                       Ecore_X_Illume_Indicator_State state)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                  _ecore_x_e_indicator_atom_get(state),
@@ -1893,7 +1893,7 @@ ecore_x_e_illume_indicator_opacity_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_indicator_opacity_atom_get(mode);
    ecore_x_window_prop_atom_set(win,
                                 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
@@ -1905,7 +1905,7 @@ ecore_x_e_illume_indicator_opacity_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_atom_get(win,
                                      ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
                                      &atom, 1))
@@ -1918,7 +1918,7 @@ EAPI void
 ecore_x_e_illume_indicator_opacity_send(Ecore_X_Window win,
                                       Ecore_X_Illume_Indicator_Opacity_Mode mode)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win,
                                  ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -1967,7 +1967,7 @@ ecore_x_e_illume_indicator_type_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_indicator_type_atom_get(mode);
    ecore_x_window_prop_atom_set(win,
                                 ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE,
@@ -1979,7 +1979,7 @@ ecore_x_e_illume_indicator_type_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_atom_get(win,
                                      ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE,
                                      &atom, 1))
@@ -1992,7 +1992,7 @@ EAPI void
 ecore_x_e_illume_indicator_type_send(Ecore_X_Window win,
                                       Ecore_X_Illume_Indicator_Type_Mode mode)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win,
                                  ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -2035,7 +2035,7 @@ ecore_x_e_illume_window_state_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_e_illume_window_state_atom_get(state);
    ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
                                 &atom, 1);
@@ -2046,7 +2046,7 @@ ecore_x_e_illume_window_state_get(Ecore_X_Window win)
 {
    Ecore_X_Atom atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_atom_get(win,
                                      ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
                                      &atom, 1))
@@ -2059,7 +2059,7 @@ EAPI void
 ecore_x_e_illume_window_state_send(Ecore_X_Window win,
                                    Ecore_X_Illume_Window_State state)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win,
                                  ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -2073,7 +2073,7 @@ ecore_x_e_window_rotation_supported_set(Ecore_X_Window root,
 {
    Ecore_X_Window win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -2112,7 +2112,7 @@ ecore_x_e_window_rotation_supported_get(Ecore_X_Window root)
    Ecore_X_Window win, win2;
    int ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
 
@@ -2144,7 +2144,7 @@ ecore_x_e_window_rotation_app_set(Ecore_X_Window win,
 {
    unsigned int val = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (set) val = 1;
 
@@ -2158,7 +2158,7 @@ ecore_x_e_window_rotation_app_get(Ecore_X_Window win)
 {
    unsigned int val = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_card32_get(win,
                                        ECORE_X_ATOM_E_WINDOW_ROTATION_APP_SUPPORTED,
                                        &val, 1))
@@ -2173,7 +2173,7 @@ ecore_x_e_window_rotation_preferred_rotation_set(Ecore_X_Window win,
 {
    unsigned int val = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (rot != -1)
      {
@@ -2196,7 +2196,7 @@ ecore_x_e_window_rotation_preferred_rotation_get(Ecore_X_Window win,
    unsigned int val = 0;
    int ret = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_E_WINDOW_ROTATION_PREFERRED_ROTATION,
@@ -2214,7 +2214,7 @@ ecore_x_e_window_rotation_available_rotations_set(Ecore_X_Window win,
                                                   const int     *rots,
                                                   unsigned int   count)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if (!win) return;
 
@@ -2236,7 +2236,7 @@ ecore_x_e_window_rotation_available_rotations_get(Ecore_X_Window  win,
    int num, i;
    int *val = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    if ((!win) || (!rots) || (!count))
      return EINA_FALSE;
@@ -2276,7 +2276,7 @@ ecore_x_e_window_rotation_change_prepare_send(Ecore_X_Window win,
                                               int            w,
                                               int            h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send
      (win, ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_PREPARE,
      ECORE_X_EVENT_MASK_NONE,
@@ -2290,7 +2290,7 @@ ecore_x_e_window_rotation_change_prepare_done_send(Ecore_X_Window root,
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -2317,7 +2317,7 @@ EAPI void
 ecore_x_e_window_rotation_change_request_send(Ecore_X_Window win,
                                               int            rot)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send
      (win, ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST,
      ECORE_X_EVENT_MASK_NONE,
@@ -2333,7 +2333,7 @@ ecore_x_e_window_rotation_change_done_send(Ecore_X_Window root,
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -2367,7 +2367,7 @@ ecore_x_e_keyrouter_set(Ecore_X_Window win EINA_UNUSED,
    unsigned int val;
    Ecore_X_Window root;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -2386,7 +2386,7 @@ ecore_x_e_keyrouter_get(Ecore_X_Window win EINA_UNUSED)
    unsigned int val;
    Ecore_X_Window root;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
 
@@ -2404,7 +2404,7 @@ ecore_x_e_stack_type_set(Ecore_X_Window win,
                          Ecore_X_Stack_Type stack_type)
 {
    unsigned int val = stack_type;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -2420,7 +2420,7 @@ ecore_x_e_stack_type_get(Ecore_X_Window win)
 {
    int ret;
    unsigned int val;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, ECORE_X_STACK_NONE);
 
@@ -2436,7 +2436,7 @@ ecore_x_e_stack_position_set(Ecore_X_Window win,
                              Ecore_X_Stack_Position stack_position)
 {
    unsigned int val = stack_position;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -2452,7 +2452,7 @@ ecore_x_e_stack_position_get(Ecore_X_Window win)
 {
    int ret;
    unsigned int val;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, ECORE_X_STACK_POSITION_NONE);
 
diff --git a/src/lib/ecore_x/ecore_x_events.c b/src/lib/ecore_x/ecore_x_events.c
index 6431bdd283..637ff0c546 100644
--- a/src/lib/ecore_x/ecore_x_events.c
+++ b/src/lib/ecore_x/ecore_x_events.c
@@ -121,7 +121,7 @@ ecore_x_event_mask_set(Ecore_X_Window w,
    XWindowAttributes attr;
    XSetWindowAttributes s_attr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -143,7 +143,7 @@ ecore_x_event_mask_unset(Ecore_X_Window w,
    XWindowAttributes attr;
    XSetWindowAttributes s_attr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -1404,7 +1404,7 @@ _ecore_x_event_handle_selection_clear(XEvent *xevent)
    Ecore_X_Event_Selection_Clear *e;
    Ecore_X_Atom sel;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_last_event_mouse_move = EINA_FALSE;
    d = _ecore_x_selection_get(xevent->xselectionclear.selection);
    if (d && (xevent->xselectionclear.time <= d->time)) return;
@@ -1443,7 +1443,7 @@ _ecore_x_event_handle_selection_request(XEvent *xevent)
    int len;
    int typesize;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_last_event_mouse_move = EINA_FALSE;
    /*
     * Generate a selection request event.
@@ -1510,7 +1510,7 @@ _ecore_x_event_handle_selection_notify(XEvent *xevent)
    Ecore_X_Atom selection;
    int num_ret, format;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_last_event_mouse_move = EINA_FALSE;
    selection = xevent->xselection.selection;
 
@@ -1643,7 +1643,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         e = calloc(1, sizeof(Ecore_X_Event_Xdnd_Enter));
         if (!e) return;
 
-        LOGFN(__FILE__, __LINE__, __FUNCTION__);
+        LOGFN;
 
         target = _ecore_x_dnd_target_get();
         target->state = ECORE_X_DND_TARGET_ENTERED;
@@ -1665,7 +1665,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
              Ecore_X_Atom *types;
              int i, num_ret;
 
-             LOGFN(__FILE__, __LINE__, __FUNCTION__);
+             LOGFN;
              if (!(ecore_x_window_prop_property_get(target->source,
                                                     ECORE_X_ATOM_XDND_TYPE_LIST,
                                                     XA_ATOM,
@@ -1682,7 +1682,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
              e->types = calloc(num_ret, sizeof(char *));
              if (e->types)
                {
-                  LOGFN(__FILE__, __LINE__, __FUNCTION__);
+                  LOGFN;
                   for (i = 0; i < num_ret; i++)
                     e->types[i] = XGetAtomName(_ecore_x_disp, types[i]);
                }
@@ -1697,7 +1697,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
              e->types = calloc(3, sizeof(char *));
              if (e->types)
                {
-                  LOGFN(__FILE__, __LINE__, __FUNCTION__);
+                  LOGFN;
                   while ((i < 3) && (xevent->xclient.data.l[i + 2]))
                     {
                        e->types[i] = XGetAtomName(_ecore_x_disp,
@@ -1720,7 +1720,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         Ecore_X_Event_Xdnd_Position *e;
         Ecore_X_DND_Target *target;
 
-        LOGFN(__FILE__, __LINE__, __FUNCTION__);
+        LOGFN;
 
         target = _ecore_x_dnd_target_get();
         if ((target->source != (Ecore_X_Window)xevent->xclient.data.l[0]) ||
@@ -1750,7 +1750,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         Ecore_X_Event_Xdnd_Status *e;
         Ecore_X_DND_Source *source;
 
-        LOGFN(__FILE__, __LINE__, __FUNCTION__);
+        LOGFN;
 
         source = _ecore_x_dnd_source_get();
         /* Make sure source/target match */
@@ -1791,7 +1791,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         Ecore_X_Event_Xdnd_Leave *e;
         Ecore_X_DND_Target *target;
 
-        LOGFN(__FILE__, __LINE__, __FUNCTION__);
+        LOGFN;
 
         target = _ecore_x_dnd_target_get();
         if ((target->source != (Ecore_X_Window)xevent->xclient.data.l[0]) ||
@@ -1813,7 +1813,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         Ecore_X_Event_Xdnd_Drop *e;
         Ecore_X_DND_Target *target;
 
-        LOGFN(__FILE__, __LINE__, __FUNCTION__);
+        LOGFN;
 
         target = _ecore_x_dnd_target_get();
         /* Match source/target */
@@ -1841,7 +1841,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         Ecore_X_DND_Source *source;
         Eina_Bool completed = EINA_TRUE;
 
-        LOGFN(__FILE__, __LINE__, __FUNCTION__);
+        LOGFN;
 
         source = _ecore_x_dnd_source_get();
         /* Match source/target */
@@ -1851,7 +1851,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
 
         if ((source->version < 5) || (xevent->xclient.data.l[1] & 0x1UL))
           {
-             LOGFN(__FILE__, __LINE__, __FUNCTION__);
+             LOGFN;
              /* Target successfully performed drop action */
              ecore_x_selection_xdnd_clear();
              source->state = ECORE_X_DND_SOURCE_IDLE;
@@ -1904,12 +1904,12 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
              return;
           }
 
-        LOGFN(__FILE__, __LINE__, __FUNCTION__);
+        LOGFN;
         e->state[0] = _ecore_x_netwm_state_get(xevent->xclient.data.l[1]);
         if (e->state[0] == ECORE_X_WINDOW_STATE_UNKNOWN)
           {
 //	     char *name;
-             LOGFN(__FILE__, __LINE__, __FUNCTION__);
+             LOGFN;
 
 //	     name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[1]);
 //	     if (name) ERR("Unknown state: %s", name);
@@ -1919,7 +1919,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         if (e->state[1] == ECORE_X_WINDOW_STATE_UNKNOWN)
           {
 //	     char *name;
-             LOGFN(__FILE__, __LINE__, __FUNCTION__);
+             LOGFN;
 
 //	     name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[2]);
 //	     if (name) ERR("Unknown state: %s", name);
@@ -1994,7 +1994,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
         ecore_event_add(ECORE_X_EVENT_PING, e, NULL, NULL);
         if (ScreenCount(_ecore_x_disp) > 1)
           {
-             LOGFN(__FILE__, __LINE__, __FUNCTION__);
+             LOGFN;
              root = ecore_x_window_root_get(e->win);
           }
         else
@@ -2309,7 +2309,7 @@ _ecore_x_event_handle_randr_notify(XEvent *xevent)
 
    _ecore_x_last_event_mouse_move = EINA_FALSE;
    randr_event = (const XRRNotifyEvent *)xevent;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    switch (randr_event->subtype)
      {
       case RRNotify_CrtcChange:
@@ -2426,7 +2426,7 @@ _ecore_x_event_handle_generic_event(XEvent *event)
    Ecore_X_Event_Generic *e;
    XGenericEventCookie *data;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    generic_event = (XGenericEvent *)event;
 
 #ifdef ECORE_XPRESENT
diff --git a/src/lib/ecore_x/ecore_x_fixes.c b/src/lib/ecore_x/ecore_x_fixes.c
index 4b659c2d8b..1c92d574f3 100644
--- a/src/lib/ecore_x/ecore_x_fixes.c
+++ b/src/lib/ecore_x/ecore_x_fixes.c
@@ -22,7 +22,7 @@ _ecore_x_fixes_init(void)
    _fixes_major = 3;
    _fixes_minor = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 
@@ -142,7 +142,7 @@ ecore_x_region_new(Ecore_X_Rectangle *rects,
    Ecore_X_Region region;
    XRectangle *xrect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xrect = _ecore_x_rectangle_ecore_to_x(rects, num);
    region = XFixesCreateRegion(_ecore_x_disp, xrect, num);
    free(xrect);
@@ -159,7 +159,7 @@ ecore_x_region_new_from_bitmap(Ecore_X_Pixmap bitmap)
 #ifdef ECORE_XFIXES
    Ecore_X_Region region;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    region = XFixesCreateRegionFromBitmap(_ecore_x_disp, bitmap);
    if (_ecore_xlib_sync) ecore_x_sync();
    return region;
@@ -176,7 +176,7 @@ ecore_x_region_new_from_window(Ecore_X_Window win,
 #ifdef ECORE_XFIXES
    Ecore_X_Region region;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    region = XFixesCreateRegionFromWindow(_ecore_x_disp, win, type);
    if (_ecore_xlib_sync) ecore_x_sync();
    return region;
@@ -192,7 +192,7 @@ ecore_x_region_new_from_gc(Ecore_X_GC gc)
 #ifdef ECORE_XFIXES
    Ecore_X_Region region;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    region = XFixesCreateRegionFromGC(_ecore_x_disp, gc);
    if (_ecore_xlib_sync) ecore_x_sync();
    return region;
@@ -208,7 +208,7 @@ ecore_x_region_new_from_picture(Ecore_X_Picture picture)
 #ifdef ECORE_XFIXES
    Ecore_X_Region region;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    region = XFixesCreateRegionFromPicture(_ecore_x_disp, picture);
    if (_ecore_xlib_sync) ecore_x_sync();
    return region;
@@ -222,7 +222,7 @@ ecore_x_region_free(Ecore_X_Region region)
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesDestroyRegion(_ecore_x_disp, region);
 #endif /* ifdef ECORE_XFIXES */
 }
@@ -235,7 +235,7 @@ ecore_x_region_set(Ecore_X_Region region,
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
    XRectangle *xrect = _ecore_x_rectangle_ecore_to_x(rects, num);
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesSetRegion(_ecore_x_disp, region, xrect, num);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -247,7 +247,7 @@ ecore_x_region_copy(Ecore_X_Region dest,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesCopyRegion(_ecore_x_disp, dest, source);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -260,7 +260,7 @@ ecore_x_region_combine(Ecore_X_Region dest,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesUnionRegion(_ecore_x_disp, dest, source1, source2);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -273,7 +273,7 @@ ecore_x_region_intersect(Ecore_X_Region dest,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesIntersectRegion(_ecore_x_disp, dest, source1, source2);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -286,7 +286,7 @@ ecore_x_region_subtract(Ecore_X_Region dest,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesSubtractRegion(_ecore_x_disp, dest, source1, source2);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -302,7 +302,7 @@ ecore_x_region_invert(Ecore_X_Region dest,
    XRectangle *xbound;
    int num = 1;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xbound = _ecore_x_rectangle_ecore_to_x(bounds, num);
 
    XFixesInvertRegion(_ecore_x_disp, dest, xbound, source);
@@ -318,7 +318,7 @@ ecore_x_region_translate(Ecore_X_Region region,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesTranslateRegion(_ecore_x_disp, region, dx, dy);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -330,7 +330,7 @@ ecore_x_region_extents(Ecore_X_Region dest,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesRegionExtents(_ecore_x_disp, dest, source);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -346,7 +346,7 @@ ecore_x_region_fetch(Ecore_X_Region region,
    Ecore_X_Rectangle *rects;
    XRectangle *xrect, xbound;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xrect = XFixesFetchRegionAndBounds(_ecore_x_disp, region, num, &xbound);
    if (_ecore_xlib_sync) ecore_x_sync();
    rects = _ecore_x_rectangle_x_to_ecore(xrect, *num);
@@ -371,7 +371,7 @@ ecore_x_region_expand(Ecore_X_Region dest,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesExpandRegion(_ecore_x_disp, dest, source, left, right, top, bottom);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -385,7 +385,7 @@ ecore_x_region_gc_clip_set(Ecore_X_Region region,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesSetGCClipRegion(_ecore_x_disp, gc, x_origin, y_origin, region);
    if (_ecore_xlib_sync) ecore_x_sync();
 #endif /* ifdef ECORE_XFIXES */
@@ -400,7 +400,7 @@ ecore_x_region_window_shape_set(Ecore_X_Region region,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesSetWindowShapeRegion(_ecore_x_disp,
                               win,
                               type,
@@ -419,7 +419,7 @@ ecore_x_region_picture_clip_set(Ecore_X_Region region,
 {
    EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
 #ifdef ECORE_XFIXES
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFixesSetPictureClipRegion(_ecore_x_disp,
                               picture,
                               x_origin,
diff --git a/src/lib/ecore_x/ecore_x_gc.c b/src/lib/ecore_x/ecore_x_gc.c
index 6b8168bb3b..2461889db8 100644
--- a/src/lib/ecore_x/ecore_x_gc.c
+++ b/src/lib/ecore_x/ecore_x_gc.c
@@ -29,7 +29,7 @@ ecore_x_gc_new(Ecore_X_Drawable draw,
    int idx;
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!draw)
      draw = DefaultRootWindow(_ecore_x_disp);
 
@@ -168,7 +168,7 @@ ecore_x_gc_new(Ecore_X_Drawable draw,
 EAPI void
 ecore_x_gc_free(Ecore_X_GC gc)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XFreeGC(_ecore_x_disp, gc);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
diff --git a/src/lib/ecore_x/ecore_x_icccm.c b/src/lib/ecore_x/ecore_x_icccm.c
index 4bf81da5ac..3a12409876 100644
--- a/src/lib/ecore_x/ecore_x_icccm.c
+++ b/src/lib/ecore_x/ecore_x_icccm.c
@@ -20,7 +20,7 @@
 EAPI void
 ecore_x_icccm_init(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 }
 
 EAPI void
@@ -29,7 +29,7 @@ ecore_x_icccm_state_set(Ecore_X_Window win,
 {
    unsigned long c[2];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (state == ECORE_X_WINDOW_STATE_HINT_WITHDRAWN)
      c[0] = WithdrawnState;
    else if (state == ECORE_X_WINDOW_STATE_HINT_NORMAL)
@@ -53,7 +53,7 @@ ecore_x_icccm_state_get(Ecore_X_Window win)
    int format_ret;
    Ecore_X_Window_State_Hint hint;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    hint = ECORE_X_WINDOW_STATE_HINT_NONE;
    XGetWindowProperty(_ecore_x_disp, win, ECORE_X_ATOM_WM_STATE,
                       0, 0x7fffffff, False, ECORE_X_ATOM_WM_STATE,
@@ -80,7 +80,7 @@ EAPI void
 ecore_x_icccm_delete_window_send(Ecore_X_Window win,
                                  Ecore_X_Time t)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS,
                                  ECORE_X_EVENT_MASK_NONE,
                                  ECORE_X_ATOM_WM_DELETE_WINDOW,
@@ -91,7 +91,7 @@ EAPI void
 ecore_x_icccm_take_focus_send(Ecore_X_Window win,
                               Ecore_X_Time t)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS,
                                  ECORE_X_EVENT_MASK_NONE,
                                  ECORE_X_ATOM_WM_TAKE_FOCUS,
@@ -102,7 +102,7 @@ EAPI void
 ecore_x_icccm_save_yourself_send(Ecore_X_Window win,
                                  Ecore_X_Time t)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS,
                                  ECORE_X_EVENT_MASK_NONE,
                                  ECORE_X_ATOM_WM_SAVE_YOURSELF,
@@ -118,7 +118,7 @@ ecore_x_icccm_move_resize_send(Ecore_X_Window win,
 {
    XEvent ev;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ev.type = ConfigureNotify;
    ev.xconfigure.display = _ecore_x_disp;
    ev.xconfigure.event = win;
@@ -150,7 +150,7 @@ ecore_x_icccm_hints_set(Ecore_X_Window win,
    if (!hints)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    hints->flags = InputHint | StateHint;
    hints->input = accepts_focus;
    if (initial_state == ECORE_X_WINDOW_STATE_HINT_WITHDRAWN)
@@ -204,7 +204,7 @@ ecore_x_icccm_hints_get(Ecore_X_Window win,
 {
    XWMHints *hints;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (accepts_focus)
      *accepts_focus = EINA_TRUE;
 
@@ -288,7 +288,7 @@ ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win,
    XSizeHints hint;
    long mask;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask))
      memset(&hint, 0, sizeof(XSizeHints));
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -368,7 +368,7 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win,
    int stepx = -1, stepy = -1;
    double mina = 0.0, maxa = 0.0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask))
      {
         if (_ecore_xlib_sync) ecore_x_sync();
@@ -483,7 +483,7 @@ ecore_x_icccm_title_set(Ecore_X_Window win,
    if (!t)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xprop.value = NULL;
 #ifdef X_HAVE_UTF8_STRING
    list[0] = strdup(t);
@@ -520,7 +520,7 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
 {
    XTextProperty xprop;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xprop.value = NULL;
    if (XGetWMName(_ecore_x_disp, win, &xprop) >= Success)
      {
@@ -585,7 +585,7 @@ ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win,
    int i;
    
    for (i = 0; i < num; i++) protos2[i] = protos[i];
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (num > 0)
      XSetWMProtocols(_ecore_x_disp, win, protos2, num);
    else
@@ -614,7 +614,7 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win,
    if (protocol >= ECORE_X_WM_PROTOCOL_NUM)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    proto = _ecore_x_atoms_wm_protocols[protocol];
 
    if (!XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count))
@@ -699,7 +699,7 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win,
    if (protocol >= ECORE_X_WM_PROTOCOL_NUM)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    proto = _ecore_x_atoms_wm_protocols[protocol];
 
    if (!XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count))
@@ -738,7 +738,7 @@ ecore_x_icccm_name_class_set(Ecore_X_Window win,
    if (!xch)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xch->res_name = (char *)n;
    xch->res_class = (char *)c;
    XSetClassHint(_ecore_x_disp, win, xch);
@@ -761,7 +761,7 @@ ecore_x_icccm_name_class_get(Ecore_X_Window win,
 {
    XClassHint xch;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (n)
      *n = NULL;
 
@@ -798,7 +798,7 @@ ecore_x_icccm_client_machine_get(Ecore_X_Window win)
 {
    char *name;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    name = ecore_x_window_prop_string_get(win, ECORE_X_ATOM_WM_CLIENT_MACHINE);
    return name;
 }
@@ -815,7 +815,7 @@ ecore_x_icccm_command_set(Ecore_X_Window win,
                           int argc,
                           char **argv)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSetCommand(_ecore_x_disp, win, argv, argc);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -844,7 +844,7 @@ ecore_x_icccm_command_get(Ecore_X_Window win,
    if (argv)
      *argv = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    success = XGetCommand(_ecore_x_disp, win, &v, &c);
    if (_ecore_xlib_sync) ecore_x_sync();
    if (!success) return;
@@ -899,7 +899,7 @@ ecore_x_icccm_icon_name_set(Ecore_X_Window win,
    XTextProperty xprop;
    int ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xprop.value = NULL;
 #ifdef X_HAVE_UTF8_STRING
    list[0] = strdup(t);
@@ -941,7 +941,7 @@ ecore_x_icccm_icon_name_get(Ecore_X_Window win)
 {
    XTextProperty xprop;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xprop.value = NULL;
    if (XGetWMIconName(_ecore_x_disp, win, &xprop) >= Success)
      {
@@ -1009,7 +1009,7 @@ ecore_x_icccm_colormap_window_set(Ecore_X_Window win,
    Window *oldset = NULL;
    Window *newset = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_property_get(win,
                                          ECORE_X_ATOM_WM_COLORMAP_WINDOWS,
                                          XA_WINDOW, 32, &old_data, &num))
@@ -1073,7 +1073,7 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win,
    Window *oldset = NULL;
    Window *newset = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_prop_property_get(win,
                                          ECORE_X_ATOM_WM_COLORMAP_WINDOWS,
                                          XA_WINDOW, 32, &old_data, &num))
@@ -1134,7 +1134,7 @@ EAPI void
 ecore_x_icccm_transient_for_set(Ecore_X_Window win,
                                 Ecore_X_Window forwin)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSetTransientForHint(_ecore_x_disp, win, forwin);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -1146,7 +1146,7 @@ ecore_x_icccm_transient_for_set(Ecore_X_Window win,
 EAPI void
 ecore_x_icccm_transient_for_unset(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XDeleteProperty(_ecore_x_disp, win, ECORE_X_ATOM_WM_TRANSIENT_FOR);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -1162,7 +1162,7 @@ ecore_x_icccm_transient_for_get(Ecore_X_Window win)
    Window forwin;
    Eina_Bool success;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    success = XGetTransientForHint(_ecore_x_disp, win, &forwin);
    if (_ecore_xlib_sync) ecore_x_sync();
    if (success)
@@ -1180,7 +1180,7 @@ EAPI void
 ecore_x_icccm_window_role_set(Ecore_X_Window win,
                               const char *role)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_string_set(win, ECORE_X_ATOM_WM_WINDOW_ROLE,
                                   (char *)role);
 }
@@ -1193,7 +1193,7 @@ ecore_x_icccm_window_role_set(Ecore_X_Window win,
 EAPI char *
 ecore_x_icccm_window_role_get(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return ecore_x_window_prop_string_get(win, ECORE_X_ATOM_WM_WINDOW_ROLE);
 }
 
@@ -1209,7 +1209,7 @@ EAPI void
 ecore_x_icccm_client_leader_set(Ecore_X_Window win,
                                 Ecore_X_Window l)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(win, ECORE_X_ATOM_WM_CLIENT_LEADER,
                                   &l, 1);
 }
@@ -1223,7 +1223,7 @@ ecore_x_icccm_client_leader_get(Ecore_X_Window win)
 {
    Ecore_X_Window l;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (ecore_x_window_prop_window_get(win, ECORE_X_ATOM_WM_CLIENT_LEADER,
                                       &l, 1) > 0)
      return l;
@@ -1240,7 +1240,7 @@ ecore_x_icccm_iconic_request_send(Ecore_X_Window win,
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!root)
      root = DefaultRootWindow(_ecore_x_disp);
 
diff --git a/src/lib/ecore_x/ecore_x_image.c b/src/lib/ecore_x/ecore_x_image.c
index 3b7030863f..a2f0c27c60 100644
--- a/src/lib/ecore_x/ecore_x_image.c
+++ b/src/lib/ecore_x/ecore_x_image.c
@@ -189,7 +189,7 @@ ecore_x_image_new(int w,
    if (!im)
      return NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    im->w = w;
    im->h = h;
    im->vis = vis;
@@ -206,7 +206,7 @@ ecore_x_image_new(int w,
 EAPI void
 ecore_x_image_free(Ecore_X_Image *im)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (im->shm)
      {
         if (im->xim)
@@ -306,7 +306,7 @@ ecore_x_image_get(Ecore_X_Image *im,
    Eina_Bool ret = EINA_TRUE;
    XErrorHandler ph;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (im->shm)
      {
         if (!im->xim) _ecore_x_image_shm_create(im);
@@ -400,7 +400,7 @@ ecore_x_image_put(Ecore_X_Image *im,
 {
    Ecore_X_GC tgc = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!gc)
      {
         XGCValues gcv;
@@ -434,7 +434,7 @@ ecore_x_image_data_get(Ecore_X_Image *im,
                        int *rows,
                        int *bpp)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!im->xim)
      {
         if (im->shm) _ecore_x_image_shm_create(im);
diff --git a/src/lib/ecore_x/ecore_x_mwm.c b/src/lib/ecore_x/ecore_x_mwm.c
index c2d298bc81..eac01f6edb 100644
--- a/src/lib/ecore_x/ecore_x_mwm.c
+++ b/src/lib/ecore_x/ecore_x_mwm.c
@@ -42,7 +42,7 @@ ecore_x_mwm_hints_get(Ecore_X_Window win,
    int num;
    Eina_Bool ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = EINA_FALSE;
    if (!ecore_x_window_prop_property_get(win,
                                          ECORE_X_ATOM_MOTIF_WM_HINTS,
@@ -100,7 +100,7 @@ ecore_x_mwm_borderless_set(Ecore_X_Window win,
    data[0] = 2; /* just set the decorations hint! */
    data[2] = !borderless;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_property_set(win,
                                     ECORE_X_ATOM_MOTIF_WM_HINTS,
                                     ECORE_X_ATOM_MOTIF_WM_HINTS,
diff --git a/src/lib/ecore_x/ecore_x_netwm.c b/src/lib/ecore_x/ecore_x_netwm.c
index 182021aad1..b939017039 100644
--- a/src/lib/ecore_x/ecore_x_netwm.c
+++ b/src/lib/ecore_x/ecore_x_netwm.c
@@ -74,7 +74,7 @@ static Eina_Hash *startup_info = NULL;
 EAPI void
 ecore_x_netwm_init(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    startup_info = eina_hash_string_superfast_new(
        _ecore_x_netwm_startup_info_free);
 }
@@ -82,7 +82,7 @@ ecore_x_netwm_init(void)
 EAPI void
 ecore_x_netwm_shutdown(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (startup_info)
      eina_hash_free(startup_info);
 
@@ -97,7 +97,7 @@ ecore_x_netwm_wm_identify(Ecore_X_Window root,
                           Ecore_X_Window check,
                           const char *wm_name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(check,
                                   ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK,
                                   &check,
@@ -123,7 +123,7 @@ ecore_x_netwm_supported_set(Ecore_X_Window root,
                             Ecore_X_Atom *supported,
                             int num)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_atom_set(root,
                                 ECORE_X_ATOM_NET_SUPPORTED,
                                 supported,
@@ -142,7 +142,7 @@ ecore_x_netwm_supported_get(Ecore_X_Window root,
    if (num)
      *num = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    num_ret = ecore_x_window_prop_atom_list_get(root, ECORE_X_ATOM_NET_SUPPORTED,
                                                supported);
    if (num_ret <= 0)
@@ -161,7 +161,7 @@ EAPI void
 ecore_x_netwm_desk_count_set(Ecore_X_Window root,
                              unsigned int n_desks)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS,
                                   &n_desks, 1);
 }
@@ -171,7 +171,7 @@ ecore_x_netwm_desk_roots_set(Ecore_X_Window root,
                              Ecore_X_Window *vroots,
                              unsigned int n_desks)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(root,
                                   ECORE_X_ATOM_NET_VIRTUAL_ROOTS,
                                   vroots,
@@ -188,7 +188,7 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root,
    unsigned int i;
    int l, len;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    buf = NULL;
    len = 0;
 
@@ -225,7 +225,7 @@ ecore_x_netwm_desk_size_set(Ecore_X_Window root,
 {
    unsigned int size[2];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    size[0] = width;
    size[1] = height;
    ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_GEOMETRY, size,
@@ -237,7 +237,7 @@ ecore_x_netwm_desk_viewports_set(Ecore_X_Window root,
                                  unsigned int *origins,
                                  unsigned int n_desks)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_VIEWPORT,
                                   origins, 2 * n_desks);
 }
@@ -251,7 +251,7 @@ ecore_x_netwm_desk_layout_set(Ecore_X_Window root,
 {
    unsigned int layout[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    layout[0] = orientation;
    layout[1] = columns;
    layout[2] = rows;
@@ -265,7 +265,7 @@ ecore_x_netwm_desk_workareas_set(Ecore_X_Window root,
                                  unsigned int *areas,
                                  unsigned int n_desks)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_WORKAREA, areas,
                                   4 * n_desks);
 }
@@ -293,7 +293,7 @@ EAPI void
 ecore_x_netwm_desk_current_set(Ecore_X_Window root,
                                unsigned int desk)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_CURRENT_DESKTOP, &desk,
                                   1);
 }
@@ -304,7 +304,7 @@ ecore_x_netwm_showing_desktop_set(Ecore_X_Window root,
 {
    unsigned int val;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    val = (on) ? 1 : 0;
    ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_SHOWING_DESKTOP, &val,
                                   1);
@@ -320,7 +320,7 @@ ecore_x_netwm_client_list_set(Ecore_X_Window root,
                               Ecore_X_Window *p_clients,
                               unsigned int n_clients)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST,
                                   p_clients, n_clients);
 }
@@ -331,7 +331,7 @@ ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root,
                                        Ecore_X_Window *p_clients,
                                        unsigned int n_clients)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST_STACKING,
                                   p_clients, n_clients);
 }
@@ -340,7 +340,7 @@ EAPI void
 ecore_x_netwm_client_active_set(Ecore_X_Window root,
                                 Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_ACTIVE_WINDOW,
                                   &win, 1);
 }
@@ -353,7 +353,7 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root,
 {
    XEvent xev = { 0 };
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!root)
      root = DefaultRootWindow(_ecore_x_disp);
 
@@ -377,7 +377,7 @@ EAPI void
 ecore_x_netwm_name_set(Ecore_X_Window win,
                        const char *name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_NAME, name);
 }
 
@@ -385,7 +385,7 @@ EAPI int
 ecore_x_netwm_name_get(Ecore_X_Window win,
                        char **name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (name)
      *name = _ecore_x_window_prop_string_utf8_get(win,
                                                   ECORE_X_ATOM_NET_WM_NAME);
@@ -397,7 +397,7 @@ EAPI void
 ecore_x_netwm_startup_id_set(Ecore_X_Window win,
                              const char *id)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_STARTUP_ID, id);
 }
 
@@ -405,7 +405,7 @@ EAPI int
 ecore_x_netwm_startup_id_get(Ecore_X_Window win,
                              char **id)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (id)
      *id = _ecore_x_window_prop_string_utf8_get(win,
                                                 ECORE_X_ATOM_NET_STARTUP_ID);
@@ -417,7 +417,7 @@ EAPI void
 ecore_x_netwm_visible_name_set(Ecore_X_Window win,
                                const char *name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_VISIBLE_NAME,
                                         name);
 }
@@ -426,7 +426,7 @@ EAPI int
 ecore_x_netwm_visible_name_get(Ecore_X_Window win,
                                char **name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (name)
      *name = _ecore_x_window_prop_string_utf8_get(
          win,
@@ -439,7 +439,7 @@ EAPI void
 ecore_x_netwm_icon_name_set(Ecore_X_Window win,
                             const char *name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_ICON_NAME,
                                         name);
 }
@@ -448,7 +448,7 @@ EAPI int
 ecore_x_netwm_icon_name_get(Ecore_X_Window win,
                             char **name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (name)
      *name = _ecore_x_window_prop_string_utf8_get(
          win,
@@ -461,7 +461,7 @@ EAPI void
 ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win,
                                     const char *name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_window_prop_string_utf8_set(win,
                                         ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME,
                                         name);
@@ -471,7 +471,7 @@ EAPI int
 ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win,
                                     char **name)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (name)
      *name = _ecore_x_window_prop_string_utf8_get(
          win,
@@ -484,7 +484,7 @@ EAPI void
 ecore_x_netwm_desktop_set(Ecore_X_Window win,
                           unsigned int desk)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_DESKTOP, &desk, 1);
 }
 
@@ -495,7 +495,7 @@ ecore_x_netwm_desktop_get(Ecore_X_Window win,
    int ret;
    unsigned int tmp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_DESKTOP,
                                         &tmp, 1);
 
@@ -517,7 +517,7 @@ ecore_x_netwm_strut_set(Ecore_X_Window win,
 {
    unsigned int strut[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    strut[0] = left;
    strut[1] = right;
    strut[2] = top;
@@ -538,7 +538,7 @@ ecore_x_netwm_strut_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int strut[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_NET_WM_STRUT,
                                         strut,
@@ -578,7 +578,7 @@ ecore_x_netwm_strut_partial_set(Ecore_X_Window win,
 {
    unsigned int strut[12];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    strut[0] = left;
    strut[1] = right;
    strut[2] = top;
@@ -615,7 +615,7 @@ ecore_x_netwm_strut_partial_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int strut[12];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_NET_WM_STRUT_PARTIAL,
                                         strut,
@@ -670,7 +670,7 @@ ecore_x_netwm_icons_set(Ecore_X_Window win,
    unsigned int *data, *p, *p2;
    unsigned int i, size, x, y;
    
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    size = 0;
    for (i = 0; i < (unsigned int)num; i++)
      {
@@ -723,7 +723,7 @@ ecore_x_netwm_icons_get(Ecore_X_Window win,
    unsigned int len, icons, i;
    int num_ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (num)
      *num = 0;
 
@@ -831,7 +831,7 @@ ecore_x_netwm_icon_geometry_set(Ecore_X_Window win,
 {
    unsigned int geometry[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    geometry[0] = x;
    geometry[1] = y;
    geometry[2] = width;
@@ -852,7 +852,7 @@ ecore_x_netwm_icon_geometry_get(Ecore_X_Window win,
    int ret;
    unsigned int geometry[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_NET_WM_ICON_GEOMETRY,
                                         geometry,
@@ -881,7 +881,7 @@ ecore_x_netwm_pid_set(Ecore_X_Window win,
 {
    unsigned int tmp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    tmp = pid;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_PID,
                                   &tmp, 1);
@@ -894,7 +894,7 @@ ecore_x_netwm_pid_get(Ecore_X_Window win,
    int ret;
    unsigned int tmp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_PID,
                                         &tmp, 1);
    if (pid)
@@ -906,7 +906,7 @@ ecore_x_netwm_pid_get(Ecore_X_Window win,
 EAPI void
 ecore_x_netwm_handled_icons_set(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_HANDLED_ICONS,
                                   NULL, 0);
 }
@@ -915,7 +915,7 @@ EAPI Eina_Bool
 ecore_x_netwm_handled_icons_get(Ecore_X_Window win)
 {
    int ret = 0;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_HANDLED_ICONS,
                                         NULL, 0);
    return ret == 0 ? EINA_TRUE : EINA_FALSE;
@@ -925,7 +925,7 @@ EAPI void
 ecore_x_netwm_user_time_set(Ecore_X_Window win,
                             unsigned int tim)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_USER_TIME,
                                   &tim, 1);
 }
@@ -937,7 +937,7 @@ ecore_x_netwm_user_time_get(Ecore_X_Window win,
    int ret;
    unsigned int tmp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_USER_TIME,
                                         &tmp, 1);
    if (tim)
@@ -1031,7 +1031,7 @@ ecore_x_netwm_window_state_set(Ecore_X_Window win,
    Ecore_X_Atom *set;
    unsigned int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!num)
      {
         ecore_x_window_prop_property_del(win, ECORE_X_ATOM_NET_WM_STATE);
@@ -1058,7 +1058,7 @@ ecore_x_netwm_window_state_get(Ecore_X_Window win,
    int num_ret, i;
    Ecore_X_Atom *atoms;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (num)
      *num = 0;
 
@@ -1182,7 +1182,7 @@ ecore_x_netwm_window_type_set(Ecore_X_Window win,
 {
    Ecore_X_Atom atom;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    atom = _ecore_x_netwm_window_type_atom_get(type);
    ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_NET_WM_WINDOW_TYPE,
                                 &atom, 1);
@@ -1196,7 +1196,7 @@ ecore_x_netwm_window_type_get(Ecore_X_Window win,
    int num;
    Ecore_X_Atom *atoms = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (type)
      *type = ECORE_X_WINDOW_TYPE_NORMAL;
 
@@ -1221,7 +1221,7 @@ ecore_x_netwm_window_types_get(Ecore_X_Window win,
    Ecore_X_Atom *atoms = NULL;
    Ecore_X_Window_Type *atoms2 = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (types)
      *types = NULL;
 
@@ -1309,7 +1309,7 @@ ecore_x_netwm_allowed_action_isset(Ecore_X_Window win,
    Ecore_X_Atom *atoms, atom;
    Eina_Bool ret = EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    num = ecore_x_window_prop_atom_list_get(win, ECORE_X_ATOM_NET_WM_WINDOW_TYPE,
                                            &atoms);
    if (num <= 0)
@@ -1339,7 +1339,7 @@ ecore_x_netwm_allowed_action_set(Ecore_X_Window win,
    Ecore_X_Atom *set;
    unsigned int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!num)
      {
         ecore_x_window_prop_property_del(win,
@@ -1370,7 +1370,7 @@ ecore_x_netwm_allowed_action_get(Ecore_X_Window win,
    int num_ret, i;
    Ecore_X_Atom *atoms;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (num)
      *num = 0;
 
@@ -1403,7 +1403,7 @@ EAPI void
 ecore_x_netwm_opacity_set(Ecore_X_Window win,
                           unsigned int opacity)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_WINDOW_OPACITY,
                                   &opacity, 1);
 }
@@ -1415,7 +1415,7 @@ ecore_x_netwm_opacity_get(Ecore_X_Window win,
    int ret;
    unsigned int tmp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_WINDOW_OPACITY,
                                         &tmp, 1);
    if (opacity)
@@ -1433,7 +1433,7 @@ ecore_x_netwm_frame_size_set(Ecore_X_Window win,
 {
    unsigned int frames[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    frames[0] = fl;
    frames[1] = fr;
    frames[2] = ft;
@@ -1454,7 +1454,7 @@ ecore_x_netwm_frame_size_get(Ecore_X_Window win,
    int ret = 0;
    unsigned int frames[4];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(win,
                                         ECORE_X_ATOM_NET_FRAME_EXTENTS,
                                         frames,
@@ -1484,7 +1484,7 @@ ecore_x_netwm_sync_counter_get(Ecore_X_Window win,
    int ret;
    unsigned int tmp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_card32_get(
        win,
        ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER,
@@ -1505,7 +1505,7 @@ ecore_x_netwm_ping_send(Ecore_X_Window win)
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xev.xclient.type = ClientMessage;
    xev.xclient.display = _ecore_x_disp;
    xev.xclient.window = win;
@@ -1531,7 +1531,7 @@ ecore_x_netwm_sync_request_send(Ecore_X_Window win,
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncIntToValue(&value, (int)serial);
 
    xev.xclient.type = ClientMessage;
@@ -1561,7 +1561,7 @@ ecore_x_netwm_state_request_send(Ecore_X_Window win,
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!root)
      root = DefaultRootWindow(_ecore_x_disp);
 
@@ -1595,7 +1595,7 @@ ecore_x_netwm_desktop_request_send(Ecore_X_Window win,
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!root)
      root = DefaultRootWindow(_ecore_x_disp);
 
@@ -1625,7 +1625,7 @@ ecore_x_netwm_moveresize_request_send(Ecore_X_Window win,
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xev.xclient.window = win;
    xev.xclient.type = ClientMessage;
    xev.xclient.message_type = ECORE_X_ATOM_NET_WM_MOVERESIZE;
@@ -2061,7 +2061,7 @@ ecore_x_screen_is_composited(int screen)
    Ecore_X_Atom atom;
    char buf[32];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    snprintf(buf, sizeof(buf), "_NET_WM_CM_S%i", screen);
    atom = XInternAtom(_ecore_x_disp, buf, True);
    if (atom == None) return EINA_FALSE;
@@ -2077,7 +2077,7 @@ ecore_x_screen_is_composited_set(int screen,
    Ecore_X_Atom atom;
    char buf[32];
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    snprintf(buf, sizeof(buf), "_NET_WM_CM_S%i", screen);
    atom = XInternAtom(_ecore_x_disp, buf, False);
    if (atom == None) return;
diff --git a/src/lib/ecore_x/ecore_x_pixmap.c b/src/lib/ecore_x/ecore_x_pixmap.c
index 30903c1cf4..bd1a9f3351 100644
--- a/src/lib/ecore_x/ecore_x_pixmap.c
+++ b/src/lib/ecore_x/ecore_x_pixmap.c
@@ -32,7 +32,7 @@ ecore_x_pixmap_new(Ecore_X_Window win,
                    int dep)
 {
    Ecore_X_Pixmap pm;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -56,7 +56,7 @@ ecore_x_pixmap_new(Ecore_X_Window win,
 EAPI void
 ecore_x_pixmap_free(Ecore_X_Pixmap pmap)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!pmap) return;
    XFreePixmap(_ecore_x_disp, pmap);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -87,7 +87,7 @@ ecore_x_pixmap_paste(Ecore_X_Pixmap pmap,
                      int dx,
                      int dy)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XCopyArea(_ecore_x_disp, pmap, dest, gc, sx, sy, w, h, dx, dy);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -108,7 +108,7 @@ ecore_x_pixmap_geometry_get(Ecore_X_Pixmap pmap,
                             int *w,
                             int *h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!pmap) return;
    ecore_x_drawable_geometry_get(pmap, x, y, w, h);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -124,7 +124,7 @@ EAPI int
 ecore_x_pixmap_depth_get(Ecore_X_Pixmap pmap)
 {
    int ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_drawable_depth_get(pmap);
    if (_ecore_xlib_sync) ecore_x_sync();
    return ret;
diff --git a/src/lib/ecore_x/ecore_x_present.c b/src/lib/ecore_x/ecore_x_present.c
index eb190b7560..4ac5fe58b2 100644
--- a/src/lib/ecore_x/ecore_x_present.c
+++ b/src/lib/ecore_x/ecore_x_present.c
@@ -17,7 +17,7 @@ _ecore_x_present_init(void)
    ECORE_X_EVENT_PRESENT_COMPLETE = ecore_event_type_new();
    ECORE_X_EVENT_PRESENT_IDLE = ecore_event_type_new();
 #ifdef ECORE_XPRESENT
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_present_exists = XPresentQueryExtension(_ecore_x_disp, &_ecore_x_present_major, NULL, NULL);
 #endif
 }
diff --git a/src/lib/ecore_x/ecore_x_private.h b/src/lib/ecore_x/ecore_x_private.h
index 5a288d4a25..d0d6a9c168 100644
--- a/src/lib/ecore_x/ecore_x_private.h
+++ b/src/lib/ecore_x/ecore_x_private.h
@@ -388,9 +388,9 @@ int _ecore_x_shutdown(void);
 
 #ifdef LOGFNS
 #include <stdio.h>
-#define LOGFN(fl, ln, fn) printf("-ECORE-X: %25s: %5i - %s\n", fl, ln, fn);
+#define LOGFN printf("-ECORE-X: %25s: %5i - %s\n", __FILE__, __LINE__, __func__)
 #else /* ifdef LOGFNS */
-#define LOGFN(fl, ln, fn)
+#define LOGFN
 #endif /* ifdef LOGFNS */
 
 
diff --git a/src/lib/ecore_x/ecore_x_region.c b/src/lib/ecore_x/ecore_x_region.c
index 01f1fa76a3..d37040a48b 100644
--- a/src/lib/ecore_x/ecore_x_region.c
+++ b/src/lib/ecore_x/ecore_x_region.c
@@ -30,14 +30,14 @@
 EAPI Ecore_X_XRegion *
 ecore_x_xregion_new()
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return (Ecore_X_XRegion *)XCreateRegion();
 }
 
 EAPI void
 ecore_x_xregion_free(Ecore_X_XRegion *region)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!region)
      return;
 
@@ -49,7 +49,7 @@ ecore_x_xregion_set(Ecore_X_XRegion *region,
                     Ecore_X_GC gc)
 {
    Eina_Bool ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = !!XSetRegion(_ecore_x_disp, gc, (Region)region);
    if (_ecore_xlib_sync) ecore_x_sync();
    return ret;
@@ -60,7 +60,7 @@ ecore_x_xregion_translate(Ecore_X_XRegion *region,
                           int x,
                           int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!region)
      return;
 
@@ -73,7 +73,7 @@ ecore_x_xregion_intersect(Ecore_X_XRegion *dst,
                           Ecore_X_XRegion *r1,
                           Ecore_X_XRegion *r2)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XIntersectRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -82,7 +82,7 @@ ecore_x_xregion_union(Ecore_X_XRegion *dst,
                       Ecore_X_XRegion *r1,
                       Ecore_X_XRegion *r2)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XUnionRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -93,7 +93,7 @@ ecore_x_xregion_union_rect(Ecore_X_XRegion *dst,
 {
    XRectangle xr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xr.x = rect->x;
    xr.y = rect->y;
    xr.width = rect->width;
@@ -107,7 +107,7 @@ ecore_x_xregion_subtract(Ecore_X_XRegion *dst,
                          Ecore_X_XRegion *rm,
                          Ecore_X_XRegion *rs)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XSubtractRegion((Region)rm, (Region)rs, (Region)dst) ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -117,7 +117,7 @@ ecore_x_xregion_is_empty(Ecore_X_XRegion *region)
    if (!region)
      return EINA_TRUE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XEmptyRegion((Region)region) ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -128,7 +128,7 @@ ecore_x_xregion_is_equal(Ecore_X_XRegion *r1,
    if (!r1 || !r2)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XEqualRegion((Region)r1, (Region)r1) ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -140,7 +140,7 @@ ecore_x_xregion_point_contain(Ecore_X_XRegion *region,
    if (!region)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XPointInRegion((Region)region, x, y) ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -151,7 +151,7 @@ ecore_x_xregion_rect_contain(Ecore_X_XRegion *region,
    if (!region || !rect)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XRectInRegion((Region)region,
                         rect->x,
                         rect->y,
diff --git a/src/lib/ecore_x/ecore_x_screensaver.c b/src/lib/ecore_x/ecore_x_screensaver.c
index faaa6256f7..cded6a3b84 100644
--- a/src/lib/ecore_x/ecore_x_screensaver.c
+++ b/src/lib/ecore_x/ecore_x_screensaver.c
@@ -22,7 +22,7 @@ ecore_x_screensaver_event_available_get(void)
 #ifdef ECORE_XSS
    int _screensaver_major, _screensaver_minor;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _screensaver_major = 1;
    _screensaver_minor = 0;
 
@@ -47,7 +47,7 @@ ecore_x_screensaver_idle_time_get(void)
    int dummy;
    int idle;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xss = XScreenSaverAllocInfo();
    XScreenSaverQueryInfo(_ecore_x_disp,
                          RootWindow(_ecore_x_disp, DefaultScreen(
@@ -104,7 +104,7 @@ ecore_x_screensaver_set(int timeout,
                         int prefer_blanking,
                         int allow_exposures)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSetScreenSaver(_ecore_x_disp,
                    timeout,
                    interval,
@@ -117,7 +117,7 @@ ecore_x_screensaver_timeout_set(int timeout)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    XSetScreenSaver(_ecore_x_disp, timeout, pint, pblank, pexpo);
 }
@@ -127,7 +127,7 @@ ecore_x_screensaver_timeout_get(void)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    return pto;
 }
@@ -137,7 +137,7 @@ ecore_x_screensaver_blank_set(int blank)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    XSetScreenSaver(_ecore_x_disp, pto, pint, blank, pexpo);
 }
@@ -147,7 +147,7 @@ ecore_x_screensaver_blank_get(void)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    return pblank;
 }
@@ -157,7 +157,7 @@ ecore_x_screensaver_expose_set(int expose)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    XSetScreenSaver(_ecore_x_disp, pto, pint, pblank, expose);
 }
@@ -167,7 +167,7 @@ ecore_x_screensaver_expose_get(void)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    return pexpo;
 }
@@ -177,7 +177,7 @@ ecore_x_screensaver_interval_set(int interval)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    XSetScreenSaver(_ecore_x_disp, pto, interval, pblank, pexpo);
 }
@@ -187,7 +187,7 @@ ecore_x_screensaver_interval_get(void)
 {
    int pto, pint, pblank, pexpo;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo);
    return pint;
 }
@@ -198,7 +198,7 @@ ecore_x_screensaver_event_listen_set(Eina_Bool on)
 #ifdef ECORE_XSS
    Ecore_X_Window root;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    root = DefaultRootWindow(_ecore_x_disp);
    if (on)
      XScreenSaverSelectInput(_ecore_x_disp, root,
diff --git a/src/lib/ecore_x/ecore_x_selection.c b/src/lib/ecore_x/ecore_x_selection.c
index 733b799244..de4c91abd5 100644
--- a/src/lib/ecore_x/ecore_x_selection.c
+++ b/src/lib/ecore_x/ecore_x_selection.c
@@ -175,7 +175,7 @@ ecore_x_selection_primary_set(Ecore_X_Window w,
                               const void *data,
                               int size)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_PRIMARY);
 }
 
@@ -188,7 +188,7 @@ ecore_x_selection_primary_set(Ecore_X_Window w,
 EAPI Eina_Bool
 ecore_x_selection_primary_clear(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_PRIMARY);
 }
 
@@ -205,7 +205,7 @@ ecore_x_selection_secondary_set(Ecore_X_Window w,
                                 const void *data,
                                 int size)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(w,
                                  data,
                                  size,
@@ -221,7 +221,7 @@ ecore_x_selection_secondary_set(Ecore_X_Window w,
 EAPI Eina_Bool
 ecore_x_selection_secondary_clear(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(None,
                                  NULL,
                                  0,
@@ -241,7 +241,7 @@ ecore_x_selection_xdnd_set(Ecore_X_Window w,
                            const void *data,
                            int size)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_XDND);
 }
 
@@ -254,7 +254,7 @@ ecore_x_selection_xdnd_set(Ecore_X_Window w,
 EAPI Eina_Bool
 ecore_x_selection_xdnd_clear(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_XDND);
 }
 
@@ -274,7 +274,7 @@ ecore_x_selection_clipboard_set(Ecore_X_Window w,
                                 const void *data,
                                 int size)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(w,
                                  data,
                                  size,
@@ -290,7 +290,7 @@ ecore_x_selection_clipboard_set(Ecore_X_Window w,
 EAPI Eina_Bool
 ecore_x_selection_clipboard_clear(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_selection_set(None,
                                  NULL,
                                  0,
@@ -365,7 +365,7 @@ EAPI void
 ecore_x_selection_primary_request(Ecore_X_Window w,
                                   const char *target)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_PRIMARY, target);
 }
 
@@ -373,7 +373,7 @@ EAPI void
 ecore_x_selection_secondary_request(Ecore_X_Window w,
                                     const char *target)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_SECONDARY, target);
 }
 
@@ -384,7 +384,7 @@ ecore_x_selection_xdnd_request(Ecore_X_Window w,
    Ecore_X_Atom atom;
    Ecore_X_DND_Target *_target;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _target = _ecore_x_dnd_target_get();
    atom = _ecore_x_selection_target_atom_get(target);
    XConvertSelection(_ecore_x_disp, ECORE_X_ATOM_SELECTION_XDND, atom,
@@ -397,7 +397,7 @@ EAPI void
 ecore_x_selection_clipboard_request(Ecore_X_Window w,
                                     const char *target)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_CLIPBOARD, target);
 }
 
@@ -413,7 +413,7 @@ ecore_x_selection_converter_atom_add(Ecore_X_Atom target,
 {
    Ecore_X_Selection_Converter *cnv;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_INLIST_FOREACH(converters, cnv)
       if (cnv->target == target)
@@ -446,7 +446,7 @@ ecore_x_selection_converter_add(char *target,
    if (!func || !target)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    x_target = _ecore_x_selection_target_atom_get(target);
 
    ecore_x_selection_converter_atom_add(x_target, func);
@@ -457,7 +457,7 @@ ecore_x_selection_converter_atom_del(Ecore_X_Atom target)
 {
    Ecore_X_Selection_Converter *cnv;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_INLIST_FOREACH(converters, cnv)
      {
@@ -479,7 +479,7 @@ ecore_x_selection_converter_del(char *target)
    if (!target)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    x_target = _ecore_x_selection_target_atom_get(target);
    ecore_x_selection_converter_atom_del(x_target);
 }
@@ -494,7 +494,7 @@ ecore_x_selection_notify_send(Ecore_X_Window requestor,
    XEvent xev = { 0 };
    XSelectionEvent xnotify;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xnotify.type = SelectionNotify;
    xnotify.display = _ecore_x_disp;
    xnotify.requestor = requestor;
@@ -523,7 +523,7 @@ ecore_x_selection_convert(Ecore_X_Atom selection,
    void *data = NULL;
    char *tgt_str;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    sel = _ecore_x_selection_get(selection);
    tgt_str = _ecore_x_selection_target_get(target);
 
@@ -576,7 +576,7 @@ ecore_x_selection_converter_text(char *target,
    if (!data || !size)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!strcmp(target, ECORE_X_SELECTION_TARGET_TEXT))
      style = XTextStyle;
    else if (!strcmp(target, ECORE_X_SELECTION_TARGET_COMPOUND_TEXT))
@@ -641,7 +641,7 @@ ecore_x_selection_parser_add(const char *target,
    if (!target)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_INLIST_FOREACH(parsers, prs)
       if (!strcmp(prs->target, target))
@@ -668,7 +668,7 @@ ecore_x_selection_parser_del(const char *target)
    if (!target)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    EINA_INLIST_FOREACH(parsers, prs)
      {
diff --git a/src/lib/ecore_x/ecore_x_sync.c b/src/lib/ecore_x/ecore_x_sync.c
index 0c7f546f1a..54c0013573 100644
--- a/src/lib/ecore_x/ecore_x_sync.c
+++ b/src/lib/ecore_x/ecore_x_sync.c
@@ -18,7 +18,7 @@ ecore_x_sync_alarm_new(Ecore_X_Sync_Counter counter)
    XSyncAlarmAttributes values;
    XSyncValue init;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncIntToValue(&init, 0);
    XSyncSetCounter(_ecore_x_disp, counter, init);
 
@@ -47,7 +47,7 @@ ecore_x_sync_alarm_new(Ecore_X_Sync_Counter counter)
 EAPI Eina_Bool
 ecore_x_sync_alarm_free(Ecore_X_Sync_Alarm alarm)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return XSyncDestroyAlarm(_ecore_x_disp, alarm);
 }
 
@@ -57,7 +57,7 @@ ecore_x_sync_counter_query(Ecore_X_Sync_Counter counter,
 {
    XSyncValue value;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (XSyncQueryCounter(_ecore_x_disp, counter, &value))
      {
         *val = (unsigned int)XSyncValueLow32(value);
@@ -73,7 +73,7 @@ ecore_x_sync_counter_new(int val)
    XSyncCounter counter;
    XSyncValue v;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncIntToValue(&v, val);
    counter = XSyncCreateCounter(_ecore_x_disp, v);
    return counter;
@@ -82,7 +82,7 @@ ecore_x_sync_counter_new(int val)
 EAPI void
 ecore_x_sync_counter_free(Ecore_X_Sync_Counter counter)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncDestroyCounter(_ecore_x_disp, counter);
 }
 
@@ -92,7 +92,7 @@ ecore_x_sync_counter_inc(Ecore_X_Sync_Counter counter,
 {
    XSyncValue v;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncIntToValue(&v, by);
    XSyncChangeCounter(_ecore_x_disp, counter, v);
 }
@@ -104,7 +104,7 @@ ecore_x_sync_counter_val_wait(Ecore_X_Sync_Counter counter,
    XSyncWaitCondition cond;
    XSyncValue v, v2;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncQueryCounter(_ecore_x_disp, counter, &v);
    XSyncIntToValue(&v, val);
    XSyncIntToValue(&v2, val + 1);
@@ -123,7 +123,7 @@ ecore_x_sync_counter_set(Ecore_X_Sync_Counter counter,
 {
    XSyncValue v;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncIntToValue(&v, val);
    XSyncSetCounter(_ecore_x_disp, counter, v);
 }
@@ -135,7 +135,7 @@ ecore_x_sync_counter_2_set(Ecore_X_Sync_Counter counter,
 {
    XSyncValue v;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSyncIntsToValue(&v, val_lo, val_hi);
    XSyncSetCounter(_ecore_x_disp, counter, v);
 }
@@ -147,7 +147,7 @@ ecore_x_sync_counter_2_query(Ecore_X_Sync_Counter counter,
 {
    XSyncValue value;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (XSyncQueryCounter(_ecore_x_disp, counter, &value))
      {
         *val_lo = (unsigned int)XSyncValueLow32(value);
diff --git a/src/lib/ecore_x/ecore_x_test.c b/src/lib/ecore_x/ecore_x_test.c
index f55291069e..fbd991e14b 100644
--- a/src/lib/ecore_x/ecore_x_test.c
+++ b/src/lib/ecore_x/ecore_x_test.c
@@ -23,7 +23,7 @@ ecore_x_test_fake_key_down(const char *key EINA_UNUSED)
    KeyCode keycode = 0;
    KeySym keysym;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!strncmp(key, "Keycode-", 8))
      keycode = atoi(key + 8);
    else
@@ -55,7 +55,7 @@ ecore_x_test_fake_key_up(const char *key EINA_UNUSED)
    KeyCode keycode = 0;
    KeySym keysym;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!strncmp(key, "Keycode-", 8))
      keycode = atoi(key + 8);
    else
@@ -88,7 +88,7 @@ ecore_x_test_fake_key_press(const char *key EINA_UNUSED)
    KeySym keysym = 0;
    int shift = 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!strncmp(key, "Keycode-", 8))
      keycode = atoi(key + 8);
    else
diff --git a/src/lib/ecore_x/ecore_x_window.c b/src/lib/ecore_x/ecore_x_window.c
index 5600956605..890551559f 100644
--- a/src/lib/ecore_x/ecore_x_window.c
+++ b/src/lib/ecore_x/ecore_x_window.c
@@ -35,7 +35,7 @@ ecore_x_window_full_new(Ecore_X_Window parent,
    Window win;
    XSetWindowAttributes attr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (parent == 0)
      parent = DefaultRootWindow(_ecore_x_disp);
 
@@ -105,7 +105,7 @@ ecore_x_window_new(Ecore_X_Window parent,
    Window win;
    XSetWindowAttributes attr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (parent == 0)
      parent = DefaultRootWindow(_ecore_x_disp);
 
@@ -174,7 +174,7 @@ ecore_x_window_override_new(Ecore_X_Window parent,
    Window win;
    XSetWindowAttributes attr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (parent == 0)
      parent = DefaultRootWindow(_ecore_x_disp);
 
@@ -240,7 +240,7 @@ ecore_x_window_input_new(Ecore_X_Window parent,
    Window win;
    XSetWindowAttributes attr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (parent == 0)
      parent = DefaultRootWindow(_ecore_x_disp);
 
@@ -302,7 +302,7 @@ ecore_x_window_defaults_set(Ecore_X_Window win)
    char **argv;
    XTextProperty xprop;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    /*
     * Set WM_CLIENT_MACHINE.
     */
@@ -348,7 +348,7 @@ ecore_x_window_configure(Ecore_X_Window win,
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 
    xwc.x = x;
    xwc.y = y;
@@ -380,7 +380,7 @@ ecore_x_window_free(Ecore_X_Window win)
    /* sorry sir, deleting the root window doesn't sound like
     * a smart idea.
     */
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!win) return;
    XDestroyWindow(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -398,7 +398,7 @@ ecore_x_window_ignore_set(Ecore_X_Window win,
    int i, j, cnt;
    Ecore_X_Window *t;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (ignore)
      {
         if (ignore_list)
@@ -475,7 +475,7 @@ ecore_x_window_delete_request_send(Ecore_X_Window win)
    if (!win)
      return;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    xev.xclient.type = ClientMessage;
    xev.xclient.display = _ecore_x_disp;
    xev.xclient.window = win;
@@ -506,7 +506,7 @@ ecore_x_window_delete_request_send(Ecore_X_Window win)
 EAPI void
 ecore_x_window_show(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XMapWindow(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -528,7 +528,7 @@ ecore_x_window_hide(Ecore_X_Window win)
    unsigned int uidum;
 
    /* ICCCM: SEND unmap event... */
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    root = win;
    if (ScreenCount(_ecore_x_disp) == 1)
      root = DefaultRootWindow(_ecore_x_disp);
@@ -579,7 +579,7 @@ ecore_x_window_move(Ecore_X_Window win,
                     int x,
                     int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XMoveWindow(_ecore_x_disp, win, x, y);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -596,7 +596,7 @@ ecore_x_window_resize(Ecore_X_Window win,
                       int w,
                       int h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (w < 1)
      w = 1;
 
@@ -623,7 +623,7 @@ ecore_x_window_move_resize(Ecore_X_Window win,
                            int w,
                            int h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (w < 1)
      w = 1;
 
@@ -649,7 +649,7 @@ ecore_x_window_move_resize(Ecore_X_Window win,
 EAPI void
 ecore_x_window_focus(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);  //   XSetInputFocus(_ecore_x_disp, win, RevertToNone, CurrentTime);
 
@@ -668,7 +668,7 @@ EAPI void
 ecore_x_window_focus_at_time(Ecore_X_Window win,
                              Ecore_X_Time t)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);  //   XSetInputFocus(_ecore_x_disp, win, RevertToNone, t);
 
@@ -688,7 +688,7 @@ ecore_x_window_focus_get(void)
    Window win;
    int revert_mode;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    win = 0;
    XGetInputFocus(_ecore_x_disp, &win, &revert_mode);
    return win;
@@ -709,7 +709,7 @@ ecore_x_window_focus_get(void)
 EAPI void
 ecore_x_window_raise(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XRaiseWindow(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -722,7 +722,7 @@ ecore_x_window_raise(Ecore_X_Window win)
 EAPI void
 ecore_x_window_lower(Ecore_X_Window win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XLowerWindow(_ecore_x_disp, win);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -748,7 +748,7 @@ ecore_x_window_reparent(Ecore_X_Window win,
                         int x,
                         int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (new_parent == 0)
      new_parent = DefaultRootWindow(_ecore_x_disp);
 
@@ -770,7 +770,7 @@ ecore_x_window_size_get(Ecore_X_Window win,
 {
    int dummy_x, dummy_y;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -801,7 +801,7 @@ ecore_x_window_geometry_get(Ecore_X_Window win,
                             int *w,
                             int *h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!win)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -819,7 +819,7 @@ EAPI int
 ecore_x_window_border_width_get(Ecore_X_Window win)
 {
    int w;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    /* doesn't make sense to call this on a root window */
    if (!win)
      return 0;
@@ -839,7 +839,7 @@ EAPI void
 ecore_x_window_border_width_set(Ecore_X_Window win,
                                 int width)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    /* doesn't make sense to call this on a root window */
    if (!win)
      return;
@@ -857,7 +857,7 @@ EAPI int
 ecore_x_window_depth_get(Ecore_X_Window win)
 {
    int d;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    d = ecore_x_drawable_depth_get(win);
    if (_ecore_xlib_sync) ecore_x_sync();
    return d;
@@ -872,7 +872,7 @@ EAPI void
 ecore_x_window_cursor_show(Ecore_X_Window win,
                            Eina_Bool show)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -915,7 +915,7 @@ ecore_x_window_cursor_set(Ecore_X_Window win,
    int devid;
 #endif
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 #ifdef ECORE_XI2
    XIGetClientPointer(_ecore_x_disp, None, &devid);
    if (c == 0)
@@ -943,7 +943,7 @@ ecore_x_window_visible_get(Ecore_X_Window win)
    Eina_Bool ret;
    XWindowAttributes attr;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = (XGetWindowAttributes(_ecore_x_disp, win, &attr) &&
           (attr.map_state == IsViewable));
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1303,7 +1303,7 @@ ecore_x_window_shadow_tree_at_xy_with_skip_get(Ecore_X_Window base,
                                                Ecore_X_Window *skip,
                                                int skip_num)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_window_shadow_tree_at_xy_get(base,
                                                 0,
                                                 0,
@@ -1328,7 +1328,7 @@ ecore_x_window_shadow_parent_get(Ecore_X_Window root EINA_UNUSED,
    Shadow *s;
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!shadow_base)
      {
         _ecore_x_window_tree_shadow_populate();
@@ -1360,7 +1360,7 @@ ecore_x_window_shadow_parent_get(Ecore_X_Window root EINA_UNUSED,
 EAPI void
 ecore_x_window_shadow_tree_flush(void)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    _ecore_x_window_tree_shadow_free();
 }
 
@@ -1375,7 +1375,7 @@ ecore_x_window_root_get(Ecore_X_Window win)
 {
    XWindowAttributes att;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!XGetWindowAttributes(_ecore_x_disp, win, &att))
      return 0;
 
@@ -1396,11 +1396,11 @@ _ecore_x_window_at_xy_get(Window base,
    int i, j, wx, wy, ww, wh;
    unsigned int num;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!ecore_x_window_visible_get(base))
      return 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_geometry_get(base, &wx, &wy, &ww, &wh);
    wx += bx;
    wy += by;
@@ -1408,7 +1408,7 @@ _ecore_x_window_at_xy_get(Window base,
    if (!((x >= wx) && (y >= wy) && (x < (wx + ww)) && (y < (wy + wh))))
      return 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!XQueryTree(_ecore_x_disp, base, &root_win, &parent_win, &list, &num))
      return base;
 
@@ -1459,7 +1459,7 @@ ecore_x_window_at_xy_get(int x,
 {
    Ecore_X_Window win, root;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    /* FIXME: Proper function to determine current root/virtual root
     * window missing here */
    root = DefaultRootWindow(_ecore_x_disp);
@@ -1489,7 +1489,7 @@ ecore_x_window_at_xy_with_skip_get(int x,
 {
    Ecore_X_Window win, root;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    /* FIXME: Proper function to determine current root/virtual root
     * window missing here */
    root = DefaultRootWindow(_ecore_x_disp);
@@ -1508,7 +1508,7 @@ ecore_x_window_at_xy_begin_get(Ecore_X_Window begin,
 {
    Ecore_X_Window win;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_grab();
    win = _ecore_x_window_at_xy_get(begin, 0, 0, x, y, NULL, 0);
    ecore_x_ungrab();
@@ -1529,7 +1529,7 @@ ecore_x_window_parent_get(Ecore_X_Window win)
    unsigned int num;
    Eina_Bool success;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    success = XQueryTree(_ecore_x_disp, win, &root, &parent, &children, &num);
    if (_ecore_xlib_sync) ecore_x_sync();
    if (!success) return 0;
@@ -1557,7 +1557,7 @@ ecore_x_window_background_color_set(Ecore_X_Window win,
    Colormap map;
    XColor col;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    col.red = r;
    col.green = g;
    col.blue = b;
@@ -1576,7 +1576,7 @@ ecore_x_window_gravity_set(Ecore_X_Window win,
 {
    XSetWindowAttributes att;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    att.win_gravity = grav;
    XChangeWindowAttributes(_ecore_x_disp, win, CWWinGravity, &att);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1588,7 +1588,7 @@ ecore_x_window_pixel_gravity_set(Ecore_X_Window win,
 {
    XSetWindowAttributes att;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    att.bit_gravity = grav;
    XChangeWindowAttributes(_ecore_x_disp, win, CWBitGravity, &att);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1598,7 +1598,7 @@ EAPI void
 ecore_x_window_pixmap_set(Ecore_X_Window win,
                           Ecore_X_Pixmap pmap)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XSetWindowBackgroundPixmap(_ecore_x_disp, win, pmap);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -1610,7 +1610,7 @@ ecore_x_window_area_clear(Ecore_X_Window win,
                           int w,
                           int h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XClearArea(_ecore_x_disp, win, x, y, w, h, False);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -1622,7 +1622,7 @@ ecore_x_window_area_expose(Ecore_X_Window win,
                            int w,
                            int h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XClearArea(_ecore_x_disp, win, x, y, w, h, True);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -1633,7 +1633,7 @@ ecore_x_window_override_set(Ecore_X_Window win,
 {
    XSetWindowAttributes att;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    att.override_redirect = override;
    XChangeWindowAttributes(_ecore_x_disp, win, CWOverrideRedirect, &att);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -1801,7 +1801,7 @@ ecore_x_window_manager_argb_new(Ecore_X_Window parent,
                                 int h)
 {
 #ifdef ECORE_XRENDER
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_window_argb_internal_new(parent, x, y, w, h, 1, 0);
 #else /* ifdef ECORE_XRENDER */
    return 0;
@@ -1827,7 +1827,7 @@ ecore_x_window_argb_new(Ecore_X_Window parent,
                         int h)
 {
 #ifdef ECORE_XRENDER
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_window_argb_internal_new(parent, x, y, w, h, 0, 0);
 #else /* ifdef ECORE_XRENDER */
    return 0;
@@ -1853,7 +1853,7 @@ ecore_x_window_override_argb_new(Ecore_X_Window parent,
                                  int h)
 {
 #ifdef ECORE_XRENDER
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    return _ecore_x_window_argb_internal_new(parent, x, y, w, h, 1, 0);
 #else /* ifdef ECORE_XRENDER */
    return 0;
@@ -1870,7 +1870,7 @@ ecore_x_window_permanent_new(Ecore_X_Window parent, Ecore_X_Atom unique_atom)
    unsigned long ldata, bytes_after, num_ret, *datap;
    unsigned char *prop_ret;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    disp = XOpenDisplay(DisplayString(_ecore_x_disp));
    if (!disp) return 0;
 
diff --git a/src/lib/ecore_x/ecore_x_window_prop.c b/src/lib/ecore_x/ecore_x_window_prop.c
index ac23a50877..ae82f9256a 100644
--- a/src/lib/ecore_x/ecore_x_window_prop.c
+++ b/src/lib/ecore_x/ecore_x_window_prop.c
@@ -31,7 +31,7 @@ ecore_x_window_prop_card32_set(Ecore_X_Window win,
    long *v2;
    unsigned int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    v2 = malloc(num * sizeof(long));
    if (!v2)
      return;
@@ -65,7 +65,7 @@ ecore_x_window_prop_card32_get(Ecore_X_Window win,
    unsigned int i;
    int num;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    prop_ret = NULL;
    if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False,
                           XA_CARDINAL, &type_ret, &format_ret, &num_ret,
@@ -112,7 +112,7 @@ ecore_x_window_prop_card32_list_get(Ecore_X_Window win,
    unsigned int i, *val;
    int num;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (plst) *plst = NULL;
    prop_ret = NULL;
    if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False,
@@ -163,7 +163,7 @@ ecore_x_window_prop_xid_set(Ecore_X_Window win,
    unsigned long *pl;
    unsigned int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    pl = malloc(num * sizeof(unsigned long));
    if (!pl)
      return;
@@ -200,7 +200,7 @@ ecore_x_window_prop_xid_get(Ecore_X_Window win,
    unsigned i;
    Eina_Bool success;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    prop_ret = NULL;
    success = (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False,
                           type, &type_ret, &format_ret, &num_ret,
@@ -252,7 +252,7 @@ ecore_x_window_prop_xid_list_get(Ecore_X_Window win,
    unsigned i;
    Eina_Bool success;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (val) *val = NULL;
    prop_ret = NULL;
    success = (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False,
@@ -294,7 +294,7 @@ ecore_x_window_prop_xid_list_change(Ecore_X_Window win,
    Ecore_X_ID *lst, *temp;
    int i, num;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    num = ecore_x_window_prop_xid_list_get(win, atom, type, &lst);
    if (num < 0)
      {
@@ -355,7 +355,7 @@ ecore_x_window_prop_atom_set(Ecore_X_Window win,
                              Ecore_X_Atom *lst,
                              unsigned int num)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_xid_set(win, atom, XA_ATOM, lst, num);
 }
 
@@ -374,7 +374,7 @@ ecore_x_window_prop_atom_get(Ecore_X_Window win,
                              unsigned int len)
 {
    int ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_xid_get(win, atom, XA_ATOM, lst, len);
    return ret;
 }
@@ -393,7 +393,7 @@ ecore_x_window_prop_atom_list_get(Ecore_X_Window win,
                                   Ecore_X_Atom **plst)
 {
    int ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_xid_list_get(win, atom, XA_ATOM, plst);
    return ret;
 }
@@ -407,7 +407,7 @@ ecore_x_window_prop_atom_list_change(Ecore_X_Window win,
                                      Ecore_X_Atom item,
                                      int op)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_xid_list_change(win, atom, XA_ATOM, item, op);
 }
 
@@ -420,7 +420,7 @@ ecore_x_window_prop_window_set(Ecore_X_Window win,
                                Ecore_X_Window *lst,
                                unsigned int num)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ecore_x_window_prop_xid_set(win, atom, XA_WINDOW, lst, num);
 }
 
@@ -439,7 +439,7 @@ ecore_x_window_prop_window_get(Ecore_X_Window win,
                                unsigned int len)
 {
    int ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_xid_get(win, atom, XA_WINDOW, lst, len);
    return ret;
 }
@@ -458,7 +458,7 @@ ecore_x_window_prop_window_list_get(Ecore_X_Window win,
                                     Ecore_X_Window **plst)
 {
    int ret;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    ret = ecore_x_window_prop_xid_list_get(win, atom, XA_WINDOW, plst);
    return ret;
 }
@@ -486,7 +486,7 @@ ecore_x_window_prop_property_set(Ecore_X_Window win,
                                  void *data,
                                  int number)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -551,7 +551,7 @@ ecore_x_window_prop_property_get(Ecore_X_Window win,
    else /* we can't store the retrieved data, so just return */
      return 0;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!win)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -602,7 +602,7 @@ EAPI void
 ecore_x_window_prop_property_del(Ecore_X_Window win,
                                  Ecore_X_Atom property)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XDeleteProperty(_ecore_x_disp, win, property);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -615,7 +615,7 @@ ecore_x_window_prop_list(Ecore_X_Window win,
    Atom *atom_ret;
    int num = 0, i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (num_ret)
      *num_ret = 0;
 
@@ -652,7 +652,7 @@ ecore_x_window_prop_string_set(Ecore_X_Window win,
 {
    XTextProperty xtp;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -677,7 +677,7 @@ ecore_x_window_prop_string_get(Ecore_X_Window win,
    XTextProperty xtp;
    char *str = NULL;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (win == 0)
      win = DefaultRootWindow(_ecore_x_disp);
 
@@ -727,7 +727,7 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win,
    if (protocol >= ECORE_X_WM_PROTOCOL_NUM)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    proto = _ecore_x_atoms_wm_protocols[protocol];
 
    ret = XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count);
@@ -763,7 +763,7 @@ ecore_x_window_prop_protocol_list_get(Ecore_X_Window win,
    Ecore_X_WM_Protocol *prot_ret = NULL;
    Eina_Bool success;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    success = XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count);
    if (_ecore_xlib_sync) ecore_x_sync();
    if (!success)
diff --git a/src/lib/ecore_x/ecore_x_window_shape.c b/src/lib/ecore_x/ecore_x_window_shape.c
index 987aa07cf8..e9f989c1cf 100644
--- a/src/lib/ecore_x/ecore_x_window_shape.c
+++ b/src/lib/ecore_x/ecore_x_window_shape.c
@@ -27,7 +27,7 @@ EAPI void
 ecore_x_window_shape_mask_set(Ecore_X_Window win,
                               Ecore_X_Pixmap mask)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineMask(_ecore_x_disp, win, ShapeBounding, 0, 0, mask, ShapeSet);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
@@ -43,7 +43,7 @@ EAPI void
 ecore_x_window_shape_input_mask_set(Ecore_X_Window win,
                                     Ecore_X_Pixmap mask)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 #ifdef ShapeInput
    XShapeCombineMask(_ecore_x_disp, win, ShapeInput, 0, 0, mask, ShapeSet);
    if (_ecore_xlib_sync) ecore_x_sync();
@@ -57,7 +57,7 @@ EAPI void
 ecore_x_window_shape_window_set(Ecore_X_Window win,
                                 Ecore_X_Window shape_win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineShape(_ecore_x_disp,
                       win,
                       ShapeBounding,
@@ -74,7 +74,7 @@ ecore_x_window_shape_input_window_set(Ecore_X_Window win,
                                       Ecore_X_Window shape_win)
 {
 #ifdef ShapeInput
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineShape(_ecore_x_disp,
                       win,
                       ShapeInput,
@@ -96,7 +96,7 @@ ecore_x_window_shape_window_set_xy(Ecore_X_Window win,
                                    int x,
                                    int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineShape(_ecore_x_disp,
                       win,
                       ShapeBounding,
@@ -115,7 +115,7 @@ ecore_x_window_shape_input_window_set_xy(Ecore_X_Window win,
                                          int y)
 {
 #ifdef ShapeInput
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineShape(_ecore_x_disp,
                       win,
                       ShapeInput,
@@ -140,7 +140,7 @@ ecore_x_window_shape_rectangle_set(Ecore_X_Window win,
 {
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -167,7 +167,7 @@ ecore_x_window_shape_input_rectangle_set(Ecore_X_Window win,
 #ifdef ShapeInput
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -197,7 +197,7 @@ ecore_x_window_shape_rectangles_set(Ecore_X_Window win,
    XRectangle *rect = NULL;
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!rects) return;
    if (num > 0)
      {
@@ -237,7 +237,7 @@ ecore_x_window_shape_input_rectangles_set(Ecore_X_Window win,
    XRectangle *rect = NULL;
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (!rects) return;
    if (num > 0)
      {
@@ -277,7 +277,7 @@ ecore_x_window_shape_rectangle_subtract(Ecore_X_Window win,
 {
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -304,7 +304,7 @@ ecore_x_window_shape_input_rectangle_subtract(Ecore_X_Window win,
 #ifdef ShapeInput
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -329,7 +329,7 @@ EAPI void
 ecore_x_window_shape_window_add(Ecore_X_Window win,
                                 Ecore_X_Window shape_win)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineShape(_ecore_x_disp,
                       win,
                       ShapeBounding,
@@ -347,7 +347,7 @@ ecore_x_window_shape_window_add_xy(Ecore_X_Window win,
                                    int x,
                                    int y)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineShape(_ecore_x_disp,
                       win,
                       ShapeBounding,
@@ -366,7 +366,7 @@ ecore_x_window_shape_input_window_add_xy(Ecore_X_Window win,
                                          int y)
 {
 #ifdef ShapeInput
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    XShapeCombineShape(_ecore_x_disp,
                       win,
                       ShapeInput,
@@ -391,7 +391,7 @@ ecore_x_window_shape_rectangle_add(Ecore_X_Window win,
 {
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -418,7 +418,7 @@ ecore_x_window_shape_input_rectangle_add(Ecore_X_Window win,
 #ifdef ShapeInput
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -448,7 +448,7 @@ ecore_x_window_shape_rectangle_clip(Ecore_X_Window win,
 {
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -475,7 +475,7 @@ ecore_x_window_shape_input_rectangle_clip(Ecore_X_Window win,
 #ifdef ShapeInput
    XRectangle rect;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect.x = x;
    rect.y = y;
    rect.width = w;
@@ -504,7 +504,7 @@ ecore_x_window_shape_rectangles_add(Ecore_X_Window win,
    XRectangle *rect = NULL;
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (num > 0)
      {
         rect = malloc(sizeof(XRectangle) * num);
@@ -540,7 +540,7 @@ ecore_x_window_shape_input_rectangles_add(Ecore_X_Window win,
    XRectangle *rect = NULL;
    int i;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (num > 0)
      {
         rect = malloc(sizeof(XRectangle) * num);
@@ -579,7 +579,7 @@ ecore_x_window_shape_rectangles_get(Ecore_X_Window win,
    Ecore_X_Rectangle *rects = NULL;
    int i, num = 0, ord;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect = XShapeGetRectangles(_ecore_x_disp, win, ShapeBounding, &num, &ord);
    if (_ecore_xlib_sync) ecore_x_sync();
    if (rect)
@@ -619,7 +619,7 @@ ecore_x_window_shape_input_rectangles_get(Ecore_X_Window win,
    XRectangle *rect;
    int i, num = 0, ord;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    rect = XShapeGetRectangles(_ecore_x_disp, win, ShapeInput, &num, &ord);
    if (_ecore_xlib_sync) ecore_x_sync();
    if (rect)
@@ -675,7 +675,7 @@ EAPI void
 ecore_x_window_shape_events_select(Ecore_X_Window win,
                                    Eina_Bool on)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (on)
      XShapeSelectInput(_ecore_x_disp, win, ShapeNotifyMask);
    else
diff --git a/src/lib/ecore_x/ecore_x_xi2.c b/src/lib/ecore_x/ecore_x_xi2.c
index c1b131e1c0..40244abcf2 100644
--- a/src/lib/ecore_x/ecore_x_xi2.c
+++ b/src/lib/ecore_x/ecore_x_xi2.c
@@ -783,7 +783,7 @@ ecore_x_input_multi_select(Ecore_X_Window win)
    if (!_ecore_x_xi2_devs)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    for (i = 0; i < _ecore_x_xi2_num; i++)
      {
         XIDeviceInfo *dev = &(_ecore_x_xi2_devs[i]);
@@ -847,7 +847,7 @@ ecore_x_input_raw_select(Ecore_X_Window win)
    if (!_ecore_x_xi2_devs)
      return EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    emask.deviceid = XIAllMasterDevices;
    emask.mask_len = sizeof(mask);
    emask.mask = mask;
@@ -881,7 +881,7 @@ _ecore_x_input_touch_devices_grab(Ecore_X_Window grab_win, Eina_Bool grab)
 
    Eina_Bool status = EINA_FALSE;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    for (i = 0; i < _ecore_x_xi2_num; i++)
      {
         XIDeviceInfo *dev = &(_ecore_x_xi2_devs[i]);
diff --git a/src/lib/ecore_x/ecore_x_xinerama.c b/src/lib/ecore_x/ecore_x_xinerama.c
index a55fdbd051..7bc8e36e6e 100644
--- a/src/lib/ecore_x/ecore_x_xinerama.c
+++ b/src/lib/ecore_x/ecore_x_xinerama.c
@@ -22,7 +22,7 @@ ecore_x_xinerama_screen_count_get(void)
 #ifdef ECORE_XINERAMA
    int event_base, error_base;
 
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
    if (_xin_info)
      XFree(_xin_info);
 
@@ -48,7 +48,7 @@ ecore_x_xinerama_screen_geometry_get(int screen EINA_UNUSED, // if no xinerama
                                      int *w,
                                      int *h)
 {
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   LOGFN;
 #ifdef ECORE_XINERAMA
    if (_xin_info)
      {