diff --git a/configure.ac b/configure.ac
index d90b51608b..1a850808f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5790,7 +5790,7 @@ src/examples/elementary/Makefile
 src/lib/eina/eina_config.h
 src/lib/ecore_x/ecore_x_version.h
 src/lib/efl/Efl_Config.h
-src/lib/elementary/Elementary.h
+src/lib/elementary/Elementary_Options.h
 src/scripts/eo/eo_debug
 elm_intro.h
 spec/efl.spec
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 44d344ce11..fec21c2a6d 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -188,6 +188,7 @@ lib_LTLIBRARIES += lib/elementary/libelementary.la
 
 includes_HEADERS = \
 lib/elementary/Elementary.h \
+lib/elementary/Elementary_Options.h \
 lib/elementary/Elementary_Cursor.h
 includesdir = $(includedir)/elementary-@VMAJ@
 
@@ -1359,7 +1360,7 @@ endif
 EXTRA_DIST2 += \
 tests/elementary/elm_suite.h \
 tests/elementary/elm_test_helper.h \
-lib/elementary/Elementary.h.in \
+lib/elementary/Elementary_Options.h.in \
 lib/elementary/elm_code_widget_text.c \
 lib/elementary/elm_code_widget_undo.c
 
diff --git a/src/lib/elementary/.gitignore b/src/lib/elementary/.gitignore
index 0015d39f9c..089c32dd72 100644
--- a/src/lib/elementary/.gitignore
+++ b/src/lib/elementary/.gitignore
@@ -1,5 +1,5 @@
-/Elementary.h
 /Elementary.hh
+/Elementary_Options.h
 /elm_intro.h
 /*.eo.c
 /*.eo.h
diff --git a/src/lib/elementary/Elementary.h.in b/src/lib/elementary/Elementary.h
similarity index 93%
rename from src/lib/elementary/Elementary.h.in
rename to src/lib/elementary/Elementary.h
index 943864196f..9de820265d 100644
--- a/src/lib/elementary/Elementary.h.in
+++ b/src/lib/elementary/Elementary.h
@@ -7,21 +7,8 @@
 #ifndef ELEMENTARY_H
 #define ELEMENTARY_H
 
-#define ELM_ELDBUS
-#define ELM_EFREET
-#define ELM_ETHUMB
-
-@ELM_UNIX_DEF@ ELM_UNIX
-@ELM_WIN32_DEF@ ELM_WIN32
-#undef ELM_EMAP
-@ELM_DEBUG_DEF@ ELM_DEBUG
-@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
-@ELM_LIBINTL_H_DEF@ ELM_LIBINTL_H
-@ELM_DIRENT_H_DEF@ ELM_DIRENT_H
-
-#ifdef EFL_BETA_API_SUPPORT
-# define ELM_ELOCATION
-#endif
+/* Options which can be enabled or disabled by the buildtool */
+#include "Elementary_Options.h"
 
 /* Standard headers for standard system calls etc. */
 #include <stdio.h>
@@ -83,6 +70,7 @@
 #include <Efreet_Mime.h>
 #include <Efreet_Trash.h>
 #include <Ethumb_Client.h>
+#include <Efl.h>
 
 #ifdef ELM_ELOCATION
 #include <Elocation.h>
@@ -135,8 +123,8 @@ extern "C"
 #include <elm_getting_started.h>
 #include <elm_authors.h>
 
-#define ELM_VERSION_MAJOR @EFL_VERSION_MAJOR@
-#define ELM_VERSION_MINOR @EFL_VERSION_MINOR@
+#define ELM_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ELM_VERSION_MINOR EFL_VERSION_MINOR
 
 typedef struct _Elm_Version
 {
diff --git a/src/lib/elementary/Elementary_Options.h.in b/src/lib/elementary/Elementary_Options.h.in
new file mode 100644
index 0000000000..a52444dddc
--- /dev/null
+++ b/src/lib/elementary/Elementary_Options.h.in
@@ -0,0 +1,20 @@
+#ifndef ELEMENTARY_OPTIONS_H
+#define ELEMENTARY_OPTIONS_H
+
+#define ELM_ELDBUS
+#define ELM_EFREET
+#define ELM_ETHUMB
+
+@ELM_UNIX_DEF@ ELM_UNIX
+@ELM_WIN32_DEF@ ELM_WIN32
+#undef ELM_EMAP
+@ELM_DEBUG_DEF@ ELM_DEBUG
+@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
+@ELM_LIBINTL_H_DEF@ ELM_LIBINTL_H
+@ELM_DIRENT_H_DEF@ ELM_DIRENT_H
+
+#ifdef EFL_BETA_API_SUPPORT
+# define ELM_ELOCATION
+#endif
+
+#endif