diff --git a/src/bindings/cxx/elementary_cxx/meson.build b/src/bindings/cxx/elementary_cxx/meson.build
new file mode 100644
index 0000000000..3c76dade79
--- /dev/null
+++ b/src/bindings/cxx/elementary_cxx/meson.build
@@ -0,0 +1 @@
+cxx_header_src += files(join_paths('..', file_location, 'Efl_Ui.hh'))
diff --git a/src/bindings/cxx/meson.build b/src/bindings/cxx/meson.build
index d5b6295731..3401a43c3f 100644
--- a/src/bindings/cxx/meson.build
+++ b/src/bindings/cxx/meson.build
@@ -11,7 +11,7 @@ cxx_sublibs = [
   ['Evas',       false,  true,  true, []],
   ['Edje',       false, false,  true, []],
   ['Eldbus',      true,  true,  true, []],
-  ['Elementary', false,  true,  true, []]
+  ['Elementary',  true,  true,  true, []]
 ]
 
 increased_dependency = []
diff --git a/src/examples/elementary/bg_cxx_example_01.cc b/src/examples/elementary/bg_cxx_example_01.cc
index 1b3ae91736..5c8a61e198 100644
--- a/src/examples/elementary/bg_cxx_example_01.cc
+++ b/src/examples/elementary/bg_cxx_example_01.cc
@@ -1,6 +1,6 @@
 #define EFL_CXXPERIMENTAL // for background part
 #define EFL_BETA_API_SUPPORT
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/bg_cxx_example_02.cc b/src/examples/elementary/bg_cxx_example_02.cc
index f88329d2eb..07b40ab5fe 100644
--- a/src/examples/elementary/bg_cxx_example_02.cc
+++ b/src/examples/elementary/bg_cxx_example_02.cc
@@ -8,7 +8,7 @@
 #define EFL_CXXPERIMENTAL
 #define EFL_BETA_API_SUPPORT
 
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/box_cxx_example_02.cc b/src/examples/elementary/box_cxx_example_02.cc
index e89007fdec..e9d802cb98 100644
--- a/src/examples/elementary/box_cxx_example_02.cc
+++ b/src/examples/elementary/box_cxx_example_02.cc
@@ -1,6 +1,6 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` box_cxx_example_02.cc -o box_cxx_example_02
 
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc
index a0cdb1c566..ff9f569c18 100644
--- a/src/examples/elementary/button_cxx_example_00.cc
+++ b/src/examples/elementary/button_cxx_example_00.cc
@@ -2,7 +2,7 @@
 
 #define EFL_CXXPERIMENTAL
 #define EFL_BETA_API_SUPPORT
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 #include <iostream>
 
 using efl::eo::instantiate;
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 3136f6ac04..4cad5d8ae7 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -2,7 +2,7 @@
 
 #define EFL_CXXPERIMENTAL
 #define EFL_BETA_API_SUPPORT
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/calendar_cxx_example_01.cc b/src/examples/elementary/calendar_cxx_example_01.cc
index 0d89dfe2d6..fbeccb92bf 100644
--- a/src/examples/elementary/calendar_cxx_example_01.cc
+++ b/src/examples/elementary/calendar_cxx_example_01.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/calendar_cxx_example_02.cc b/src/examples/elementary/calendar_cxx_example_02.cc
index 047f5841f8..60fb796bf1 100644
--- a/src/examples/elementary/calendar_cxx_example_02.cc
+++ b/src/examples/elementary/calendar_cxx_example_02.cc
@@ -1,6 +1,6 @@
 #define EFL_CXXPERIMENTAL
 
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using namespace std::placeholders;
 using efl::eo::add;
diff --git a/src/examples/elementary/calendar_cxx_example_03.cc b/src/examples/elementary/calendar_cxx_example_03.cc
index 5b44afb557..3f75b07167 100644
--- a/src/examples/elementary/calendar_cxx_example_03.cc
+++ b/src/examples/elementary/calendar_cxx_example_03.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/calendar_cxx_example_04.cc b/src/examples/elementary/calendar_cxx_example_04.cc
index 4e7a17fe21..ef2a8eb643 100644
--- a/src/examples/elementary/calendar_cxx_example_04.cc
+++ b/src/examples/elementary/calendar_cxx_example_04.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 #warning This example can not be implemented with EO APIs... FIXME
 
diff --git a/src/examples/elementary/calendar_cxx_example_05.cc b/src/examples/elementary/calendar_cxx_example_05.cc
index 3e6b9f780c..ccb7891d15 100644
--- a/src/examples/elementary/calendar_cxx_example_05.cc
+++ b/src/examples/elementary/calendar_cxx_example_05.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 #warning This example can not be implemented with EO APIs... FIXME
 
diff --git a/src/examples/elementary/clock_cxx_example.cc b/src/examples/elementary/clock_cxx_example.cc
index 7e30937c2c..aa08d40c88 100644
--- a/src/examples/elementary/clock_cxx_example.cc
+++ b/src/examples/elementary/clock_cxx_example.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/icon_cxx_example_01.cc b/src/examples/elementary/icon_cxx_example_01.cc
index 6252ce1cc0..fd71bedeb5 100644
--- a/src/examples/elementary/icon_cxx_example_01.cc
+++ b/src/examples/elementary/icon_cxx_example_01.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 EAPI_MAIN int
 elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)
diff --git a/src/examples/elementary/menu_cxx_example_01.cc b/src/examples/elementary/menu_cxx_example_01.cc
index 04cb3905ad..ff3a62e9be 100644
--- a/src/examples/elementary/menu_cxx_example_01.cc
+++ b/src/examples/elementary/menu_cxx_example_01.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 #warning This example can not be implemented with EO APIs... FIXME
 
diff --git a/src/examples/elementary/popup_cxx_example.cc b/src/examples/elementary/popup_cxx_example.cc
index a6a29ed955..f92b1add89 100644
--- a/src/examples/elementary/popup_cxx_example.cc
+++ b/src/examples/elementary/popup_cxx_example.cc
@@ -4,7 +4,7 @@
 
 #include <Evas.hh>
 #include <Efl_Ui.h>
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 #include <iostream>
 
 using efl::eo::instantiate;
diff --git a/src/examples/elementary/radio_cxx_example_01.cc b/src/examples/elementary/radio_cxx_example_01.cc
index e72fe9f55e..6d6f943fb9 100644
--- a/src/examples/elementary/radio_cxx_example_01.cc
+++ b/src/examples/elementary/radio_cxx_example_01.cc
@@ -2,7 +2,7 @@
 
 #define EFL_CXXPERIMENTAL
 #define EFL_BETA_API_SUPPORT
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 #include <iostream>
 
 using efl::eo::instantiate;
diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc
index 82846257cf..24de288d06 100644
--- a/src/examples/elementary/slider_cxx_example.cc
+++ b/src/examples/elementary/slider_cxx_example.cc
@@ -2,7 +2,7 @@
 
 #define EFL_CXXPERIMENTAL
 #define EFL_BETA_API_SUPPORT
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using namespace std::placeholders;
 using efl::eo::instantiate;
diff --git a/src/examples/elementary/spinner_cxx_example.cc b/src/examples/elementary/spinner_cxx_example.cc
index a37e24e44c..98319c091d 100644
--- a/src/examples/elementary/spinner_cxx_example.cc
+++ b/src/examples/elementary/spinner_cxx_example.cc
@@ -2,7 +2,7 @@
 
 #define ELM_WIDGET_PROTECTED
 
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 #include <iostream>
 
 #warning FIXME: This example requires proper EO API usage (not legacy spinner)
diff --git a/src/examples/elementary/table_cxx_example_01.cc b/src/examples/elementary/table_cxx_example_01.cc
index 60a923d283..11e97b589f 100644
--- a/src/examples/elementary/table_cxx_example_01.cc
+++ b/src/examples/elementary/table_cxx_example_01.cc
@@ -1,6 +1,6 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` table_cxx_example_01.cc -o table_cxx_example_01
 
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/table_cxx_example_02.cc b/src/examples/elementary/table_cxx_example_02.cc
index f9e4c13c53..f0ca35e76d 100644
--- a/src/examples/elementary/table_cxx_example_02.cc
+++ b/src/examples/elementary/table_cxx_example_02.cc
@@ -1,7 +1,7 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` table_cxx_example_01.cc -o table_cxx_example_01
 
 #include <Evas.hh>
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
 
diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc
index 6f4e83be89..a32f4926b6 100644
--- a/src/examples/elementary/toolbar_cxx_example_01.cc
+++ b/src/examples/elementary/toolbar_cxx_example_01.cc
@@ -8,7 +8,7 @@
 #warning This example requires yet unfinished EO APIs
 
 #define EFL_BETA_API_SUPPORT
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 EAPI int
 elm_main(int argc, char* argv[])
diff --git a/src/lib/elementary/Elementary.hh b/src/lib/elementary/Efl_Ui.hh
similarity index 85%
rename from src/lib/elementary/Elementary.hh
rename to src/lib/elementary/Efl_Ui.hh
index e5e1036e0c..d8551b8d09 100644
--- a/src/lib/elementary/Elementary.hh
+++ b/src/lib/elementary/Efl_Ui.hh
@@ -14,7 +14,9 @@
 #include <Efl.hh>
 
 extern "C" {
+// Some Elm_* classes are built and require the old header.
 #include "Elementary.h"
+#include "Efl_Ui.h"
 }
 
 #include <Edje.hh>
diff --git a/src/tests/elementary_cxx/cxx_compile_test.cc b/src/tests/elementary_cxx/cxx_compile_test.cc
index 62b9460bf0..a32e863347 100644
--- a/src/tests/elementary_cxx/cxx_compile_test.cc
+++ b/src/tests/elementary_cxx/cxx_compile_test.cc
@@ -4,7 +4,7 @@
 # include "elementary_config.h"
 #endif
 
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 #include <iostream>