diff --git a/legacy/ecore/src/lib/ecore_input/Ecore_Input.h b/legacy/ecore/src/lib/ecore_input/Ecore_Input.h
index c0094624c7..bfb32f8448 100644
--- a/legacy/ecore/src/lib/ecore_input/Ecore_Input.h
+++ b/legacy/ecore/src/lib/ecore_input/Ecore_Input.h
@@ -1,15 +1,27 @@
-#ifndef		_ECORE_INPUT_H
-# define	_ECORE_INPUT_H
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
+#ifndef _ECORE_INPUT_H
+#define _ECORE_INPUT_H
+
+
+#include <Evas.h>
 
 #ifdef EAPI
-#undef EAPI
+# undef EAPI
 #endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-#  define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_ECORE_INPUT_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
 # else
 #  define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_ECORE_INPUT_BUILD */
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@@ -22,8 +34,6 @@
 # endif
 #endif
 
-#include <Evas.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/legacy/ecore/src/lib/ecore_input/Makefile.am b/legacy/ecore/src/lib/ecore_input/Makefile.am
index 7c1c067488..162bd78fae 100644
--- a/legacy/ecore/src/lib/ecore_input/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_input/Makefile.am
@@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore \
+@EFL_ECORE_INPUT_BUILD@ \
 @EVAS_CFLAGS@
 
 if BUILD_ECORE_INPUT