diff --git a/src/lib/elementary/efl_general.h b/src/lib/elementary/efl_general.h
new file mode 100644
index 0000000000..e10261cd63
--- /dev/null
+++ b/src/lib/elementary/efl_general.h
@@ -0,0 +1,68 @@
+#ifdef EFL_BETA_API_SUPPORT
+
+#ifdef EFL_VERSION_MICRO
+# define _EFL_VERSION_MICRO EFL_VERSION_MICRO
+#else
+# define _EFL_VERSION_MICRO 0
+#endif
+
+#ifdef EFL_VERSION_REVISION
+# define _EFL_VERSION_REVISION EFL_VERSION_REVISION
+#else
+# define _EFL_VERSION_REVISION 0
+#endif
+
+#ifdef EFL_VERSION_FLAVOR
+# define _EFL_VERSION_FLAVOR EFL_VERSION_FLAVOR
+#else
+# define _EFL_VERSION_FLAVOR NULL
+#endif
+
+#ifdef EFL_BUILD_ID
+# define _EFL_BUILD_ID EFL_BUILD_ID
+#else
+# define _EFL_BUILD_ID NULL
+#endif
+
+#define _EFL_APP_VERSION_SET()                                          \
+  do {                                                                  \
+     if (efl_build_version_set)                                         \
+       efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, _EFL_VERSION_MICRO, \
+                             _EFL_VERSION_REVISION, _EFL_VERSION_FLAVOR, _EFL_BUILD_ID); \
+  } while (0)
+
+#define EFL_MAIN() int main(int argc, char **argv)                      \
+  {                                                                     \
+     Eina_Value *ret__;                                                 \
+     int real__;                                                        \
+     _EFL_APP_VERSION_SET();                                            \
+     _elm_startup_time = ecore_time_unix_get();                         \
+     elm_init(argc, argv);                                              \
+     efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \
+     ret__ = efl_loop_begin(ecore_main_loop_get());                     \
+     real__ = efl_loop_exit_code_process(ret__);                        \
+     elm_shutdown();                                                    \
+     return real__;                                                     \
+  }
+
+#define EFL_MAIN_EX()                                                   \
+  EFL_CALLBACKS_ARRAY_DEFINE(_efl_main_ex,                              \
+                             { EFL_LOOP_EVENT_ARGUMENTS, efl_main },    \
+                             { EFL_LOOP_EVENT_PAUSE, efl_pause },       \
+                             { EFL_LOOP_EVENT_RESUME, efl_resume },     \
+                             { EFL_LOOP_EVENT_TERMINATE, efl_terminate });         \
+  int main(int argc, char **argv)                                       \
+  {                                                                     \
+     Eina_Value *ret__;                                                 \
+     int real__;                                                        \
+     _EFL_APP_VERSION_SET();                                            \
+     _elm_startup_time = ecore_time_unix_get();                         \
+     elm_init(argc, argv);                                              \
+     efl_event_callback_array_add(ecore_main_loop_get(), _efl_main_ex(), NULL); \
+     ret__ = efl_loop_begin(ecore_main_loop_get());                     \
+     real__ = efl_loop_exit_code_process(ret__);                        \
+     elm_shutdown();                                                    \
+     return real__;                                                     \
+  }
+
+#endif /* EFL_BETA_API_SUPPORT */
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 4e3097eac1..7c2a28236a 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -96,76 +96,7 @@ extern EAPI double _elm_startup_time;
 #define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; }
 #endif
 
-
-#ifdef EFL_BETA_API_SUPPORT
-
-#ifdef EFL_VERSION_MICRO
-# define _EFL_VERSION_MICRO EFL_VERSION_MICRO
-#else
-# define _EFL_VERSION_MICRO 0
-#endif
-
-#ifdef EFL_VERSION_REVISION
-# define _EFL_VERSION_REVISION EFL_VERSION_REVISION
-#else
-# define _EFL_VERSION_REVISION 0
-#endif
-
-#ifdef EFL_VERSION_FLAVOR
-# define _EFL_VERSION_FLAVOR EFL_VERSION_FLAVOR
-#else
-# define _EFL_VERSION_FLAVOR NULL
-#endif
-
-#ifdef EFL_BUILD_ID
-# define _EFL_BUILD_ID EFL_BUILD_ID
-#else
-# define _EFL_BUILD_ID NULL
-#endif
-
-#define _EFL_APP_VERSION_SET()                                          \
-  do {                                                                  \
-     if (efl_build_version_set)                                         \
-       efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, _EFL_VERSION_MICRO, \
-                             _EFL_VERSION_REVISION, _EFL_VERSION_FLAVOR, _EFL_BUILD_ID); \
-  } while (0)
-
-#define EFL_MAIN() int main(int argc, char **argv)                      \
-  {                                                                     \
-     Eina_Value *ret__;                                                 \
-     int real__;                                                        \
-     _EFL_APP_VERSION_SET();                                            \
-     _elm_startup_time = ecore_time_unix_get();                         \
-     elm_init(argc, argv);                                              \
-     efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \
-     ret__ = efl_loop_begin(ecore_main_loop_get());                     \
-     real__ = efl_loop_exit_code_process(ret__);                        \
-     elm_shutdown();                                                    \
-     return real__;                                                     \
-  }
-
-#define EFL_MAIN_EX()                                                   \
-  EFL_CALLBACKS_ARRAY_DEFINE(_efl_main_ex,                              \
-                             { EFL_LOOP_EVENT_ARGUMENTS, efl_main },    \
-                             { EFL_LOOP_EVENT_PAUSE, efl_pause },       \
-                             { EFL_LOOP_EVENT_RESUME, efl_resume },     \
-                             { EFL_LOOP_EVENT_TERMINATE, efl_terminate });         \
-  int main(int argc, char **argv)                                       \
-  {                                                                     \
-     Eina_Value *ret__;                                                 \
-     int real__;                                                        \
-     _EFL_APP_VERSION_SET();                                            \
-     _elm_startup_time = ecore_time_unix_get();                         \
-     elm_init(argc, argv);                                              \
-     efl_event_callback_array_add(ecore_main_loop_get(), _efl_main_ex(), NULL); \
-     ret__ = efl_loop_begin(ecore_main_loop_get());                     \
-     real__ = efl_loop_exit_code_process(ret__);                        \
-     elm_shutdown();                                                    \
-     return real__;                                                     \
-  }
-
-#endif /* EFL_BETA_API_SUPPORT */
-
+#include "efl_general.h"
 
 /**************************************************************************/
 /* General calls */