diff --git a/legacy/evas/src/modules/engines/gl_x11/Makefile.am b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
index e1859339f9..a26ea393d7 100644
--- a/legacy/evas/src/modules/engines/gl_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
@@ -19,7 +19,7 @@ GL_X11_SOURCES = \
 evas_engine.c \
 evas_x_main.c
 
-GL_X11_LIBADD = @evas_engine_gl_xlib_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la 
+GL_X11_LIBADD = @evas_engine_gl_xlib_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
 
 
 includes_HEADERS = Evas_Engine_GL_X11.h
@@ -32,7 +32,7 @@ pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = $(GL_X11_SOURCES)
 module_la_LIBADD = @EVAS_GENERAL_LIBS@ @GL_EET_LIBS@ $(GL_X11_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
+module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 else
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c
index de20035374..27ac42d5d3 100644
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -360,7 +360,7 @@ evas_module_unregister(const Evas_Module_Api *module, Evas_Module_Type type)
 # define EVAS_MODULE_NAME_IMAGE_LOADER "loader_%s.dll"
 # define EVAS_MODULE_NAME_ENGINE "engine_%s.dll"
 # define EVAS_MODULE_NAME_OBJECT "object_%s.dll"
-#elif _WIN32
+#elif defined(_WIN32) || defined(__CYGWIN__)
 # define EVAS_MODULE_NAME_IMAGE_SAVER "module.dll"
 # define EVAS_MODULE_NAME_IMAGE_LOADER "module.dll"
 # define EVAS_MODULE_NAME_ENGINE "module.dll"