diff --git a/configure.ac b/configure.ac
index ce46fb1e6c..b04f4dd452 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3713,7 +3713,7 @@ if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; th
        AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
       ],
       [have_ecore_imf_ibus="no"])
-   IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"²
+   IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"
    IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}"
 fi
 
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index 820ae2b12a..5634b909cd 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -89,6 +89,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_x \
 -I$(top_srcdir)/src/lib/ecore_imf \
 -I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_srcdir)/src/lib/evas \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
 -I$(top_builddir)/src/lib/ecore \
@@ -101,7 +102,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
 @EFL_COV_CFLAGS@ \
 @IBUS_CFLAGS@
 modules_ecore_immodules_ibus_ibus_la_LIBADD = \
-lib/ecore_imf/libecore_evas.la \
+lib/ecore_evas/libecore_evas.la \
 lib/ecore_imf/libecore_imf.la \
 lib/ecore_x/libecore_x.la \
 lib/ecore/libecore.la \
@@ -129,6 +130,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_x \
 -I$(top_srcdir)/src/lib/ecore_imf \
 -I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_srcdir)/src/lib/evas \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
 -I$(top_builddir)/src/lib/ecore \
@@ -141,7 +143,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
 @EFL_COV_CFLAGS@ \
 @SCIM_CFLAGS@
 modules_ecore_immodules_scim_scim_la_LIBADD = \
-lib/ecore_imf/libecore_evas.la \
+lib/ecore_evas/libecore_evas.la \
 lib/ecore_imf/libecore_imf.la \
 lib/ecore_x/libecore_x.la \
 lib/ecore/libecore.la \
diff --git a/src/modules/ecore/immodules/scim/scim_imcontext.cpp b/src/modules/ecore/immodules/scim/scim_imcontext.cpp
index d4d20b161a..5d48bf2a17 100644
--- a/src/modules/ecore/immodules/scim/scim_imcontext.cpp
+++ b/src/modules/ecore/immodules/scim/scim_imcontext.cpp
@@ -1455,7 +1455,7 @@ isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
 
 /* Panel Slot functions */
 static void
-panel_slot_reload_config(int context __UNUSED__)
+panel_slot_reload_config(int context EINA_UNUSED)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
    _config->reload();
@@ -1834,7 +1834,7 @@ panel_finalize(void)
 }
 
 static Eina_Bool
-panel_iochannel_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler)
+panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
@@ -2753,7 +2753,7 @@ slot_update_property(IMEngineInstanceBase *si,
 }
 
 static void
-slot_beep(IMEngineInstanceBase *si __UNUSED__)
+slot_beep(IMEngineInstanceBase *si EINA_UNUSED)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 }
@@ -2886,7 +2886,7 @@ reload_config_callback(const ConfigPointer &config)
 }
 
 static void
-fallback_commit_string_cb(IMEngineInstanceBase  *si __UNUSED__,
+fallback_commit_string_cb(IMEngineInstanceBase  *si EINA_UNUSED,
                           const WideString      &str)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";