diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index 270463d7b0..2ec590a7e8 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -15,13 +15,6 @@ set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 set(MODULE_ARCH "v-${VMAJ}.${VMIN}")
 
-#change when on windows
-if (WIN32)
-    set(SHARED_LIB_SUFFIX ".dll")
-else()
-    set(SHARED_LIB_SUFFIX ".so")
-endif()
-
 EFL_OPTION(BUILD_PROFILE "How to build EFL" dev CHOICE release;dev;debug)
 EFL_OPTION(EFL_NOLEGACY_API_SUPPORT "Whenever to disable non-Eo (Legacy) APIs" ON)
 EFL_OPTION(EFL_EO_API_SUPPORT "Whenever to enable new Eo APIs" ON)
diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake
index 2331f4ba5a..a7fd4bc4cf 100644
--- a/src/lib/efl/config.h.cmake
+++ b/src/lib/efl/config.h.cmake
@@ -17,7 +17,8 @@
 #cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1
 
 #define MODULE_ARCH "@MODULE_ARCH@"
-#define SHARED_LIB_SUFFIX "@SHARED_LIB_SUFFIX@"
+#define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
+#define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@"
 
 #if defined (HAVE_LISTXATTR) && defined (HAVE_SETXATTR) && defined (HAVE_GETXATTR)
 #define HAVE_XATTR