diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
index bf1353a199..703513adc8 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
@@ -316,8 +316,11 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE
           }
         if (ee->prop.avoid_damage)
           {
+             int pdam;
+
+             pdam = ecore_evas_avoid_damage_get(ee);
              ecore_evas_avoid_damage_set(ee, 0);
-             ecore_evas_avoid_damage_set(ee, 1);
+             ecore_evas_avoid_damage_set(ee, pdam);
           }
 /*         if (ee->shaped) */
 /*           _ecore_evas_win32_region_border_resize(ee); */
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
index 1c20e2f562..aca3d78360 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
@@ -394,6 +394,7 @@ _ecore_win32_window_procedure(HWND   window,
      case WM_WINDOWPOSCHANGED:
        INF("position changed window message");
        _ecore_win32_event_handle_configure_notify(data);
+       _ecore_win32_event_handle_expose(data);
        return 0;
      case WM_ENTERSIZEMOVE:
        INF("enter size move window message");
diff --git a/legacy/ecore/src/modules/immodules/xim/Makefile.am b/legacy/ecore/src/modules/immodules/xim/Makefile.am
index 9e3d074ce0..7d4718f358 100644
--- a/legacy/ecore/src/modules/immodules/xim/Makefile.am
+++ b/legacy/ecore/src/modules/immodules/xim/Makefile.am
@@ -12,6 +12,8 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_imf \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@x_cflags@ \
+@XCB_CFLAGS@ \
 @EVAS_CFLAGS@ \
 @EINA_CFLAGS@
 
@@ -20,7 +22,6 @@ pkgdir = $(libdir)/ecore/immodules
 pkg_LTLIBRARIES = xim.la
 xim_la_SOURCES = \
 ecore_imf_xim.c
-xim_la_LIBADD  = $(top_builddir)/src/lib/ecore_imf/libecore_imf.la
+xim_la_LIBADD  = $(top_builddir)/src/lib/ecore_imf/libecore_imf.la $(top_builddir)/src/lib/ecore_x/libecore_x.la
 xim_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 xim_la_LIBTOOLFLAGS = --tag=disable-static
-xim_la_DEPENDENCIES = $(top_builddir)/config.h