diff --git a/c-cmdline/meson.build b/c-cmdline/meson.build
index 76b3b606..c598bfd1 100644
--- a/c-cmdline/meson.build
+++ b/c-cmdline/meson.build
@@ -6,15 +6,6 @@ project(
 
 add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
 
-config_h = configuration_data()
-config_h.set_quoted('PACKAGE', meson.project_name())
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
-config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
-config_h.set_quoted('PACKAGE_NAME', meson.project_name())
-
-config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
-config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
-
 eina = dependency('eina', version : '>=1.20.99')
 efl = dependency('efl', version : '>=1.20.99')
 elm = dependency('elementary', version : '>=1.20.99')
@@ -22,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
 inc = include_directories('.')
 subdir('src')
 
-configure_file(
-  output : 'config.h',
-  install : false,
-  configuration: config_h
-)
diff --git a/c-cmdline/src/cmdline_main.c b/c-cmdline/src/cmdline_main.c
index 3995124e..503c55e9 100644
--- a/c-cmdline/src/cmdline_main.c
+++ b/c-cmdline/src/cmdline_main.c
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
 
 #include <Eina.h>
 #include <Efl.h>
diff --git a/c-gui/meson.build b/c-gui/meson.build
index d894a22e..05cfb5e4 100644
--- a/c-gui/meson.build
+++ b/c-gui/meson.build
@@ -6,15 +6,6 @@ project(
 
 add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
 
-config_h = configuration_data()
-config_h.set_quoted('PACKAGE', meson.project_name())
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
-config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
-config_h.set_quoted('PACKAGE_NAME', meson.project_name())
-
-config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
-config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
-
 eina = dependency('eina', version : '>=1.20.99')
 efl = dependency('efl', version : '>=1.20.99')
 elm = dependency('elementary', version : '>=1.20.99')
@@ -22,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
 inc = include_directories('.')
 subdir('src')
 
-configure_file(
-  output : 'config.h',
-  install : false,
-  configuration: config_h
-)
diff --git a/c-gui/src/gui_main.c b/c-gui/src/gui_main.c
index 10409a16..f99f753f 100644
--- a/c-gui/src/gui_main.c
+++ b/c-gui/src/gui_main.c
@@ -1,11 +1,18 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
 
 #include <Eina.h>
 #include <Efl.h>
 #include <Elementary.h>
 
+static void
+_gui_editor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
+{
+   Eo *editor = data;
+
+   printf("Change recorded: %s\n", efl_text_get(editor));
+}
+
 static void
 _gui_about_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
 {
@@ -40,6 +47,8 @@ _gui_setup()
                     efl_ui_text_interactive_editable_set(efl_added, EINA_TRUE),
                     efl_ui_text_scrollable_set(efl_added, EINA_TRUE),
                     efl_pack(box, efl_added));
+   efl_event_callback_add(editor, EFL_UI_TEXT_EVENT_CHANGED_USER,
+                          _gui_editor_changed_cb, editor);
 
    hbox = efl_add(EFL_UI_BOX_CLASS, box,
                  efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
diff --git a/c-lib/meson.build b/c-lib/meson.build
index 0bcf9e41..69122650 100644
--- a/c-lib/meson.build
+++ b/c-lib/meson.build
@@ -6,16 +6,6 @@ project(
 
 add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
 
-config_h = configuration_data()
-config_h.set_quoted('PACKAGE', meson.project_name())
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
-config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
-config_h.set_quoted('PACKAGE_NAME', meson.project_name())
-config_h.set_quoted('PACKAGE_BUILD_DIR', meson.build_root())
-
-config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
-config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
-
 eina = dependency('eina', version : '>=1.20.99')
 efl = dependency('efl', version : '>=1.20.99')
 elm = dependency('elementary', version : '>=1.20.99')
@@ -23,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
 inc = include_directories('.')
 subdir('src')
 
-configure_file(
-  output : 'config.h',
-  install : false,
-  configuration: config_h
-)
diff --git a/c-lib/src/lib/Example.h b/c-lib/src/lib/Example.h
index 7522c27d..db09e3d0 100644
--- a/c-lib/src/lib/Example.h
+++ b/c-lib/src/lib/Example.h
@@ -1,6 +1,9 @@
 #ifndef EXAMPLE_H_
 # define EXAMPLE_H_
 
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
 #include <Eina.h>
 
 #ifdef EAPI
diff --git a/c-lib/src/lib/example.c b/c-lib/src/lib/example.c
index 35039a1e..23c4122d 100644
--- a/c-lib/src/lib/example.c
+++ b/c-lib/src/lib/example.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "Example.h"
 
 EAPI Eina_Bool example_method()
diff --git a/c-lib/src/test/meson.build b/c-lib/src/test/meson.build
index dd9f3d0a..3268e3a1 100644
--- a/c-lib/src/test/meson.build
+++ b/c-lib/src/test/meson.build
@@ -9,6 +9,7 @@ check = dependency('check')
 exe = executable('example-test', src,
   dependencies : [eina, efl, elm, check, example_lib],
   include_directories : inc,
+  c_args : '-DPACKAGE_BUILD_DIR="' + meson.build_root() + '"',
   install : false
 )
 test('lib test', exe)
diff --git a/c-lib/src/test/runner.c b/c-lib/src/test/runner.c
index c15eb20e..9b81cf36 100644
--- a/c-lib/src/test/runner.c
+++ b/c-lib/src/test/runner.c
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
 
 #include <check.h>
 #include <Elementary.h>
diff --git a/c-lib/src/test/test_lib.c b/c-lib/src/test/test_lib.c
index 5b14b8a9..4072e568 100644
--- a/c-lib/src/test/test_lib.c
+++ b/c-lib/src/test/test_lib.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "suite.h"
 
 START_TEST (lib_test_basic_call)
diff --git a/c-lifecycle/meson.build b/c-lifecycle/meson.build
index 27365aac..c45709d8 100644
--- a/c-lifecycle/meson.build
+++ b/c-lifecycle/meson.build
@@ -6,15 +6,6 @@ project(
 
 add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
 
-config_h = configuration_data()
-config_h.set_quoted('PACKAGE', meson.project_name())
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
-config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
-config_h.set_quoted('PACKAGE_NAME', meson.project_name())
-
-config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
-config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
-
 eina = dependency('eina', version : '>=1.20.99')
 efl = dependency('efl', version : '>=1.20.99')
 elm = dependency('elementary', version : '>=1.20.99')
@@ -22,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
 inc = include_directories('.')
 subdir('src')
 
-configure_file(
-  output : 'config.h',
-  install : false,
-  configuration: config_h
-)
diff --git a/c-lifecycle/src/lifecycle_main.c b/c-lifecycle/src/lifecycle_main.c
index 7ba1c389..0abb0559 100644
--- a/c-lifecycle/src/lifecycle_main.c
+++ b/c-lifecycle/src/lifecycle_main.c
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
 
 #include <Eina.h>
 #include <Efl.h>